fix(vpcgw):better vizualisation gw network dhcp (#3674)

Author: Laure-di

internal/namespaces/vpcgw/v1/custom.go

@@ -11,7 +11,8 @@ func GetCommands() *core.Commands {
 
 	human.RegisterMarshalerFunc(vpcgw.GatewayNetworkStatus(""), human.EnumMarshalFunc(gatewayNetworkStatusMarshalSpecs))
 	human.RegisterMarshalerFunc(vpcgw.GatewayStatus(""), human.EnumMarshalFunc(gatewayStatusMarshalSpecs))
-	human.RegisterMarshalerFunc(vpcgw.Gateway{}, gatewayNetworkMarshallerFunc)
+	human.RegisterMarshalerFunc(vpcgw.Gateway{}, gatewayMarshalerFunc)
+	human.RegisterMarshalerFunc(vpcgw.GatewayNetwork{}, gatewayNetworkMarshalerFunc)
 
 	cmds.MustFind("vpc-gw", "gateway-type", "list").Override(vpcgwGatewayTypeListBuilder)
 	cmds.MustFind("vpc-gw", "gateway", "create").Override(gatewayCreateBuilder)

internal/namespaces/vpcgw/v1/custom_gateway.go

@@ -42,3 +42,23 @@ func gatewayCreateBuilder(c *core.Command) *core.Command {
 	}
 	return c
 }
+
+func gatewayMarshalerFunc(i interface{}, opt *human.MarshalOpt) (string, error) {
+	type tmp vpcgw.Gateway
+	vpcgtw := tmp(i.(vpcgw.Gateway))
+	opt.Sections = []*human.MarshalSection{
+		{
+			FieldName: "IP",
+			Title:     "IP",
+		},
+		{
+			FieldName: "GatewayNetworks",
+			Title:     "GatewayNetworks",
+		},
+	}
+	str, err := human.Marshal(vpcgtw, opt)
+	if err != nil {
+		return "", err
+	}
+	return str, nil
+}

internal/namespaces/vpcgw/v1/custom_gateway_network.go

@@ -64,20 +64,16 @@ func gatewayNetworkDeleteBuilder(c *core.Command) *core.Command {
 	return c
 }
 
-func gatewayNetworkMarshallerFunc(i interface{}, opt *human.MarshalOpt) (string, error) {
-	type tmp vpcgw.Gateway
-	vpcgtwNetwork := tmp(i.(vpcgw.Gateway))
+func gatewayNetworkMarshalerFunc(i interface{}, opt *human.MarshalOpt) (string, error) {
+	type tmp vpcgw.GatewayNetwork
+	vpcgwNetwork := tmp(i.(vpcgw.GatewayNetwork))
 	opt.Sections = []*human.MarshalSection{
 		{
-			FieldName: "IP",
-			Title:     "IP",
-		},
-		{
-			FieldName: "GatewayNetworks",
-			Title:     "GatewayNetworks",
+			FieldName: "DHCP",
+			Title:     "DHCP",
 		},
 	}
-	str, err := human.Marshal(vpcgtwNetwork, opt)
+	str, err := human.Marshal(vpcgwNetwork, opt)
 	if err != nil {
 		return "", err
 	}

internal/namespaces/vpcgw/v1/custom_gateway_network_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/scaleway/scaleway-cli/v2/internal/testhelpers"
 )
 
-func Test_vpcGwGatewayGet(t *testing.T) {
+func Test_vpcGwGatewayNetworkGet(t *testing.T) {
 	cmds := GetCommands()
 	cmds.Merge(vpc.GetCommands())
 
@@ -17,13 +17,15 @@ func Test_vpcGwGatewayGet(t *testing.T) {
 		BeforeFunc: core.BeforeFuncCombine(
 			testhelpers.CreatePN(),
 			testhelpers.CreateGateway("GW"),
-			testhelpers.CreateGatewayNetwork("GW"),
+			testhelpers.CreateDHCP(),
+			testhelpers.CreateGatewayNetworkDHCP("GW"),
 		),
-		Cmd:   "scw vpc-gw gateway get {{ .GW.ID }}",
+		Cmd:   "scw vpc-gw gateway-network get {{ .GWNT.ID }}",
 		Check: core.TestCheckGolden(),
 		AfterFunc: core.AfterFuncCombine(
 			testhelpers.DeleteGatewayNetwork(),
 			testhelpers.DeletePN(),
+			testhelpers.DeleteDHCP(),
 			testhelpers.DeleteGateway("GW"),
 			testhelpers.DeleteIPVpcGw("GW"),
 		),

internal/namespaces/vpcgw/v1/custom_gateway_test.go

@@ -0,0 +1,31 @@
+package vpcgw
+
+import (
+	"testing"
+
+	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
+	"github.com/scaleway/scaleway-cli/v2/internal/testhelpers"
+)
+
+func Test_vpcGwGatewayGet(t *testing.T) {
+	cmds := GetCommands()
+	cmds.Merge(vpc.GetCommands())
+
+	t.Run("Simple", core.Test(&core.TestConfig{
+		Commands: cmds,
+		BeforeFunc: core.BeforeFuncCombine(
+			testhelpers.CreatePN(),
+			testhelpers.CreateGateway("GW"),
+			testhelpers.CreateGatewayNetwork("GW"),
+		),
+		Cmd:   "scw vpc-gw gateway get {{ .GW.ID }}",
+		Check: core.TestCheckGolden(),
+		AfterFunc: core.AfterFuncCombine(
+			testhelpers.DeleteGatewayNetwork(),
+			testhelpers.DeletePN(),
+			testhelpers.DeleteGateway("GW"),
+			testhelpers.DeleteIPVpcGw("GW"),
+		),
+	}))
+}

internal/namespaces/vpcgw/v1/testdata/test-list-gateway-type-simple.cassette.yaml

@@ -7,7 +7,7 @@ interactions:
     form: {}
     headers:
       User-Agent:
-      - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.21.5; darwin; amd64) cli-e2e-test
+      - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.21.7; darwin; amd64) cli-e2e-test
     url: https://api.scaleway.com/vpc-gw/v1/zones/fr-par-1/gateway-types
     method: GET
   response:
@@ -21,17 +21,17 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 09 Feb 2024 10:04:35 GMT
+      - Fri, 23 Feb 2024 14:58:24 GMT
       Server:
-      - Scaleway API-Gateway
+      - Scaleway API Gateway (fr-par-2;edge02)
       Strict-Transport-Security:
       - max-age=63072000
       X-Content-Type-Options:
       - nosniff
       X-Frame-Options:
       - DENY
       X-Request-Id:
-      - 12fc57cb-d111-4bce-8998-535a2360fd24
+      - cbfce925-94a9-46d6-9b31-27672a1fd1e9
     status: 200 OK
     code: 200
     duration: ""