chore: fixed import example

chore: generic NullableToString. Handles enum as well

Author: tontonrally

docs/resources/apikey.md

@@ -52,6 +52,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
-# Apikey can be imported by specifying the <project_ref>/<apikey_uuid> identifier.
-terraform import hashicups_order.example mayuaycdtijbctgqbycg/601f6916-62a3-428b-9ebf-a433c7cac8b7
+# The ID is the project reference and a unique identifier of the key separated by '/'
+terraform import supabase_apikey.example <project_ref>/<key_id>
 ```

examples/resources/supabase_apikey/import.sh

@@ -1,2 +1,2 @@
-# Apikey can be imported by specifying the <project_ref>/<apikey_uuid> identifier.
-terraform import hashicups_order.example mayuaycdtijbctgqbycg/601f6916-62a3-428b-9ebf-a433c7cac8b7
+# The ID is the project reference and a unique identifier of the key separated by '/'
+terraform import supabase_apikey.example <project_ref>/<key_id>

internal/provider/apikey_resource.go

@@ -254,7 +254,7 @@ func readApiKeyDatabase(ctx context.Context, state *ApiKeyResourceModel, client
 
 	idValue := NullableToString(httpResp.JSON200.Id)
 	apiKeyValue := NullableToString(httpResp.JSON200.ApiKey)
-	typeValue := NullableEnumToString(httpResp.JSON200.Type)
+	typeValue := NullableToString(httpResp.JSON200.Type)
 	descriptionValue := NullableToString(httpResp.JSON200.Description)
 
 	database := ApiKeyDatabaseModel{
@@ -360,7 +360,7 @@ func createApiKey(ctx context.Context, plan *ApiKeyResourceModel, client *api.Cl
 	// Update computed fields from creation response
 	plan.Id = NullableToString(httpResp.JSON201.Id)
 	plan.ApiKey = NullableToString(httpResp.JSON201.ApiKey)
-	plan.Type = NullableEnumToString(httpResp.JSON201.Type)
+	plan.Type = NullableToString(httpResp.JSON201.Type)
 
 	obj, diags := types.ObjectValue(secretJwtTemplateAttrTypes, map[string]attr.Value{
 		"role": types.StringValue("service_role"),

internal/provider/utils.go

@@ -11,18 +11,7 @@ func Ptr[T any](v T) *T {
 
 // NullableToString converts an oapi-codegen [nullable.Nullable] to an appropriate
 // terraform string type.
-func NullableToString(n nullable.Nullable[string]) tftypes.String {
-	if n.IsSpecified() && !n.IsNull() {
-		// MustGet is safe when the value is specified and not null
-		return tftypes.StringValue(n.MustGet())
-	}
-
-	return tftypes.StringNull()
-}
-
-// NullableEnumToString converts an oapi-codegen nullable enum (or any string-like
-// type) into a terraform string type.
-func NullableEnumToString[T ~string](n nullable.Nullable[T]) tftypes.String {
+func NullableToString[T ~string](n nullable.Nullable[T]) tftypes.String {
 	if n.IsSpecified() && !n.IsNull() {
 		return tftypes.StringValue(string(n.MustGet()))
 	}