Skip to content

Commit 37f1dcf

Browse files
remyleoneremyleone
authored
Merge branch 'master' into action_reboot
2 parents fa4ff95 + 6278d71 commit 37f1dcf

File tree

270 files changed

+70411
-64721
lines changed

Some content is hidden

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

270 files changed

+70411
-64721
lines changed

‎.github/codecov.yml‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
component_management:
2+
default_rules: # default rules that will be inherited by all components
3+
statuses:
4+
- type: project # in this case every component that doens't have a status defined will have a project type one
5+
target: auto
6+
branches:
7+
- "!main"
8+
individual_components:
9+
- component_id: account
10+
name: account
11+
paths:
12+
- internal/services/account/**
13+
- component_id: applesilicon
14+
name: applesilicon
15+
paths:
16+
- internal/services/applesilicon/**
17+
- component_id: autoscaling
18+
name: autoscaling
19+
paths:
20+
- internal/services/autoscaling/**
21+
- component_id: az
22+
name: az
23+
paths:
24+
- internal/services/az/**
25+
- component_id: baremetal
26+
name: baremetal
27+
paths:
28+
- internal/services/baremetal/**
29+
- component_id: billing
30+
name: billing
31+
paths:
32+
- internal/services/billing/**
33+
- component_id: block
34+
name: block
35+
paths:
36+
- internal/services/block/**
37+
- component_id: cockpit
38+
name: cockpit
39+
paths:
40+
- internal/services/cockpit/**
41+
- component_id: container
42+
name: container
43+
paths:
44+
- internal/services/container/**
45+
- component_id: domain
46+
name: domain
47+
paths:
48+
- internal/services/domain/**
49+
- component_id: edgeservices
50+
name: edgeservices
51+
paths:
52+
- internal/services/edgeservices/**
53+
- component_id: file
54+
name: file
55+
paths:
56+
- internal/services/file/**
57+
- component_id: flexibleip
58+
name: flexibleip
59+
paths:
60+
- internal/services/flexibleip/**
61+
- component_id: function
62+
name: function
63+
paths:
64+
- internal/services/function/**
65+
- component_id: iam
66+
name: iam
67+
paths:
68+
- internal/services/iam/**
69+
- component_id: inference
70+
name: inference
71+
paths:
72+
- internal/services/inference/**
73+
- component_id: instance
74+
name: instance
75+
paths:
76+
- internal/services/instance/**
77+
- component_id: iot
78+
name: iot
79+
paths:
80+
- internal/services/iot/**
81+
- component_id: ipam
82+
name: ipam
83+
paths:
84+
- internal/services/ipam/**
85+
- component_id: jobs
86+
name: jobs
87+
paths:
88+
- internal/services/jobs/**
89+
- component_id: k8s
90+
name: k8s
91+
paths:
92+
- internal/services/k8s/**
93+
- component_id: keymanager
94+
name: keymanager
95+
paths:
96+
- internal/services/keymanager/**
97+
- component_id: lb
98+
name: lb
99+
paths:
100+
- internal/services/lb/**
101+
- component_id: marketplace
102+
name: marketplace
103+
paths:
104+
- internal/services/marketplace/**
105+
- component_id: mnq
106+
name: mnq
107+
paths:
108+
- internal/services/mnq/**
109+
- component_id: mongodb
110+
name: mongodb
111+
paths:
112+
- internal/services/mongodb/**
113+
- component_id: object
114+
name: object
115+
paths:
116+
- internal/services/object/**
117+
- component_id: rdb
118+
name: rdb
119+
paths:
120+
- internal/services/rdb/**
121+
- component_id: redis
122+
name: redis
123+
paths:
124+
- internal/services/redis/**
125+
- component_id: registry
126+
name: registry
127+
paths:
128+
- internal/services/registry/**
129+
- component_id: scwconfig
130+
name: scwconfig
131+
paths:
132+
- internal/services/scwconfig/**
133+
- component_id: sdb
134+
name: sdb
135+
paths:
136+
- internal/services/sdb/**
137+
- component_id: secret
138+
name: secret
139+
paths:
140+
- internal/services/secret/**
141+
- component_id: tem
142+
name: tem
143+
paths:
144+
- internal/services/tem/**
145+
- component_id: vpc
146+
name: vpc
147+
paths:
148+
- internal/services/vpc/**
149+
- component_id: vpcgw
150+
name: vpcgw
151+
paths:
152+
- internal/services/vpcgw/**
153+
- component_id: webhosting
154+
name: webhosting
155+
paths:
156+
- internal/services/webhosting/**

‎.github/workflows/coverage.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Code Coverage
2+
3+
on:
4+
pull_request:
5+
merge_group:
6+
push:
7+
branches:
8+
- main
9+
- master
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
coverage:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v5
20+
with:
21+
fetch-depth: 1
22+
23+
- name: Install Go
24+
uses: actions/setup-go@v6
25+
with:
26+
go-version: stable
27+
28+
- name: Install Terraform
29+
uses: hashicorp/setup-terraform@v3
30+
31+
- name: Build binaries
32+
run: make build
33+
34+
- name: Verify go.mod is tidy
35+
run: |
36+
go mod tidy
37+
git diff --exit-code
38+
39+
- name: Run coverage
40+
run: go tool gotestsum --format github-actions --junitfile junit.xml -- -coverprofile=coverage.out -covermode=count ./...
41+
42+
- name: Upload coverage to Codecov
43+
uses: codecov/codecov-action@v5
44+
45+
- name: Upload test results to Codecov
46+
if: ${{ !cancelled() }}
47+
uses: codecov/test-results-action@v1
48+
with:
49+
token: ${{ secrets.CODECOV_TOKEN }}

‎.go-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎GNUmakefile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ test-compile:
5353
website:
5454
@echo "Use this site to preview markdown rendering: https://registry.terraform.io/tools/doc-preview"
5555

56-
.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website
56+
.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website docs
5757

5858
tfproviderlint:
5959
go tool tfproviderlint -R014=false -AT001.ignored-filename-suffixes=_data_source_test.go ./...
@@ -63,3 +63,8 @@ tfproviderdocs:
6363

6464
tfproviderlintx:
6565
go tool tfproviderlintx -XR001=false -XS002=false ./...
66+
67+
docs:
68+
go tool tfplugindocs validate
69+
rm -fr ./docs
70+
go tool tfplugindocs generate

‎docs/data-sources/baremetal_offer.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ data "scaleway_baremetal_offer" "my_offer" {
3131

3232
- `offer_id` - (Optional) The offer id. Only one of `name` and `offer_id` should be specified.
3333

34-
- `allow_disabled` - (Optional, default `false`) Include disabled offers.
34+
- `include_disabled` - (Optional, default `false`) Include disabled offers.
3535

3636
- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the offer should be created.
3737

‎docs/data-sources/instance_server.md‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ You find all the available types on the [pricing page](https://www.scaleway.com/
5959
- `additional_volume_ids` - The [additional volumes](https://developers.scaleway.com/en/products/instance/api/#volumes-7e8a39)
6060
attached to the server.
6161

62-
- `enable_ipv6` - Determines if IPv6 is enabled for the server.
63-
6462
- `enable_dynamic_ip` - True if dynamic IP in enable on the server.
6563

6664
- `state` - The state of the server. Possible values are: `started`, `stopped` or `standby`.
@@ -78,16 +76,10 @@ attached to the server.
7876
- `root_volume`
7977
- `volume_id` - The volume ID of the root volume of the server.
8078

81-
- `private_ip` - The Scaleway internal IP address of the server.
82-
83-
- `public_ip` - The public IP address of the server.
84-
8579
- `public_ips` - The list of public IPs of the server
8680
- `id` - The ID of the IP
8781
- `address` - The address of the IP
8882

89-
- `ipv6_address` - The default ipv6 address routed to the server. ( Only set when enable_ipv6 is set to true )
90-
91-
- `ipv6_gateway` - The ipv6 gateway address. ( Only set when enable_ipv6 is set to true )
92-
93-
- `ipv6_prefix_length` - The prefix length of the ipv6 subnet routed to the server. ( Only set when enable_ipv6 is set to true )
83+
- `private_ips` - The list of private IPs of the server.
84+
- `id` - The ID of the IP address resource.
85+
- `address` - The private IP address.

‎docs/data-sources/instance_servers.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ In addition to all above arguments, the following attributes are exported:
4444
~> **Important:** Instance servers' IDs are [zoned](../guides/regions_and_zones.md#resource-ids), which means they are of the form `{zone}/{id}`, e.g. `fr-par-1/11111111-1111-1111-1111-111111111111`
4545

4646
- `tags` - The tags associated with the server.
47-
- `public_ip` - The public IP address of the server.
48-
- `private_ip` - The Scaleway internal IP address of the server.
4947
- `private_ips` - The list of private IPv4 and IPv6 addresses associated with the server.
5048
- `id` - The ID of the IP address resource.
5149
- `address` - The private IP address.
@@ -59,14 +57,8 @@ In addition to all above arguments, the following attributes are exported:
5957
- `boot_type` - The boot Type of the server. Possible values are: `local`, `bootscript` or `rescue`.
6058
- `type` - The commercial type of the server.
6159
- `security_group_id` - The [security group](https://developers.scaleway.com/en/products/instance/api/#security-groups-8d7f89) the server is attached to.
62-
- `enable_ipv6` - Determines if IPv6 is enabled for the server.
63-
- `ipv6_address` - The default ipv6 address routed to the server. ( Only set when enable_ipv6 is set to true )
64-
- `ipv6_gateway` - The ipv6 gateway address. ( Only set when enable_ipv6 is set to true )
65-
- `ipv6_prefix_length` - The prefix length of the ipv6 subnet routed to the server. ( Only set when enable_ipv6 is set to true )
6660
- `enable_dynamic_ip` - If true a dynamic IP will be attached to the server.
6761
- `image` - The UUID or the label of the base image used by the server.
6862
- `placement_group_id` - The [placement group](https://developers.scaleway.com/en/products/instance/api/#placement-groups-d8f653) the server is attached to.
6963
- `organization_id` - The organization ID the server is associated with.
7064
- `project_id` - The ID of the project the server is associated with.
71-
72-

0 commit comments

Comments
 (0)