Skip to content

TPT-4294: terraform: Update linode_instance resource to support reserved IP assignment at creation #2323

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
mgwoj merged 3 commits into from
May 8, 2026
Merged

TPT-4294: terraform: Update linode_instance resource to support reserved IP assignment at creation #2323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5df1c1c
TPT-4294: terraform: Update linode_instance resource to support reser…
mgwoj Apr 2, 2026
f5391d5
Merge branch 'proj/reserved-ips' into feature/TPT-4294-terraform-upda…
mgwoj May 7, 2026
cdfe033
TPT-4294: terraform: Update linode_instance resource to support reser…
mgwoj May 7, 2026
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
10 changes: 6 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ require (
github.com/linode/linodego v1.67.0
github.com/linode/linodego/k8s v1.25.2
github.com/stretchr/testify v1.11.1
golang.org/x/crypto v0.49.0
golang.org/x/crypto v0.50.0
golang.org/x/sync v0.20.0
)

Expand Down Expand Up @@ -100,10 +100,10 @@ require (
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/zclconf/go-cty v1.18.1 // indirect
golang.org/x/mod v0.35.0 // indirect
golang.org/x/net v0.52.0 // indirect
golang.org/x/net v0.53.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sys v0.43.0 // indirect
golang.org/x/term v0.41.0 // indirect
golang.org/x/term v0.42.0 // indirect
golang.org/x/text v0.36.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/tools v0.43.0 // indirect
Expand All @@ -112,7 +112,7 @@ require (
google.golang.org/grpc v1.79.3 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.1 // indirect
gopkg.in/ini.v1 v1.67.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.28.1 // indirect
Expand All @@ -125,3 +125,5 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/linode/linodego => github.com/linode/linodego v1.66.1-0.20260507140953-d6820ea45304
20 changes: 10 additions & 10 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/linode/linodego v1.67.0 h1:pomhFuuCCJI4N6emtB9027h1yXHY2/MIT0hwHEFwvq4=
github.com/linode/linodego v1.67.0/go.mod h1:+9mbdu0P3WMRCl0QbVfiFavR+Iel7TCRDJk3nInyx14=
github.com/linode/linodego v1.66.1-0.20260507140953-d6820ea45304 h1:wk9VAISN35+2JON5rGeJ7Yfnk1BxBSd51OoW63Um3kY=
github.com/linode/linodego v1.66.1-0.20260507140953-d6820ea45304/go.mod h1:QPzvRKCy9oz1lRaIACPRORoAI9AAfKKg2AR5mXujoB0=
github.com/linode/linodego/k8s v1.25.2 h1:PY6S0sAD3xANVvM9WY38bz9GqMTjIbytC8IJJ9Cv23o=
github.com/linode/linodego/k8s v1.25.2/go.mod h1:DC1XCSRZRGsmaa/ggpDPSDUmOM6aK1bhSIP6+f9Cwhc=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
Expand Down Expand Up @@ -293,8 +293,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
Expand All @@ -306,8 +306,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -334,8 +334,8 @@ golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU=
golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A=
golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
Expand Down Expand Up @@ -374,8 +374,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/ini.v1 v1.67.1 h1:tVBILHy0R6e4wkYOn3XmiITt/hEVH4TFMYvAX2Ytz6k=
gopkg.in/ini.v1 v1.67.1/go.mod h1:x/cyOwCgZqOkJoDIJ3c1KNHMo10+nLGAhh+kn3Zizss=
gopkg.in/ini.v1 v1.67.2 h1:JtOSMb9OuaCZKr7h5D/h6iii14sK0hLbplTc6frx4Ss=
gopkg.in/ini.v1 v1.67.2/go.mod h1:x/cyOwCgZqOkJoDIJ3c1KNHMo10+nLGAhh+kn3Zizss=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
Expand Down
17 changes: 11 additions & 6 deletions linode/instance/flatten.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"
"fmt"
"net"

"github.com/linode/linodego"
"github.com/linode/terraform-provider-linode/v3/linode/helper"
Expand All @@ -20,12 +21,7 @@ func flattenInstance(
return nil, fmt.Errorf("failed to get ips for linode instance %d: %s", id, err)
}

var ips []string
for _, ip := range instance.IPv4 {
ips = append(ips, ip.String())
}

result["ipv4"] = ips
result["ipv4"] = flattenInstanceIPv4(instance.IPv4)
result["ipv6"] = instance.IPv6

public, private := instanceNetwork.IPv4.Public, instanceNetwork.IPv4.Private
Expand Down Expand Up @@ -90,6 +86,15 @@ func flattenInstance(
return result, nil
}

// flattenInstanceIPv4 converts a slice of net.IP pointers to a slice of IP address strings.
func flattenInstanceIPv4(ips []*net.IP) []string {
result := make([]string, 0, len(ips))
for _, ip := range ips {
result = append(result, ip.String())
}
return result
}

func flattenInstanceAlerts(instance linodego.Instance) []map[string]int {
return []map[string]int{{
"cpu": instance.Alerts.CPU,
Expand Down
46 changes: 46 additions & 0 deletions linode/instance/flatten_unit_test.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 (
"net"
"reflect"
"testing"
"time"
Expand Down Expand Up @@ -356,3 +357,48 @@ func TestFlattenInstanceSpecs(t *testing.T) {
}
}
}

func TestFlattenInstanceIPv4(t *testing.T) {
tests := []struct {
name string
input []*net.IP
expected []string
}{
{
name: "nil input",
input: nil,
expected: []string{},
},
{
name: "empty input",
input: []*net.IP{},
expected: []string{},
},
{
name: "single public IPv4",
input: func() []*net.IP {
ip := net.ParseIP("192.0.2.1")
return []*net.IP{&ip}
}(),
expected: []string{"192.0.2.1"},
},
{
name: "multiple IPs including reserved",
input: func() []*net.IP {
ip1 := net.ParseIP("203.0.113.5")
ip2 := net.ParseIP("192.168.128.10")
return []*net.IP{&ip1, &ip2}
}(),
expected: []string{"203.0.113.5", "192.168.128.10"},
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := flattenInstanceIPv4(tt.input)
if !reflect.DeepEqual(result, tt.expected) {
t.Errorf("flattenInstanceIPv4(%v) = %v, want %v", tt.input, result, tt.expected)
}
})
}
}
15 changes: 2 additions & 13 deletions linode/instance/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ import (
linodediffs "github.com/linode/terraform-provider-linode/v3/linode/helper/customdiffs"
)

// Instance creation with reserved IPv4 is for internal use only : please refer to KB page for more information.

const (
LinodeInstanceCreateTimeout = 15 * time.Minute
LinodeInstanceUpdateTimeout = time.Hour
Expand Down Expand Up @@ -82,11 +80,7 @@ func readResource(ctx context.Context, d *schema.ResourceData, meta any) diag.Di
return diag.Errorf("failed to get instance configs: %s", err)
}

var ips []string
for _, ip := range instance.IPv4 {
ips = append(ips, ip.String())
}
d.Set("ipv4", ips)
d.Set("ipv4", flattenInstanceIPv4(instance.IPv4))
d.Set("ipv6", instance.IPv6)
d.Set("shared_ipv4", instanceIPSliceToString(instanceNetwork.IPv4.Shared))

Expand Down Expand Up @@ -341,12 +335,7 @@ func createResource(ctx context.Context, d *schema.ResourceData, meta any) diag.
d.SetId(fmt.Sprintf("%d", instance.ID))
createPoller.EntityID = instance.ID

var ips []string
for _, ip := range instance.IPv4 {
ips = append(ips, ip.String())
}

d.Set("ipv4", ips)
d.Set("ipv4", flattenInstanceIPv4(instance.IPv4))
d.Set("ipv6", instance.IPv6)

for _, address := range instance.IPv4 {
Expand Down
4 changes: 2 additions & 2 deletions linode/instance/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3537,7 +3537,7 @@ func TestAccResourceInstance_withReservedIP(t *testing.T) {
rootPass := acctest.RandString(16)

resource.Test(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t); acceptance.OptInTest(t) },
PreCheck: func() { acceptance.PreCheck(t) },
ProtoV6ProviderFactories: acceptance.ProtoV6ProviderFactories,
CheckDestroy: acceptance.CheckInstanceDestroy,
Steps: []resource.TestStep{
Expand Down Expand Up @@ -3569,7 +3569,7 @@ func TestAccResourceInstance_deleteWithReservedIP(t *testing.T) {
ipResourceName := "linode_networking_ip.test"
rootPass := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t); acceptance.OptInTest(t) },
PreCheck: func() { acceptance.PreCheck(t) },
ProtoV6ProviderFactories: acceptance.ProtoV6ProviderFactories,
CheckDestroy: acceptance.CheckInstanceDestroy,
Steps: []resource.TestStep{
Expand Down
Loading