Merge branch 'scaleway:master' into master

Author: scaleway-bot

.github/codecov.yml

@@ -0,0 +1,197 @@
+codecov:
+  branch: master
+
+component_management:
+  individual_components:
+    - component_id: account
+      name: account
+      paths:
+        - internal/namespaces/account/**
+    - component_id: alias
+      name: alias
+      paths:
+        - internal/namespaces/alias/**
+    - component_id: applesilicon
+      name: applesilicon
+      paths:
+        - internal/namespaces/applesilicon/**
+    - component_id: audit_trail
+      name: audit_trail
+      paths:
+        - internal/namespaces/audit_trail/**
+    - component_id: autocomplete
+      name: autocomplete
+      paths:
+        - internal/namespaces/autocomplete/**
+    - component_id: baremetal
+      name: baremetal
+      paths:
+        - internal/namespaces/baremetal/**
+    - component_id: billing
+      name: billing
+      paths:
+        - internal/namespaces/billing/**
+    - component_id: block
+      name: block
+      paths:
+        - internal/namespaces/block/**
+    - component_id: cockpit
+      name: cockpit
+      paths:
+        - internal/namespaces/cockpit/**
+    - component_id: config
+      name: config
+      paths:
+        - internal/namespaces/config/**
+    - component_id: container
+      name: container
+      paths:
+        - internal/namespaces/container/**
+    - component_id: dedibox
+      name: dedibox
+      paths:
+        - internal/namespaces/dedibox/**
+    - component_id: domain
+      name: domain
+      paths:
+        - internal/namespaces/domain/**
+    - component_id: edge_services
+      name: edge_services
+      paths:
+        - internal/namespaces/edge_services/**
+    - component_id: feedback
+      name: feedback
+      paths:
+        - internal/namespaces/feedback/**
+    - component_id: file
+      name: file
+      paths:
+        - internal/namespaces/file/**
+    - component_id: flexibleip
+      name: flexibleip
+      paths:
+        - internal/namespaces/flexibleip/**
+    - component_id: function
+      name: function
+      paths:
+        - internal/namespaces/function/**
+    - component_id: help
+      name: help
+      paths:
+        - internal/namespaces/help/**
+    - component_id: iam
+      name: iam
+      paths:
+        - internal/namespaces/iam/**
+    - component_id: inference
+      name: inference
+      paths:
+        - internal/namespaces/inference/**
+    - component_id: info
+      name: info
+      paths:
+        - internal/namespaces/info/**
+    - component_id: init
+      name: init
+      paths:
+        - internal/namespaces/init/**
+    - component_id: instance
+      name: instance
+      paths:
+        - internal/namespaces/instance/**
+    - component_id: interlink
+      name: interlink
+      paths:
+        - internal/namespaces/interlink/**
+    - component_id: iot
+      name: iot
+      paths:
+        - internal/namespaces/iot/**
+    - component_id: ipam
+      name: ipam
+      paths:
+        - internal/namespaces/ipam/**
+    - component_id: jobs
+      name: jobs
+      paths:
+        - internal/namespaces/jobs/**
+    - component_id: k8s
+      name: k8s
+      paths:
+        - internal/namespaces/k8s/**
+    - component_id: key_manager
+      name: key_manager
+      paths:
+        - internal/namespaces/key_manager/**
+    - component_id: lb
+      name: lb
+      paths:
+        - internal/namespaces/lb/**
+    - component_id: login
+      name: login
+      paths:
+        - internal/namespaces/login/**
+    - component_id: marketplace
+      name: marketplace
+      paths:
+        - internal/namespaces/marketplace/**
+    - component_id: mnq
+      name: mnq
+      paths:
+        - internal/namespaces/mnq/**
+    - component_id: mongodb
+      name: mongodb
+      paths:
+        - internal/namespaces/mongodb/**
+    - component_id: object
+      name: object
+      paths:
+        - internal/namespaces/object/**
+    - component_id: rdb
+      name: rdb
+      paths:
+        - internal/namespaces/rdb/**
+    - component_id: redis
+      name: redis
+      paths:
+        - internal/namespaces/redis/**
+    - component_id: registry
+      name: registry
+      paths:
+        - internal/namespaces/registry/**
+    - component_id: secret
+      name: secret
+      paths:
+        - internal/namespaces/secret/**
+    - component_id: serverless_sqldb
+      name: serverless_sqldb
+      paths:
+        - internal/namespaces/serverless_sqldb/**
+    - component_id: shell
+      name: shell
+      paths:
+        - internal/namespaces/shell/**
+    - component_id: tem
+      name: tem
+      paths:
+        - internal/namespaces/tem/**
+    - component_id: test
+      name: test
+      paths:
+        - internal/namespaces/test/**
+    - component_id: version
+      name: version
+      paths:
+        - internal/namespaces/version/**
+    - component_id: vpc
+      name: vpc
+      paths:
+        - internal/namespaces/vpc/**
+    - component_id: vpcgw
+      name: vpcgw
+      paths:
+        - internal/namespaces/vpcgw/**
+    - component_id: webhosting
+      name: webhosting
+      paths:
+        - internal/namespaces/webhosting/**

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/docker/docker v28.5.1+incompatible
 	github.com/dustin/go-humanize v1.0.1
 	github.com/fatih/color v1.18.0
-	github.com/getsentry/sentry-go v0.36.0
+	github.com/getsentry/sentry-go v0.36.1
 	github.com/ghodss/yaml v1.0.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/hashicorp/go-version v1.7.0
@@ -23,7 +23,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/moby/buildkit v0.25.1
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251015050748-12aafea99911
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251021162421-9dee01f565c9
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/pflag v1.0.10

go.sum

@@ -231,8 +231,8 @@ github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uh
 github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
 github.com/gdamore/tcell/v2 v2.9.0 h1:N6t+eqK7/xwtRPwxzs1PXeRWnm0H9l02CrgJ7DLn1ys=
 github.com/gdamore/tcell/v2 v2.9.0/go.mod h1:8/ZoqM9rxzYphT9tH/9LnunhV9oPBqwS8WHGYm5nrmo=
-github.com/getsentry/sentry-go v0.36.0 h1:UkCk0zV28PiGf+2YIONSSYiYhxwlERE5Li3JPpZqEns=
-github.com/getsentry/sentry-go v0.36.0/go.mod h1:p5Im24mJBeruET8Q4bbcMfCQ+F+Iadc4L48tB1apo2c=
+github.com/getsentry/sentry-go v0.36.1 h1:kMJt0WWsxWATUxkvFgVBZdIeHSk/Oiv5P0jZ9e5m/Lw=
+github.com/getsentry/sentry-go v0.36.1/go.mod h1:p5Im24mJBeruET8Q4bbcMfCQ+F+Iadc4L48tB1apo2c=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
@@ -462,8 +462,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251015050748-12aafea99911 h1:puwRtGGoGw9Rw3qlB7ltimV2+uugkalN08DyVEL1VoE=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251015050748-12aafea99911/go.mod h1:SVm1Zk6UpZtqZN6KtEQpjC+v+Lir4tyVfhQTU19q3PA=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251021162421-9dee01f565c9 h1:ZwoABMCRbJRspA/zO14tnAg5wCnotc+cuZRB8ec3dsA=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251021162421-9dee01f565c9/go.mod h1:SVm1Zk6UpZtqZN6KtEQpjC+v+Lir4tyVfhQTU19q3PA=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
 github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

internal/namespaces/iam/v1alpha1/custom_test.go

@@ -9,6 +9,8 @@ import (
 	iam "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iam/v1alpha1"
 	"github.com/scaleway/scaleway-cli/v2/internal/testhelpers"
 	iamsdk "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_initWithSSHKeyCommand(t *testing.T) {
@@ -43,11 +45,11 @@ func Test_initWithSSHKeyCommand(t *testing.T) {
 }
 
 func Test_SSHKeyCreateCommand(t *testing.T) {
-	key := `ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBieay3nO9wViPkuvFVgGGaA1IRlkFrr946yqvg9LxZIRhsnZ61yLCPmIOhvUAZ/gTxZGmhgtMDxkenSUTsG3F0= foobar@foobar`
+	key1 := `ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBieay3nO9wViPkuvFVgGGaA1IRlkFrr946yqvg9LxZIRhsnZ61yLCPmIOhvUAZ/gTxZGmhgtMDxkenSUTsG3F0= foobar@foobar`
 	t.Run("simple", core.Test(&core.TestConfig{
 		Commands: iam.GetCommands(),
 		Args: []string{
-			"scw", "iam", "ssh-key", "create", "name=foobar", "public-key=" + key,
+			"scw", "iam", "ssh-key", "create", "name=foobar", "public-key=" + key1,
 		},
 		Check: core.TestCheckCombine(
 			core.TestCheckGolden(),
@@ -62,6 +64,44 @@ func Test_SSHKeyCreateCommand(t *testing.T) {
 			})
 		},
 	}))
+
+	////
+	// File import will test the @/path/file import functionality
+	////
+	key2 := "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIHoWVcE8ItB7WPbmanQY/GhMWqU2XKQthfoAv51IE4OAgnnMWo7RHf1grLdiRZ4MxIwW2SaDBGIDminJCw1OMo= foobar@foobar2"
+	t.Run("file_import", func(t *testing.T) {
+		f, err := os.CreateTemp(t.TempDir(), "ssh.pub")
+		require.NoError(t, err)
+		assert.NotNil(t, f)
+		defer os.Remove(f.Name()) // clean up
+
+		_, err = f.WriteString(key2)
+		require.NoError(t, err)
+		t.Logf("public key written on %s (will be deleted at the end of the test)", f.Name())
+
+		err = f.Close()
+		require.NoError(t, err)
+
+		testConfig := &core.TestConfig{
+			Commands: iam.GetCommands(),
+			Args: []string{
+				"scw", "iam", "ssh-key", "create", "name=foobar2", "public-key=@" + f.Name(),
+			},
+			Check: core.TestCheckCombine(
+				core.TestCheckGolden(),
+				core.TestCheckExitCode(0),
+			),
+			AfterFunc: func(ctx *core.AfterFuncCtx) error {
+				api := iamsdk.NewAPI(ctx.Client)
+				key := testhelpers.Value[*iamsdk.SSHKey](t, ctx.CmdResult)
+
+				return api.DeleteSSHKey(&iamsdk.DeleteSSHKeyRequest{
+					SSHKeyID: key.ID,
+				})
+			},
+		}
+		core.Test(testConfig)(t)
+	})
 }
 
 func Test_SSHKeyRemoveCommand(t *testing.T) {

internal/namespaces/iam/v1alpha1/testdata/test-ssh-key-create-command-file-import.cassette.yaml

@@ -0,0 +1,77 @@
+---
+version: 1
+interactions:
+- request:
+    body: '{"id":"35d4a543-ba4f-46b8-94a1-3e7d1caeccb9", "name":"foobar2", "public_key":"ecdsa-sha2-nistp256
+      AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIHoWVcE8ItB7WPbmanQY/GhMWqU2XKQthfoAv51IE4OAgnnMWo7RHf1grLdiRZ4MxIwW2SaDBGIDminJCw1OMo=",
+      "fingerprint":"256 MD5:a5:b1:5a:ff:d2:71:ed:53:d7:8c:fb:b0:ec:12:10:de (ecdsa-sha2-nistp256)",
+      "created_at":"2025-10-21T10:06:35.771313Z", "updated_at":"2025-10-21T10:06:35.771313Z",
+      "organization_id":"9e9389ca-503a-44c3-bbd5-7a3812303bb0", "project_id":"9e9389ca-503a-44c3-bbd5-7a3812303bb0",
+      "disabled":false}'
+    form: {}
+    headers:
+      Content-Type:
+      - application/json
+      User-Agent:
+      - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.25.0; linux; amd64) cli-e2e-test
+    url: https://api.scaleway.com/iam/v1alpha1/ssh-keys
+    method: POST
+  response:
+    body: '{"id":"35d4a543-ba4f-46b8-94a1-3e7d1caeccb9", "name":"foobar2", "public_key":"ecdsa-sha2-nistp256
+      AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIHoWVcE8ItB7WPbmanQY/GhMWqU2XKQthfoAv51IE4OAgnnMWo7RHf1grLdiRZ4MxIwW2SaDBGIDminJCw1OMo=",
+      "fingerprint":"256 MD5:a5:b1:5a:ff:d2:71:ed:53:d7:8c:fb:b0:ec:12:10:de (ecdsa-sha2-nistp256)",
+      "created_at":"2025-10-21T10:06:35.771313Z", "updated_at":"2025-10-21T10:06:35.771313Z",
+      "organization_id":"9e9389ca-503a-44c3-bbd5-7a3812303bb0", "project_id":"9e9389ca-503a-44c3-bbd5-7a3812303bb0",
+      "disabled":false}'
+    headers:
+      Content-Length:
+      - "552"
+      Content-Security-Policy:
+      - default-src 'none'; frame-ancestors 'none'
+      Content-Type:
+      - application/json
+      Date:
+      - Tue, 21 Oct 2025 10:06:35 GMT
+      Server:
+      - Scaleway API Gateway (fr-par-1;edge02)
+      Strict-Transport-Security:
+      - max-age=63072000
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Request-Id:
+      - 686dc9c2-3fe0-42ca-92fa-9a3ff0b60e1e
+    status: 200 OK
+    code: 200
+    duration: ""
+- request:
+    body: ""
+    form: {}
+    headers:
+      User-Agent:
+      - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.25.0; linux; amd64) cli-e2e-test
+    url: https://api.scaleway.com/iam/v1alpha1/ssh-keys/35d4a543-ba4f-46b8-94a1-3e7d1caeccb9
+    method: DELETE
+  response:
+    body: ""
+    headers:
+      Content-Security-Policy:
+      - default-src 'none'; frame-ancestors 'none'
+      Content-Type:
+      - application/json
+      Date:
+      - Tue, 21 Oct 2025 10:06:35 GMT
+      Server:
+      - Scaleway API Gateway (fr-par-1;edge02)
+      Strict-Transport-Security:
+      - max-age=63072000
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Request-Id:
+      - bc788029-3879-4eff-a462-68b6adbddcb7
+    status: 204 No Content
+    code: 204
+    duration: ""