Drop linode_reserved_ip resource and data sources in favor of linode_…

…networking_ip (#1710)

* Drop reserved IP resources

* oops

linode/framework_provider.go

@@ -68,8 +68,6 @@ import (
 	"github.com/linode/terraform-provider-linode/v2/linode/rdns"
 	"github.com/linode/terraform-provider-linode/v2/linode/region"
 	"github.com/linode/terraform-provider-linode/v2/linode/regions"
-	"github.com/linode/terraform-provider-linode/v2/linode/reservedip"
-	"github.com/linode/terraform-provider-linode/v2/linode/reservedips"
 	"github.com/linode/terraform-provider-linode/v2/linode/sshkey"
 	"github.com/linode/terraform-provider-linode/v2/linode/sshkeys"
 	"github.com/linode/terraform-provider-linode/v2/linode/stackscript"
@@ -231,7 +229,6 @@ func (p *FrameworkProvider) Resources(ctx context.Context) []func() resource.Res
 		placementgroup.NewResource,
 		placementgroupassignment.NewResource,
 		instancereservedipassignment.NewResource,
-		reservedip.NewResource,
 		rdns.NewResource,
 		sshkey.NewResource,
 		stackscript.NewResource,
@@ -311,7 +308,5 @@ func (p *FrameworkProvider) DataSources(ctx context.Context) []func() datasource
 		childaccount.NewDataSource,
 		childaccounts.NewDataSource,
 		networkingips.NewDataSource,
-		reservedip.NewDataSource,
-		reservedips.NewDataSource,
 	}
 }

linode/instance/resource_test.go

@@ -2932,7 +2932,7 @@ func TestAccResourceInstance_deleteWithReservedIP(t *testing.T) {
 	testRegion := "us-east"
 	reservedIP := ""
 	instanceName := acctest.RandomWithPrefix("tf_test")
-	ipResourceName := "linode_reserved_ip.test"
+	ipResourceName := "linode_networking_ip.test"
 	rootPass := acctest.RandString(16)
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acceptance.PreCheck(t) },

linode/instance/tmpl/template.go

@@ -757,8 +757,11 @@ func WithReservedIP(t *testing.T, label, pubKey, region, rootPass string) string
 
 func OnlyReservedIP(t *testing.T, region string) string {
 	return fmt.Sprintf(`
-resource "linode_reserved_ip" "test" {
+resource "linode_networking_ip" "test" {
+	type = "ipv4"
 	region = "%s"
+	public = true
+	reserved = true
 }
 `, region)
 }

linode/instance/tmpl/templates/instance_with_reserved_ip.gotf

@@ -2,8 +2,11 @@
 
 {{ template "e2e_test_firewall" . }}
 
-resource "linode_reserved_ip" "test" {
+resource "linode_networking_ip" "test" {
+  type = "ipv4"
   region = "{{ .Region }}"
+  public = true
+  reserved = true
 }
 
 resource "linode_instance" "foobar" {
@@ -15,7 +18,7 @@ resource "linode_instance" "foobar" {
     root_pass = "{{ .RootPass }}"
     authorized_keys = ["{{ .PubKey }}"]
 
-    ipv4 = [linode_reserved_ip.test.address]
+    ipv4 = [linode_networking_ip.test.address]
 }
 
 {{ end }}

linode/instancereservedipassignment/tmpl/AddReservedIPToInstance.gotf

@@ -11,14 +11,17 @@ resource "linode_instance" "foobar" {
     firewall_id = linode_firewall.e2e_test_firewall.id
 }
 
-resource "linode_reserved_ip" "test" {
+resource "linode_networking_ip" "test" {
+  type = "ipv4"
   region = "{{ .Region }}"
+  public = true
+  reserved = true
 }
 
 resource "linode_reserved_ip_assignment" "test" {
     linode_id = linode_instance.foobar.id
     public = true
-    address = linode_reserved_ip.test.address
+    address = linode_networking_ip.test.address
 }
 
 {{ end }}