Merge branch 'scaleway:master' into master

Author: scaleway-bot

internal/namespaces/iot/v1/custom.go

@@ -20,8 +20,14 @@ func GetCommands() *core.Commands {
 		iot.DeviceStatus(""),
 		human.EnumMarshalFunc(deviceStatusMarshalSpecs),
 	)
-	human.RegisterMarshalerFunc(iot.CreateNetworkResponse{}, iotNetworkCreateResponsedMarshalerFunc)
-	human.RegisterMarshalerFunc(iot.CreateDeviceResponse{}, iotDeviceCreateResponsedMarshalerFunc)
+	human.RegisterMarshalerFunc(
+		&iot.CreateNetworkResponse{},
+		iotNetworkCreateResponsedMarshalerFunc,
+	)
+	human.RegisterMarshalerFunc(
+		&iot.CreateDeviceResponse{},
+		iotDeviceCreateResponsedMarshalerFunc,
+	)
 
 	cmds.MustFind("iot", "hub", "create").Override(hubCreateBuilder)
 

internal/namespaces/iot/v1/custom_device.go

@@ -33,7 +33,7 @@ var (
 
 func iotDeviceCreateResponsedMarshalerFunc(i any, opt *human.MarshalOpt) (string, error) {
 	type tmp iot.CreateDeviceResponse
-	deviceCreateResponse := tmp(i.(iot.CreateDeviceResponse))
+	deviceCreateResponse := tmp(*i.(*iot.CreateDeviceResponse))
 
 	deviceContent, err := human.Marshal(deviceCreateResponse.Device, opt)
 	if err != nil {

internal/namespaces/iot/v1/custom_network.go

@@ -11,7 +11,7 @@ import (
 
 func iotNetworkCreateResponsedMarshalerFunc(i any, opt *human.MarshalOpt) (string, error) {
 	type tmp iot.CreateNetworkResponse
-	networkCreateResponse := tmp(i.(iot.CreateNetworkResponse))
+	networkCreateResponse := tmp(*i.(*iot.CreateNetworkResponse))
 
 	networkContent, err := human.Marshal(networkCreateResponse.Network, opt)
 	if err != nil {

internal/namespaces/rdb/v1/custom_backup_test.go

@@ -24,9 +24,14 @@ func Test_CreateBackup(t *testing.T) {
 				},
 			),
 		),
-		Cmd:           "scw rdb backup create name=foobar expires-at=2032-01-02T15:04:05-07:00 instance-id={{ .Instance.ID }} database-name=rdb --wait",
-		Check:         core.TestCheckGolden(),
-		AfterFunc:     deleteInstance(),
+		Cmd:   "scw rdb backup create name=foobar expires-at=2032-01-02T15:04:05-07:00 instance-id={{ .Instance.ID }} database-name=rdb --wait",
+		Check: core.TestCheckGolden(),
+		AfterFunc: core.AfterFuncCombine(
+			core.AfterFuncWhenUpdatingCassette(
+				core.ExecAfterCmd("scw rdb backup delete {{ .CmdResult.ID }}"),
+			),
+			deleteInstance(),
+		),
 		DefaultRegion: scw.RegionNlAms,
 	}))
 }
@@ -54,7 +59,12 @@ func Test_RestoreBackup(t *testing.T) {
 			core.TestCheckGolden(),
 			core.TestCheckExitCode(0),
 		),
-		AfterFunc: deleteInstance(),
+		AfterFunc: core.AfterFuncCombine(
+			core.AfterFuncWhenUpdatingCassette(
+				core.ExecAfterCmd("scw rdb backup delete {{ .Backup.ID }}"),
+			),
+			deleteInstance(),
+		),
 	}))
 }
 
@@ -81,7 +91,12 @@ func Test_ExportBackup(t *testing.T) {
 			core.TestCheckGolden(),
 			core.TestCheckExitCode(0),
 		),
-		AfterFunc: deleteInstance(),
+		AfterFunc: core.AfterFuncCombine(
+			core.AfterFuncWhenUpdatingCassette(
+				core.ExecAfterCmd("scw rdb backup delete {{ .Backup.ID }}"),
+			),
+			deleteInstance(),
+		),
 	}))
 }
 
@@ -105,6 +120,9 @@ func Test_DownloadBackup(t *testing.T) {
 			core.TestCheckExitCode(0),
 		),
 		AfterFunc: core.AfterFuncCombine(
+			core.AfterFuncWhenUpdatingCassette(
+				core.ExecAfterCmd("scw rdb backup delete {{ .Backup.ID }}"),
+			),
 			deleteInstance(),
 			func(_ *core.AfterFuncCtx) error {
 				err := os.Remove("simple_dump")
@@ -131,6 +149,9 @@ func Test_DownloadBackup(t *testing.T) {
 			core.TestCheckExitCode(0),
 		),
 		AfterFunc: core.AfterFuncCombine(
+			core.AfterFuncWhenUpdatingCassette(
+				core.ExecAfterCmd("scw rdb backup delete {{ .Backup.ID }}"),
+			),
 			deleteInstance(),
 			func(_ *core.AfterFuncCtx) error {
 				err := os.Remove("no_previous_export_dump")
@@ -169,6 +190,14 @@ func Test_ListBackup(t *testing.T) {
 			core.TestCheckGolden(),
 			core.TestCheckExitCode(0),
 		),
-		AfterFunc: deleteInstance(),
+		AfterFunc: core.AfterFuncCombine(
+			core.AfterFuncWhenUpdatingCassette(
+				core.AfterFuncCombine(
+					core.ExecAfterCmd("scw rdb backup delete {{ .BackupA.ID }}"),
+					core.ExecAfterCmd("scw rdb backup delete {{ .BackupB.ID }}"),
+				),
+			),
+			deleteInstance(),
+		),
 	}))
 }