Skip to content

Commit 7359c96

Browse files
authored
Merge branch 'master' into feat/add_retention_date_in_data_source
2 parents c8e3cfb + d70615f commit 7359c96

File tree

74 files changed

+43658
-27156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+43658
-27156
lines changed

docs/resources/baremetal_server.md

+32
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,37 @@ resource "scaleway_baremetal_server" "base" {
184184
}
185185
```
186186

187+
### With custom partitioning
188+
189+
```terraform
190+
variable "configCustomPartitioning" {
191+
default = "{\"disks\":[{\"device\":\"/dev/nvme0n1\",\"partitions\":[{\"label\":\"uefi\",\"number\":1,\"size\":536870912},{\"label\":\"swap\",\"number\":2,\"size\":4294967296},{\"label\":\"boot\",\"number\":3,\"size\":1073741824},{\"label\":\"root\",\"number\":4,\"size\":1017827045376}]},{\"device\":\"/dev/nvme1n1\",\"partitions\":[{\"label\":\"swap\",\"number\":1,\"size\":4294967296},{\"label\":\"boot\",\"number\":2,\"size\":1073741824},{\"label\":\"root\",\"number\":3,\"size\":1017827045376}]}],\"filesystems\":[{\"device\":\"/dev/nvme0n1p1\",\"format\":\"fat32\",\"mountpoint\":\"/boot/efi\"},{\"device\":\"/dev/md0\",\"format\":\"ext4\",\"mountpoint\":\"/boot\"},{\"device\":\"/dev/md1\",\"format\":\"ext4\",\"mountpoint\":\"/\"}],\"raids\":[{\"devices\":[\"/dev/nvme0n1p3\",\"/dev/nvme1n1p2\"],\"level\":\"raid_level_1\",\"name\":\"/dev/md0\"},{\"devices\":[\"/dev/nvme0n1p4\",\"/dev/nvme1n1p3\"],\"level\":\"raid_level_1\",\"name\":\"/dev/md1\"}],\"zfs\":{\"pools\":[]}}"
192+
}
193+
194+
data "scaleway_baremetal_os" "my_os" {
195+
zone = "fr-par-1"
196+
name = "Ubuntu"
197+
version = "22.04 LTS (Jammy Jellyfish)"
198+
}
199+
200+
resource "scaleway_iam_ssh_key" "main" {
201+
name = "main"
202+
}
203+
204+
resource "scaleway_baremetal_server" "base" {
205+
name = "%s"
206+
zone = "fr-par-1"
207+
description = "test a description"
208+
offer = "EM-B220E-NVME"
209+
os = data.scaleway_baremetal_os.my_os.os_id
210+
partitioning = var.configCustomPartitioning
211+
212+
tags = [ "terraform-test", "scaleway_baremetal_server", "minimal" ]
213+
ssh_key_ids = [ scaleway_iam_ssh_key.main.id ]
214+
}
215+
216+
```
217+
187218
## Argument Reference
188219

189220
The following arguments are supported:
@@ -216,6 +247,7 @@ The following arguments are supported:
216247
- `id` - (Required) The id of the private network to attach.
217248
- `ipam_ip_ids` - (Optional) List of IPAM IP IDs to assign to the server in the requested private network.
218249
- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the server should be created.
250+
- `partitioning` (Optional) The partitioning schema in JSON format
219251
- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the server is associated with.
220252

221253

docs/resources/object.md

+2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ The following arguments are supported:
5151

5252
* `tags` - (Optional) Map of tags.
5353

54+
* `sse_customer_key` - (Optional) Customer's encryption keys to encrypt data (SSE-C)
55+
5456
* `project_id` - (Defaults to [provider](../index.md#arguments-reference) `project_id`) The ID of the project the bucket is associated with.
5557

5658
~> **Important:** The `project_id` attribute has a particular behavior with s3 products because the s3 API is scoped by project.

docs/resources/redis_cluster.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,13 @@ you cannot downgrade a Redis™ cluster.
100100

101101
- `cluster_size` - (Optional) The number of nodes in the Redis™ cluster.
102102

103-
~> **Important:** You cannot set `cluster_size` to 2, you either have to choose Standalone mode (1 node) or cluster mode
104-
which is minimum 3 (1 main node + 2 secondary nodes)
103+
~> **Important:**
104+
105+
- Cluster_size = 1 for Standalone mode (single node).
106+
107+
- Cluster_size = 2 for High Availability (HA) mode, with 1 main node and 1 standby node.
108+
109+
- Cluster_size >= 3 for Cluster mode, which requires a minimum of 1 main node and 2 secondary nodes.
105110

106111
~> **Important:** If you are using the cluster mode (>=3 nodes), you can set a bigger `cluster_size` than you initially
107112
did, it will migrate the Redis™ cluster but keep in mind that you cannot downgrade a Redis™ cluster, so setting a smaller

go.mod

+18-16
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@ go 1.22.0
55
toolchain go1.23.1
66

77
require (
8-
github.com/aws/aws-sdk-go v1.55.5
9-
github.com/aws/aws-sdk-go-v2 v1.32.3
8+
github.com/aws/aws-sdk-go-v2 v1.32.6
109
github.com/aws/aws-sdk-go-v2/config v1.28.1
1110
github.com/aws/aws-sdk-go-v2/credentials v1.17.42
1211
github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2
13-
github.com/aws/smithy-go v1.22.0
12+
github.com/aws/aws-sdk-go-v2/service/sns v1.33.7
13+
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.2
14+
github.com/aws/smithy-go v1.22.1
1415
github.com/bflad/tfproviderdocs v0.12.1
1516
github.com/bflad/tfproviderlint v0.30.0
1617
github.com/docker/docker v27.3.1+incompatible
1718
github.com/dustin/go-humanize v1.0.1
1819
github.com/google/go-cmp v0.6.0
1920
github.com/hashicorp/aws-sdk-go-base v1.1.0
21+
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.59
2022
github.com/hashicorp/awspolicyequivalence v1.6.0
2123
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
2224
github.com/hashicorp/go-multierror v1.1.1
@@ -30,7 +32,7 @@ require (
3032
github.com/robfig/cron/v3 v3.0.1
3133
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241129094524-023aa8142bc1
3234
github.com/stretchr/testify v1.9.0
33-
golang.org/x/crypto v0.28.0
35+
golang.org/x/crypto v0.31.0
3436
gopkg.in/dnaeon/go-vcr.v3 v3.2.0
3537
)
3638

@@ -43,10 +45,11 @@ require (
4345
github.com/agext/levenshtein v1.2.3 // indirect
4446
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
4547
github.com/armon/go-radix v1.0.0 // indirect
48+
github.com/aws/aws-sdk-go v1.55.5 // indirect
4649
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
4750
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 // indirect
48-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 // indirect
49-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 // indirect
51+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
52+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
5053
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
5154
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22 // indirect
5255
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
@@ -65,9 +68,9 @@ require (
6568
github.com/distribution/reference v0.5.0 // indirect
6669
github.com/docker/go-connections v0.4.0 // indirect
6770
github.com/docker/go-units v0.4.0 // indirect
68-
github.com/fatih/color v1.16.0 // indirect
71+
github.com/fatih/color v1.17.0 // indirect
6972
github.com/felixge/httpsnoop v1.0.4 // indirect
70-
github.com/go-logr/logr v1.4.1 // indirect
73+
github.com/go-logr/logr v1.4.2 // indirect
7174
github.com/go-logr/stdr v1.2.2 // indirect
7275
github.com/gogo/protobuf v1.3.2 // indirect
7376
github.com/golang/protobuf v1.5.4 // indirect
@@ -89,7 +92,6 @@ require (
8992
github.com/hashicorp/yamux v0.1.1 // indirect
9093
github.com/huandu/xstrings v1.3.3 // indirect
9194
github.com/imdario/mergo v0.3.15 // indirect
92-
github.com/jmespath/go-jmespath v0.4.0 // indirect
9395
github.com/klauspost/compress v1.17.2 // indirect
9496
github.com/mattn/go-colorable v0.1.13 // indirect
9597
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -119,16 +121,16 @@ require (
119121
github.com/yuin/goldmark-meta v1.1.0 // indirect
120122
github.com/zclconf/go-cty v1.15.0 // indirect
121123
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
122-
go.opentelemetry.io/otel v1.22.0 // indirect
124+
go.opentelemetry.io/otel v1.31.0 // indirect
123125
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
124-
go.opentelemetry.io/otel/metric v1.22.0 // indirect
126+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
125127
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
126-
go.opentelemetry.io/otel/trace v1.22.0 // indirect
128+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
127129
golang.org/x/mod v0.21.0 // indirect
128-
golang.org/x/net v0.28.0 // indirect
129-
golang.org/x/sync v0.9.0 // indirect
130-
golang.org/x/sys v0.27.0 // indirect
131-
golang.org/x/text v0.20.0 // indirect
130+
golang.org/x/net v0.30.0 // indirect
131+
golang.org/x/sync v0.10.0 // indirect
132+
golang.org/x/sys v0.28.0 // indirect
133+
golang.org/x/text v0.21.0 // indirect
132134
golang.org/x/time v0.3.0 // indirect
133135
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
134136
google.golang.org/appengine v1.6.8 // indirect

0 commit comments

Comments
 (0)