Skip to content

feat(instance_server): prevent usage of routed_ip_enabled as false #2763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 8, 2024
Merged

feat(instance_server): prevent usage of routed_ip_enabled as false #2763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf944eb
feat(instance_server): prevent usage of routed_ip_enabled as false
Codelax Oct 4, 2024
c471501
feat(instance_ip): prevent usage of nat ips
Codelax Oct 4, 2024
92cfe21
correct message
Codelax Oct 4, 2024
07b052b
add documentation link
Codelax Oct 4, 2024
d15f02b
lint
Codelax Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions internal/services/instance/ip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package instance
import (
"context"

"github.com/hashicorp/go-cty/cty"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
Expand Down Expand Up @@ -42,6 +43,18 @@ func ResourceIP() *schema.Resource {
Computed: true,
Optional: true,
Description: "The type of instance IP",
ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics {
if i.(string) == "nat" {
return diag.Diagnostics{{
Severity: diag.Error,
Summary: "NAT IPs are not supported anymore",
Detail: "Remove explicit nat configuration, migrate to routed ips or downgrade terraform.\nLearn more about migration: https://www.scaleway.com/en/docs/compute/instances/how-to/migrate-routed-ips/",
AttributePath: path,
}}
}

return nil
},
},
"reverse": {
Type: schema.TypeString,
Expand Down
110 changes: 0 additions & 110 deletions internal/services/instance/ip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,116 +98,6 @@ func TestAccIP_Tags(t *testing.T) {
})
}

func TestAccIP_RoutedMigrate(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

resource.ParallelTest(t, resource.TestCase{
ProviderFactories: tt.ProviderFactories,
CheckDestroy: instancechecks.IsIPDestroyed(tt),
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_instance_ip" "main" {
type = "nat"
}
`,
Check: resource.ComposeTestCheckFunc(
instancechecks.CheckIPExists(tt, "scaleway_instance_ip.main"),
resource.TestCheckResourceAttr("scaleway_instance_ip.main", "type", "nat"),
),
},
{
Config: `
resource "scaleway_instance_ip" "main" {
type = "nat"
}
resource "scaleway_instance_ip" "copy" {
}
`,
Check: resource.ComposeTestCheckFunc(
instancechecks.CheckIPExists(tt, "scaleway_instance_ip.main"),
instancechecks.CheckIPExists(tt, "scaleway_instance_ip.copy"),
resource.TestCheckResourceAttr("scaleway_instance_ip.main", "type", "nat"),
resource.TestCheckResourceAttr("scaleway_instance_ip.copy", "type", "nat"),
resource.TestCheckResourceAttrPair("scaleway_instance_ip.main", "id", "scaleway_instance_ip.copy", "id"),
),
ResourceName: "scaleway_instance_ip.copy",
ImportState: true,
ImportStateIdFunc: func(state *terraform.State) (string, error) {
return state.RootModule().Resources["scaleway_instance_ip.main"].Primary.ID, nil
},
ImportStatePersist: true,
},
{
Config: `
resource "scaleway_instance_ip" "main" {
type = "routed_ipv4"
}
resource "scaleway_instance_ip" "copy" {
}
`,
Check: resource.ComposeTestCheckFunc(
instancechecks.CheckIPExists(tt, "scaleway_instance_ip.main"),
instancechecks.CheckIPExists(tt, "scaleway_instance_ip.copy"),
resource.TestCheckResourceAttr("scaleway_instance_ip.main", "type", "routed_ipv4"),
resource.TestCheckResourceAttrPair("scaleway_instance_ip.main", "id", "scaleway_instance_ip.copy", "id"),
),
},
{
// After the main IP migrated, we check that there is no ForceNew on the copy
// This check that the ip is not deleted if the migration is done outside terraform
RefreshState: true,
Check: resource.ComposeTestCheckFunc(
instancechecks.CheckIPExists(tt, "scaleway_instance_ip.main"),
instancechecks.CheckIPExists(tt, "scaleway_instance_ip.copy"),
resource.TestCheckResourceAttr("scaleway_instance_ip.main", "type", "routed_ipv4"),
resource.TestCheckResourceAttr("scaleway_instance_ip.copy", "type", "routed_ipv4"),
resource.TestCheckResourceAttrPair("scaleway_instance_ip.main", "id", "scaleway_instance_ip.copy", "id"),
),
},
},
})
}

func TestAccIP_RoutedDowngrade(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

resource.ParallelTest(t, resource.TestCase{
ProviderFactories: tt.ProviderFactories,
CheckDestroy: instancechecks.IsIPDestroyed(tt),
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_instance_ip" "main" {
type = "routed_ipv4"
}
`,
Check: resource.ComposeTestCheckFunc(
instancechecks.CheckIPExists(tt, "scaleway_instance_ip.main"),
resource.TestCheckResourceAttr("scaleway_instance_ip.main", "type", "routed_ipv4"),
isIPValid("scaleway_instance_ip.main", "address"),
isIPCIDRValid("scaleway_instance_ip.main", "prefix"),
),
},
{
Config: `
resource "scaleway_instance_ip" "main" {
type = "nat"
}
`,
Check: resource.ComposeTestCheckFunc(
instancechecks.CheckIPExists(tt, "scaleway_instance_ip.main"),
resource.TestCheckResourceAttr("scaleway_instance_ip.main", "type", "nat"),
isIPValid("scaleway_instance_ip.main", "address"),
isIPCIDRValid("scaleway_instance_ip.main", "prefix"),
),
},
},
})
}

func TestAccIP_RoutedIPV6(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
Expand Down
19 changes: 18 additions & 1 deletion internal/services/instance/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ func ResourceServer() *schema.Resource {
"ipv6_prefix_length": {
Type: schema.TypeInt,
Computed: true,
Deprecated: "Please use a scaleway_instance_ip with a `routed_ipv6` type",
Description: "The IPv6 prefix length routed to the server.",
},
"enable_dynamic_ip": {
Expand Down Expand Up @@ -338,9 +339,25 @@ func ResourceServer() *schema.Resource {
},
"routed_ip_enabled": {
Type: schema.TypeBool,
Description: "If server supports routed IPs, default to true if public_ips is used",
Description: "If server supports routed IPs, default to true",
Optional: true,
Computed: true,
ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics {
if i == nil {
return nil
}
if !i.(bool) {
return diag.Diagnostics{{
Severity: diag.Error,
Summary: "NAT IPs are not supported anymore",
Detail: "Remove explicit disabling, enable it or downgrade terraform.\nLearn more about migration: https://www.scaleway.com/en/docs/compute/instances/how-to/migrate-routed-ips/",
AttributePath: path,
}}
}

return nil
},
Deprecated: "Routed IP is the default configuration, it should always be true",
},
"zone": zonal.Schema(),
"organization_id": account.OrganizationIDSchema(),
Expand Down
Loading
Loading