Skip to content
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

Do not default GCP authentication type #679

Merged
merged 1 commit into from
Oct 22, 2024
Merged

Do not default GCP authentication type #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 22 additions & 25 deletions cmd/ocm/create/cluster/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,15 +385,6 @@ func init() {
)
arguments.SetQuestion(fs, "psc-subnet", "PrivatSericeConnect ServiceAttachment Subnet:")

fs.StringVar(
&args.gcpAuthentication.Type,
"gcp-auth-type",
c.AuthenticationWif,
"Method of authenticating GCP cluster",
)
arguments.SetQuestion(fs, "gcp-auth-type", "Authentication method:")
fs.MarkHidden("gcp-auth-type")

fs.StringVar(
&args.gcpWifConfig,
"wif-config",
Expand All @@ -411,13 +402,6 @@ func osdProviderOptions(_ *sdk.Connection) ([]arguments.Option, error) {
}, nil
}

func gcpAuthenticationOptions(_ *sdk.Connection) ([]arguments.Option, error) {
return []arguments.Option{
{Value: c.AuthenticationWif, Description: ""},
{Value: c.AuthenticationKey, Description: ""},
}, nil
}

func getRegionOptions(connection *sdk.Connection) ([]arguments.Option, error) {
regions, err := provider.GetRegions(connection.ClustersMgmt().V1(), args.provider, args.ccs)
if err != nil {
Expand Down Expand Up @@ -1343,7 +1327,7 @@ func promptCCS(fs *pflag.FlagSet, presetCCS bool) error {
return err
}

err = arguments.CheckIgnoredCCSFlags(args.ccs)
err = arguments.CheckIgnoredCCSFlags(args.ccs, fs)
if err != nil {
return err
}
Expand Down Expand Up @@ -1382,24 +1366,35 @@ func promptAuthentication(fs *pflag.FlagSet, connection *sdk.Connection) error {

func promptGcpAuth(fs *pflag.FlagSet, connection *sdk.Connection) error {
var err error

isWif := fs.Changed("wif-config")
isNonWif := fs.Changed("service-account-file")

if isWif && isNonWif {
return fmt.Errorf("can't use both wif-config and GCP service account file at the same time")
}

if !isWif && !isNonWif {
options, _ := gcpAuthenticationOptions(connection)
err = arguments.PromptOneOf(fs, "gcp-auth-type", options)
if !args.interactive {
return fmt.Errorf("either wif-config or GCP service account file must be specified")
}
// if the user has not specified the authentication method, we need to ask
args.gcpAuthentication.Type, err = interactive.GetOption(interactive.Input{
Question: "Authentication type",
Help: "Select the authentication method to use for the GCP cluster",
Required: true,
Options: []string{c.AuthenticationWif, c.AuthenticationKey},
})
if err != nil {
return err
}
}
if isWif {
args.gcpAuthentication.Type = c.AuthenticationWif
} else if isNonWif {
args.gcpAuthentication.Type = c.AuthenticationKey

if args.gcpAuthentication.Type == "" {
// if the user has not specified the authentication method, we can determine it based on the flags
if isWif {
args.gcpAuthentication.Type = c.AuthenticationWif
} else if isNonWif {
args.gcpAuthentication.Type = c.AuthenticationKey
}
}

switch args.gcpAuthentication.Type {
Expand All @@ -1422,6 +1417,8 @@ func promptGcpAuth(fs *pflag.FlagSet, connection *sdk.Connection) error {
if err != nil {
return err
}
default:
return fmt.Errorf("unexpected GCP authentication method %q", args.gcpAuthentication.Type)
}
return nil
}
Expand Down
12 changes: 11 additions & 1 deletion pkg/arguments/arguments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func AddCCSFlags(fs *pflag.FlagSet, value *cluster.CCS) {
}

// CheckIgnoredCCSFlags errors if --aws-... were used without --ccs.
func CheckIgnoredCCSFlags(ccs cluster.CCS) error {
func CheckIgnoredCCSFlags(ccs cluster.CCS, fs *pflag.FlagSet) error {
if !ccs.Enabled {
bad := []string{}
if ccs.AWS.AccountID != "" {
Expand All @@ -147,6 +147,16 @@ func CheckIgnoredCCSFlags(ccs cluster.CCS) error {
if ccs.AWS.SecretAccessKey != "" {
bad = append(bad, "--aws-secret-access-key")
}
if fs.Changed("wif-config") {
bad = append(bad, "--wif-config")
}
if fs.Changed("service-account-file") {
bad = append(bad, "--service-account-file")
}
if fs.Changed("gcp-authentication-type") {
bad = append(bad, "--gcp-authentication-type")
}

if len(bad) == 1 {
return fmt.Errorf("%s flag is meaningless without --ccs", bad[0])
} else if len(bad) > 1 {
Expand Down
Loading