feat: add control_plane_id field to the dumped configuration

Add the `control_plane_id` field to enable its usage in `decK`.

Author: asartori86

pkg/dump/dump.go

@@ -58,7 +58,8 @@ type Config struct {
 	LookUpSelectorTagsPartials       []string
 
 	// KonnectControlPlane
-	KonnectControlPlane string
+	KonnectControlPlane   string
+	KonnectControlPlaneID string
 
 	// IsConsumerGroupScopedPluginSupported
 	IsConsumerGroupScopedPluginSupported bool
@@ -108,7 +109,7 @@ func validateConfig(config Config) error {
 }
 
 func isKongVersion34Plus(ctx context.Context, client *kong.Client, config Config) (bool, error) {
-	if config.KonnectControlPlane != "" {
+	if config.KonnectControlPlane != "" || config.KonnectControlPlaneID != "" {
 		return false, nil
 	}
 
@@ -267,7 +268,7 @@ func getConsumerConfiguration(ctx context.Context, group *errgroup.Group,
 	})
 
 	// OAuth2 credentials are not supported in Konnect.
-	if config.KonnectControlPlane == "" {
+	if config.KonnectControlPlane == "" && config.KonnectControlPlaneID == "" {
 		group.Go(func() error {
 			oauth2Creds, err := GetAllOauth2Creds(ctx, client, config.SelectorTags)
 			if err != nil {

pkg/file/kong_json_schema.json

@@ -1660,6 +1660,9 @@
         "control_plane_name": {
           "type": "string"
         },
+        "control_plane_id": {
+          "type": "string"
+        },
         "runtime_group_name": {
           "type": "string"
         }
@@ -2182,4 +2185,4 @@
       "type": "object"
     }
   }
-}
+}

pkg/file/reader.go

@@ -79,7 +79,7 @@ func Get(ctx context.Context, fileContent *Content, opt RenderConfig, dumpConfig
 	builder.client = wsClient
 	builder.ctx = ctx
 	builder.skipCACerts = dumpConfig.SkipCACerts
-	builder.isKonnect = dumpConfig.KonnectControlPlane != ""
+	builder.isKonnect = dumpConfig.KonnectControlPlane != "" || dumpConfig.KonnectControlPlaneID != ""
 	builder.includeLicenses = dumpConfig.IncludeLicenses
 	builder.isPartialApply = dumpConfig.IsPartialApply
 	builder.isConsumerGroupPolicyOverrideSet = dumpConfig.IsConsumerGroupPolicyOverrideSet

pkg/file/types.go

@@ -802,6 +802,7 @@ type LookUpSelectorTags struct {
 type Konnect struct {
 	RuntimeGroupName string `json:"runtime_group_name,omitempty" yaml:"runtime_group_name,omitempty"`
 	ControlPlaneName string `json:"control_plane_name,omitempty" yaml:"control_plane_name,omitempty"`
+	ControlPlaneID   string `json:"control_plane_id,omitempty" yaml:"control_plane_id,omitempty"`
 }
 
 // Kong represents Kong implementation of a Service in Konnect.

pkg/file/writer.go

@@ -24,6 +24,7 @@ type WriteConfig struct {
 	FileFormat                       Format
 	WithID                           bool
 	ControlPlaneName                 string
+	ControlPlaneID                   string
 	KongVersion                      string
 	IsConsumerGroupPolicyOverrideSet bool
 }
@@ -56,9 +57,10 @@ func KongStateToContent(kongState *state.KongState, config WriteConfig) (*Conten
 		return nil, fmt.Errorf("get format version: %w", err)
 	}
 	file.FormatVersion = formatVersion
-	if config.ControlPlaneName != "" {
+	if config.ControlPlaneName != "" || config.ControlPlaneID != "" {
 		file.Konnect = &Konnect{
 			ControlPlaneName: config.ControlPlaneName,
+			ControlPlaneID:   config.ControlPlaneID,
 		}
 	}