Skip to content

Commit 4165248

Browse files
authored
Merge branch 'scaleway:master' into master
2 parents 438440c + 2d4b64f commit 4165248

14 files changed

+13684
-8016
lines changed

cmd/scw/testdata/test-all-usage-marketplace-local-image-list-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ USAGE:
88
ARGS:
99
[order-by] Ordering to use (type_asc | type_desc | created_at_asc | created_at_desc)
1010
[zone] Filter local images available on this Availability Zone
11+
[arch] Filter local images available for this machine architecture
1112
[image-id] Filter by image id
1213
[version-id] Filter by version id
1314
[image-label] Filter by image label

docs/commands/marketplace.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ scw marketplace local-image list [arg=value ...]
139139
|------|---|-------------|
140140
| order-by | One of: `type_asc`, `type_desc`, `created_at_asc`, `created_at_desc` | Ordering to use |
141141
| zone | | Filter local images available on this Availability Zone |
142+
| arch | | Filter local images available for this machine architecture |
142143
| image-id | | Filter by image id |
143144
| version-id | | Filter by version id |
144145
| image-label | | Filter by image label |

go.mod

Lines changed: 103 additions & 98 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 244 additions & 284 deletions
Large diffs are not rendered by default.

internal/namespaces/container/v1beta1/testdata/test-deploy-app-name-deduced-from-path.cassette.yaml

Lines changed: 682 additions & 2468 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
3-
Your application is now available at https://appclitctnrdeployfpvgptoyk4-app-cli-t-ctnr-deploy-fp.functions.fnc.fr-par.scw.cloud
3+
Your application is now available at https://appclitctnrdeployfpzayj9zdx-app-cli-t-ctnr-deploy-fp.functions.fnc.fr-par.scw.cloud
44

55
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
6-
"Your application is now available at https://appclitctnrdeployfpvgptoyk4-app-cli-t-ctnr-deploy-fp.functions.fnc.fr-par.scw.cloud\n"
6+
"Your application is now available at https://appclitctnrdeployfpzayj9zdx-app-cli-t-ctnr-deploy-fp.functions.fnc.fr-par.scw.cloud\n"

internal/namespaces/container/v1beta1/testdata/test-deploy-build-args.cassette.yaml

Lines changed: 668 additions & 368 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
3-
Your application is now available at https://clitctnrdeploybaen3cu4hs-cli-t-ctnr-deploy-ba.functions.fnc.fr-par.scw.cloud
3+
Your application is now available at https://clitctnrdeploybanaloas4l-cli-t-ctnr-deploy-ba.functions.fnc.fr-par.scw.cloud
44

55
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
6-
"Your application is now available at https://clitctnrdeploybaen3cu4hs-cli-t-ctnr-deploy-ba.functions.fnc.fr-par.scw.cloud\n"
6+
"Your application is now available at https://clitctnrdeploybanaloas4l-cli-t-ctnr-deploy-ba.functions.fnc.fr-par.scw.cloud\n"

internal/namespaces/container/v1beta1/testdata/test-deploy-buildpack.cassette.yaml

Lines changed: 11201 additions & 4381 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
3-
Your application is now available at https://clitctnrdeploybpxovfnujd-cli-t-ctnr-deploy-bp.functions.fnc.fr-par.scw.cloud
3+
Your application is now available at https://clitctnrdeploybp5rwcoxvx-cli-t-ctnr-deploy-bp.functions.fnc.fr-par.scw.cloud
44

55
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
6-
"Your application is now available at https://clitctnrdeploybpxovfnujd-cli-t-ctnr-deploy-bp.functions.fnc.fr-par.scw.cloud\n"
6+
"Your application is now available at https://clitctnrdeploybp5rwcoxvx-cli-t-ctnr-deploy-bp.functions.fnc.fr-par.scw.cloud\n"

0 commit comments

Comments
 (0)