new: Add VPC to InstanceIPv4Response (#465)

* Add VPC to InstanceIPv4Response * make format
linode · Mar 13, 2024 · 9db9207 · 9db9207
1 parent 823c699
commit 9db9207
Show file tree

Hide file tree

Showing 13 changed files with 1,062 additions and 366 deletions.
diff --git a/instance_ips.go b/instance_ips.go
@@ -19,6 +19,7 @@ type InstanceIPv4Response struct {
 	Private  []*InstanceIP `json:"private"`
 	Shared   []*InstanceIP `json:"shared"`
 	Reserved []*InstanceIP `json:"reserved"`
+	VPC      []*VPCIP      `json:"vpc"`
 }
 
 // InstanceIP represents an Instance IP with additional DNS and networking details
@@ -35,6 +36,23 @@ type InstanceIP struct {
 	VPCNAT1To1 *InstanceIPNAT1To1 `json:"vpc_nat_1_1"`
 }
 
+// VPCIP represents a private IP address in a VPC subnet with additional networking details
+type VPCIP struct {
+	Address      *string `json:"address"`
+	AddressRange *string `json:"address_range"`
+	Gateway      string  `json:"gateway"`
+	SubnetMask   string  `json:"subnet_mask"`
+	Prefix       int     `json:"prefix"`
+	LinodeID     int     `json:"linode_id"`
+	Region       string  `json:"region"`
+	Active       bool    `json:"active"`
+	NAT1To1      *string `json:"nat_1_1"`
+	VPCID        int     `json:"vpc_id"`
+	SubnetID     int     `json:"subnet_id"`
+	ConfigID     int     `json:"config_id"`
+	InterfaceID  int     `json:"interface_id"`
+}
+
 // InstanceIPv6Response contains the IPv6 addresses and ranges for an Instance
 type InstanceIPv6Response struct {
 	LinkLocal *InstanceIP `json:"link_local"`

diff --git a/test/integration/fixtures/TestIPAddresses_Instance_Get.yaml b/test/integration/fixtures/TestIPAddresses_Instance_Get.yaml
diff --git a/test/integration/fixtures/TestIPAddresses_List.yaml b/test/integration/fixtures/TestIPAddresses_List.yaml
diff --git a/test/integration/fixtures/TestIPv6Range_Share.yaml b/test/integration/fixtures/TestIPv6Range_Share.yaml
diff --git a/test/integration/instance_config_test.go b/test/integration/instance_config_test.go
@@ -67,7 +67,7 @@ func setupInstanceWith3Interfaces(t *testing.T, fixturesYaml string) (
 		t,
 		fixturesYaml,
 		func(client *Client, opts *InstanceCreateOptions) {
-			opts.Region = getRegionsWithCaps(t, client, []string{"VPCs"})[0]
+			opts.Region = getRegionsWithCaps(t, client, []string{"Linodes", "VPCs"})[0]
 		},
 	)
 	if err != nil {

diff --git a/test/integration/instances_test.go b/test/integration/instances_test.go
@@ -230,7 +230,6 @@ func TestInstance_Disk_ListMultiple(t *testing.T) {
 		Label: "go-disk-test-" + randLabel(),
 		Size:  2000,
 	})
-
 	if err != nil {
 		t.Errorf("Error creating disk after a private image: %s", err)
 	}
@@ -357,7 +356,6 @@ func TestInstance_Rebuild(t *testing.T) {
 	}
 
 	_, err = client.WaitForEventFinished(context.Background(), instance.ID, linodego.EntityLinode, linodego.ActionLinodeCreate, *instance.Created, 180)
-
 	if err != nil {
 		t.Errorf("Error waiting for instance created: %s", err)
 	}
@@ -371,7 +369,6 @@ func TestInstance_Rebuild(t *testing.T) {
 		Type:     "g6-standard-2",
 	}
 	instance, err = client.RebuildInstance(context.Background(), instance.ID, rebuildOpts)
-
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -404,7 +401,6 @@ func TestInstance_Clone(t *testing.T) {
 		*instance.Created,
 		180,
 	)
-
 	if err != nil {
 		t.Errorf("Error waiting for instance created: %s", err)
 	}
@@ -435,7 +431,6 @@ func TestInstance_Clone(t *testing.T) {
 		*clonedInstance.Created,
 		240,
 	)
-
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/test/integration/network_ips_test.go b/test/integration/network_ips_test.go
@@ -95,18 +95,18 @@ func TestIPAddresses_List_smoke(t *testing.T) {
 }
 
 func TestIPAddresses_Instance_Get(t *testing.T) {
-	client, instance, _, teardown, err := setupInstanceWithoutDisks(t, "fixtures/TestIPAddresses_Instance_Get")
+	client, _, _, instance, config, teardown := setupInstanceWith3Interfaces(t, "fixtures/TestIPAddresses_Instance_Get")
 	defer teardown()
-	if err != nil {
-		t.Errorf("Error creating IPAddress test Instance, got error %v", err)
-	}
 
 	i, err := client.GetInstanceIPAddresses(context.Background(), instance.ID)
 	if err != nil {
 		t.Errorf("Error listing ipaddresses, expected struct, got error %v", err)
 	}
 	if i.IPv4.Public[0].Address != instance.IPv4[0].String() {
-		t.Errorf("Expected matching ipaddresses with GetInstanceIPAddress Instance IPAddress but got %v", i)
+		t.Errorf("Expected matching public IP ipaddresses with GetInstanceIPAddress Instance IPAddress but got %v", i)
+	}
+	if *i.IPv4.VPC[0].Address != config.Interfaces[2].IPv4.VPC {
+		t.Errorf("Expected matching VPC IP addresses with GetInstanceIPAddress Instance IPAddress but got %v", i)
 	}
 }
 
@@ -229,11 +229,7 @@ func TestIPAddress_Instance_Assign(t *testing.T) {
 }
 
 func TestIPAddress_Instance_Share(t *testing.T) {
-	client, instance, _, teardown, err := setupInstanceWithoutDisks(t, "fixtures/TestIPAddress_Instance_Share", func(client *Client, options *InstanceCreateOptions) {
-		// This should stay hardcoded at the moment as the
-		// IP sharing rollout does not have a corresponding capability.
-		options.Region = "us-ord"
-	})
+	client, instance, _, teardown, err := setupInstanceWithoutDisks(t, "fixtures/TestIPAddress_Instance_Share")
 	defer teardown()
 	if err != nil {
 		t.Error(err)

diff --git a/test/integration/network_ranges_test.go b/test/integration/network_ranges_test.go
@@ -87,7 +87,6 @@ func TestIPv6Range_Share(t *testing.T) {
 			strings.TrimSuffix(ipRange.Range, "/64"),
 		},
 	})
-
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -98,7 +97,6 @@ func TestIPv6Range_Share(t *testing.T) {
 			strings.TrimSuffix(ipRange.Range, "/64"),
 		},
 	})
-
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/test/integration/nodebalancers_test.go b/test/integration/nodebalancers_test.go
@@ -42,7 +42,6 @@ func TestNodeBalancer_Update(t *testing.T) {
 		Label: &renamedLabel,
 	}
 	nodebalancer, err = client.UpdateNodeBalancer(context.Background(), nodebalancer.ID, updateOpts)
-
 	if err != nil {
 		t.Errorf("Error renaming nodebalancer, %s", err)
 	}

diff --git a/test/integration/object_storage_keys_test.go b/test/integration/object_storage_keys_test.go
@@ -67,7 +67,6 @@ func TestObjectStorageKey_Update(t *testing.T) {
 		Label: renamedLabel,
 	}
 	objectStorageKey, err = client.UpdateObjectStorageKey(context.Background(), objectStorageKey.ID, updateOpts)
-
 	if err != nil {
 		t.Errorf("Error renaming objectStorageKey, %s", err)
 	}

diff --git a/test/integration/profile_sshkeys_test.go b/test/integration/profile_sshkeys_test.go
@@ -68,7 +68,6 @@ func TestSSHKey_Update(t *testing.T) {
 		Label: renamedLabel,
 	}
 	sshkey, err = client.UpdateSSHKey(context.Background(), sshkey.ID, updateOpts)
-
 	if err != nil {
 		t.Errorf("Error renaming sshkey, %s", err)
 	}

diff --git a/test/integration/volumes_test.go b/test/integration/volumes_test.go
@@ -94,7 +94,6 @@ func TestVolume_WaitForLinodeID_nil(t *testing.T) {
 		t.Errorf("Error setting up volume test, %s", err)
 	}
 	_, err = client.WaitForVolumeLinodeID(context.Background(), volume.ID, nil, 20)
-
 	if err != nil {
 		t.Errorf("Error getting volume %d, expected *LinodeVolume, got error %v", volume.ID, err)
 	}

diff --git a/test/integration/vpc_subnet_test.go b/test/integration/vpc_subnet_test.go
@@ -82,7 +82,7 @@ func createVPCWithSubnet(t *testing.T, client *linodego.Client, vpcModifier ...v
 	t.Helper()
 	createOpts := linodego.VPCCreateOptions{
 		Label:  "go-test-vpc-" + getUniqueText(),
-		Region: getRegionsWithCaps(t, client, []string{"VPCs"})[0],
+		Region: getRegionsWithCaps(t, client, []string{"Linodes", "VPCs"})[0],
 		Subnets: []VPCSubnetCreateOptions{
 			{
 				Label: "linodego-vpc-test-" + getUniqueText(),