Skip to content

feat(init): save project_id in config #1380

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

feat(init): save project_id in config #1380

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a509153
feat(init): save project_id in config
Sep 3, 2020
5f7eba0
test
Sep 3, 2020
85b82e7
add test
jerome-quere Sep 3, 2020
ff8be73
Merge branch 'master' into init-project-id
remyleone Sep 3, 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
1 change: 1 addition & 0 deletions internal/core/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ func createTestClient(t *testing.T, testConfig *TestConfig, httpClient *http.Cli
scw.WithDefaultZone(scw.ZoneFrPar1),
scw.WithAuth("SCWXXXXXXXXXXXXXXXXX", "11111111-1111-1111-1111-111111111111"),
scw.WithDefaultOrganizationID("11111111-1111-1111-1111-111111111111"),
scw.WithDefaultProjectID("11111111-1111-1111-1111-111111111111"),
scw.WithUserAgent("cli-e2e-test"),
scw.WithHTTPClient(&http.Client{
Transport: &retryableHTTPTransport{transport: http.DefaultTransport},
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,8 @@ func initCommand() *core.Command {
SecretKey: &args.SecretKey,
DefaultZone: scw.StringPtr(args.Zone.String()),
DefaultRegion: scw.StringPtr(args.Region.String()),
DefaultOrganizationID: &apiKey.OrganizationID, // An api key is always bound to an organization.
DefaultOrganizationID: &apiKey.OrganizationID,
DefaultProjectID: &apiKey.ProjectID, // An API key is always bound to a project.
}

// Save the profile as default or as a named profile
Expand Down
2 changes: 2 additions & 0 deletions internal/namespaces/init/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ func TestInit(t *testing.T) {
checkConfig(func(t *testing.T, ctx *core.CheckFuncCtx, config *scw.Config) {
secretKey, _ := ctx.Client.GetSecretKey()
assert.Equal(t, secretKey, *config.SecretKey)
assert.NotEmpty(t, *config.DefaultProjectID)
assert.Equal(t, *config.DefaultProjectID, *config.DefaultProjectID)
}),
),
}))
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-darwin-bash.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-darwin-fish.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-darwin-without.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-darwin-zsh.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-linux-bash.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-linux-fish.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-linux-without.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-linux-zsh.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-windows-bash.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-windows-fish.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-windows-without.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-autocomplete-windows-zsh.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-cl-iv2-config-overwrite.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T08:21:54.096455+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-configuration-path.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T08:21:54.096455+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-profile.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T08:21:54.096455+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-simple.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T08:21:54.096455+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-ssh-key-registered.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-ssh-key-unregistered.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T14:06:56.763352+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down
3 changes: 2 additions & 1 deletion internal/namespaces/init/testdata/test-init-ssh-no-local-key.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ interactions:
"expires": null, "creation_date": "2020-06-23T08:21:54.096455+00:00", "creation_ip":
"195.154.229.35", "category": "user_created", "deletion_date": null, "inherits_user_perms":
true, "roles": {"role": null, "organization": null}, "description": "sieben-macbook",
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "use_role_key": false}}'
"organization_id": "951df375-e094-4d26-97c1-ba548eeb9c42", "project_id": "951df375-e094-4d26-97c1-ba548eeb9c42",
"use_role_key": false}}'
headers:
Connection:
- keep-alive
Expand Down