Skip to content

Commit 598b48f

Browse files
committed
Merge branch 'feat/edge-services' of github.com:yfodil/terraform-provider-scaleway into feat/edge-services
2 parents b38489b + 511aff4 commit 598b48f

File tree

143 files changed

+42782
-28033
lines changed

Some content is hidden

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

143 files changed

+42782
-28033
lines changed

cmd/tftemplate/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ module tftemplate
22

33
go 1.22
44

5+
toolchain go1.22.2
6+
57
require github.com/AlecAivazis/survey/v2 v2.3.7
68

79
require (

docs/data-sources/account_ssh_key.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@ data "scaleway_account_ssh_key" "my_key" {
2323

2424
## Argument Reference
2525

26-
- `name` - The SSH key name. Only one of `name` and `ssh_key_id` should be specified.
27-
- `ssh_key_id` - The SSH key id. Only one of `name` and `ssh_key_id` should be specified.
26+
- `name` - The SSH key name.
27+
- `ssh_key_id` - The SSH key id.
28+
29+
-> **Note** You must specify at least one: `name` and/or `ssh_key_id`.
30+
2831
- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the SSH key is associated with.
2932

3033
## Attributes Reference

docs/data-sources/billing_invoices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ page_title: "Scaleway: scaleway_billing_invoices"
55

66
# scaleway_billing_invoices
77

8-
Gets information about your Invoices.
8+
Gets information about your Scaleway invoices.
99

1010
## Example Usage
1111

@@ -51,4 +51,4 @@ In addition to all arguments above, the following attributes are exported:
5151
- `invoice_type` - The type of invoice.
5252
- `state` - The state of the invoice.
5353
- `number` - The invoice number.
54-
- `seller_name` - The name of the seller (Scaleway).
54+
- `seller_name` - The name of the seller (Scaleway).

docs/data-sources/iam_application.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ data "scaleway_iam_application" "find_by_id" {
2323
## Argument Reference
2424

2525
- `name` - (Optional) The name of the IAM application.
26-
Only one of the `name` and `application_id` should be specified.
2726

2827
- `application_id` - (Optional) The ID of the IAM application.
29-
Only one of the `name` and `application_id` should be specified.
28+
29+
-> **Note** You must specify at least one: `name` and/or `application_id`.
3030

3131
- `organization_id` - (Optional. Defaults to [provider](../index.md#organization_d) `organization_id`) The ID of the
32-
organization the application is associated with.
32+
Organization the application is associated with.
3333

3434
## Attribute Reference
3535

docs/data-sources/iam_group.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ page_title: "Scaleway: scaleway_iam_group"
55

66
# scaleway_iam_group
77

8-
Gets information about an existing IAM group. For more information, please
9-
check [the documentation](https://developers.scaleway.com/en/products/iam/api/v1alpha1/#applications-83ce5e)
8+
Gets information about an existing IAM group.
9+
10+
For more information, refer to the [IAM API documentation](https://developers.scaleway.com/en/products/iam/api/v1alpha1/#applications-83ce5e)
1011

1112
## Example Usage
1213

@@ -25,10 +26,10 @@ data "scaleway_iam_group" "find_by_id" {
2526
## Argument Reference
2627

2728
- `name` - (Optional) The name of the IAM group.
28-
Only one of the `name` and `group_id` should be specified.
2929

3030
- `group_id` - (Optional) The ID of the IAM group.
31-
Only one of the `name` and `group_id` should be specified.
31+
32+
-> **Note** You must specify at least one: `name` and/or `group_id`.
3233

3334
- `organization_id` - (Optional. Defaults to [provider](../index.md#organization_d) `organization_id`) The ID of the
3435
organization the group is associated with.

docs/data-sources/iam_ssh_key.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@ data "scaleway_iam_ssh_key" "my_key" {
2323

2424
## Argument Reference
2525

26-
- `name` - The SSH key name. Only one of `name` and `ssh_key_id` should be specified.
27-
- `ssh_key_id` - The SSH key id. Only one of `name` and `ssh_key_id` should be specified.
26+
- `name` - The SSH key name.
27+
- `ssh_key_id` - The SSH key id.
28+
29+
-> **Note** You must specify at least one: `name` and/or `ssh_key_id`.
30+
2831
- `project_id` (Optional. Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the SSH
2932
key is associated with.
3033

docs/data-sources/iam_user.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ page_title: "Scaleway: scaleway_iam_user"
66
# scaleway_iam_user
77

88
Use this data source to get information on an existing IAM user based on its ID or email address.
9-
For more information,
10-
see [the documentation](https://developers.scaleway.com/en/products/iam/api/v1alpha1/#users-06bdcf).
9+
For more information refer to the [IAM API documentation](https://developers.scaleway.com/en/products/iam/api/v1alpha1/#users-06bdcf).
1110

1211
## Example Usage
1312

@@ -24,8 +23,11 @@ data "scaleway_iam_user" "find_by_email" {
2423

2524
## Argument Reference
2625

27-
- `email` - (Optional) The email address of the IAM user. Only one of the `email` and `user_id` should be specified.
28-
- `user_id` - (Optional) The ID of the IAM user. Only one of the `email` and `user_id` should be specified.
26+
- `email` - (Optional) The email address of the IAM user.
27+
- `user_id` - (Optional) The ID of the IAM user.
28+
29+
-> **Note** You must specify at least one: `name` and/or `user_id`.
30+
2931
- `organization_id` - (Optional. Defaults to [provider](../index.md#organization_d) `organization_id`) The ID of the
3032
organization the user is associated with.
3133

docs/data-sources/ipam_ip.md

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ page_title: "Scaleway: scaleway_ipam_ip"
55

66
# scaleway_ipam_ip
77

8-
Gets information about IP managed by IPAM service. IPAM service is used for dhcp bundled in VPCs' private networks.
8+
Gets information about IP addresses managed by Scaleway's IP Address Management (IPAM) service. IPAM is used for the DHCP bundled with VPC Private Networks.
9+
10+
For more information about IPAM, see the main [documentation](https://www.scaleway.com/en/docs/network/vpc/concepts/#ipam).
911

1012
## Examples
1113

@@ -20,7 +22,7 @@ data "scaleway_ipam_ip" "by_id" {
2022

2123
### Instance Private Network IP
2224

23-
Get Instance IP in a private network.
25+
Get an Instance's IP on a Private Network.
2426

2527
```terraform
2628
# Connect your instance to a private network using a private nic.
@@ -77,19 +79,19 @@ data "scaleway_ipam_ip" "by_name" {
7779

7880
## Argument Reference
7981

80-
- `ipam_ip_id` - (Optional) The IPAM IP ID. Cannot be used with the rest of the arguments.
82+
- `ipam_ip_id` - (Optional) The IPAM IP ID. Cannot be used with any other arguments.
8183

82-
- `type` - (Optional) The type of IP to search for (ipv4, ipv6). Cannot be used with `ipam_ip_id`.
84+
- `type` - (Optional) The type of IP to search for (`ipv4` or `ipv6`). Cannot be used with `ipam_ip_id`.
8385

84-
- `private_network_id` - (Optional) The ID of the private network the IP belong to. Cannot be used with `ipam_ip_id`.
86+
- `private_network_id` - (Optional) The ID of the Private Network the IP belongs to. Cannot be used with `ipam_ip_id`.
8587

8688
- `resource` - (Optional) Filter by resource ID, type or name. Cannot be used with `ipam_ip_id`.
8789
If specified, `type` is required, and at least one of `id` or `name` must be set.
88-
- `id` - The ID of the resource that the IP is bound to.
89-
- `type` - The type of the resource to get the IP from. [Documentation](https://pkg.go.dev/github.com/scaleway/scaleway-sdk-go@master/api/ipam/v1#pkg-constants) with type list.
90-
- `name` - The name of the resource to get the IP from.
90+
- `id` - The ID of the resource that the IP is attached to.
91+
- `type` - The type of the resource the IP is attached to. [Documentation](https://pkg.go.dev/github.com/scaleway/scaleway-sdk-go@master/api/ipam/v1#pkg-constants) with type list.
92+
- `name` - The name of the resource the IP is attached to.
9193

92-
- `mac_address` - (Optional) The Mac Address linked to the IP. Cannot be used with `ipam_ip_id`.
94+
- `mac_address` - (Optional) The MAC address linked to the IP. Cannot be used with `ipam_ip_id`.
9395

9496
- `region` - (Defaults to [provider](../index.md#zone) `region`) The [region](../guides/regions_and_zones.md#regions) in which the IP exists.
9597

@@ -100,14 +102,14 @@ If specified, `type` is required, and at least one of `id` or `name` must be set
100102

101103
- `attached` - (Optional) Defines whether to filter only for IPs which are attached to a resource. Cannot be used with `ipam_ip_id`.
102104

103-
- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the IP is associated with.
105+
- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the Project the IP is associated with.
104106

105-
- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the IP is in.
107+
- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the Organization the IP is in.
106108

107109
## Attributes Reference
108110

109111
In addition to all above arguments, the following attributes are exported:
110112

111113
- `id` - The ID of the IP in IPAM.
112114
- `address` - The IP address.
113-
- `address_cidr` - the IP address with a CIDR notation.
115+
- `address_cidr` - the IP address in CIDR notation.

docs/data-sources/ipam_ips.md

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ page_title: "Scaleway: scaleway_ipam_ips"
55

66
# scaleway_ipam_ips
77

8-
Gets information about multiple IPs managed by IPAM service.
8+
Gets information about multiple IP addresses managed by Scaleway's IP Address Management (IPAM) service.
9+
10+
For more information about IPAM, see the main [documentation](https://www.scaleway.com/en/docs/network/vpc/concepts/#ipam).
911

1012
## Examples
1113

@@ -54,49 +56,49 @@ data "scaleway_ipam_ips" "by_type_and_resource" {
5456

5557
## Argument Reference
5658

57-
- `type` - (Optional) The type of IP used as filter (ipv4, ipv6).
59+
- `type` - (Optional) The type of IP to filter for (`ipv4` or `ipv6`).
5860

59-
- `private_network_id` - (Optional) The ID of the private network used as filter.
61+
- `private_network_id` - (Optional) The ID of the Private Network to filter for.
6062

61-
- `resource` - (Optional) Filter by resource ID, type or name.
62-
- `id` - The ID of the resource that the IP is bound to.
63-
- `type` - The type of the resource to get the IP from. [Documentation](https://pkg.go.dev/github.com/scaleway/scaleway-sdk-go@master/api/ipam/v1#pkg-constants) with type list.
64-
- `name` - The name of the resource to get the IP from.
63+
- `resource` - (Optional) Filter for a resource attached to the IP, using resource ID, type or name.
64+
- `id` - The ID of the attached resource.
65+
- `type` - The type of the attached resource. [Documentation](https://pkg.go.dev/github.com/scaleway/scaleway-sdk-go@master/api/ipam/v1#pkg-constants) with type list.
66+
- `name` - The name of the attached resource.
6567

66-
- `mac_address` - (Optional) The Mac Address used as filter.
68+
- `mac_address` - (Optional) The linked MAC address to filter for.
6769

68-
- `tags` (Optional) The tags used as filter.
70+
- `tags` (Optional) The IP tags to filter for.
6971

7072
- `attached` - (Optional) Defines whether to filter only for IPs which are attached to a resource.
7173

7274
- `zonal` - (Optional) Only IPs that are zonal, and in this zone, will be returned.
7375

74-
- `region` - (Optional) The region used as filter.
76+
- `region` - (Optional) The region to filter for.
7577

76-
- `project_id` - (Optional) The ID of the project used as filter.
78+
- `project_id` - (Optional) The ID of the Project to filter for.
7779

78-
- `organization_id` - (Optional) The ID of the organization used as filter.
80+
- `organization_id` - (Optional) The ID of the Organization to filter for.
7981

8082
## Attributes Reference
8183

8284
In addition to all above arguments, the following attributes are exported:
8385

84-
- `id` - The region of the IPS
85-
- `ips` - List of found IPs
86+
- `id` - The region of the IPs.
87+
- `ips` - List of found IPs.
8688
- `id` - The ID of the IP.
8789

88-
~> **Important:** IPAM IPs' IDs are [regional](../guides/regions_and_zones.md#resource-ids), which means they are of the form `{region}/{id}`, e.g. `fr-par/11111111-1111-1111-1111-111111111111`
90+
~> **Important:** IPAM IP IDs are [regional](../guides/regions_and_zones.md#resource-ids), which means they are of the form `{region}/{id}`, e.g. `fr-par/11111111-1111-1111-1111-111111111111`
8991

90-
- `address` - The Scaleway internal IP address of the server.
91-
- `resource` - The list of public IPs of the server.
92+
- `address` - The Scaleway internal IP address of the resource.
93+
- `resource` - The list of public IPs attached to the resource.
9294
- `id` - The ID of the resource.
9395
- `type` - The type of resource.
94-
- `mac_address` - The mac address.
96+
- `mac_address` - The associated MAC address.
9597
- `name` - The name of the resource.
9698
- `tags` - The tags associated with the IP.
9799
- `created_at` - The date and time of the creation of the IP.
98100
- `updated_at` - The date and time of the last update of the IP.
99-
- `zone` - The [zone](../guides/regions_and_zones.md#zones) in which the IP is.
100-
- `region` - The [region](../guides/regions_and_zones.md#regions) in which the IP is.
101-
- `project_id` - The ID of the project the server is associated with.
101+
- `zone` - The [zone](../guides/regions_and_zones.md#zones) of the IP.
102+
- `region` - The [region](../guides/regions_and_zones.md#regions) of the IP.
103+
- `project_id` - The ID of the Project the resource is associated with.
102104

docs/data-sources/lb.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ page_title: "Scaleway: scaleway_lb"
77

88
Gets information about a Load Balancer.
99

10+
For more information, see the [main documentation](https://www.scaleway.com/en/docs/network/load-balancer/concepts/#load-balancers) or [API documentation](https://www.scaleway.com/en/developers/api/load-balancer/zoned-api/#path-load-balancer-list-load-balancers).
11+
1012
## Example Usage
1113

1214
```hcl
@@ -23,24 +25,24 @@ data "scaleway_lb" "by_id" {
2325

2426
## Argument Reference
2527

26-
- `name` - (Optional) The load balancer name.
28+
- `name` - (Optional) The Load Balancer name.
2729

28-
- `ip_id` - (Optional) The load balancer IP ID.
30+
- `ip_id` - (Optional) The Load Balancer IP ID.
2931

30-
- `project_id` - (Optional) The ID of the project the LB is associated with.
32+
- `project_id` - (Optional) The ID of the Project the Load Balancer is associated with.
3133

3234
## Attributes Reference
3335

3436
In addition to all arguments above, the following attributes are exported:
3537

36-
- `id` - The ID of the load-balancer.
38+
- `id` - The ID of the Load Balancer.
3739

38-
~> **Important:** Load-Balancers' 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`
40+
~> **Important:** Load Balancer 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`
3941

40-
- `ip_address` - The load-balancer public IP Address.
42+
- `ip_address` - The Load Balancer public IP address.
4143

42-
- `type` - The type of the load-balancer.
44+
- `type` - The Load Balancer type.
4345

44-
- `tags` - The tags associated with the load-balancer.
46+
- `tags` - The tags associated with the Load Balancer.
4547

46-
- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the LB exists.
48+
- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the Load Balancer exists.

0 commit comments

Comments
 (0)