Skip to content

Feat/konnect control plane id flag #1679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
asartori86 wants to merge 2 commits into from
Closed

Feat/konnect control plane id flag #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
387b5a8
feat: add konnect-control-plane-id flag
asartori86 Jun 26, 2025
657408e
chore: document default value of konnect-control-plane-name flag
asartori86 Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions cmd/common_konnect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,14 @@ func GetKongClientForKonnectMode(
if err != nil {
return nil, fmt.Errorf("authenticating with Konnect: %w", err)
}
cpID, err := fetchKonnectControlPlaneID(ctx, konnectClient, konnectConfig.ControlPlaneName)
if err != nil {
return nil, err
var cpID string
if konnectControlPlaneID != "" {
cpID = konnectControlPlaneID
} else {
cpID, err = fetchKonnectControlPlaneID(ctx, konnectClient, konnectConfig.ControlPlaneName)
if err != nil {
return nil, err
}
}

// set the kong control plane ID in the client
Expand Down Expand Up @@ -140,6 +145,10 @@ func dumpKonnectV2(ctx context.Context) error {
konnectControlPlane = defaultControlPlaneName
}
dumpConfig.KonnectControlPlane = konnectControlPlane

if konnectControlPlaneID != "" {
dumpConfig.KonnectControlPlaneID = konnectControlPlaneID
}
konnectConfig.TLSConfig = rootConfig.TLSConfig
client, err := GetKongClientForKonnectMode(ctx, &konnectConfig)
if err != nil {
Expand All @@ -159,6 +168,7 @@ func dumpKonnectV2(ctx context.Context) error {
FileFormat: file.Format(strings.ToUpper(dumpCmdStateFormat)),
WithID: dumpWithID,
ControlPlaneName: konnectControlPlane,
ControlPlaneID: konnectControlPlaneID,
KongVersion: fetchKonnectKongVersion(),
})
}
Expand Down
15 changes: 12 additions & 3 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ var (
disableAnalytics bool
konnectConnectionDesired bool

konnectRuntimeGroup string
konnectControlPlane string
konnectRuntimeGroup string
konnectControlPlane string
konnectControlPlaneID string
)

// NewRootCmd represents the base command when called without any subcommands
Expand Down Expand Up @@ -217,12 +218,19 @@ It can be used to export, import, or sync entities to Kong.`,
viper.BindPFlag("konnect-runtime-group-name",
rootCmd.PersistentFlags().Lookup("konnect-runtime-group-name"))

rootCmd.PersistentFlags().String("konnect-control-plane-name", "",
rootCmd.PersistentFlags().String("konnect-control-plane-name", defaultControlPlaneName,
"Konnect Control Plane name.")
viper.BindPFlag("konnect-control-plane-name",
rootCmd.PersistentFlags().Lookup("konnect-control-plane-name"))

rootCmd.PersistentFlags().String("konnect-control-plane-id", "",
"Konnect Control Plane ID.")
viper.BindPFlag("konnect-control-plane-id",
rootCmd.PersistentFlags().Lookup("konnect-control-plane-id"))
rootCmd.PersistentFlags().MarkHidden("konnect-control-plane-id")

rootCmd.MarkFlagsMutuallyExclusive("konnect-runtime-group-name", "konnect-control-plane-name")
rootCmd.MarkFlagsMutuallyExclusive("konnect-control-plane-id", "konnect-control-plane-name")

rootCmd.AddCommand(newVersionCmd())
rootCmd.AddCommand(newCompletionCmd())
Expand Down Expand Up @@ -441,6 +449,7 @@ func initKonnectConfig() error {
konnectConfig.Headers = extendHeaders(viper.GetStringSlice("headers"))
konnectControlPlane = viper.GetString("konnect-control-plane-name")
konnectRuntimeGroup = viper.GetString("konnect-runtime-group-name")
konnectControlPlaneID = viper.GetString("konnect-control-plane-id")
return nil
}

Expand Down