Merge branch 'master' into v1.4463.0

scaleway · Jan 11, 2024 · 161417c · 161417c
2 parents e9c9a9a + 0aad63e
commit 161417c
Show file tree

Hide file tree

Showing 26 changed files with 193 additions and 119 deletions.
diff --git a/cmd/scw/testdata/test-all-usage-cockpit-alert-disable-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-alert-disable-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Disable the sending of managed alerts for the specified Project's Cockpit.
+Disable the sending of managed alerts for a given Cockpit, specified by the ID of the Project the Cockpit belongs to.
 
 USAGE:
   scw cockpit alert disable [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-alert-enable-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-alert-enable-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Enable the sending of managed alerts for the specified Project's Cockpit.
+Enable the sending of managed alerts for a given Cockpit, specified by the ID of the Project the Cockpit belongs to.
 
 USAGE:
   scw cockpit alert enable [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-alert-test-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-alert-test-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Trigger a test alert to all of the Cockpit's receivers.
+Send a test alert to make sure your contact points get notified when an actual alert is triggered.
 
 USAGE:
   scw cockpit alert test [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-alert-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-alert-usage.golden
@@ -6,9 +6,9 @@ USAGE:
   scw cockpit alert <command>
 
 AVAILABLE COMMANDS:
-  disable     Disable the sending of managed alerts for the specified Project's Cockpit
-  enable      Enable the sending of managed alerts for the specified Project's Cockpit
-  test        Trigger a test alert to all of the Cockpit's receivers
+  disable     Disable the sending of managed alerts for a given Cockpit, specified by the ID of the Project the Cockpit belongs to
+  enable      Enable the sending of managed alerts for a given Cockpit, specified by the ID of the Project the Cockpit belongs to
+  test        Send a test alert to make sure your contact points get notified when an actual alert is triggered
 
 FLAGS:
   -h, --help   help for alert

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-cockpit-activate-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-cockpit-activate-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Activate the Cockpit of the specified Project ID.
+Activate the Cockpit of a given Project specified by the Project ID.
 
 USAGE:
   scw cockpit cockpit activate [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-cockpit-deactivate-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-cockpit-deactivate-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Deactivate the Cockpit of the specified Project ID.
+Deactivate the Cockpit of a given Project specified by the Project ID.
 
 USAGE:
   scw cockpit cockpit deactivate [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-cockpit-get-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-cockpit-get-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Retrieve the Cockpit of the specified Project ID.
+Retrieve the Cockpit of a given Project specified by the Project ID.
 
 USAGE:
   scw cockpit cockpit get [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-cockpit-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-cockpit-usage.golden
@@ -6,9 +6,9 @@ USAGE:
   scw cockpit cockpit <command>
 
 AVAILABLE COMMANDS:
-  activate    Activate the Cockpit of the specified Project ID
-  deactivate  Deactivate the Cockpit of the specified Project ID
-  get         Retrieve the Cockpit of the specified Project ID
+  activate    Activate the Cockpit of a given Project specified by the Project ID
+  deactivate  Deactivate the Cockpit of a given Project specified by the Project ID
+  get         Retrieve the Cockpit of a given Project specified by the Project ID
 
 WORKFLOW COMMANDS:
   wait        Wait for a cockpit to reach a stable state (installation)

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-contact-create-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-contact-create-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Create a contact point to receive alerts for the default receiver.
+Create a contact point associated with the default receiver, to receive alerts.
 
 USAGE:
   scw cockpit contact create [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-contact-delete-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-contact-delete-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Delete a contact point for the default receiver.
+Delete a contact point associated with the default receiver.
 
 USAGE:
   scw cockpit contact delete [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-contact-list-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-contact-list-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Get a list of contact points for the Cockpit associated with the specified Project ID.
+Get a list of contact points created for a given Cockpit, specified by the ID of the Project the Cockpit belongs to.
 
 USAGE:
   scw cockpit contact list [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-contact-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-contact-usage.golden
@@ -6,9 +6,9 @@ USAGE:
   scw cockpit contact <command>
 
 AVAILABLE COMMANDS:
-  create      Create a contact point to receive alerts for the default receiver
-  delete      Delete a contact point for the default receiver
-  list        Get a list of contact points for the Cockpit associated with the specified Project ID
+  create      Create a contact point associated with the default receiver, to receive alerts
+  delete      Delete a contact point associated with the default receiver
+  list        Get a list of contact points created for a given Cockpit, specified by the ID of the Project the Cockpit belongs to
 
 FLAGS:
   -h, --help   help for contact

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-grafana-user-create-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-grafana-user-create-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Create a Grafana user for your Cockpit's Grafana instance. Make sure you save the automatically-generated password and the Grafana user ID.
+Create a Grafana user for your Cockpit's Grafana. Make sure you save the automatically-generated password and the Grafana user ID.
 
 USAGE:
   scw cockpit grafana-user create [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-grafana-user-delete-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-grafana-user-delete-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Delete a Grafana user from a Grafana instance, specified by the Cockpit's Project ID and the Grafana user ID.
+Delete a Grafana user from your Cockpit's Grafana, specified by the ID of the Project the Cockpit belongs to, and the ID of the Grafana user.
 
 USAGE:
   scw cockpit grafana-user delete [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-grafana-user-list-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-grafana-user-list-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Get a list of Grafana users who are able to connect to the Cockpit's Grafana instance.
+Get a list of all Grafana users created in your Cockpit's Grafana.
 
 USAGE:
   scw cockpit grafana-user list [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-grafana-user-reset-password-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-grafana-user-reset-password-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Reset a Grafana user's password specified by the Cockpit's Project ID and the Grafana user ID.
+Reset the password of a Grafana user, specified by the ID of the Project the Cockpit belongs to, and the ID of the Grafana user.
 
 USAGE:
   scw cockpit grafana-user reset-password [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-grafana-user-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-grafana-user-usage.golden
@@ -6,10 +6,10 @@ USAGE:
   scw cockpit grafana-user <command>
 
 AVAILABLE COMMANDS:
-  create         Create a Grafana user for your Cockpit's Grafana instance. Make sure you save the automatically-generated password and the Grafana user ID
-  delete         Delete a Grafana user from a Grafana instance, specified by the Cockpit's Project ID and the Grafana user ID
-  list           Get a list of Grafana users who are able to connect to the Cockpit's Grafana instance
-  reset-password Reset a Grafana user's password specified by the Cockpit's Project ID and the Grafana user ID
+  create         Create a Grafana user for your Cockpit's Grafana. Make sure you save the automatically-generated password and the Grafana user ID
+  delete         Delete a Grafana user from your Cockpit's Grafana, specified by the ID of the Project the Cockpit belongs to, and the ID of the Grafana user
+  list           Get a list of all Grafana users created in your Cockpit's Grafana
+  reset-password Reset the password of a Grafana user, specified by the ID of the Project the Cockpit belongs to, and the ID of the Grafana user
 
 FLAGS:
   -h, --help   help for grafana-user

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-token-create-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-token-create-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Create a token associated with the specified Project ID.
+Create a token in a given Project specified by the Project ID.
 
 USAGE:
   scw cockpit token create [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-token-delete-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-token-delete-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Delete the token associated with the specified token ID.
+Delete a given token specified by the token ID.
 
 USAGE:
   scw cockpit token delete [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-token-get-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-token-get-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Retrieve the token associated with the specified token ID.
+Retrieve a given token specified by the token ID.
 
 USAGE:
   scw cockpit token get <token-id ...> [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-token-list-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-token-list-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Get a list of tokens associated with the specified Project ID.
+Get a list of tokens in a given Project specified by the Project ID.
 
 USAGE:
   scw cockpit token list [arg=value ...]

diff --git a/cmd/scw/testdata/test-all-usage-cockpit-token-usage.golden b/cmd/scw/testdata/test-all-usage-cockpit-token-usage.golden
@@ -6,10 +6,10 @@ USAGE:
   scw cockpit token <command>
 
 AVAILABLE COMMANDS:
-  create      Create a token associated with the specified Project ID
-  delete      Delete the token associated with the specified token ID
-  get         Retrieve the token associated with the specified token ID
-  list        Get a list of tokens associated with the specified Project ID
+  create      Create a token in a given Project specified by the Project ID
+  delete      Delete a given token specified by the token ID
+  get         Retrieve a given token specified by the token ID
+  list        Get a list of tokens in a given Project specified by the Project ID
 
 FLAGS:
   -h, --help   help for token

diff --git a/cmd/scw/testdata/test-all-usage-jobs-definition-start-usage.cassette.yaml b/cmd/scw/testdata/test-all-usage-jobs-definition-start-usage.cassette.yaml
@@ -0,0 +1,37 @@
+---
+version: 1
+interactions:
+- request:
+    body: '{"access_key":"SCWHJNSK2028RFV4SE6K","secret_key":null,"description":"lmarabese
+      IAM API key","created_at":"2023-02-07T12:50:30.653520Z","updated_at":"2023-02-07T12:50:30.653520Z","expires_at":null,"default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552","editable":true,"creation_ip":"51.159.46.153","user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
+    form: {}
+    headers:
+      User-Agent:
+      - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.21.6; linux; amd64) cli-e2e-test
+    url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWXXXXXXXXXXXXXXXXX
+    method: GET
+  response:
+    body: '{"access_key":"SCWHJNSK2028RFV4SE6K","secret_key":null,"description":"lmarabese
+      IAM API key","created_at":"2023-02-07T12:50:30.653520Z","updated_at":"2023-02-07T12:50:30.653520Z","expires_at":null,"default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552","editable":true,"creation_ip":"51.159.46.153","user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
+    headers:
+      Content-Length:
+      - "352"
+      Content-Security-Policy:
+      - default-src 'none'; frame-ancestors 'none'
+      Content-Type:
+      - application/json
+      Date:
+      - Thu, 11 Jan 2024 16:07:21 GMT
+      Server:
+      - Scaleway API-Gateway
+      Strict-Transport-Security:
+      - max-age=63072000
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Request-Id:
+      - e89d9b60-76dc-4821-b7ac-c58b88b6c0b2
+    status: 200 OK
+    code: 200
+    duration: ""
diff --git a/cmd/scw/testdata/test-all-usage-jobs-run-get-usage.cassette.yaml b/cmd/scw/testdata/test-all-usage-jobs-run-get-usage.cassette.yaml
@@ -0,0 +1,37 @@
+---
+version: 1
+interactions:
+- request:
+    body: '{"access_key":"SCWHJNSK2028RFV4SE6K","secret_key":null,"description":"lmarabese
+      IAM API key","created_at":"2023-02-07T12:50:30.653520Z","updated_at":"2023-02-07T12:50:30.653520Z","expires_at":null,"default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552","editable":true,"creation_ip":"51.159.46.153","user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
+    form: {}
+    headers:
+      User-Agent:
+      - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.21.6; linux; amd64) cli-e2e-test
+    url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWXXXXXXXXXXXXXXXXX
+    method: GET
+  response:
+    body: '{"access_key":"SCWHJNSK2028RFV4SE6K","secret_key":null,"description":"lmarabese
+      IAM API key","created_at":"2023-02-07T12:50:30.653520Z","updated_at":"2023-02-07T12:50:30.653520Z","expires_at":null,"default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552","editable":true,"creation_ip":"51.159.46.153","user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
+    headers:
+      Content-Length:
+      - "352"
+      Content-Security-Policy:
+      - default-src 'none'; frame-ancestors 'none'
+      Content-Type:
+      - application/json
+      Date:
+      - Thu, 11 Jan 2024 16:07:21 GMT
+      Server:
+      - Scaleway API-Gateway
+      Strict-Transport-Security:
+      - max-age=63072000
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Request-Id:
+      - ef5df827-b60d-42a6-a815-dd89bf6df4b6
+    status: 200 OK
+    code: 200
+    duration: ""