Skip to content

Commit d4d2100

Browse files
authored
Merge branch 'master' into feat/support-resource-identity
2 parents 34c7ba0 + 1a14897 commit d4d2100

File tree

127 files changed

+411
-189
lines changed

Some content is hidden

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

127 files changed

+411
-189
lines changed

.github/workflows/documentation.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,6 @@ jobs:
6565
go-version: ${{ env.GO_VERSION }}
6666
- uses: hashicorp/setup-terraform@v3
6767
- run: go tool tfplugindocs validate
68+
- run: rm -fr ./docs
6869
- run: go tool tfplugindocs generate
6970
- run: git diff --exit-code docs

.golangci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ linters:
8888
- usetesting # Reports uses of functions with replacement inside the testing package. [auto-fix]
8989
- wastedassign # wastedassign finds wasted assignment statements. [fast: false, auto-fix: false]
9090
- whitespace # Tool for detection of leading and trailing whitespace [fast: true, auto-fix: true]
91-
- wsl # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
91+
- wsl_v5 # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
9292
- zerologlint # Detects the wrong usage of `zerolog` that a user forgets to dispatch with `Send` or `Msg` [fast: false, auto-fix: false]
9393

9494
disable:
@@ -141,6 +141,11 @@ linters:
141141
reject:
142142
- anon
143143

144+
wsl_v5:
145+
allow-first-in-block: true
146+
allow-whole-block: false
147+
branch-max-lines: 2
148+
144149
exclusions:
145150
rules:
146151
- path: _test\.go

docs/resources/mongodb_instance.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,24 @@ resource "scaleway_mongodb_instance" "main" {
7575
}
7676
```
7777

78+
### With Snapshot Scheduling
79+
80+
```terraform
81+
resource "scaleway_mongodb_instance" "main" {
82+
name = "test-mongodb-with-snapshots"
83+
version = "7.0.12"
84+
node_type = "MGDB-PLAY2-NANO"
85+
node_number = 1
86+
user_name = "my_initial_user"
87+
password = "thiZ_is_v&ry_s3cret"
88+
volume_size_in_gb = 5
89+
90+
# Snapshot scheduling configuration
91+
snapshot_schedule_frequency_hours = 24
92+
snapshot_schedule_retention_days = 7
93+
is_snapshot_schedule_enabled = true
94+
}
95+
```
7896

7997
### Restore From Snapshot
8098

@@ -107,6 +125,12 @@ The following arguments are supported:
107125
- `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#regions) in which the MongoDB® instance should be created.
108126
- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the MongoDB® instance is associated with.
109127

128+
### Snapshot Scheduling
129+
130+
- `snapshot_schedule_frequency_hours` - (Optional) Snapshot schedule frequency in hours.
131+
- `snapshot_schedule_retention_days` - (Optional) Snapshot schedule retention in days.
132+
- `is_snapshot_schedule_enabled` - (Optional) Enable or disable automatic snapshot scheduling.
133+
110134
~> **Important** If neither private_network nor public_network is specified, a public network endpoint is created by default.
111135

112136

@@ -130,6 +154,9 @@ In addition to all arguments above, the following attributes are exported:
130154
- `id` - The ID of the endpoint.
131155
- `port` - TCP port of the endpoint.
132156
- `dns_records` - List of DNS records for your endpoint.
157+
- `snapshot_schedule_frequency_hours` - Snapshot schedule frequency in hours.
158+
- `snapshot_schedule_retention_days` - Snapshot schedule retention in days.
159+
- `is_snapshot_schedule_enabled` - Whether automatic snapshot scheduling is enabled.
133160
- `tls_certificate` - The PEM-encoded TLS certificate for the MongoDB® instance, if available.
134161

135162
## Import

docs/resources/rdb_instance.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ resource "scaleway_rdb_instance" "main" {
128128

129129
-> **Note** If nothing is defined, your Database Instance will have a default public load-balancer endpoint.
130130

131+
-> **Note** Managed PostgreSQL and MySQL Database Instances are compatible with the [VPC routing](https://www.scaleway.com/en/docs/network/vpc/concepts/#routing) feature, which allows you to connect one or more Database Instances in a Private Network to resources in other Private Networks of the same VPC. This feature is automatically enabled when your Database Instance is connected to a Private Network within a VPC that has routing enabled. Refer to the [How to manage routing](https://www.scaleway.com/en/docs/network/vpc/how-to/manage-routing/) documentation page for more information about VPC routing.
132+
131133
## Argument Reference
132134

133135
The following arguments are supported:

go.mod

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

55
require (
66
github.com/alexedwards/argon2id v1.0.0
7-
github.com/aws/aws-sdk-go-v2 v1.38.3
8-
github.com/aws/aws-sdk-go-v2/config v1.31.6
9-
github.com/aws/aws-sdk-go-v2/credentials v1.18.10
10-
github.com/aws/aws-sdk-go-v2/service/s3 v1.85.1
11-
github.com/aws/aws-sdk-go-v2/service/sns v1.34.4
12-
github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3
7+
github.com/aws/aws-sdk-go-v2 v1.39.0
8+
github.com/aws/aws-sdk-go-v2/config v1.31.8
9+
github.com/aws/aws-sdk-go-v2/credentials v1.18.12
10+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1
11+
github.com/aws/aws-sdk-go-v2/service/sns v1.38.3
12+
github.com/aws/aws-sdk-go-v2/service/sqs v1.42.5
1313
github.com/aws/smithy-go v1.23.0
14-
github.com/docker/docker v28.3.3+incompatible
14+
github.com/docker/docker v28.4.0+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
1818
github.com/hashicorp/aws-sdk-go-base v1.1.0
19-
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65
19+
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66
2020
github.com/hashicorp/awspolicyequivalence v1.7.0
2121
github.com/hashicorp/go-cty v1.5.0
2222
github.com/hashicorp/go-multierror v1.1.1
2323
github.com/hashicorp/go-retryablehttp v0.7.8
24-
github.com/hashicorp/terraform-plugin-go v0.28.0
24+
github.com/hashicorp/terraform-plugin-go v0.29.0
2525
github.com/hashicorp/terraform-plugin-log v0.9.0
26-
github.com/hashicorp/terraform-plugin-mux v0.20.0
27-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
26+
github.com/hashicorp/terraform-plugin-mux v0.21.0
27+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.0
2828
github.com/hashicorp/terraform-plugin-testing v1.13.3
2929
github.com/nats-io/jwt/v2 v2.8.0
3030
github.com/nats-io/nats.go v1.45.0
3131
github.com/robfig/cron/v3 v3.0.1
3232
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250721082157-a9b7a7bd9686
33-
github.com/stretchr/testify v1.10.0
34-
golang.org/x/crypto v0.41.0
33+
github.com/stretchr/testify v1.11.1
34+
golang.org/x/crypto v0.42.0
3535
gopkg.in/dnaeon/go-vcr.v3 v3.2.0
3636
)
3737

@@ -47,19 +47,19 @@ require (
4747
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
4848
github.com/armon/go-radix v1.0.0 // indirect
4949
github.com/aws/aws-sdk-go v1.55.5 // indirect
50-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
51-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect
52-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 // indirect
53-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 // indirect
50+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
51+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 // indirect
52+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 // indirect
53+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 // indirect
5454
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
55-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.1 // indirect
55+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 // indirect
5656
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
57-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.1 // indirect
58-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.1 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect
61-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect
62-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/sso v1.29.3 // indirect
61+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 // indirect
62+
github.com/aws/aws-sdk-go-v2/service/sts v1.38.4 // indirect
6363
github.com/bflad/gopaniccheck v0.1.0 // indirect
6464
github.com/bflad/tfproviderdocs v0.12.1 // indirect
6565
github.com/bflad/tfproviderlint v0.31.0 // indirect
@@ -71,17 +71,16 @@ require (
7171
github.com/containerd/errdefs v1.0.0 // indirect
7272
github.com/containerd/errdefs/pkg v0.3.0 // indirect
7373
github.com/containerd/log v0.1.0 // indirect
74-
github.com/davecgh/go-spew v1.1.1 // indirect
74+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7575
github.com/distribution/reference v0.5.0 // indirect
7676
github.com/dnephin/pflag v1.0.7 // indirect
7777
github.com/docker/go-connections v0.4.0 // indirect
7878
github.com/docker/go-units v0.4.0 // indirect
7979
github.com/fatih/color v1.18.0 // indirect
8080
github.com/felixge/httpsnoop v1.0.4 // indirect
8181
github.com/fsnotify/fsnotify v1.8.0 // indirect
82-
github.com/go-logr/logr v1.4.2 // indirect
82+
github.com/go-logr/logr v1.4.3 // indirect
8383
github.com/go-logr/stdr v1.2.2 // indirect
84-
github.com/gogo/protobuf v1.3.2 // indirect
8584
github.com/golang/protobuf v1.5.4 // indirect
8685
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8786
github.com/gookit/color v1.5.1 // indirect
@@ -90,19 +89,19 @@ require (
9089
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
9190
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
9291
github.com/hashicorp/go-hclog v1.6.3 // indirect
93-
github.com/hashicorp/go-plugin v1.6.3 // indirect
92+
github.com/hashicorp/go-plugin v1.7.0 // indirect
9493
github.com/hashicorp/go-uuid v1.0.3 // indirect
9594
github.com/hashicorp/go-version v1.7.0 // indirect
9695
github.com/hashicorp/hc-install v0.9.2 // indirect
9796
github.com/hashicorp/hcl v1.0.0 // indirect
98-
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
97+
github.com/hashicorp/hcl/v2 v2.24.0 // indirect
9998
github.com/hashicorp/logutils v1.0.0 // indirect
100-
github.com/hashicorp/terraform-exec v0.23.0 // indirect
101-
github.com/hashicorp/terraform-json v0.25.0 // indirect
99+
github.com/hashicorp/terraform-exec v0.23.1 // indirect
100+
github.com/hashicorp/terraform-json v0.27.1 // indirect
102101
github.com/hashicorp/terraform-plugin-docs v0.21.0 // indirect
103-
github.com/hashicorp/terraform-registry-address v0.2.5 // indirect
102+
github.com/hashicorp/terraform-registry-address v0.4.0 // indirect
104103
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
105-
github.com/hashicorp/yamux v0.1.1 // indirect
104+
github.com/hashicorp/yamux v0.1.2 // indirect
106105
github.com/huandu/xstrings v1.3.3 // indirect
107106
github.com/imdario/mergo v0.3.15 // indirect
108107
github.com/inconshreveable/mousetrap v1.0.0 // indirect
@@ -132,7 +131,7 @@ require (
132131
github.com/pelletier/go-toml v1.9.5 // indirect
133132
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
134133
github.com/pkg/errors v0.9.1 // indirect
135-
github.com/pmezard/go-difflib v1.0.0 // indirect
134+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
136135
github.com/posener/complete v1.2.3 // indirect
137136
github.com/shopspring/decimal v1.3.1 // indirect
138137
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -149,28 +148,29 @@ require (
149148
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
150149
github.com/yuin/goldmark v1.7.7 // indirect
151150
github.com/yuin/goldmark-meta v1.1.0 // indirect
152-
github.com/zclconf/go-cty v1.16.3 // indirect
151+
github.com/zclconf/go-cty v1.17.0 // indirect
153152
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
154153
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
155154
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
156-
go.opentelemetry.io/otel v1.36.0 // indirect
155+
go.opentelemetry.io/otel v1.38.0 // indirect
157156
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
158-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
159-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
157+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
158+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
159+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
160160
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect
161-
golang.org/x/mod v0.26.0 // indirect
162-
golang.org/x/net v0.42.0 // indirect
163-
golang.org/x/sync v0.16.0 // indirect
164-
golang.org/x/sys v0.35.0 // indirect
165-
golang.org/x/term v0.34.0 // indirect
166-
golang.org/x/text v0.28.0 // indirect
161+
golang.org/x/mod v0.27.0 // indirect
162+
golang.org/x/net v0.43.0 // indirect
163+
golang.org/x/sync v0.17.0 // indirect
164+
golang.org/x/sys v0.36.0 // indirect
165+
golang.org/x/term v0.35.0 // indirect
166+
golang.org/x/text v0.29.0 // indirect
167167
golang.org/x/time v0.3.0 // indirect
168-
golang.org/x/tools v0.35.0 // indirect
168+
golang.org/x/tools v0.36.0 // indirect
169169
google.golang.org/appengine v1.6.8 // indirect
170-
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 // indirect
171-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
172-
google.golang.org/grpc v1.72.1 // indirect
173-
google.golang.org/protobuf v1.36.6 // indirect
170+
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
171+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
172+
google.golang.org/grpc v1.75.1 // indirect
173+
google.golang.org/protobuf v1.36.9 // indirect
174174
gopkg.in/ini.v1 v1.66.4 // indirect
175175
gopkg.in/yaml.v2 v2.4.0 // indirect
176176
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)