Skip to content

Commit 0a46e9a

Browse files
Mia-CrossMia-Cross
authored
Merge branch 'master' into k8s_acl_order
2 parents ff3fc88 + 114ccff commit 0a46e9a

20 files changed

+16937
-4043
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ name: "CodeQL"
77

88
permissions:
99
contents: read
10+
security-events: write
11+
actions: read
1012

1113
on:
1214
push:

‎docs/data-sources/instance_servers.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ In addition to all above arguments, the following attributes are exported:
4646
- `tags` - The tags associated with the server.
4747
- `public_ip` - The public IP address of the server.
4848
- `private_ip` - The Scaleway internal IP address of the server.
49+
- `private_ips` - The list of private IPv4 and IPv6 addresses associated with the server.
50+
- `id` - The ID of the IP address resource.
51+
- `address` - The private IP address.
4952
- `public_ips` - The list of public IPs of the server
5053
- `id` - The ID of the IP
5154
- `address` - The address of the IP

‎docs/resources/baremetal_server.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ The following arguments are supported:
305305
- `ipam_ip_ids` - (Optional) List of IPAM IP IDs to assign to the server in the requested private network.
306306
- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the server should be created.
307307
- `partitioning` (Optional) The partitioning schema in JSON format
308+
- `protected` - (Optional) Set to true to activate server protection option.
308309
- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the server is associated with.
309310

310311

‎docs/resources/instance_security_group.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ resource "scaleway_instance_security_group" "web" {
2121
inbound_rule {
2222
action = "accept"
2323
port = 22
24-
ip = "212.47.225.64"
24+
ip_range = "212.47.225.64/32"
2525
}
2626
2727
inbound_rule {
@@ -46,13 +46,13 @@ resource "scaleway_instance_security_group" "web" {
4646
4747
inbound_rule {
4848
action = "drop"
49-
ip = "1.1.1.1" # Banned IP
49+
ip_range = "1.1.1.1/32" # Banned IP range
5050
}
5151
5252
inbound_rule {
5353
action = "accept"
5454
port = 22
55-
ip = "212.47.225.64"
55+
ip_range = "212.47.225.64/32"
5656
}
5757
5858
inbound_rule {
@@ -62,7 +62,7 @@ resource "scaleway_instance_security_group" "web" {
6262
6363
outbound_rule {
6464
action = "accept"
65-
ip = "8.8.8.8" # Only allow outgoing connection to this IP.
65+
ip_range = "8.8.8.8/32" # Only allow outgoing connection to this IP range.
6666
}
6767
}
6868
```
@@ -86,7 +86,7 @@ resource "scaleway_instance_security_group" "dummy" {
8686
content {
8787
action = "accept"
8888
port = 22
89-
ip = inbound_rule.value
89+
ip_range = inbound_rule.value
9090
}
9191
}
9292
}
@@ -132,7 +132,7 @@ The `inbound_rule` and `outbound_rule` block supports:
132132
If no `port` nor `port_range` are specified, rule will apply to all port.
133133
Only one of `port` and `port_range` should be specified.
134134

135-
- `ip`- (Optional) The ip this rule apply to. If no `ip` nor `ip_range` are specified, rule will apply to all ip. Only one of `ip` and `ip_range` should be specified.
135+
- `ip`- (Deprecated) The ip this rule apply to. If no `ip` nor `ip_range` are specified, rule will apply to all ip. Only one of `ip` and `ip_range` should be specified.
136136

137137
- `ip_range`- (Optional) The ip range (e.g `192.168.1.0/24`) this rule applies to. If no `ip` nor `ip_range` are specified, rule will apply to all ip. Only one of `ip` and `ip_range` should be specified.
138138

‎docs/resources/instance_security_group_rules.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ resource "scaleway_instance_security_group" "main" {
4646
4747
locals {
4848
trusted = [
49-
"1.2.3.4",
50-
"4.5.6.7",
51-
"7.8.9.10"
49+
"1.2.3.4/32",
50+
"4.5.6.7/32",
51+
"7.8.9.10/24"
5252
]
5353
}
5454
@@ -59,7 +59,7 @@ resource "scaleway_instance_security_group_rules" "main" {
5959
for_each = local.trusted
6060
content {
6161
action = "accept"
62-
ip = inbound_rule.value
62+
ip_range = inbound_rule.value
6363
port = 80
6464
}
6565
}
@@ -79,9 +79,9 @@ resource "scaleway_instance_security_group" "main" {
7979
8080
locals {
8181
trusted = [
82-
{ ip = "1.2.3.4", port = "80" },
83-
{ ip = "5.6.7.8", port = "81" },
84-
{ ip = "9.10.11.12", port = "81" },
82+
{ ip_range = "1.2.3.4/32", port = "80" },
83+
{ ip_range = "5.6.7.8/32", port = "81" },
84+
{ ip_range = "9.10.11.12/32", port = "81" },
8585
]
8686
}
8787
@@ -92,7 +92,7 @@ resource "scaleway_instance_security_group_rules" "main" {
9292
for_each = local.trusted
9393
content {
9494
action = "accept"
95-
ip = inbound_rule.value.ip
95+
ip_range = inbound_rule.value.ip_range
9696
port = inbound_rule.value.port
9797
}
9898
}
@@ -122,7 +122,7 @@ The `inbound_rule` and `outbound_rule` block supports:
122122
If no `port` nor `port_range` are specified, rule will apply to all port.
123123
Only one of `port` and `port_range` should be specified.
124124

125-
- `ip`- (Optional) The ip this rule apply to. If no `ip` nor `ip_range` are specified, rule will apply to all ip. Only one of `ip` and `ip_range` should be specified.
125+
- `ip`- (Deprecated) The ip this rule apply to. If no `ip` nor `ip_range` are specified, rule will apply to all ip. Only one of `ip` and `ip_range` should be specified.
126126

127127
- `ip_range`- (Optional) The ip range (e.g `192.168.1.0/24`) this rule applies to. If no `ip` nor `ip_range` are specified, rule will apply to all ip. Only one of `ip` and `ip_range` should be specified.
128128

‎go.mod‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ go 1.24.0
44

55
require (
66
github.com/alexedwards/argon2id v1.0.0
7-
github.com/aws/aws-sdk-go-v2 v1.36.5
7+
github.com/aws/aws-sdk-go-v2 v1.37.1
88
github.com/aws/aws-sdk-go-v2/config v1.29.17
99
github.com/aws/aws-sdk-go-v2/credentials v1.17.70
10-
github.com/aws/aws-sdk-go-v2/service/s3 v1.82.0
10+
github.com/aws/aws-sdk-go-v2/service/s3 v1.85.1
1111
github.com/aws/aws-sdk-go-v2/service/sns v1.34.4
1212
github.com/aws/aws-sdk-go-v2/service/sqs v1.38.6
13-
github.com/aws/smithy-go v1.22.4
14-
github.com/docker/docker v28.2.2+incompatible
13+
github.com/aws/smithy-go v1.22.5
14+
github.com/docker/docker v28.3.3+incompatible
1515
github.com/dustin/go-humanize v1.0.1
1616
github.com/google/go-cmp v0.7.0
1717
github.com/google/uuid v1.6.0
@@ -26,11 +26,11 @@ require (
2626
github.com/hashicorp/terraform-plugin-mux v0.20.0
2727
github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
2828
github.com/nats-io/jwt/v2 v2.7.4
29-
github.com/nats-io/nats.go v1.38.0
29+
github.com/nats-io/nats.go v1.44.0
3030
github.com/robfig/cron/v3 v3.0.1
3131
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250721082157-a9b7a7bd9686
3232
github.com/stretchr/testify v1.10.0
33-
golang.org/x/crypto v0.39.0
33+
golang.org/x/crypto v0.40.0
3434
gopkg.in/dnaeon/go-vcr.v3 v3.2.0
3535
)
3636

@@ -46,16 +46,16 @@ require (
4646
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
4747
github.com/armon/go-radix v1.0.0 // indirect
4848
github.com/aws/aws-sdk-go v1.55.5 // indirect
49-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 // indirect
49+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
5050
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32 // indirect
51-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
52-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
51+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.1 // indirect
52+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.1 // indirect
5353
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
54-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 // indirect
55-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4 // indirect
56-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 // indirect
57-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
58-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 // indirect
54+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.1 // indirect
55+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.1 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.1 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.1 // indirect
5959
github.com/aws/aws-sdk-go-v2/service/sso v1.25.5 // indirect
6060
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.3 // indirect
6161
github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 // indirect
@@ -105,7 +105,7 @@ require (
105105
github.com/katbyte/andreyvit-diff v0.0.2 // indirect
106106
github.com/katbyte/sergi-go-diff v1.2.2 // indirect
107107
github.com/katbyte/terrafmt v0.5.5 // indirect
108-
github.com/klauspost/compress v1.17.9 // indirect
108+
github.com/klauspost/compress v1.18.0 // indirect
109109
github.com/magiconair/properties v1.8.6 // indirect
110110
github.com/mattn/go-colorable v0.1.14 // indirect
111111
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -157,7 +157,7 @@ require (
157157
golang.org/x/mod v0.25.0 // indirect
158158
golang.org/x/net v0.41.0 // indirect
159159
golang.org/x/sync v0.16.0 // indirect
160-
golang.org/x/sys v0.33.0 // indirect
160+
golang.org/x/sys v0.34.0 // indirect
161161
golang.org/x/text v0.27.0 // indirect
162162
golang.org/x/time v0.3.0 // indirect
163163
golang.org/x/tools v0.34.0 // indirect

0 commit comments

Comments
 (0)