Skip to content

Commit 2475a95

Browse files
jremy42jremy42
authored
Merge branch 'master' into fix/redis-public-endpoint-default
2 parents 3f783d4 + d30cd72 commit 2475a95

34 files changed

+17561
-14489
lines changed

‎.github/codecov.yml‎

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,197 @@
1+
codecov:
2+
branch: master
3+
4+
component_management:
5+
individual_components:
6+
- component_id: account
7+
name: account
8+
paths:
9+
- internal/namespaces/account/**
10+
- component_id: alias
11+
name: alias
12+
paths:
13+
- internal/namespaces/alias/**
14+
- component_id: applesilicon
15+
name: applesilicon
16+
paths:
17+
- internal/namespaces/applesilicon/**
18+
- component_id: audit_trail
19+
name: audit_trail
20+
paths:
21+
- internal/namespaces/audit_trail/**
22+
- component_id: autocomplete
23+
name: autocomplete
24+
paths:
25+
- internal/namespaces/autocomplete/**
26+
- component_id: baremetal
27+
name: baremetal
28+
paths:
29+
- internal/namespaces/baremetal/**
30+
- component_id: billing
31+
name: billing
32+
paths:
33+
- internal/namespaces/billing/**
34+
- component_id: block
35+
name: block
36+
paths:
37+
- internal/namespaces/block/**
38+
- component_id: cockpit
39+
name: cockpit
40+
paths:
41+
- internal/namespaces/cockpit/**
42+
- component_id: config
43+
name: config
44+
paths:
45+
- internal/namespaces/config/**
46+
- component_id: container
47+
name: container
48+
paths:
49+
- internal/namespaces/container/**
50+
- component_id: dedibox
51+
name: dedibox
52+
paths:
53+
- internal/namespaces/dedibox/**
54+
- component_id: domain
55+
name: domain
56+
paths:
57+
- internal/namespaces/domain/**
58+
- component_id: edge_services
59+
name: edge_services
60+
paths:
61+
- internal/namespaces/edge_services/**
62+
- component_id: feedback
63+
name: feedback
64+
paths:
65+
- internal/namespaces/feedback/**
66+
- component_id: file
67+
name: file
68+
paths:
69+
- internal/namespaces/file/**
70+
- component_id: flexibleip
71+
name: flexibleip
72+
paths:
73+
- internal/namespaces/flexibleip/**
74+
- component_id: function
75+
name: function
76+
paths:
77+
- internal/namespaces/function/**
78+
- component_id: help
79+
name: help
80+
paths:
81+
- internal/namespaces/help/**
82+
- component_id: iam
83+
name: iam
84+
paths:
85+
- internal/namespaces/iam/**
86+
- component_id: inference
87+
name: inference
88+
paths:
89+
- internal/namespaces/inference/**
90+
- component_id: info
91+
name: info
92+
paths:
93+
- internal/namespaces/info/**
94+
- component_id: init
95+
name: init
96+
paths:
97+
- internal/namespaces/init/**
98+
- component_id: instance
99+
name: instance
100+
paths:
101+
- internal/namespaces/instance/**
102+
- component_id: interlink
103+
name: interlink
104+
paths:
105+
- internal/namespaces/interlink/**
106+
- component_id: iot
107+
name: iot
108+
paths:
109+
- internal/namespaces/iot/**
110+
- component_id: ipam
111+
name: ipam
112+
paths:
113+
- internal/namespaces/ipam/**
114+
- component_id: jobs
115+
name: jobs
116+
paths:
117+
- internal/namespaces/jobs/**
118+
- component_id: k8s
119+
name: k8s
120+
paths:
121+
- internal/namespaces/k8s/**
122+
- component_id: key_manager
123+
name: key_manager
124+
paths:
125+
- internal/namespaces/key_manager/**
126+
- component_id: lb
127+
name: lb
128+
paths:
129+
- internal/namespaces/lb/**
130+
- component_id: login
131+
name: login
132+
paths:
133+
- internal/namespaces/login/**
134+
- component_id: marketplace
135+
name: marketplace
136+
paths:
137+
- internal/namespaces/marketplace/**
138+
- component_id: mnq
139+
name: mnq
140+
paths:
141+
- internal/namespaces/mnq/**
142+
- component_id: mongodb
143+
name: mongodb
144+
paths:
145+
- internal/namespaces/mongodb/**
146+
- component_id: object
147+
name: object
148+
paths:
149+
- internal/namespaces/object/**
150+
- component_id: rdb
151+
name: rdb
152+
paths:
153+
- internal/namespaces/rdb/**
154+
- component_id: redis
155+
name: redis
156+
paths:
157+
- internal/namespaces/redis/**
158+
- component_id: registry
159+
name: registry
160+
paths:
161+
- internal/namespaces/registry/**
162+
- component_id: secret
163+
name: secret
164+
paths:
165+
- internal/namespaces/secret/**
166+
- component_id: serverless_sqldb
167+
name: serverless_sqldb
168+
paths:
169+
- internal/namespaces/serverless_sqldb/**
170+
- component_id: shell
171+
name: shell
172+
paths:
173+
- internal/namespaces/shell/**
174+
- component_id: tem
175+
name: tem
176+
paths:
177+
- internal/namespaces/tem/**
178+
- component_id: test
179+
name: test
180+
paths:
181+
- internal/namespaces/test/**
182+
- component_id: version
183+
name: version
184+
paths:
185+
- internal/namespaces/version/**
186+
- component_id: vpc
187+
name: vpc
188+
paths:
189+
- internal/namespaces/vpc/**
190+
- component_id: vpcgw
191+
name: vpcgw
192+
paths:
193+
- internal/namespaces/vpcgw/**
194+
- component_id: webhosting
195+
name: webhosting
196+
paths:
197+
- internal/namespaces/webhosting/**

‎.github/workflows/coverage.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ jobs:
2020
with:
2121
go-version: stable
2222
- name: Run coverage
23-
run: go test -coverprofile=coverage.out -covermode=count ./...
23+
run: go tool gotestsum --format github-actions --junitfile junit.xml -- -coverprofile=coverage.out -covermode=count ./...
2424
- name: Upload coverage to Codecov
2525
uses: codecov/codecov-action@v5
26+
- name: Upload test results to Codecov
27+
if: ${{ !cancelled() }}
28+
uses: codecov/test-results-action@v1
29+
with:
30+
token: ${{ secrets.CODECOV_TOKEN }}

‎cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ARGS:
4040
[install.partitioning-schema.zfs.pools.{index}.filesystem-options.{index}]
4141
[option-ids.{index}] IDs of options to enable on server
4242
[protected] If enabled, the server can not be deleted
43+
[user-data] Configuration data to pass to cloud-init such as a YAML cloud config data or a user-data script
4344
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
4445
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
4546

‎cmd/scw/testdata/test-all-usage-baremetal-server-install-usage.golden‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ ARGS:
3838
[partitioning-schema.zfs.pools.{index}.filesystem-options.{index}]
3939
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
4040

41+
DEPRECATED ARGS:
42+
[user-data.name]
43+
[user-data.content-type]
44+
[user-data.content]
45+
4146
FLAGS:
4247
-h, --help help for install
4348
-w, --wait wait until the server is ready

‎cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ARGS:
1111
[description] Description associated with the server, max 255 characters, not updated if null
1212
[tags.{index}] Tags associated with the server, not updated if null
1313
[protected] If enabled, the server can not be deleted
14+
[user-data] Configuration data to pass to cloud-init such as a YAML cloud config data or a user-data script
1415
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-2 | pl-waw-3)
1516

1617
FLAGS:

‎docs/commands/baremetal.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,7 @@ scw baremetal server create [arg=value ...]
565565
| install.partitioning-schema.zfs.pools.{index}.filesystem-options.{index} | | |
566566
| option-ids.{index} | | IDs of options to enable on server |
567567
| protected | | If enabled, the server can not be deleted |
568+
| user-data | | Configuration data to pass to cloud-init such as a YAML cloud config data or a user-data script |
568569
| organization-id | | Organization ID to use. If none is passed the default organization ID will be used |
569570
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
570571

@@ -700,6 +701,9 @@ scw baremetal server install <server-id ...> [arg=value ...]
700701
| partitioning-schema.zfs.pools.{index}.devices.{index} | | |
701702
| partitioning-schema.zfs.pools.{index}.options.{index} | | |
702703
| partitioning-schema.zfs.pools.{index}.filesystem-options.{index} | | |
704+
| ~~user-data.name~~ | Deprecated | |
705+
| ~~user-data.content-type~~ | Deprecated | |
706+
| ~~user-data.content~~ | Deprecated | |
703707
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
704708

705709

@@ -895,6 +899,7 @@ scw baremetal server update <server-id ...> [arg=value ...]
895899
| description | | Description associated with the server, max 255 characters, not updated if null |
896900
| tags.{index} | | Tags associated with the server, not updated if null |
897901
| protected | | If enabled, the server can not be deleted |
902+
| user-data | | Configuration data to pass to cloud-init such as a YAML cloud config data or a user-data script |
898903
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
899904

900905

‎go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/scaleway/scaleway-cli/v2
33
go 1.25.0
44

55
require (
6-
github.com/aws/aws-sdk-go-v2 v1.39.3
7-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.5
6+
github.com/aws/aws-sdk-go-v2 v1.39.4
7+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7
88
github.com/buildpacks/pack v0.38.2
99
github.com/c-bata/go-prompt v0.2.6
1010
github.com/charmbracelet/bubbletea v1.3.10
@@ -14,7 +14,7 @@ require (
1414
github.com/docker/docker v28.5.1+incompatible
1515
github.com/dustin/go-humanize v1.0.1
1616
github.com/fatih/color v1.18.0
17-
github.com/getsentry/sentry-go v0.36.0
17+
github.com/getsentry/sentry-go v0.36.1
1818
github.com/ghodss/yaml v1.0.0
1919
github.com/gorilla/websocket v1.5.3
2020
github.com/hashicorp/go-version v1.7.0
@@ -23,7 +23,7 @@ require (
2323
github.com/mattn/go-isatty v0.0.20
2424
github.com/moby/buildkit v0.25.1
2525
github.com/opencontainers/go-digest v1.0.0
26-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251015050748-12aafea99911
26+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251024091811-f46054a61f65
2727
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2828
github.com/spf13/cobra v1.10.1
2929
github.com/spf13/pflag v1.0.10
@@ -58,16 +58,16 @@ require (
5858
github.com/aws/aws-sdk-go-v2/config v1.31.6 // indirect
5959
github.com/aws/aws-sdk-go-v2/credentials v1.18.10 // indirect
6060
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect
61-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.10 // indirect
62-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.10 // indirect
61+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 // indirect
62+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 // indirect
6363
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
64-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.10 // indirect
64+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11 // indirect
6565
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 // indirect
6666
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 // indirect
6767
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect
68-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.1 // indirect
69-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.10 // indirect
70-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.10 // indirect
68+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2 // indirect
69+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 // indirect
70+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11 // indirect
7171
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect
7272
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect
7373
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect

0 commit comments

Comments
 (0)