Merge branch 'master' into feat/task-composite-logs

Author: remyleone

cmd/scw/testdata/test-all-usage-secret-secret-create-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 EXAMPLES:
   Add a given Secret
-    scw secret secret create name=foobar description="$(cat <path/to/your/secret>)"
+    scw secret secret create project-id=<your-project-id> name="foobar" description="bar"
 
 ARGS:
   [project-id]      Project ID to use. If none is passed the default project ID will be used

cmd/scw/testdata/test-all-usage-secret-version-create-usage.golden

@@ -5,6 +5,10 @@ Create a SecretVersion.
 USAGE:
   scw secret version create [arg=value ...]
 
+EXAMPLES:
+  Add a given Secret Version
+    scw secret version create name=foobar secret-id="<secret-id>" data=@<path/to/your/secret/file>
+
 ARGS:
   secret-id         ID of the Secret
   data              Content of the secret version. Base64 is handled by the SDK (Support file loading with @/path/to/file)

docs/commands/secret.md

@@ -52,7 +52,7 @@ scw secret secret create [arg=value ...]
 
 Add a given Secret
 ```
-scw secret secret create name=foobar description="$(cat <path/to/your/secret>)"
+scw secret secret create project-id=<your-project-id> name="foobar" description="bar"
 ```
 
 
@@ -203,6 +203,16 @@ scw secret version create [arg=value ...]
 | region | Default: `fr-par`<br />One of: `fr-par` | Region to target. If none is passed will use default region from the config |
 
 
+**Examples:**
+
+
+Add a given Secret Version
+```
+scw secret version create name=foobar secret-id="<secret-id>" data=@<path/to/your/secret/file>
+```
+
+
+
 
 ### Destroy a SecretVersion, permanently destroying the sensitive data
 

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/moby/buildkit v0.11.4
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/pkg/errors v0.9.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14.0.20230314173919-2ec24bb08c42
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14.0.20230318120603-8df14b12fd02
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.2

go.sum

@@ -192,9 +192,9 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14.0.20230314173919-2ec24bb08c42 h1:8X7HJIk2/9N3PCt7jrp3DPLDr8ev3ilzJJaW+vx4LN4=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14.0.20230314173919-2ec24bb08c42/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14.0.20230318120603-8df14b12fd02 h1:Ipdjm5oXQtzoHxsc1Pj7LqOlNJh5HrVb4R9TRpFiwKM=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14.0.20230318120603-8df14b12fd02/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shibumi/go-pathspec v1.3.0 h1:QUyMZhFo0Md5B8zV8x2tesohbb5kfbpTi9rBnKh5dkI=

internal/namespaces/secret/v1alpha1/secret_cli.go

@@ -110,7 +110,7 @@ func secretSecretCreate() *core.Command {
 		Examples: []*core.Example{
 			{
 				Short: "Add a given Secret",
-				Raw:   `scw secret secret create name=foobar description="$(cat <path/to/your/secret>)"`,
+				Raw:   `scw secret secret create project-id=<your-project-id> name="foobar" description="bar"`,
 			},
 		},
 	}
@@ -347,6 +347,12 @@ func secretVersionCreate() *core.Command {
 			return api.CreateSecretVersion(request)
 
 		},
+		Examples: []*core.Example{
+			{
+				Short: "Add a given Secret Version",
+				Raw:   `scw secret version create name=foobar secret-id="<secret-id>" data=@<path/to/your/secret/file>`,
+			},
+		},
 	}
 }