chore(baremetal): change from account to iam api for ssh-keys (#3203)

Author: Codelax

internal/namespaces/baremetal/v1/custom_server_install.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	account "github.com/scaleway/scaleway-sdk-go/api/account/v2alpha1"
 	baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
+	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
@@ -33,9 +33,9 @@ func serverInstallBuilder(c *core.Command) *core.Command {
 		// SSH keys management
 		if tmpRequest.AllSSHKeys != nil && *tmpRequest.AllSSHKeys {
 			client := core.ExtractClient(ctx)
-			accountapi := account.NewAPI(client)
+			iamAPI := iam.NewAPI(client)
 			orgID, _ := client.GetDefaultOrganizationID()
-			listKeys, err := accountapi.ListSSHKeys(&account.ListSSHKeysRequest{
+			listKeys, err := iamAPI.ListSSHKeys(&iam.ListSSHKeysRequest{
 				OrganizationID: &orgID,
 			}, scw.WithAllPages())
 			if err != nil {

internal/namespaces/baremetal/v1/custom_server_install_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	account "github.com/scaleway/scaleway-cli/v2/internal/namespaces/account/v2alpha1"
+	iam "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iam/v1alpha1"
 )
 
 func Test_InstallServer(t *testing.T) {
@@ -14,7 +14,7 @@ func Test_InstallServer(t *testing.T) {
 		sshKey := `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCbJuYSOQc01zjHsMyn4OUsW61cqRvttKt3StJgbvt2WBuGpwi1/5RtSoMQpudYlZpdeivFb21S8QRas8zcOc+6WqgWa2nj/8yA+cauRlV6CMWY+hOTkkg39xaekstuQ+WR2/AP7O/9hjVx5735+9ZNIxxHsFjVYdBEuk9gEX+1Rw== foobar@foobar`
 		osID := `03b7f4ba-a6a1-4305-984e-b54fafbf1681` // Ubuntu 20.04 LTS (Focal)
 		cmds := GetCommands()
-		cmds.Merge(account.GetCommands())
+		cmds.Merge(iam.GetCommands())
 
 		t.Run("With ID", core.Test(&core.TestConfig{
 			BeforeFunc: core.BeforeFuncCombine(

internal/namespaces/baremetal/v1/helpers_test.go

@@ -26,13 +26,13 @@ func deleteServer(metaKey string) core.AfterFunc {
 func addSSH(metaKey string, key string) core.BeforeFunc {
 	return func(ctx *core.BeforeFuncCtx) error {
 		ctx.Meta[metaKey] = ctx.ExecuteCmd([]string{
-			"scw", "account", "ssh-key", "add", "public-key=" + key,
+			"scw", "iam", "ssh-key", "create", "public-key=" + key,
 		})
 		return nil
 	}
 }
 
 // delete an ssh key with a given meta key
 func deleteSSH(metaKey string) core.AfterFunc {
-	return core.ExecAfterCmd("scw account ssh-key remove {{ ." + metaKey + ".ID }}")
+	return core.ExecAfterCmd("scw iam ssh-key delete {{ ." + metaKey + ".ID }}")
 }

internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.cassette.yaml

@@ -27,11 +27,7 @@ BootType                    normal
 Zone                        nl-ams-1
 Install.OsID                03b7f4ba-a6a1-4305-984e-b54fafbf1681
 Install.Hostname            test-install-server
-Install.SSHKeyIDs.0         9bf6c340-687c-4f31-8aad-6a525761d8cd
-Install.SSHKeyIDs.1         d957cb31-2a7f-4b68-9363-b128184b3c85
-Install.SSHKeyIDs.2         b97c757c-d530-4ff6-92c3-febddb801096
-Install.SSHKeyIDs.3         48734124-36fc-409c-a515-40c87ed0e1b8
-Install.SSHKeyIDs.4         66f16bba-3002-45d5-8348-58f13d31afaf
+Install.SSHKeyIDs.0         02aeb573-5220-4e1d-8983-fbd12fc38b5f
 Install.Status              completed
 Install.User                -
 Install.ServiceUser         -
@@ -75,11 +71,7 @@ PingStatus                  down
     "os_id": "03b7f4ba-a6a1-4305-984e-b54fafbf1681",
     "hostname": "test-install-server",
     "ssh_key_ids": [
-      "9bf6c340-687c-4f31-8aad-6a525761d8cd",
-      "d957cb31-2a7f-4b68-9363-b128184b3c85",
-      "b97c757c-d530-4ff6-92c3-febddb801096",
-      "48734124-36fc-409c-a515-40c87ed0e1b8",
-      "66f16bba-3002-45d5-8348-58f13d31afaf"
+      "02aeb573-5220-4e1d-8983-fbd12fc38b5f"
     ],
     "status": "completed",
     "user": "",

internal/namespaces/baremetal/v1/testdata/test-install-server-simple-all-ssh-keys.golden

@@ -27,7 +27,7 @@ BootType                    normal
 Zone                        nl-ams-1
 Install.OsID                03b7f4ba-a6a1-4305-984e-b54fafbf1681
 Install.Hostname            test-install-server
-Install.SSHKeyIDs.0         48734124-36fc-409c-a515-40c87ed0e1b8
+Install.SSHKeyIDs.0         02aeb573-5220-4e1d-8983-fbd12fc38b5f
 Install.Status              completed
 Install.User                -
 Install.ServiceUser         -
@@ -71,7 +71,7 @@ PingStatus                  down
     "os_id": "03b7f4ba-a6a1-4305-984e-b54fafbf1681",
     "hostname": "test-install-server",
     "ssh_key_ids": [
-      "48734124-36fc-409c-a515-40c87ed0e1b8"
+      "02aeb573-5220-4e1d-8983-fbd12fc38b5f"
     ],
     "status": "completed",
     "user": "",