fix(vpc): add k8s view on get private-network + goconst lint (#3456)

scaleway · Oct 30, 2023 · 95bdee6 · 95bdee6
1 parent 25d3093
commit 95bdee6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/internal/namespaces/instance/v1/custom_ssh_config.go b/internal/namespaces/instance/v1/custom_ssh_config.go
@@ -18,6 +18,8 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
+const configFileGeneratedMessage = "Config file was generated to"
+
 type sshConfigServer struct {
 	Name              string
 	Address           string
@@ -116,15 +118,15 @@ Do you want the include statement to be added at the beginning of your file ?`,
 				} else {
 					logger.Warningf("Failed to check default config file, skipping include prompt\n")
 					return &core.SuccessResult{
-						Message: "Config file was generated to " + configFilePath,
+						Message: configFileGeneratedMessage + " " + configFilePath,
 					}, nil
 				}
 			}
 
 			// Generated config is already included
 			if included {
 				return &core.SuccessResult{
-					Message: "Config file was generated to " + configFilePath,
+					Message: configFileGeneratedMessage + " " + configFilePath,
 				}, nil
 			}
 
@@ -136,7 +138,7 @@ Do you want the include statement to be added at the beginning of your file ?`,
 			if err != nil {
 				logger.Warningf("Failed to prompt, skipping include\n")
 				return &core.SuccessResult{
-					Message: "Config file was generated to " + configFilePath,
+					Message: configFileGeneratedMessage + " " + configFilePath,
 				}, nil
 			}
 
@@ -148,7 +150,7 @@ Do you want the include statement to be added at the beginning of your file ?`,
 			}
 
 			return &core.SuccessResult{
-				Message: "Config file was generated to " + configFilePath,
+				Message: configFileGeneratedMessage + " " + configFilePath,
 			}, nil
 		},
 		Groups: []string{"workflow"},

diff --git a/internal/namespaces/instance/v1/helpers_test.go b/internal/namespaces/instance/v1/helpers_test.go
@@ -27,7 +27,8 @@ func createServer(metaKey string) core.BeforeFunc {
 // createServer creates a stopped ubuntu-bionic server and
 // register it in the context Meta at metaKey.
 func startServer(metaKey string) core.BeforeFunc {
-	return core.ExecStoreBeforeCmd(metaKey, "scw instance server start -w {{ ."+metaKey+".ID }}")
+	return core.ExecStoreBeforeCmd(metaKey, "scw instance server start -w {{ ."+metaKey+
+		".ID }}") //nolint: goconst
 }
 
 // deleteServer deletes a server and its attached IP and volumes

diff --git a/internal/namespaces/vpc/v2/custom_private_network.go b/internal/namespaces/vpc/v2/custom_private_network.go
@@ -100,6 +100,11 @@ func privateNetworkGetBuilder(c *core.Command) *core.Command {
 				Title:       "Baremetal Servers",
 				HideIfEmpty: true,
 			},
+			{
+				FieldName:   "K8sClusters",
+				Title:       "K8s Clusters",
+				HideIfEmpty: true,
+			},
 			{
 				FieldName:   "LBs",
 				Title:       "Load-Balancers",