Merge pull request #43089 from hashicorp/b-dont-set-Identity-when-removing

Resource Identity: Don't set Identity when removing resource

Author: gdavison

internal/provider/framework/identity_interceptor.go

@@ -70,6 +70,9 @@ func (r identityInterceptor) read(ctx context.Context, opts interceptorOptions[r
 
 	switch response, when := opts.response, opts.when; when {
 	case After:
+		if response.State.Raw.IsNull() {
+			break
+		}
 		identity := response.Identity
 		if identity == nil {
 			break

internal/provider/sdkv2/identity_interceptor.go

@@ -32,6 +32,9 @@ func (r identityInterceptor) run(ctx context.Context, opts crudInterceptorOption
 	case After:
 		switch why {
 		case Create, Read:
+			if d.Id() == "" {
+				break
+			}
 			identity, err := d.Identity()
 			if err != nil {
 				return sdkdiag.AppendFromErr(diags, err)
@@ -76,7 +79,7 @@ func getAttributeOk(d schemaResourceData, name string) (string, bool) {
 func newIdentityInterceptor(attributes []inttypes.IdentityAttribute) interceptorInvocation {
 	return interceptorInvocation{
 		when: After,
-		why:  Create, // TODO: probably need to do this after Read and Update as well
+		why:  Create | Read,
 		interceptor: identityInterceptor{
 			attributes: tfslices.ApplyToAll(attributes, func(v inttypes.IdentityAttribute) string {
 				return v.Name