Add resource identity import support

Author: jrhouston

manifest/provider/import.go

@@ -15,6 +15,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // ImportResourceState function
@@ -49,7 +50,14 @@ func (s *RawProviderServer) ImportResourceState(ctx context.Context, req *tfprot
 		return resp, nil
 	}
 
-	gvk, name, namespace, err := util.ParseResourceID(req.ID)
+	var gvk schema.GroupVersionKind
+	var name, namespace string
+	var err error
+	if req.Identity != nil {
+		gvk, name, namespace, err = parseResourceIdentityData(req.Identity)
+	} else {
+		gvk, name, namespace, err = util.ParseResourceID(req.ID)
+	}
 	if err != nil {
 		resp.Diagnostics = append(resp.Diagnostics, &tfprotov5.Diagnostic{
 			Severity: tfprotov5.DiagnosticSeverityError,
@@ -58,6 +66,7 @@ func (s *RawProviderServer) ImportResourceState(ctx context.Context, req *tfprot
 		})
 	}
 	s.logger.Trace("[ImportResourceState]", "[ID]", gvk, name, namespace)
+
 	rt, err := GetResourceType(req.TypeName)
 	if err != nil {
 		resp.Diagnostics = append(resp.Diagnostics, &tfprotov5.Diagnostic{
@@ -196,16 +205,24 @@ func (s *RawProviderServer) ImportResourceState(ctx context.Context, req *tfprot
 			Detail:   err.Error(),
 		})
 	}
+	idData, err := createIdentityData(ro)
+	if err != nil {
+		return resp, err
+	}
 	nr := &tfprotov5.ImportedResource{
 		TypeName: req.TypeName,
 		State:    &impState,
 		Private:  fb,
+		Identity: &tfprotov5.ResourceIdentityData{
+			IdentityData: &idData,
+		},
 	}
 	resp.ImportedResources = append(resp.ImportedResources, nr)
 	resp.Diagnostics = append(resp.Diagnostics, &tfprotov5.Diagnostic{
 		Severity: tfprotov5.DiagnosticSeverityWarning,
 		Summary:  "Apply needed after 'import'",
 		Detail:   "Please run apply after a successful import to realign the resource state to the configuration in Terraform.",
 	})
+
 	return resp, nil
 }

manifest/provider/resourceidentity.go

@@ -2,10 +2,12 @@ package provider
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 func (s *RawProviderServer) GetResourceIdentitySchemas(ctx context.Context, req *tfprotov5.GetResourceIdentitySchemasRequest) (*tfprotov5.GetResourceIdentitySchemasResponse, error) {
@@ -18,7 +20,7 @@ func (s *RawProviderServer) GetResourceIdentitySchemas(ctx context.Context, req
 					{Name: "api_version", RequiredForImport: true, Type: tftypes.String},
 					{Name: "kind", RequiredForImport: true, Type: tftypes.String},
 					{Name: "name", RequiredForImport: true, Type: tftypes.String},
-					{Name: "namespace", RequiredForImport: true, Type: tftypes.String},
+					{Name: "namespace", OptionalForImport: true, Type: tftypes.String},
 				},
 			},
 		},
@@ -32,6 +34,28 @@ func (s *RawProviderServer) UpgradeResourceIdentity(ctx context.Context, req *tf
 	return resp, nil
 }
 
+func parseResourceIdentityData(rid *tfprotov5.ResourceIdentityData) (schema.GroupVersionKind, string, string, error) {
+	namespace := "default"
+	var apiVersion, kind, name string
+
+	iddata, err := rid.IdentityData.Unmarshal(getIdentityType())
+	if err != nil {
+		return schema.GroupVersionKind{}, "", "",
+			fmt.Errorf("could not unmarshal identity data: %v", err.Error())
+	}
+
+	var idvals map[string]tftypes.Value
+	iddata.As(&idvals)
+
+	idvals["api_version"].As(&apiVersion)
+	idvals["kind"].As(&kind)
+	idvals["namespace"].As(&namespace)
+	idvals["name"].As(&name)
+
+	gvk := schema.FromAPIVersionAndKind(apiVersion, kind)
+	return gvk, name, namespace, nil
+}
+
 func getIdentityType() tftypes.Type {
 	return tftypes.Object{
 		AttributeTypes: map[string]tftypes.Type{