Skip to content

feat(info): add support for project #1448

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
merged 3 commits into from
Sep 15, 2020
Merged

feat(info): add support for project #1448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b545e92
feat(info): add support for project
jerome-quere Sep 15, 2020
879b2d1
Merge branch 'master' into info-project
jerome-quere Sep 15, 2020
071fa25
Merge branch 'master' into info-project
jerome-quere Sep 15, 2020
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
24 changes: 24 additions & 0 deletions internal/namespaces/info/custom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ func infosRoot() *core.Command {
defaultRegion(ctx, config, profileName),
defaultZone(ctx, config, profileName),
defaultOrganizationID(ctx, config, profileName),
defaultProjectID(ctx, config, profileName),
accessKey(ctx, config, profileName),
secretKey(ctx, config, profileName, req.ShowSecret),
},
Expand Down Expand Up @@ -203,6 +204,29 @@ func defaultOrganizationID(ctx context.Context, config *scw.Config, profileName
}
return setting
}
func defaultProjectID(ctx context.Context, config *scw.Config, profileName string) *setting {
setting := &setting{Key: "default_project_id"}
switch {
// Environment variable check
case core.ExtractEnv(ctx, scw.ScwDefaultProjectIDEnv) != "":
setting.Value = core.ExtractEnv(ctx, scw.ScwDefaultProjectIDEnv)
setting.Origin = fmt.Sprintf("env (%s)", scw.ScwDefaultProjectIDEnv)
// There is no config file
case config == nil:
setting.Origin = ""
// Config file with profile name
case config.Profiles[profileName] != nil && config.Profiles[profileName].DefaultProjectID != nil:
setting.Value = *config.Profiles[profileName].DefaultProjectID
setting.Origin = fmt.Sprintf("profile (%s)", profileName)
// Default config
case config.Profile.DefaultProjectID != nil:
setting.Value = *config.Profile.DefaultProjectID
setting.Origin = defaultProfileOrigin
default:
setting.Origin = unknownOrigin
}
return setting
}

func accessKey(ctx context.Context, config *scw.Config, profileName string) *setting {
setting := &setting{Key: "access_key"}
Expand Down
2 changes: 2 additions & 0 deletions internal/namespaces/info/custom_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ func Test_Info(t *testing.T) {
OverrideEnv: map[string]string{
"SCW_SECRET_KEY": "22222222-2222-2222-2222-222222222222",
"SCW_DEFAULT_ORGANIZATION_ID": "22222222-2222-2222-2222-222222222222",
"SCW_DEFAULT_PROJECT_ID": "22222222-2222-2222-2222-222222222222",
"SCW_ACCESS_KEY": "SCWYYYYYYYYYYYYYYYYY",
"SCW_CONFIG_PATH": "/tmp/.config/scw/config.yaml",
"SCW_DEFAULT_REGION": "fr-par",
Expand All @@ -34,6 +35,7 @@ func Test_Info(t *testing.T) {
OverrideEnv: map[string]string{
"SCW_SECRET_KEY": "22222222-2222-2222-2222-222222222222",
"SCW_DEFAULT_ORGANIZATION_ID": "22222222-2222-2222-2222-222222222222",
"SCW_DEFAULT_PROJECT_ID": "22222222-2222-2222-2222-222222222222",
"SCW_ACCESS_KEY": "SCWYYYYYYYYYYYYYYYYY",
"SCW_CONFIG_PATH": "/tmp/.config/scw/config.yaml",
"SCW_DEFAULT_REGION": "fr-par",
Expand Down
6 changes: 6 additions & 0 deletions internal/namespaces/info/testdata/test-info-show-secret.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ profile default -
default_region fr-par env (SCW_DEFAULT_REGION)
default_zone fr-par-1 env (SCW_DEFAULT_ZONE)
default_organization_id 22222222-2222-2222-2222-222222222222 env (SCW_DEFAULT_ORGANIZATION_ID)
default_project_id 22222222-2222-2222-2222-222222222222 env (SCW_DEFAULT_PROJECT_ID)
access_key SCWYYYYYYYYYYYYYYYYY env (SCW_ACCESS_KEY)
secret_key 22222222-2222-2222-2222-222222222222 env (SCW_SECRET_KEY)
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
Expand Down Expand Up @@ -55,6 +56,11 @@ secret_key 22222222-2222-2222-2222-222222222222 env (SCW_SECRET_K
"value": "22222222-2222-2222-2222-222222222222",
"origin": "env (SCW_DEFAULT_ORGANIZATION_ID)"
},
{
"key": "default_project_id",
"value": "22222222-2222-2222-2222-222222222222",
"origin": "env (SCW_DEFAULT_PROJECT_ID)"
},
{
"key": "access_key",
"value": "SCWYYYYYYYYYYYYYYYYY",
Expand Down
6 changes: 6 additions & 0 deletions internal/namespaces/info/testdata/test-info-simple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ profile default -
default_region fr-par env (SCW_DEFAULT_REGION)
default_zone fr-par-1 env (SCW_DEFAULT_ZONE)
default_organization_id 22222222-2222-2222-2222-222222222222 env (SCW_DEFAULT_ORGANIZATION_ID)
default_project_id 22222222-2222-2222-2222-222222222222 env (SCW_DEFAULT_PROJECT_ID)
access_key SCWYYYYYYYYYYYYYYYYY env (SCW_ACCESS_KEY)
secret_key 22222222-xxxx-xxxx-xxxx-xxxxxxxxxxxx env (SCW_SECRET_KEY)
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
Expand Down Expand Up @@ -55,6 +56,11 @@ secret_key 22222222-xxxx-xxxx-xxxx-xxxxxxxxxxxx env (SCW_SECRET_K
"value": "22222222-2222-2222-2222-222222222222",
"origin": "env (SCW_DEFAULT_ORGANIZATION_ID)"
},
{
"key": "default_project_id",
"value": "22222222-2222-2222-2222-222222222222",
"origin": "env (SCW_DEFAULT_PROJECT_ID)"
},
{
"key": "access_key",
"value": "SCWYYYYYYYYYYYYYYYYY",
Expand Down