diff --git a/go.mod b/go.mod index 02297eaf75..ca5bf8f64c 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/mattn/go-colorable v0.1.7 github.com/mattn/go-isatty v0.0.12 github.com/pkg/errors v0.9.1 // indirect - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210104102201-c1581bd3f961 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210118180419-87b8b277149c github.com/sergi/go-diff v1.1.0 // indirect github.com/spf13/cobra v1.0.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 05df8b7642..5ed3772f34 100644 --- a/go.sum +++ b/go.sum @@ -118,8 +118,8 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210104102201-c1581bd3f961 h1:77+4aSKjBGBmgifdCZ1YSGPDwAcgJNTqbiJKqORl36E= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210104102201-c1581bd3f961/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210118180419-87b8b277149c h1:NDAovDzT4JfgX7k/ED0Y5/swOtsIsDCRQMzzqPh3yA0= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210118180419-87b8b277149c/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= diff --git a/internal/e2e/testdata/test-human-create-simple.golden b/internal/e2e/testdata/test-human-create-simple.golden index 799e627794..74eb5aeb7d 100644 --- a/internal/e2e/testdata/test-human-create-simple.golden +++ b/internal/e2e/testdata/test-human-create-simple.golden @@ -15,7 +15,6 @@ EyesColor unknown Status stopped Name - ProjectID 11111111-1111-1111-1111-111111111111 -Region fr-par 🟩🟩🟩 JSON STDOUT 🟩🟩🟩 { "id": "0194fdc2-fa2f-fcc0-41d3-ff12045b73c8", @@ -32,6 +31,5 @@ Region fr-par "eyes_color": "unknown", "status": "stopped", "name": "", - "project_id": "11111111-1111-1111-1111-111111111111", - "region": "fr-par" + "project_id": "11111111-1111-1111-1111-111111111111" } diff --git a/internal/e2e/testdata/test-human-create-usage.golden b/internal/e2e/testdata/test-human-create-usage.golden index 9b76810c22..4ce24a4354 100644 --- a/internal/e2e/testdata/test-human-create-usage.golden +++ b/internal/e2e/testdata/test-human-create-usage.golden @@ -21,7 +21,6 @@ ARGS: [name] [project-id] Project ID to use. If none is passed the default project ID will be used [organization-id] Organization ID to use. If none is passed the default organization ID will be used - [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par) FLAGS: -h, --help help for create diff --git a/internal/e2e/testdata/test-human-create-with-args.golden b/internal/e2e/testdata/test-human-create-with-args.golden index 811d44723c..c3f8aaf7b2 100644 --- a/internal/e2e/testdata/test-human-create-with-args.golden +++ b/internal/e2e/testdata/test-human-create-with-args.golden @@ -15,7 +15,6 @@ EyesColor amber Status stopped Name - ProjectID b3ba839a-dcf2-4b0a-ac81-fc32370052a0 -Region fr-par 🟩🟩🟩 JSON STDOUT 🟩🟩🟩 { "id": "0194fdc2-fa2f-fcc0-41d3-ff12045b73c8", @@ -32,6 +31,5 @@ Region fr-par "eyes_color": "amber", "status": "stopped", "name": "", - "project_id": "b3ba839a-dcf2-4b0a-ac81-fc32370052a0", - "region": "fr-par" + "project_id": "b3ba839a-dcf2-4b0a-ac81-fc32370052a0" } diff --git a/internal/e2e/testdata/test-human-delete-simple.golden b/internal/e2e/testdata/test-human-delete-simple.golden index 46b74ceea0..6317e5d518 100644 --- a/internal/e2e/testdata/test-human-delete-simple.golden +++ b/internal/e2e/testdata/test-human-delete-simple.golden @@ -15,7 +15,6 @@ EyesColor blue Status stopped Name - ProjectID b3ba839a-dcf2-4b0a-ac81-fc32370052a0 -Region fr-par 🟩🟩🟩 JSON STDOUT 🟩🟩🟩 { "id": "0194fdc2-fa2f-fcc0-41d3-ff12045b73c8", @@ -32,6 +31,5 @@ Region fr-par "eyes_color": "blue", "status": "stopped", "name": "", - "project_id": "b3ba839a-dcf2-4b0a-ac81-fc32370052a0", - "region": "fr-par" + "project_id": "b3ba839a-dcf2-4b0a-ac81-fc32370052a0" } diff --git a/internal/e2e/testdata/test-human-delete-usage.golden b/internal/e2e/testdata/test-human-delete-usage.golden index 873e457ce8..ca02747a1f 100644 --- a/internal/e2e/testdata/test-human-delete-usage.golden +++ b/internal/e2e/testdata/test-human-delete-usage.golden @@ -6,8 +6,7 @@ USAGE: scw test human delete [arg=value ...] ARGS: - human-id UUID of the human you want to delete - [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par) + human-id UUID of the human you want to delete FLAGS: -h, --help help for delete diff --git a/internal/e2e/testdata/test-human-get-invalid-arg-name.golden b/internal/e2e/testdata/test-human-get-invalid-arg-name.golden index ca76f37dbe..86ee86896b 100644 --- a/internal/e2e/testdata/test-human-get-invalid-arg-name.golden +++ b/internal/e2e/testdata/test-human-get-invalid-arg-name.golden @@ -3,10 +3,10 @@ Unknown argument 'invalid' Hint: -Valid arguments are: human-id, region +Valid arguments are: human-id πŸŸ₯πŸŸ₯πŸŸ₯ JSON STDERR πŸŸ₯πŸŸ₯πŸŸ₯ { "message": "unknown argument 'invalid'", "error": {}, - "hint": "Valid arguments are: human-id, region" + "hint": "Valid arguments are: human-id" } diff --git a/internal/e2e/testdata/test-human-get-simple.golden b/internal/e2e/testdata/test-human-get-simple.golden index 46b74ceea0..6317e5d518 100644 --- a/internal/e2e/testdata/test-human-get-simple.golden +++ b/internal/e2e/testdata/test-human-get-simple.golden @@ -15,7 +15,6 @@ EyesColor blue Status stopped Name - ProjectID b3ba839a-dcf2-4b0a-ac81-fc32370052a0 -Region fr-par 🟩🟩🟩 JSON STDOUT 🟩🟩🟩 { "id": "0194fdc2-fa2f-fcc0-41d3-ff12045b73c8", @@ -32,6 +31,5 @@ Region fr-par "eyes_color": "blue", "status": "stopped", "name": "", - "project_id": "b3ba839a-dcf2-4b0a-ac81-fc32370052a0", - "region": "fr-par" + "project_id": "b3ba839a-dcf2-4b0a-ac81-fc32370052a0" } diff --git a/internal/e2e/testdata/test-human-get-usage.golden b/internal/e2e/testdata/test-human-get-usage.golden index d587704631..04f83b4371 100644 --- a/internal/e2e/testdata/test-human-get-usage.golden +++ b/internal/e2e/testdata/test-human-get-usage.golden @@ -6,8 +6,7 @@ USAGE: scw test human get [arg=value ...] ARGS: - human-id UUID of the human you want to get - [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par) + human-id UUID of the human you want to get FLAGS: -h, --help help for get diff --git a/internal/e2e/testdata/test-human-list-simple.golden b/internal/e2e/testdata/test-human-list-simple.golden index 7fd0d0221a..f68b37bbe4 100644 --- a/internal/e2e/testdata/test-human-list-simple.golden +++ b/internal/e2e/testdata/test-human-list-simple.golden @@ -1,9 +1,9 @@ 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 🟩🟩🟩 STDOUT️ 🟩🟩🟩️ -ID ORGANIZATION ID CREATED AT UPDATED AT HEIGHT SHOE SIZE ALTITUDE IN METER ALTITUDE IN MILLIMETER FINGERS COUNT HAIR COUNT IS HAPPY EYES COLOR STATUS NAME PROJECT ID REGION -0194fdc2-fa2f-fcc0-41d3-ff12045b73c8 11111111-1111-1111-1111-111111111111 few seconds ago few seconds ago 0 0 0 0 0 0 false unknown stopped - 11111111-1111-1111-1111-111111111111 fr-par -62a5eee8-2abd-f44a-2d0b-75fb180daf48 11111111-1111-1111-1111-111111111111 few seconds ago few seconds ago 0 0 0 0 0 0 false unknown stopped - 11111111-1111-1111-1111-111111111111 fr-par -39465185-0fd4-a178-892e-e285ece15114 11111111-1111-1111-1111-111111111111 few seconds ago few seconds ago 0 0 0 0 0 0 false unknown stopped - 11111111-1111-1111-1111-111111111111 fr-par +ID ORGANIZATION ID CREATED AT UPDATED AT HEIGHT SHOE SIZE ALTITUDE IN METER ALTITUDE IN MILLIMETER FINGERS COUNT HAIR COUNT IS HAPPY EYES COLOR STATUS NAME PROJECT ID +0194fdc2-fa2f-fcc0-41d3-ff12045b73c8 11111111-1111-1111-1111-111111111111 few seconds ago few seconds ago 0 0 0 0 0 0 false unknown stopped - 11111111-1111-1111-1111-111111111111 +62a5eee8-2abd-f44a-2d0b-75fb180daf48 11111111-1111-1111-1111-111111111111 few seconds ago few seconds ago 0 0 0 0 0 0 false unknown stopped - 11111111-1111-1111-1111-111111111111 +39465185-0fd4-a178-892e-e285ece15114 11111111-1111-1111-1111-111111111111 few seconds ago few seconds ago 0 0 0 0 0 0 false unknown stopped - 11111111-1111-1111-1111-111111111111 🟩🟩🟩 JSON STDOUT 🟩🟩🟩 [ { @@ -21,8 +21,7 @@ ID ORGANIZATION ID CREA "eyes_color": "unknown", "status": "stopped", "name": "", - "project_id": "11111111-1111-1111-1111-111111111111", - "region": "fr-par" + "project_id": "11111111-1111-1111-1111-111111111111" }, { "id": "62a5eee8-2abd-f44a-2d0b-75fb180daf48", @@ -39,8 +38,7 @@ ID ORGANIZATION ID CREA "eyes_color": "unknown", "status": "stopped", "name": "", - "project_id": "11111111-1111-1111-1111-111111111111", - "region": "fr-par" + "project_id": "11111111-1111-1111-1111-111111111111" }, { "id": "39465185-0fd4-a178-892e-e285ece15114", @@ -57,7 +55,6 @@ ID ORGANIZATION ID CREA "eyes_color": "unknown", "status": "stopped", "name": "", - "project_id": "11111111-1111-1111-1111-111111111111", - "region": "fr-par" + "project_id": "11111111-1111-1111-1111-111111111111" } ] diff --git a/internal/e2e/testdata/test-human-list-usage.golden b/internal/e2e/testdata/test-human-list-usage.golden index e517b5b7e4..b31f06fa06 100644 --- a/internal/e2e/testdata/test-human-list-usage.golden +++ b/internal/e2e/testdata/test-human-list-usage.golden @@ -9,7 +9,6 @@ ARGS: [order-by] (created_at_asc | created_at_desc | updated_at_asc | updated_at_desc | height_asc | height_desc) [project-id] [organization-id] - [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par) FLAGS: -h, --help help for list diff --git a/internal/e2e/testdata/test-human-run-usage.golden b/internal/e2e/testdata/test-human-run-usage.golden index f12cf0c917..b2f0c31b1f 100644 --- a/internal/e2e/testdata/test-human-run-usage.golden +++ b/internal/e2e/testdata/test-human-run-usage.golden @@ -11,8 +11,7 @@ EXAMPLES: scw test human run xxxxx ARGS: - human-id UUID of the human you want to make run - [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par) + human-id UUID of the human you want to make run FLAGS: -h, --help help for run diff --git a/internal/e2e/testdata/test-human-update-multiple-args.golden b/internal/e2e/testdata/test-human-update-multiple-args.golden index 64609e947e..53349a229d 100644 --- a/internal/e2e/testdata/test-human-update-multiple-args.golden +++ b/internal/e2e/testdata/test-human-update-multiple-args.golden @@ -15,7 +15,6 @@ EyesColor blue Status stopped Name - ProjectID 11111111-1111-1111-1111-111111111111 -Region fr-par 🟩🟩🟩 JSON STDOUT 🟩🟩🟩 { "id": "0194fdc2-fa2f-fcc0-41d3-ff12045b73c8", @@ -32,6 +31,5 @@ Region fr-par "eyes_color": "blue", "status": "stopped", "name": "", - "project_id": "11111111-1111-1111-1111-111111111111", - "region": "fr-par" + "project_id": "11111111-1111-1111-1111-111111111111" } diff --git a/internal/e2e/testdata/test-human-update-single-arg.golden b/internal/e2e/testdata/test-human-update-single-arg.golden index c65194e719..0b39f986de 100644 --- a/internal/e2e/testdata/test-human-update-single-arg.golden +++ b/internal/e2e/testdata/test-human-update-single-arg.golden @@ -15,7 +15,6 @@ EyesColor amber Status stopped Name - ProjectID b3ba839a-dcf2-4b0a-ac81-fc32370052a0 -Region fr-par 🟩🟩🟩 JSON STDOUT 🟩🟩🟩 { "id": "0194fdc2-fa2f-fcc0-41d3-ff12045b73c8", @@ -32,6 +31,5 @@ Region fr-par "eyes_color": "amber", "status": "stopped", "name": "", - "project_id": "b3ba839a-dcf2-4b0a-ac81-fc32370052a0", - "region": "fr-par" + "project_id": "b3ba839a-dcf2-4b0a-ac81-fc32370052a0" } diff --git a/internal/e2e/testdata/test-human-update-usage.golden b/internal/e2e/testdata/test-human-update-usage.golden index 5719a800b8..97509d8d80 100644 --- a/internal/e2e/testdata/test-human-update-usage.golden +++ b/internal/e2e/testdata/test-human-update-usage.golden @@ -16,7 +16,6 @@ ARGS: [is-happy] [eyes-color] (unknown | amber | blue | brown | gray | green | hazel | red | violet) [name] - [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par) FLAGS: -h, --help help for update diff --git a/internal/e2e/testdata/test-sdk-standard-errors-resource-not-found.golden b/internal/e2e/testdata/test-sdk-standard-errors-resource-not-found.golden index 9166a4efc8..324b9d7761 100644 --- a/internal/e2e/testdata/test-sdk-standard-errors-resource-not-found.golden +++ b/internal/e2e/testdata/test-sdk-standard-errors-resource-not-found.golden @@ -3,10 +3,10 @@ A positional argument is required for this command Hint: -Try running: scw test human get 0194fdc2-fa2f-fcc0-41d3-ff12045b73c8 region=fr-par +Try running: scw test human get 0194fdc2-fa2f-fcc0-41d3-ff12045b73c8 πŸŸ₯πŸŸ₯πŸŸ₯ JSON STDERR πŸŸ₯πŸŸ₯πŸŸ₯ { "message": "a positional argument is required for this command", "error": {}, - "hint": "Try running: scw test human get 0194fdc2-fa2f-fcc0-41d3-ff12045b73c8 region=fr-par" + "hint": "Try running: scw test human get 0194fdc2-fa2f-fcc0-41d3-ff12045b73c8" } diff --git a/internal/e2e/testdata/test-sdk-standard-errors-transient-state.golden b/internal/e2e/testdata/test-sdk-standard-errors-transient-state.golden index 9697d78a00..cfa11efc38 100644 --- a/internal/e2e/testdata/test-sdk-standard-errors-transient-state.golden +++ b/internal/e2e/testdata/test-sdk-standard-errors-transient-state.golden @@ -3,10 +3,10 @@ A positional argument is required for this command Hint: -Try running: scw test human update 0194fdc2-fa2f-fcc0-41d3-ff12045b73c8 eyes-color=red region=fr-par +Try running: scw test human update 0194fdc2-fa2f-fcc0-41d3-ff12045b73c8 eyes-color=red πŸŸ₯πŸŸ₯πŸŸ₯ JSON STDERR πŸŸ₯πŸŸ₯πŸŸ₯ { "message": "a positional argument is required for this command", "error": {}, - "hint": "Try running: scw test human update 0194fdc2-fa2f-fcc0-41d3-ff12045b73c8 eyes-color=red region=fr-par" + "hint": "Try running: scw test human update 0194fdc2-fa2f-fcc0-41d3-ff12045b73c8 eyes-color=red" } diff --git a/internal/namespaces/test/v1/test_cli.go b/internal/namespaces/test/v1/test_cli.go index 4cfc0aa957..a45ba637bc 100644 --- a/internal/namespaces/test/v1/test_cli.go +++ b/internal/namespaces/test/v1/test_cli.go @@ -84,7 +84,6 @@ Hint: you can use other test commands by setting the SCW_SECRET_KEY env variable Deprecated: false, Positional: false, }, - core.RegionArgSpec(scw.RegionFrPar), }, Run: func(ctx context.Context, args interface{}) (i interface{}, e error) { request := args.(*test.RegisterRequest) @@ -126,7 +125,6 @@ func testHumanList() *core.Command { Deprecated: false, Positional: false, }, - core.RegionArgSpec(scw.RegionFrPar), }, Run: func(ctx context.Context, args interface{}) (i interface{}, e error) { request := args.(*test.ListHumansRequest) @@ -160,7 +158,6 @@ func testHumanGet() *core.Command { Deprecated: false, Positional: true, }, - core.RegionArgSpec(scw.RegionFrPar), }, Run: func(ctx context.Context, args interface{}) (i interface{}, e error) { request := args.(*test.GetHumanRequest) @@ -240,7 +237,6 @@ func testHumanCreate() *core.Command { }, core.ProjectIDArgSpec(), core.OrganizationIDArgSpec(), - core.RegionArgSpec(scw.RegionFrPar), }, Run: func(ctx context.Context, args interface{}) (i interface{}, e error) { request := args.(*test.CreateHumanRequest) @@ -331,7 +327,6 @@ func testHumanUpdate() *core.Command { Deprecated: false, Positional: false, }, - core.RegionArgSpec(scw.RegionFrPar), }, Run: func(ctx context.Context, args interface{}) (i interface{}, e error) { request := args.(*test.UpdateHumanRequest) @@ -361,7 +356,6 @@ func testHumanDelete() *core.Command { Deprecated: false, Positional: true, }, - core.RegionArgSpec(scw.RegionFrPar), }, Run: func(ctx context.Context, args interface{}) (i interface{}, e error) { request := args.(*test.DeleteHumanRequest) @@ -391,7 +385,6 @@ func testHumanRun() *core.Command { Deprecated: false, Positional: true, }, - core.RegionArgSpec(scw.RegionFrPar), }, Run: func(ctx context.Context, args interface{}) (i interface{}, e error) { request := args.(*test.RunHumanRequest) @@ -428,7 +421,6 @@ func testHumanSmoke() *core.Command { Deprecated: true, Positional: true, }, - core.RegionArgSpec(scw.RegionFrPar), }, Run: func(ctx context.Context, args interface{}) (i interface{}, e error) { request := args.(*test.SmokeHumanRequest)