This filters the boot disk out of attachments (#444)

Author: nickryand

internal/provider/resource_instance.go

@@ -411,7 +411,10 @@ func (r *instanceResource) Create(ctx context.Context, req resource.CreateReques
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	params.Body.Disks = disks
+
+	// The control plane API counts the BootDisk and the Disk attachments when it calculates the limit on disk attachments.
+	// If bootdisk is set explicitly, we don't want it to be in the API call, but we need it in the state entry.
+	params.Body.Disks = filterBootDiskFromDisks(disks, params.Body.BootDisk)
 
 	externalIPs := newExternalIPsOnCreate(plan.ExternalIPs)
 	params.Body.ExternalIps = externalIPs
@@ -1178,6 +1181,17 @@ func newDiskAttachmentsOnCreate(ctx context.Context, client *oxide.Client, diskI
 	return disks, diags
 }
 
+func filterBootDiskFromDisks(disks []oxide.InstanceDiskAttachment, boot_disk *oxide.InstanceDiskAttachment) []oxide.InstanceDiskAttachment {
+	var filtered_disks = []oxide.InstanceDiskAttachment{}
+	for _, disk := range disks {
+		if disk == *boot_disk {
+			continue
+		}
+		filtered_disks = append(filtered_disks, disk)
+	}
+	return filtered_disks
+}
+
 func newExternalIPsOnCreate(externalIPs []instanceResourceExternalIPModel) []oxide.ExternalIpCreate {
 	var ips []oxide.ExternalIpCreate
 

internal/provider/resource_instance_test.go

@@ -7,6 +7,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"reflect"
 	"testing"
 	"time"
 
@@ -382,13 +383,13 @@ func TestAccCloudResourceInstance_nic(t *testing.T) {
 data "oxide_project" "{{.SupportBlockName}}" {
 	name = "tf-acc-test"
 }
-  
+
 data "oxide_vpc_subnet" "{{.SubnetBlockName}}" {
   project_name = data.oxide_project.{{.SupportBlockName}}.name
   vpc_name     = "default"
   name         = "default"
 }
-  
+
 resource "oxide_instance" "{{.BlockName}}" {
   project_id       = data.oxide_project.{{.SupportBlockName}}.id
   description      = "a test instance"
@@ -412,7 +413,7 @@ resource "oxide_instance" "{{.BlockName}}" {
 data "oxide_project" "{{.SupportBlockName}}" {
 	name = "tf-acc-test"
 }
-  
+
 resource "oxide_instance" "{{.BlockName}}" {
   project_id       = data.oxide_project.{{.SupportBlockName}}.id
   description      = "a test instance"
@@ -1227,3 +1228,83 @@ func testAccInstanceDestroy(s *terraform.State) error {
 
 	return nil
 }
+
+func TestFilterBootDiskFromDisks(t *testing.T) {
+	boot_disk := oxide.InstanceDiskAttachment{
+		Name: "testboot01",
+		Type: oxide.InstanceDiskAttachmentTypeAttach,
+	}
+
+	tests := []struct {
+		boot_disk oxide.InstanceDiskAttachment
+		disks     []oxide.InstanceDiskAttachment
+		want      []oxide.InstanceDiskAttachment
+	}{
+		{
+			boot_disk: boot_disk,
+			disks: []oxide.InstanceDiskAttachment{
+				boot_disk,
+				{
+					Name: "testdisk01",
+					Type: oxide.InstanceDiskAttachmentTypeAttach,
+				},
+				{
+					Name: "testdisk01",
+					Type: oxide.InstanceDiskAttachmentTypeAttach,
+				},
+			},
+			want: []oxide.InstanceDiskAttachment{
+				{
+					Name: "testdisk01",
+					Type: oxide.InstanceDiskAttachmentTypeAttach,
+				},
+				{
+					Name: "testdisk01",
+					Type: oxide.InstanceDiskAttachmentTypeAttach,
+				},
+			},
+		},
+		{
+			boot_disk: oxide.InstanceDiskAttachment{},
+			disks: []oxide.InstanceDiskAttachment{
+				{
+					Name: "testdisk01",
+					Type: oxide.InstanceDiskAttachmentTypeAttach,
+				},
+				{
+					Name: "testdisk01",
+					Type: oxide.InstanceDiskAttachmentTypeAttach,
+				},
+				{
+					Name: "testboot01",
+					Type: oxide.InstanceDiskAttachmentTypeAttach,
+				},
+			},
+			want: []oxide.InstanceDiskAttachment{
+				{
+					Name: "testdisk01",
+					Type: oxide.InstanceDiskAttachmentTypeAttach,
+				},
+				{
+					Name: "testdisk01",
+					Type: oxide.InstanceDiskAttachmentTypeAttach,
+				},
+				{
+					Name: "testboot01",
+					Type: oxide.InstanceDiskAttachmentTypeAttach,
+				},
+			},
+		},
+		{
+			boot_disk: oxide.InstanceDiskAttachment{},
+			disks:     []oxide.InstanceDiskAttachment{},
+			want:      []oxide.InstanceDiskAttachment{},
+		},
+	}
+	for _, tt := range tests {
+		disks := filterBootDiskFromDisks(tt.disks, &tt.boot_disk)
+		if !reflect.DeepEqual(disks, tt.want) {
+			t.Errorf("want: %+v, got: %+v", tt.want, disks)
+		}
+	}
+}