Skip to content

Don't prompt for service roles when flags are passed to rill service create #9792

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

Merged
begelundmuller merged 1 commit into from
Aug 6, 2026
Merged

Don't prompt for service roles when flags are passed to rill service create #9792

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
12 changes: 10 additions & 2 deletions cli/cmd/service/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ func CreateCmd(ch *cmdutil.Helper) *cobra.Command {
Org: ch.Org,
}

if ch.Interactive && orgRole == "" {
hasFlags := cmd.Flags().Changed("org-role") || cmd.Flags().Changed("project-role") || cmd.Flags().Changed("project") || cmd.Flags().Changed("attributes")

if ch.Interactive && !hasFlags {
ok, err := cmdutil.YesNoPrompt("Do you want to assign an organization role to the service?", false)
if err != nil {
return err
Expand All @@ -51,7 +53,7 @@ func CreateCmd(ch *cmdutil.Helper) *cobra.Command {
}
}

if ch.Interactive && projectRole == "" && !cmd.Flags().Changed("org-role") {
if ch.Interactive && !hasFlags {
ok, err := cmdutil.YesNoPrompt("Do you want to assign a project role to the service?", false)
if err != nil {
return err
Expand All @@ -72,6 +74,12 @@ func CreateCmd(ch *cmdutil.Helper) *cobra.Command {
}
}

if projectRole != "" && projectName == "" {
return fmt.Errorf("--project must be specified when --project-role is set")
}
if projectRole == "" && projectName != "" {
return fmt.Errorf("--project-role must be specified when --project is set")
}
if orgRole == "" && projectRole == "" {
return fmt.Errorf("either --org-role or --project-role must be specified")
}
Expand Down
Loading