feat(k8s): fix version list and add a golden test (#1769)

remyleone · web-flow · commit d936977fe6f3 · 2021-02-18T15:35:08.000+01:00
diff --git a/internal/namespaces/k8s/v1/custom.go b/internal/namespaces/k8s/v1/custom.go
@@ -26,9 +26,6 @@ func GetCommands() *core.Commands {
 
 	human.RegisterMarshalerFunc(k8s.Version{}, versionMarshalerFunc)
 	human.RegisterMarshalerFunc(k8s.Cluster{}, clusterMarshalerFunc)
-	human.RegisterMarshalerFunc([]k8s.CNI{}, cniSliceMarshalerFunc)
-	human.RegisterMarshalerFunc([]k8s.Ingress{}, ingressSliceMarshalerFunc)
-	human.RegisterMarshalerFunc([]k8s.Runtime{}, runtimeSliceMarshalerFunc)
 	human.RegisterMarshalerFunc(k8s.ClusterStatus(""), human.EnumMarshalFunc(clusterStatusMarshalSpecs))
 	human.RegisterMarshalerFunc(k8s.PoolStatus(""), human.EnumMarshalFunc(poolStatusMarshalSpecs))
 	human.RegisterMarshalerFunc(k8s.NodeStatus(""), human.EnumMarshalFunc(nodeStatusMarshalSpecs))
diff --git a/internal/namespaces/k8s/v1/custom_version.go b/internal/namespaces/k8s/v1/custom_version.go
@@ -2,8 +2,6 @@ package k8s
 
 import (
 	"context"
-	"fmt"
-	"strings"
 
 	"github.com/scaleway/scaleway-cli/internal/core"
 	"github.com/scaleway/scaleway-cli/internal/human"
@@ -24,33 +22,6 @@ func versionListBuilder(c *core.Command) *core.Command {
 	return c
 }
 
-func runtimeSliceMarshalerFunc(i interface{}, opt *human.MarshalOpt) (string, error) {
-	runtimeSlice := i.([]k8s.Runtime)
-	var res []string
-	for _, value := range runtimeSlice {
-		res = append(res, fmt.Sprintf("- %s", value.String()))
-	}
-	return strings.Join(res, "\n"), nil
-}
-
-func ingressSliceMarshalerFunc(i interface{}, opt *human.MarshalOpt) (string, error) {
-	runtimeSlice := i.([]k8s.Ingress)
-	var res []string
-	for _, value := range runtimeSlice {
-		res = append(res, fmt.Sprintf("- %s", value.String()))
-	}
-	return strings.Join(res, "\n"), nil
-}
-
-func cniSliceMarshalerFunc(i interface{}, opt *human.MarshalOpt) (string, error) {
-	runtimeSlice := i.([]k8s.CNI)
-	var res []string
-	for _, value := range runtimeSlice {
-		res = append(res, fmt.Sprintf("- %s", value.String()))
-	}
-	return strings.Join(res, "\n"), nil
-}
-
 func versionMarshalerFunc(i interface{}, opt *human.MarshalOpt) (string, error) {
 	type tmp k8s.Version
 	version := tmp(i.(k8s.Version))
diff --git a/internal/namespaces/k8s/v1/custom_version_test.go b/internal/namespaces/k8s/v1/custom_version_test.go
@@ -19,3 +19,13 @@ func Test_GetVersion(t *testing.T) {
 		),
 	}))
 }
+
+func Test_ListVersion_Basic(t *testing.T) {
+	t.Run("simple", core.Test(&core.TestConfig{
+		Commands: GetCommands(),
+		Cmd:      "scw k8s version list",
+		Check: core.TestCheckCombine(
+			core.TestCheckGolden(),
+		),
+	}))
+}
diff --git a/internal/namespaces/k8s/v1/testdata/test-get-version-simple.cassette.yaml b/internal/namespaces/k8s/v1/testdata/test-get-version-simple.cassette.yaml
@@ -6,7 +6,7 @@ interactions:
     form: {}
     headers:
       User-Agent:
-      - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.15.7; darwin; amd64) cli-e2e-test
+      - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.15.8; darwin; amd64) cli-e2e-test
     url: https://api.scaleway.com/k8s/v1/regions/fr-par/versions/1.20.2
     method: GET
   response:
@@ -19,7 +19,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Wed, 10 Feb 2021 15:25:17 GMT
+      - Thu, 18 Feb 2021 14:28:56 GMT
       Server:
       - Scaleway API-Gateway
       Strict-Transport-Security:
@@ -29,7 +29,7 @@ interactions:
       X-Frame-Options:
       - DENY
       X-Request-Id:
-      - 6b5b146e-bdd6-485f-b38c-a8782f4eba52
+      - 29f9a8d1-4bc1-4df9-86a8-5e74f70d2e8c
     status: 200 OK
     code: 200
     duration: ""
diff --git a/internal/namespaces/k8s/v1/testdata/test-get-version-simple.golden b/internal/namespaces/k8s/v1/testdata/test-get-version-simple.golden
@@ -8,21 +8,13 @@ Available Kubelet Arguments:
 map[cpuCFSQuota:bool cpuCFSQuotaPeriod:duration cpuManagerPolicy:enum:none|static maxPods:uint16]
 
 Available CNIs:
-- cilium
-- calico
-- weave
-- flannel
+[cilium calico weave flannel]
 
 Available Ingresses:
-- none
-- nginx
-- traefik
-- traefik2
+[none nginx traefik traefik2]
 
 Available Container Runtimes:
-- containerd
-- crio
-- docker
+[containerd crio docker]
 
 Available Feature Gates:
 [TTLAfterFinished HPAScaleToZero ServiceTopology EphemeralContainers KubeletCredentialProviders GenericEphemeralVolume]
diff --git a/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.cassette.yaml b/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.cassette.yaml
@@ -0,0 +1,35 @@
+---
+version: 1
+interactions:
+- request:
+    body: ""
+    form: {}
+    headers:
+      User-Agent:
+      - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.15.8; darwin; amd64) cli-e2e-test
+    url: https://api.scaleway.com/k8s/v1/regions/fr-par/versions
+    method: GET
+  response:
+    body: '{"versions":[{"region":"fr-par","name":"1.20.3","label":"Kubernetes 1.20.3","available_cnis":["cilium","calico","weave","flannel"],"available_ingresses":["none","nginx","traefik","traefik2"],"available_container_runtimes":["containerd","crio","docker"],"available_feature_gates":["TTLAfterFinished","HPAScaleToZero","ServiceTopology","EphemeralContainers","KubeletCredentialProviders","GenericEphemeralVolume"],"available_admission_plugins":["PodSecurityPolicy","PodNodeSelector","AlwaysPullImages","PodPreset","PodTolerationRestriction"],"available_kubelet_args":{"cpuCFSQuota":"bool","cpuCFSQuotaPeriod":"duration","cpuManagerPolicy":"enum:none|static","maxPods":"uint16"}},{"region":"fr-par","name":"1.19.8","label":"Kubernetes 1.19.8","available_cnis":["cilium","calico","weave","flannel"],"available_ingresses":["none","nginx","traefik","traefik2"],"available_container_runtimes":["containerd","crio","docker"],"available_feature_gates":["TTLAfterFinished","ServiceNodeExclusion","EndpointSlice","EndpointSliceProxying","HPAScaleToZero","ServiceTopology","EphemeralContainers","GenericEphemeralVolume"],"available_admission_plugins":["PodSecurityPolicy","PodNodeSelector","AlwaysPullImages","PodPreset","PodTolerationRestriction"],"available_kubelet_args":{"cpuCFSQuota":"bool","cpuCFSQuotaPeriod":"duration","cpuManagerPolicy":"enum:none|static","maxPods":"uint16"}},{"region":"fr-par","name":"1.18.16","label":"Kubernetes 1.18.16","available_cnis":["cilium","calico","weave","flannel"],"available_ingresses":["none","nginx","traefik","traefik2"],"available_container_runtimes":["containerd","crio","docker"],"available_feature_gates":["TTLAfterFinished","ServiceNodeExclusion","EndpointSlice","EndpointSliceProxying","HPAScaleToZero","ServiceTopology","EphemeralContainers"],"available_admission_plugins":["PodSecurityPolicy","PodNodeSelector","AlwaysPullImages","PodPreset","PodTolerationRestriction"],"available_kubelet_args":{"cpuCFSQuota":"bool","cpuCFSQuotaPeriod":"duration","cpuManagerPolicy":"enum:none|static","maxPods":"uint16"}},{"region":"fr-par","name":"1.17.17","label":"Kubernetes 1.17.17","available_cnis":["cilium","calico","weave","flannel"],"available_ingresses":["none","nginx","traefik","traefik2"],"available_container_runtimes":["containerd","crio","docker"],"available_feature_gates":["TTLAfterFinished","ServiceNodeExclusion","EndpointSlice","HPAScaleToZero","ServiceTopology","EphemeralContainers"],"available_admission_plugins":["PodSecurityPolicy","PodNodeSelector","AlwaysPullImages","PodPreset","PodTolerationRestriction"],"available_kubelet_args":{"cpuCFSQuota":"bool","cpuCFSQuotaPeriod":"duration","cpuManagerPolicy":"enum:none|static","maxPods":"uint16"}},{"region":"fr-par","name":"1.16.15","label":"Kubernetes 1.16.15","available_cnis":["cilium","calico","weave","flannel"],"available_ingresses":["none","nginx","traefik","traefik2"],"available_container_runtimes":["containerd","crio","docker"],"available_feature_gates":["TTLAfterFinished","ServiceNodeExclusion","EndpointSlice","HPAScaleToZero","EphemeralContainers"],"available_admission_plugins":["PodSecurityPolicy","PodNodeSelector","AlwaysPullImages","PodPreset","PodTolerationRestriction"],"available_kubelet_args":{"cpuCFSQuota":"bool","cpuCFSQuotaPeriod":"duration","cpuManagerPolicy":"enum:none|static","maxPods":"uint16"}}]}'
+    headers:
+      Content-Length:
+      - "3330"
+      Content-Security-Policy:
+      - default-src 'none'; frame-ancestors 'none'
+      Content-Type:
+      - application/json
+      Date:
+      - Thu, 18 Feb 2021 14:29:13 GMT
+      Server:
+      - Scaleway API-Gateway
+      Strict-Transport-Security:
+      - max-age=63072000
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Request-Id:
+      - 29d7cfc4-5c09-4110-85a8-55d27500f3e1
+    status: 200 OK
+    code: 200
+    duration: ""
diff --git a/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.golden b/internal/namespaces/k8s/v1/testdata/test-list-version-basic-simple.golden
@@ -0,0 +1,228 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟩🟩🟩 STDOUT️ 🟩🟩🟩️
+NAME     AVAILABLE CNIS                 AVAILABLE INGRESSES            AVAILABLE CONTAINER RUNTIMES  AVAILABLE FEATURE GATES                                                                                                                                AVAILABLE ADMISSION PLUGINS                                                              AVAILABLE KUBELET ARGS
+1.20.3   [cilium calico weave flannel]  [none nginx traefik traefik2]  [containerd crio docker]      [TTLAfterFinished HPAScaleToZero ServiceTopology EphemeralContainers KubeletCredentialProviders GenericEphemeralVolume]                                [PodSecurityPolicy PodNodeSelector AlwaysPullImages PodPreset PodTolerationRestriction]  map[cpuCFSQuota:bool cpuCFSQuotaPeriod:duration cpuManagerPolicy:enum:none|static maxPods:uint16]
+1.19.8   [cilium calico weave flannel]  [none nginx traefik traefik2]  [containerd crio docker]      [TTLAfterFinished ServiceNodeExclusion EndpointSlice EndpointSliceProxying HPAScaleToZero ServiceTopology EphemeralContainers GenericEphemeralVolume]  [PodSecurityPolicy PodNodeSelector AlwaysPullImages PodPreset PodTolerationRestriction]  map[cpuCFSQuota:bool cpuCFSQuotaPeriod:duration cpuManagerPolicy:enum:none|static maxPods:uint16]
+1.18.16  [cilium calico weave flannel]  [none nginx traefik traefik2]  [containerd crio docker]      [TTLAfterFinished ServiceNodeExclusion EndpointSlice EndpointSliceProxying HPAScaleToZero ServiceTopology EphemeralContainers]                         [PodSecurityPolicy PodNodeSelector AlwaysPullImages PodPreset PodTolerationRestriction]  map[cpuCFSQuota:bool cpuCFSQuotaPeriod:duration cpuManagerPolicy:enum:none|static maxPods:uint16]
+1.17.17  [cilium calico weave flannel]  [none nginx traefik traefik2]  [containerd crio docker]      [TTLAfterFinished ServiceNodeExclusion EndpointSlice HPAScaleToZero ServiceTopology EphemeralContainers]                                               [PodSecurityPolicy PodNodeSelector AlwaysPullImages PodPreset PodTolerationRestriction]  map[cpuCFSQuota:bool cpuCFSQuotaPeriod:duration cpuManagerPolicy:enum:none|static maxPods:uint16]
+1.16.15  [cilium calico weave flannel]  [none nginx traefik traefik2]  [containerd crio docker]      [TTLAfterFinished ServiceNodeExclusion EndpointSlice HPAScaleToZero EphemeralContainers]                                                               [PodSecurityPolicy PodNodeSelector AlwaysPullImages PodPreset PodTolerationRestriction]  map[cpuCFSQuota:bool cpuCFSQuotaPeriod:duration cpuManagerPolicy:enum:none|static maxPods:uint16]
+🟩🟩🟩 JSON STDOUT 🟩🟩🟩
+[
+  {
+    "name": "1.20.3",
+    "label": "Kubernetes 1.20.3",
+    "region": "fr-par",
+    "available_cnis": [
+      "cilium",
+      "calico",
+      "weave",
+      "flannel"
+    ],
+    "available_ingresses": [
+      "none",
+      "nginx",
+      "traefik",
+      "traefik2"
+    ],
+    "available_container_runtimes": [
+      "containerd",
+      "crio",
+      "docker"
+    ],
+    "available_feature_gates": [
+      "TTLAfterFinished",
+      "HPAScaleToZero",
+      "ServiceTopology",
+      "EphemeralContainers",
+      "KubeletCredentialProviders",
+      "GenericEphemeralVolume"
+    ],
+    "available_admission_plugins": [
+      "PodSecurityPolicy",
+      "PodNodeSelector",
+      "AlwaysPullImages",
+      "PodPreset",
+      "PodTolerationRestriction"
+    ],
+    "available_kubelet_args": {
+      "cpuCFSQuota": "bool",
+      "cpuCFSQuotaPeriod": "duration",
+      "cpuManagerPolicy": "enum:none|static",
+      "maxPods": "uint16"
+    }
+  },
+  {
+    "name": "1.19.8",
+    "label": "Kubernetes 1.19.8",
+    "region": "fr-par",
+    "available_cnis": [
+      "cilium",
+      "calico",
+      "weave",
+      "flannel"
+    ],
+    "available_ingresses": [
+      "none",
+      "nginx",
+      "traefik",
+      "traefik2"
+    ],
+    "available_container_runtimes": [
+      "containerd",
+      "crio",
+      "docker"
+    ],
+    "available_feature_gates": [
+      "TTLAfterFinished",
+      "ServiceNodeExclusion",
+      "EndpointSlice",
+      "EndpointSliceProxying",
+      "HPAScaleToZero",
+      "ServiceTopology",
+      "EphemeralContainers",
+      "GenericEphemeralVolume"
+    ],
+    "available_admission_plugins": [
+      "PodSecurityPolicy",
+      "PodNodeSelector",
+      "AlwaysPullImages",
+      "PodPreset",
+      "PodTolerationRestriction"
+    ],
+    "available_kubelet_args": {
+      "cpuCFSQuota": "bool",
+      "cpuCFSQuotaPeriod": "duration",
+      "cpuManagerPolicy": "enum:none|static",
+      "maxPods": "uint16"
+    }
+  },
+  {
+    "name": "1.18.16",
+    "label": "Kubernetes 1.18.16",
+    "region": "fr-par",
+    "available_cnis": [
+      "cilium",
+      "calico",
+      "weave",
+      "flannel"
+    ],
+    "available_ingresses": [
+      "none",
+      "nginx",
+      "traefik",
+      "traefik2"
+    ],
+    "available_container_runtimes": [
+      "containerd",
+      "crio",
+      "docker"
+    ],
+    "available_feature_gates": [
+      "TTLAfterFinished",
+      "ServiceNodeExclusion",
+      "EndpointSlice",
+      "EndpointSliceProxying",
+      "HPAScaleToZero",
+      "ServiceTopology",
+      "EphemeralContainers"
+    ],
+    "available_admission_plugins": [
+      "PodSecurityPolicy",
+      "PodNodeSelector",
+      "AlwaysPullImages",
+      "PodPreset",
+      "PodTolerationRestriction"
+    ],
+    "available_kubelet_args": {
+      "cpuCFSQuota": "bool",
+      "cpuCFSQuotaPeriod": "duration",
+      "cpuManagerPolicy": "enum:none|static",
+      "maxPods": "uint16"
+    }
+  },
+  {
+    "name": "1.17.17",
+    "label": "Kubernetes 1.17.17",
+    "region": "fr-par",
+    "available_cnis": [
+      "cilium",
+      "calico",
+      "weave",
+      "flannel"
+    ],
+    "available_ingresses": [
+      "none",
+      "nginx",
+      "traefik",
+      "traefik2"
+    ],
+    "available_container_runtimes": [
+      "containerd",
+      "crio",
+      "docker"
+    ],
+    "available_feature_gates": [
+      "TTLAfterFinished",
+      "ServiceNodeExclusion",
+      "EndpointSlice",
+      "HPAScaleToZero",
+      "ServiceTopology",
+      "EphemeralContainers"
+    ],
+    "available_admission_plugins": [
+      "PodSecurityPolicy",
+      "PodNodeSelector",
+      "AlwaysPullImages",
+      "PodPreset",
+      "PodTolerationRestriction"
+    ],
+    "available_kubelet_args": {
+      "cpuCFSQuota": "bool",
+      "cpuCFSQuotaPeriod": "duration",
+      "cpuManagerPolicy": "enum:none|static",
+      "maxPods": "uint16"
+    }
+  },
+  {
+    "name": "1.16.15",
+    "label": "Kubernetes 1.16.15",
+    "region": "fr-par",
+    "available_cnis": [
+      "cilium",
+      "calico",
+      "weave",
+      "flannel"
+    ],
+    "available_ingresses": [
+      "none",
+      "nginx",
+      "traefik",
+      "traefik2"
+    ],
+    "available_container_runtimes": [
+      "containerd",
+      "crio",
+      "docker"
+    ],
+    "available_feature_gates": [
+      "TTLAfterFinished",
+      "ServiceNodeExclusion",
+      "EndpointSlice",
+      "HPAScaleToZero",
+      "EphemeralContainers"
+    ],
+    "available_admission_plugins": [
+      "PodSecurityPolicy",
+      "PodNodeSelector",
+      "AlwaysPullImages",
+      "PodPreset",
+      "PodTolerationRestriction"
+    ],
+    "available_kubelet_args": {
+      "cpuCFSQuota": "bool",
+      "cpuCFSQuotaPeriod": "duration",
+      "cpuManagerPolicy": "enum:none|static",
+      "maxPods": "uint16"
+    }
+  }
+]
