Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 18 additions & 2 deletions internal/cli/apps.go
Original file line number Diff line number Diff line change
Expand Up @@ -513,8 +513,24 @@ func createAppCmd(cli *cli) *cobra.Command {

// Prompt for resource server identifier if app type is resource_server.
if appIsResourceServer {
if err := appResourceServerIdentifier.Ask(cmd, &inputs.ResourceServerIdentifier, nil); err != nil {
return err
if !appResourceServerIdentifier.IsSet(cmd) {
var selectedAPIID string
if err := appResourceServerIdentifier.Pick(cmd, &selectedAPIID, cli.apiPickerOptionsWithoutAuth0); err != nil {
return err
}

var selectedAPI *management.ResourceServer
if err := ansi.Waiting(func() error {
var err error
selectedAPI, err = cli.api.ResourceServer.Read(cmd.Context(), selectedAPIID)
return err
}); err != nil {
return fmt.Errorf("failed to read selected API: %w", err)
}

inputs.ResourceServerIdentifier = selectedAPI.GetIdentifier()
} else if strings.TrimSpace(inputs.ResourceServerIdentifier) == "" {
return fmt.Errorf("resource-server-identifier cannot be empty for resource_server app type")
}
}

Expand Down
48 changes: 48 additions & 0 deletions internal/cli/apps_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,54 @@ func TestAppsListCmd(t *testing.T) {
}
}

func TestAppsCreateCmd(t *testing.T) {
tests := []struct {
name string
args []string
expectedError string
}{
{
name: "Resource Server - resource-server-identifier is empty string",
args: []string{
"--name", "My Resource Server App",
"--type", "resource_server",
"--resource-server-identifier", "",
},
expectedError: "resource-server-identifier cannot be empty for resource_server app type",
},
{
name: "Resource Server - resource-server-identifier is whitespace only",
args: []string{
"--name", "My Resource Server App",
"--type", "resource_server",
"--resource-server-identifier", " ",
},
expectedError: "resource-server-identifier cannot be empty for resource_server app type",
},
{
name: "Resource Server - resource-server-identifier is tab/newline",
args: []string{
"--name", "My Resource Server App",
"--type", "resource_server",
"--resource-server-identifier", "\t\n",
},
expectedError: "resource-server-identifier cannot be empty for resource_server app type",
},
}

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
cli := &cli{}
cli.noInput = true // Non-interactive mode.
cmd := createAppCmd(cli)
cmd.SetArgs(test.args)
err := cmd.Execute()

assert.EqualError(t, err, test.expectedError)
})
}
}

func TestFormatAppSettingsPath(t *testing.T) {
assert.Empty(t, formatAppSettingsPath(""))
assert.Equal(t, "applications/app-id-1/settings", formatAppSettingsPath("app-id-1"))
Expand Down
Loading