Skip to content

Commit 13938d2

Browse files
committed
fix reviews
Signed-off-by: Patrik Cyvoct <[email protected]>
1 parent e647dde commit 13938d2

5 files changed

+10
-10
lines changed

internal/namespaces/k8s/v1beta4/custom_version_get.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,23 @@ func k8sVersionGetCommand() *core.Command {
3737
}
3838

3939
func k8sVersionGetRun(ctx context.Context, argsI interface{}) (i interface{}, e error) {
40-
args := argsI.(*k8sVersionGetRequest)
40+
request := argsI.(*k8sVersionGetRequest)
4141

4242
client := core.ExtractClient(ctx)
4343
apiK8s := k8s.NewAPI(client)
4444

4545
versions, err := apiK8s.ListVersions(&k8s.ListVersionsRequest{
46-
Region: args.Region,
46+
Region: request.Region,
4747
})
4848

4949
if err != nil {
5050
return nil, err
5151
}
5252

5353
for _, version := range versions.Versions {
54-
if version.Name == args.Version {
54+
if version.Name == request.Version {
5555
return version, nil
5656
}
5757
}
58-
return nil, fmt.Errorf("version '%s' not found", args.Version)
58+
return nil, fmt.Errorf("version '%s' not found", request.Version)
5959
}

internal/namespaces/k8s/v1beta4/custom_version_get_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package k8s
22

33
import (
4+
"fmt"
45
"testing"
56

67
"github.com/scaleway/scaleway-cli/internal/core"
@@ -23,7 +24,7 @@ func Test_GetVersion(t *testing.T) {
2324
Commands: GetCommands(),
2425
Cmd: "scw k8s version get test",
2526
Check: core.TestCheckCombine(
26-
core.TestCheckGolden(),
27+
core.TestCheckError(fmt.Errorf("version 'test' not found")),
2728
core.TestCheckExitCode(1),
2829
),
2930
}))

internal/namespaces/k8s/v1beta4/testdata/test-get-version-error.cassette.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ interactions:
2121
Content-Type:
2222
- application/json
2323
Date:
24-
- Tue, 17 Mar 2020 10:46:45 GMT
24+
- Tue, 17 Mar 2020 11:38:15 GMT
2525
Server:
2626
- scaleway_api
2727
Strict-Transport-Security:
@@ -31,7 +31,7 @@ interactions:
3131
X-Frame-Options:
3232
- DENY
3333
X-Request-Id:
34-
- d94317bb-def1-4259-ad50-1c0b8c9dc003
34+
- d3f5d4f9-44bb-4c0c-8c4a-a82d2251db18
3535
status: 200 OK
3636
code: 200
3737
duration: ""

internal/namespaces/k8s/v1beta4/testdata/test-get-version-error.stderr.golden

-1
This file was deleted.

internal/namespaces/k8s/v1beta4/testdata/test-get-version-simple.cassette.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ interactions:
2121
Content-Type:
2222
- application/json
2323
Date:
24-
- Tue, 17 Mar 2020 10:46:45 GMT
24+
- Tue, 17 Mar 2020 11:38:15 GMT
2525
Server:
2626
- scaleway_api
2727
Strict-Transport-Security:
@@ -31,7 +31,7 @@ interactions:
3131
X-Frame-Options:
3232
- DENY
3333
X-Request-Id:
34-
- fb59bc0a-a3bc-425b-9db0-4ba947bc6c30
34+
- 7d321500-a3fd-4a89-ab8c-12caab3b8f4c
3535
status: 200 OK
3636
code: 200
3737
duration: ""

0 commit comments

Comments
 (0)