Skip to content

Commit 9fd6586

Browse files
committed
chore: Harmonize resource names.
1 parent 34ce342 commit 9fd6586

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ module "my_instance" {
3737

3838
| Name | Type |
3939
|------|------|
40-
| [scaleway_domain_record.ip4](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/domain_record) | resource |
41-
| [scaleway_domain_record.ip6](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/domain_record) | resource |
40+
| [scaleway_domain_record.ipv4](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/domain_record) | resource |
41+
| [scaleway_domain_record.ipv6](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/domain_record) | resource |
4242
| [scaleway_instance_ip.ipv6](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/instance_ip) | resource |
43-
| [scaleway_instance_ip.this](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/instance_ip) | resource |
43+
| [scaleway_instance_ip.public_ipv4](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/instance_ip) | resource |
4444
| [scaleway_instance_ip_reverse_dns.ipv6](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/instance_ip_reverse_dns) | resource |
45-
| [scaleway_instance_ip_reverse_dns.this](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/instance_ip_reverse_dns) | resource |
45+
| [scaleway_instance_ip_reverse_dns.public_ipv4](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/instance_ip_reverse_dns) | resource |
4646
| [scaleway_instance_server.this](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/instance_server) | resource |
4747

4848
## Inputs

main.tf

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
moved {
2-
from = scaleway_instance_ip.public_ipv4
3-
to = scaleway_instance_ip.this
2+
from = scaleway_instance_ip.this
3+
to = scaleway_instance_ip.public_ipv4
4+
}
5+
6+
moved {
7+
from = scaleway_instance_ip_reverse_dns.this
8+
to = scaleway_instance_ip_reverse_dns.public_ipv4
9+
}
10+
11+
moved {
12+
from = scaleway_domain_record.ip4
13+
to = scaleway_domain_record.ipv4
14+
}
15+
16+
moved {
17+
from = scaleway_domain_record.ip6
18+
to = scaleway_domain_record.ipv6
419
}
520

621
locals {
@@ -9,24 +24,20 @@ locals {
924
effective_fqdn = var.domainname != null ? format("%s.%s", local.effective_hostname, var.domainname) : local.effective_hostname
1025
}
1126

12-
resource "scaleway_instance_ip" "this" {
27+
resource "scaleway_instance_ip" "public_ipv4" {
1328
count = var.enable_public_ipv4 ? 1 : 0
1429

1530
project_id = var.project_id
1631
type = var.routed_ip_enabled ? "routed_ipv4" : "nat"
1732
zone = var.zone
1833
}
1934

20-
resource "scaleway_instance_ip_reverse_dns" "this" {
35+
resource "scaleway_instance_ip_reverse_dns" "public_ipv4" {
2136
count = var.enable_public_ipv4 && (var.domainname != null) ? 1 : 0
2237

23-
ip_id = scaleway_instance_ip.this[count.index].id
38+
ip_id = scaleway_instance_ip.public_ipv4[count.index].id
2439
reverse = local.effective_fqdn
2540
zone = var.zone
26-
27-
depends_on = [
28-
scaleway_domain_record.ip4,
29-
]
3041
}
3142

3243
resource "scaleway_instance_ip" "ipv6" {
@@ -71,7 +82,7 @@ resource "scaleway_instance_server" "this" {
7182
routed_ip_enabled = var.routed_ip_enabled
7283

7384
ip_ids = tolist([
74-
var.enable_public_ipv4 ? scaleway_instance_ip.this[0].id : null,
85+
var.enable_public_ipv4 ? scaleway_instance_ip.public_ipv4[0].id : null,
7586
var.enable_ipv6 && var.routed_ip_enabled ? scaleway_instance_ip.ipv6[0].id : null,
7687
])
7788

@@ -91,7 +102,7 @@ resource "scaleway_instance_server" "this" {
91102
zone = var.zone
92103
}
93104

94-
resource "scaleway_domain_record" "ip4" {
105+
resource "scaleway_domain_record" "ipv4" {
95106
count = var.domainname != null ? 1 : 0
96107

97108
data = var.enable_public_ipv4 ? scaleway_instance_server.this.public_ip : scaleway_instance_server.this.private_ip
@@ -100,7 +111,7 @@ resource "scaleway_domain_record" "ip4" {
100111
type = "A"
101112
}
102113

103-
resource "scaleway_domain_record" "ip6" {
114+
resource "scaleway_domain_record" "ipv6" {
104115
count = var.domainname != null && var.enable_ipv6 && var.state != "stopped" ? 1 : 0
105116

106117
data = var.routed_ip_enabled ? one([for item in scaleway_instance_server.this.public_ips[*].address : item if can(regex(":", item))]) : scaleway_instance_server.this.ipv6_address

0 commit comments

Comments
 (0)