Merge pull request #35290 from acwwat/b-aws_grafana_license_associati…

…on-set_workspace_id_on_import

fix: Add missing workspace_id from importing aws_grafana_license_association

.changelog/35290.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_grafana_license_association: Fix missing `workspace_id` attribute after import
+```

internal/service/grafana/grafana_test.go

@@ -6,9 +6,21 @@ package grafana_test
 import (
 	"testing"
 
+	"github.com/aws/aws-sdk-go/service/managedgrafana"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
 )
 
+func init() {
+	acctest.RegisterServiceErrorCheckFunc(managedgrafana.EndpointsID, testAccErrorCheckSkip)
+}
+
+func testAccErrorCheckSkip(t *testing.T) resource.ErrorCheckFunc {
+	return acctest.ErrorCheckSkipMessagesContaining(t,
+		"Active marketplace agreement not found",
+	)
+}
+
 func TestAccGrafana_serial(t *testing.T) {
 	t.Parallel()
 

internal/service/grafana/license_association.go

@@ -111,6 +111,7 @@ func resourceLicenseAssociationRead(ctx context.Context, d *schema.ResourceData,
 		d.Set("license_expiration", nil)
 	}
 	d.Set("license_type", workspace.LicenseType)
+	d.Set("workspace_id", d.Id())
 
 	return diags
 }

internal/service/grafana/license_association_test.go

@@ -39,6 +39,11 @@ func testAccLicenseAssociation_freeTrial(t *testing.T) {
 					resource.TestCheckResourceAttrPair(resourceName, "workspace_id", workspaceResourceName, "id"),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }