Skip to content

Commit 784f3cc

Browse files
jremy42jremy42
authored
Merge branch 'master' into fix/panic_dmarc
2 parents ded396a + 339c8f2 commit 784f3cc

File tree

11 files changed

+179
-122
lines changed

11 files changed

+179
-122
lines changed

‎.github/CODEOWNERS

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@
22
# the repo. Unless a later match takes precedence,
33
* @remyleone
44

5-
/internal/services/account/ @Codelax
6-
/internal/services/applesilicon/ @Laure-di
7-
/internal/services/baremetal/ @Laure-di
8-
/internal/services/billing/ @yfodil
9-
/internal/services/block/ @Codelax
10-
/internal/services/cockpit/ @jremy42
11-
/internal/services/container/ @Codelax
12-
/internal/services/documentdb/ @jremy42
13-
/internal/services/domain/ @yfodil
14-
/internal/services/flexibleip/ @yfodil
15-
/internal/services/function/ @Codelax
16-
/internal/services/iam/ @Codelax
17-
/internal/services/instance/ @Codelax
18-
/internal/services/iot/ @jremy42
19-
/internal/services/ipam/ @yfodil
20-
/internal/services/jobs/ @Codelax
21-
/internal/services/k8s/ @Mia-Cross
22-
/internal/services/lb/ @yfodil
23-
/internal/services/marketplace/ @Codelax
24-
/internal/services/mnq/ @Codelax
25-
/internal/services/object/ @Mia-Cross
26-
/internal/services/rdb/ @jremy42
27-
/internal/services/redis/ @jremy42
28-
/internal/services/registry/ @Mia-Cross
29-
/internal/services/sdb/ @jremy42
30-
/internal/services/secret/ @Codelax
31-
/internal/services/tem/ @jremy42
32-
/internal/services/vpc/ @yfodil
33-
/internal/services/vpcgw/ @yfodil
34-
/internal/services/webhosting/ @jremy42
5+
/internal/services/account/ @scaleway/devtools-core
6+
/internal/services/applesilicon/ @scaleway/devtools-compute-foundation
7+
/internal/services/baremetal/ @scaleway/devtools-compute-foundation
8+
/internal/services/billing/ @scaleway/devtools-core
9+
/internal/services/block/ @scaleway/devtools-storage
10+
/internal/services/cockpit/ @scaleway/devtools-dms
11+
/internal/services/container/ @scaleway/devtools-compute
12+
/internal/services/documentdb/ @scaleway/devtools-dms
13+
/internal/services/domain/ @scaleway/devtools-dms
14+
/internal/services/flexibleip/ @scaleway/devtools-network
15+
/internal/services/function/ @scaleway/devtools-compute
16+
/internal/services/iam/ @scaleway/devtools-core
17+
/internal/services/instance/ @scaleway/devtools-compute
18+
/internal/services/iot/ @scaleway/devtools-dms
19+
/internal/services/ipam/ @scaleway/devtools-network
20+
/internal/services/jobs/ @scaleway/devtools-compute
21+
/internal/services/k8s/ @scaleway/devtools-compute
22+
/internal/services/lb/ @scaleway/devtools-network
23+
/internal/services/marketplace/ @scaleway/devtools-compute
24+
/internal/services/mnq/ @scaleway/devtools-dms
25+
/internal/services/object/ @scaleway/devtools-storage
26+
/internal/services/rdb/ @scaleway/devtools-dms
27+
/internal/services/redis/ @scaleway/devtools-dms
28+
/internal/services/registry/ @scaleway/devtools-compute
29+
/internal/services/sdb/ @scaleway/devtools-dms
30+
/internal/services/secret/ @scaleway/devtools-core
31+
/internal/services/tem/ @scaleway/devtools-dms
32+
/internal/services/vpc/ @scaleway/devtools-network
33+
/internal/services/vpcgw/ @scaleway/devtools-network
34+
/internal/services/webhosting/ @scaleway/devtools-dms

‎.github/workflows/documentation.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,13 @@ jobs:
5151
key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('go.sum') }}
5252
- run: go install github.com/client9/misspell/cmd/misspell@latest
5353
- run: misspell -error -source text docs/
54+
55+
tfplugindocs:
56+
runs-on: ubuntu-latest
57+
steps:
58+
- uses: actions/checkout@v4
59+
- uses: actions/setup-go@v5
60+
with:
61+
go-version: ${{ env.GO_VERSION }}
62+
- uses: hashicorp/setup-terraform@v3
63+
- run: go tool tfplugindocs validate

‎docs/data-sources/billing_consumption.md renamed to ‎docs/data-sources/billing_consumptions.md

File renamed without changes.

‎docs/data-sources/bloc_snapshot.md renamed to ‎docs/data-sources/block_snapshot.md

File renamed without changes.

‎docs/data-sources/config.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
subcategory: "Config"
3+
page_title: "Scaleway: scaleway_config"
4+
---
5+
6+
# scaleway_config
7+
8+
Gets information about the current configuration that Scaleway provider is using.
9+
10+
## Example Usage
11+
12+
```hcl
13+
# Get configuration information
14+
data "scaleway_config" "main" {}
15+
```

‎docs/resources/apple_silicon.md renamed to ‎docs/resources/apple_silicon_server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ subcategory: "Apple Silicon"
33
page_title: "Scaleway: scaleway_apple_silicon"
44
---
55

6-
# Resource: scaleway_apple_silicon
6+
# Resource: scaleway_apple_silicon_server
77

88
Creates and manages Scaleway Apple silicon. For more information,
99
see the [API documentation](https://www.scaleway.com/en/developers/api/apple-silicon/).

‎docs/resources/function.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ The following arguments are supported:
8787

8888
- `deploy` - Define whether the function should be deployed. Terraform will wait for the function to be deployed. Your function will be redeployed if you update the source zip file.
8989

90+
- `http_option` - (Optional) Allows both HTTP and HTTPS (`enabled`) or redirect HTTP to HTTPS (`redirected`). Defaults to `enabled`.
91+
9092
- `sandbox` - (Optional) Execution environment of the function.
9193

9294
- `region` - (Defaults to [provider](../index.md#region) `region`). The [region](../guides/regions_and_zones.md#regions) in which the namespace should be created.

‎go.mod

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ module github.com/scaleway/terraform-provider-scaleway/v2
33
go 1.24.0
44

55
require (
6-
github.com/aws/aws-sdk-go-v2 v1.36.0
7-
github.com/aws/aws-sdk-go-v2/config v1.29.4
8-
github.com/aws/aws-sdk-go-v2/credentials v1.17.57
9-
github.com/aws/aws-sdk-go-v2/service/s3 v1.75.2
6+
github.com/aws/aws-sdk-go-v2 v1.36.3
7+
github.com/aws/aws-sdk-go-v2/config v1.29.8
8+
github.com/aws/aws-sdk-go-v2/credentials v1.17.61
9+
github.com/aws/aws-sdk-go-v2/service/s3 v1.78.0
1010
github.com/aws/aws-sdk-go-v2/service/sns v1.33.17
1111
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.12
1212
github.com/aws/smithy-go v1.22.2
1313
github.com/docker/docker v27.5.1+incompatible
1414
github.com/dustin/go-humanize v1.0.1
15-
github.com/google/go-cmp v0.6.0
15+
github.com/google/go-cmp v0.7.0
1616
github.com/hashicorp/aws-sdk-go-base v1.1.0
1717
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.59
1818
github.com/hashicorp/awspolicyequivalence v1.7.0
@@ -33,6 +33,8 @@ require (
3333
)
3434

3535
require (
36+
github.com/BurntSushi/toml v1.2.1 // indirect
37+
github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
3638
github.com/Masterminds/goutils v1.1.1 // indirect
3739
github.com/Masterminds/semver/v3 v3.2.0 // indirect
3840
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
@@ -42,24 +44,25 @@ require (
4244
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
4345
github.com/armon/go-radix v1.0.0 // indirect
4446
github.com/aws/aws-sdk-go v1.55.5 // indirect
45-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
46-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
47-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
48-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
49-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
50-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31 // indirect
51-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
52-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.5 // indirect
53-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
54-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12 // indirect
55-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
56-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
57-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 // indirect
47+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
48+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
49+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
50+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
51+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
52+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.2 // indirect
55+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.0 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.0 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.16 // indirect
5860
github.com/bflad/gopaniccheck v0.1.0 // indirect
5961
github.com/bflad/tfproviderdocs v0.12.1 // indirect
6062
github.com/bflad/tfproviderlint v0.31.0 // indirect
6163
github.com/bgentry/speakeasy v0.1.0 // indirect
6264
github.com/bmatcuk/doublestar v1.3.4 // indirect
65+
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
6366
github.com/cloudflare/circl v1.3.7 // indirect
6467
github.com/containerd/log v0.1.0 // indirect
6568
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -73,6 +76,7 @@ require (
7376
github.com/gogo/protobuf v1.3.2 // indirect
7477
github.com/golang/protobuf v1.5.4 // indirect
7578
github.com/google/uuid v1.6.0 // indirect
79+
github.com/hashicorp/cli v1.1.7 // indirect
7680
github.com/hashicorp/errwrap v1.1.0 // indirect
7781
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
7882
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -85,14 +89,16 @@ require (
8589
github.com/hashicorp/logutils v1.0.0 // indirect
8690
github.com/hashicorp/terraform-exec v0.22.0 // indirect
8791
github.com/hashicorp/terraform-json v0.24.0 // indirect
92+
github.com/hashicorp/terraform-plugin-docs v0.21.0 // indirect
8893
github.com/hashicorp/terraform-registry-address v0.2.4 // indirect
8994
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
9095
github.com/hashicorp/yamux v0.1.1 // indirect
9196
github.com/huandu/xstrings v1.3.3 // indirect
9297
github.com/imdario/mergo v0.3.15 // indirect
9398
github.com/klauspost/compress v1.17.9 // indirect
94-
github.com/mattn/go-colorable v0.1.13 // indirect
99+
github.com/mattn/go-colorable v0.1.14 // indirect
95100
github.com/mattn/go-isatty v0.0.20 // indirect
101+
github.com/mattn/go-runewidth v0.0.9 // indirect
96102
github.com/mitchellh/cli v1.1.5 // indirect
97103
github.com/mitchellh/copystructure v1.2.0 // indirect
98104
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
@@ -110,19 +116,21 @@ require (
110116
github.com/pkg/errors v0.9.1 // indirect
111117
github.com/pmezard/go-difflib v1.0.0 // indirect
112118
github.com/posener/complete v1.2.3 // indirect
113-
github.com/shopspring/decimal v1.2.0 // indirect
114-
github.com/spf13/cast v1.3.1 // indirect
119+
github.com/shopspring/decimal v1.3.1 // indirect
120+
github.com/spf13/cast v1.5.0 // indirect
115121
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
116122
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
117123
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
118-
github.com/yuin/goldmark v1.5.4 // indirect
124+
github.com/yuin/goldmark v1.7.7 // indirect
119125
github.com/yuin/goldmark-meta v1.1.0 // indirect
120126
github.com/zclconf/go-cty v1.16.2 // indirect
127+
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
121128
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
122129
go.opentelemetry.io/otel v1.31.0 // indirect
123130
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
124131
go.opentelemetry.io/otel/metric v1.31.0 // indirect
125132
go.opentelemetry.io/otel/trace v1.31.0 // indirect
133+
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
126134
golang.org/x/mod v0.23.0 // indirect
127135
golang.org/x/net v0.35.0 // indirect
128136
golang.org/x/sync v0.11.0 // indirect
@@ -142,4 +150,5 @@ require (
142150
tool (
143151
github.com/bflad/tfproviderdocs
144152
github.com/bflad/tfproviderlint/cmd/tfproviderlint
153+
github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
145154
)

0 commit comments

Comments
 (0)