oxide_ip_pool_silo_link: use composite attributes for id

The `id` attribute for the `oxide_ip_pool_silo_link` resource
now uses the format `IP_POOL_ID/SILO_ID`, matching the
`oxide_subnet_pool_silo_link` resource.

Closes SSE-348.

Author: sudomateo

.changelog/0.21.0.toml

@@ -1,6 +1,8 @@
 [[breaking]]
 
 [[features]]
+title = "`oxide_ip_pool_silo_link`"
+description = "The `id` attribute for the `oxide_ip_pool_silo_link` resource now uses the format `IP_POOL_ID/SILO_ID`, matching the `oxide_subnet_pool_silo_link` resource. [#794](https://github.com/oxidecomputer/terraform-provider-oxide/pull/794)"
 
 [[enhancements]]
 

docs/resources/ip_pool_silo_link.md

@@ -60,5 +60,6 @@ Import is supported using the following syntax:
 The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
 
 ```shell
-terraform import oxide_ip_pool_silo_link.example 3e2c6e84-bed8-4c94-afc3-1032082d6a90
+# Import ID is the format `${IP_POOL_ID}/${SILO_ID}`.
+terraform import oxide_ip_pool_silo_link.example 3e2c6e84-bed8-4c94-afc3-1032082d6a90/9e199e45-01a6-43d3-8bc3-5b27726e67a6
 ```

docs/resources/subnet_pool_silo_link.md

@@ -10,7 +10,15 @@ description: |-
 
 This resource manages subnet pool to silo links.
 
+## Example Usage
 
+```terraform
+resource "oxide_subnet_pool_silo_link" "example" {
+  silo_id    = "1fec2c21-cf22-40d8-9ebd-e5b57ebec80f"
+  ip_pool_id = "081a331d-5ee4-4a23-ac8b-328af5e15cdc"
+  is_default = true
+}
+```
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -38,3 +46,14 @@ Optional:
 - `delete` (String) A string that can be [parsed as a duration](https://pkg.go.dev/time#ParseDuration) consisting of numbers and unit suffixes, such as "30s" or "2h45m". Valid time units are "s" (seconds), "m" (minutes), "h" (hours). Setting a timeout for a Delete operation is only applicable if changes are saved into state before the destroy operation occurs.
 - `read` (String) A string that can be [parsed as a duration](https://pkg.go.dev/time#ParseDuration) consisting of numbers and unit suffixes, such as "30s" or "2h45m". Valid time units are "s" (seconds), "m" (minutes), "h" (hours). Read operations occur during any refresh or planning operation when refresh is enabled.
 - `update` (String) A string that can be [parsed as a duration](https://pkg.go.dev/time#ParseDuration) consisting of numbers and unit suffixes, such as "30s" or "2h45m". Valid time units are "s" (seconds), "m" (minutes), "h" (hours).
+
+## Import
+
+Import is supported using the following syntax:
+
+The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
+
+```shell
+# Import ID is the format `${SUBNET_POOL_ID}/${SILO_ID}`.
+terraform import oxide_subnet_pool_silo_link.example 3e2c6e84-bed8-4c94-afc3-1032082d6a90/9e199e45-01a6-43d3-8bc3-5b27726e67a6
+```

examples/resources/oxide_ip_pool_silo_link/import.sh

@@ -1 +1,2 @@
-terraform import oxide_ip_pool_silo_link.example 3e2c6e84-bed8-4c94-afc3-1032082d6a90
+# Import ID is the format `${IP_POOL_ID}/${SILO_ID}`.
+terraform import oxide_ip_pool_silo_link.example 3e2c6e84-bed8-4c94-afc3-1032082d6a90/9e199e45-01a6-43d3-8bc3-5b27726e67a6

examples/resources/oxide_subnet_pool_silo_link/import.sh

@@ -0,0 +1,2 @@
+# Import ID is the format `${SUBNET_POOL_ID}/${SILO_ID}`.
+terraform import oxide_subnet_pool_silo_link.example 3e2c6e84-bed8-4c94-afc3-1032082d6a90/9e199e45-01a6-43d3-8bc3-5b27726e67a6

examples/resources/oxide_subnet_pool_silo_link/resource.tf

@@ -0,0 +1,5 @@
+resource "oxide_subnet_pool_silo_link" "example" {
+  silo_id    = "1fec2c21-cf22-40d8-9ebd-e5b57ebec80f"
+  ip_pool_id = "081a331d-5ee4-4a23-ac8b-328af5e15cdc"
+  is_default = true
+}

internal/provider/ip_pool_silo_link/resource.go

@@ -8,8 +8,8 @@ import (
 	"context"
 	"fmt"
 	"slices"
+	"strings"
 
-	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -75,7 +75,20 @@ func (r *Resource) ImportState(
 	req resource.ImportStateRequest,
 	resp *resource.ImportStateResponse,
 ) {
-	resource.ImportStatePassthroughID(ctx, path.Root("ip_pool_id"), req, resp)
+	idParts := strings.Split(req.ID, "/")
+	if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" {
+		resp.Diagnostics.AddError(
+			"Invalid Import ID",
+			fmt.Sprintf("Expected import ID format: ip_pool_id/silo_id, got: %s", req.ID),
+		)
+		return
+	}
+
+	// Use the import ID directly as the terraform ID (it's already in the correct format)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("id"), req.ID)...)
+	resp.Diagnostics.Append(
+		resp.State.SetAttribute(ctx, path.Root("ip_pool_id"), idParts[0])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("silo_id"), idParts[1])...)
 }
 
 // Schema defines the schema for the resource.
@@ -167,8 +180,8 @@ func (r *Resource) Create(
 		map[string]any{"success": true},
 	)
 
-	// Set a unique ID for the resource payload
-	plan.ID = types.StringValue(uuid.New().String())
+	// Set a deterministic ID based on composite attributes.
+	plan.ID = types.StringValue(fmt.Sprintf("%s/%s", link.IpPoolId, link.SiloId))
 
 	// Save plan into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...)
@@ -199,13 +212,11 @@ func (r *Resource) Read(
 	ctx, cancel := context.WithTimeout(ctx, readTimeout)
 	defer cancel()
 
-	params := oxide.SystemIpPoolSiloListParams{
-		Pool:   oxide.NameOrId(state.IPPoolID.ValueString()),
-		Limit:  oxide.NewPointer(1000000000),
-		SortBy: oxide.IdSortModeIdAscending,
-	}
-
-	links, err := r.client.SystemIpPoolSiloList(ctx, params)
+	// This `/v1/system/silos/{silo}/ip-pools` API works with non-discoverable silos
+	// whereas the `/v1/system/ip-pools/{pool}/silos` does not.
+	pools, err := r.client.SiloIpPoolListAllPages(ctx, oxide.SiloIpPoolListParams{
+		Silo: oxide.NameOrId(state.SiloID.ValueString()),
+	})
 	if err != nil {
 		if shared.Is404(err) {
 			// Remove resource from state during a refresh
@@ -220,27 +231,31 @@ func (r *Resource) Read(
 	}
 	tflog.Trace(
 		ctx,
-		fmt.Sprintf("read IP pool links with ID: %v", state.IPPoolID),
+		fmt.Sprintf("read IP pool links for silo: %v", state.SiloID.ValueString()),
 		map[string]any{"success": true},
 	)
 
-	siloID := state.SiloID.ValueString()
+	ipPoolID := state.IPPoolID.ValueString()
 	idx := slices.IndexFunc(
-		links.Items,
-		func(l oxide.IpPoolSiloLink) bool { return l.SiloId == siloID },
+		pools,
+		func(p oxide.SiloIpPool) bool {
+			// We check for both ID and name equality to ensure resources that mistakenly
+			// used the IP pool name aren't removed from state.
+			return p.Id == ipPoolID || p.Name == oxide.Name(ipPoolID)
+		},
 	)
 	if idx < 0 {
-		resp.Diagnostics.AddError(
-			"Missing resource",
-			fmt.Sprintf("Unable to find requested link between IP pool %v and silo %v",
-				state.IPPoolID.ValueString(), state.SiloID.ValueString()),
-		)
+		resp.State.RemoveResource(ctx)
 		return
 	}
 
-	state.IPPoolID = types.StringValue(links.Items[idx].IpPoolId)
-	state.IsDefault = types.BoolPointerValue(links.Items[idx].IsDefault)
-	state.SiloID = types.StringValue(links.Items[idx].SiloId)
+	// Set a deterministic ID based on composite attributes.
+	state.ID = types.StringValue(
+		fmt.Sprintf("%s/%s", pools[idx].Id, state.SiloID.ValueString()),
+	)
+
+	state.IPPoolID = types.StringValue(pools[idx].Id)
+	state.IsDefault = types.BoolPointerValue(pools[idx].IsDefault)
 
 	// Save updated data into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
@@ -300,8 +315,8 @@ func (r *Resource) Update(
 		map[string]any{"success": true},
 	)
 
-	// This is a terraform-specific ID. We just copy it from the state
-	plan.ID = state.ID
+	// Set a deterministic ID based on composite attributes.
+	plan.ID = types.StringValue(fmt.Sprintf("%s/%s", link.IpPoolId, link.SiloId))
 
 	// Save plan into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...)