feat: add import via address for ip resources (#145)

krystal · Jan 9, 2025 · 921caf7 · 921caf7
1 parent 6e30909
commit 921caf7
Show file tree

Hide file tree

Showing 4 changed files with 171 additions and 55 deletions.
diff --git a/internal/provider/testdata/SecurityGroup_invalid_rules.cassette.rand_id b/internal/provider/testdata/SecurityGroup_invalid_rules.cassette.rand_id
@@ -1 +1 @@
-pdzsvmnkeyne
+begv003ejaf9
diff --git a/internal/v6provider/resource_ip.go b/internal/v6provider/resource_ip.go
@@ -392,7 +392,26 @@ func (r *IPResource) ImportState(
 	req resource.ImportStateRequest,
 	resp *resource.ImportStateResponse,
 ) {
-	resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)
+	if strings.HasPrefix(req.ID, "ip_") {
+		resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)
+		return
+	}
+
+	res, err := r.M.Core.GetIpAddressWithResponse(ctx, &core.GetIpAddressParams{
+		IpAddressAddress: &req.ID,
+	})
+	if err != nil {
+		resp.Diagnostics.AddError("IP Address Import Error", err.Error())
+		return
+	}
+
+	resp.Diagnostics.Append(
+		resp.State.SetAttribute(
+			ctx,
+			path.Root("id"),
+			*res.JSON200.IpAddress.Id,
+		)...,
+	)
 }
 
 func unflattenIPVersion(ver int64) core.IPAddressVersionEnum {

diff --git a/internal/v6provider/resource_ip_test.go b/internal/v6provider/resource_ip_test.go
@@ -121,6 +121,19 @@ func TestAccKatapultIP_minimal(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				ResourceName: "katapult_ip.web",
+				ImportStateIdFunc: func(s *terraform.State) (string, error) {
+					rs := s.RootModule().Resources["katapult_ip.web"]
+					if rs == nil {
+						return "", fmt.Errorf("resource not found")
+					}
+
+					return rs.Primary.Attributes["address"], nil
+				},
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }