Skip to content

Commit 32beb6b

Browse files
[ND-7015] Split the --use-project-settings environment argument
Signed-off-by: Aris Buzachis <aris.buzachis@bunnyshell.com>
1 parent 81c7808 commit 32beb6b

File tree

1 file changed

+33
-15
lines changed

1 file changed

+33
-15
lines changed

cmd/environment/action/update.build_settings.go

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ func init() {
1616
options := config.GetOptions()
1717
settings := config.GetSettings()
1818

19-
useProjectSettings := enum.BoolFalse
19+
useClusterProjectSettings := enum.BoolFalse
20+
useRegistryProjectSettings := enum.BoolFalse
2021

2122
editBuildSettingsOptions := environment.NewEditBuildSettingsOptions("")
2223

@@ -28,7 +29,7 @@ func init() {
2829
RunE: func(cmd *cobra.Command, args []string) error {
2930
editBuildSettingsOptions.ID = settings.Profile.Context.Environment
3031

31-
parseEditBuildSettingsOptions(cmd.Flags(), useProjectSettings, editBuildSettingsOptions)
32+
parseEditBuildSettingsOptions(cmd.Flags(), editBuildSettingsOptions, useClusterProjectSettings, useRegistryProjectSettings)
3233

3334
_, err := environment.EditBuildSettings(editBuildSettingsOptions)
3435
if err != nil {
@@ -52,34 +53,51 @@ func init() {
5253

5354
flags.AddFlag(options.Environment.GetFlag("id", util.FlagRequired))
5455

55-
useProjectSettingsFlag := enum.BoolFlag(
56-
&useProjectSettings,
57-
"use-project-settings",
58-
"Use the project build settings",
56+
useClusterProjectSettingsFlag := enum.BoolFlag(
57+
&useClusterProjectSettings,
58+
"use-project-k8s",
59+
"Use the project build cluster settings",
5960
)
60-
flags.AddFlag(useProjectSettingsFlag)
61-
useProjectSettingsFlag.NoOptDefVal = "true"
61+
flags.AddFlag(useClusterProjectSettingsFlag)
62+
useClusterProjectSettingsFlag.NoOptDefVal = "true"
63+
64+
useRegistryProjectSettingsFlag := enum.BoolFlag(
65+
&useRegistryProjectSettings,
66+
"use-project-registry",
67+
"Use the project build registry settings",
68+
)
69+
flags.AddFlag(useRegistryProjectSettingsFlag)
70+
useRegistryProjectSettingsFlag.NoOptDefVal = "true"
6271

6372
editBuildSettingsOptions.UpdateFlagSet(flags)
6473

6574
// use-project-settings excludes the other build settings flags for the cluster
66-
command.MarkFlagsMutuallyExclusive("use-project-settings", "use-managed-k8s")
67-
command.MarkFlagsMutuallyExclusive("use-project-settings", "k8s")
68-
command.MarkFlagsMutuallyExclusive("use-project-settings", "cpu")
69-
command.MarkFlagsMutuallyExclusive("use-project-settings", "memory")
75+
command.MarkFlagsMutuallyExclusive("use-project-k8s", "use-managed-k8s")
76+
command.MarkFlagsMutuallyExclusive("use-project-k8s", "k8s")
77+
command.MarkFlagsMutuallyExclusive("use-project-k8s", "cpu")
78+
command.MarkFlagsMutuallyExclusive("use-project-k8s", "memory")
79+
80+
command.MarkFlagsMutuallyExclusive("use-project-registry", "use-managed-registry")
81+
command.MarkFlagsMutuallyExclusive("use-project-registry", "registry")
7082

7183
mainCmd.AddCommand(command)
7284
}
7385

7486
func parseEditBuildSettingsOptions(
7587
flags *pflag.FlagSet,
76-
useProjectSettings enum.Bool,
7788
editBuildSettingsOptions *environment.EditBuildSettingsOptions,
89+
useClusterProjectSettings enum.Bool,
90+
useRegistryProjectSettings enum.Bool,
7891
) {
79-
if useProjectSettings == enum.BoolTrue {
92+
if useClusterProjectSettings == enum.BoolTrue {
8093
editBuildSettingsOptions.EditData.UseManagedCluster = enum.BoolFalse
81-
editBuildSettingsOptions.SetKubernetesIntegration(flags.Lookup("k8s").Value.String())
94+
editBuildSettingsOptions.SetKubernetesIntegration("")
8295
editBuildSettingsOptions.Cpu = sdk.NullableString{}
8396
editBuildSettingsOptions.Memory = sdk.NullableInt32{}
8497
}
98+
99+
if useRegistryProjectSettings == enum.BoolTrue {
100+
editBuildSettingsOptions.EditData.UseManagedRegistry = enum.BoolFalse
101+
editBuildSettingsOptions.SetRegistryIntegration("")
102+
}
85103
}

0 commit comments

Comments
 (0)