diff --git a/.changes/unreleased/changed-20250305-154933.yaml b/.changes/unreleased/changed-20250305-154933.yaml new file mode 100644 index 00000000..43d5ea6b --- /dev/null +++ b/.changes/unreleased/changed-20250305-154933.yaml @@ -0,0 +1,5 @@ +kind: changed +body: SPN is now supported for Domain resources/data-sources +time: 2025-03-05T15:49:33.2641607-08:00 +custom: + Issue: "286" diff --git a/docs/data-sources/domain.md b/docs/data-sources/domain.md index e90f40d6..e6327f42 100644 --- a/docs/data-sources/domain.md +++ b/docs/data-sources/domain.md @@ -5,7 +5,7 @@ subcategory: "" description: |- Get a Fabric Domain. Use this data source to get Domain https://learn.microsoft.com/fabric/governance/domains. - -> This item does not support Service Principal. Please use a User context authentication. + -> This item supports Service Principal authentication. ~> This data-source is in preview. To access it, you must explicitly enable the preview mode in the provider level configuration. --- @@ -15,7 +15,7 @@ Get a Fabric Domain. Use this data source to get [Domain](https://learn.microsoft.com/fabric/governance/domains). --> This item does not support Service Principal. Please use a User context authentication. +-> This item supports Service Principal authentication. ~> This data-source is in **preview**. To access it, you must explicitly enable the `preview` mode in the provider level configuration. diff --git a/docs/data-sources/domain_workspace_assignments.md b/docs/data-sources/domain_workspace_assignments.md index 073a7e7f..328e6d30 100644 --- a/docs/data-sources/domain_workspace_assignments.md +++ b/docs/data-sources/domain_workspace_assignments.md @@ -5,7 +5,7 @@ subcategory: "" description: |- List a Fabric Domain Workspace Assignments. Use this data source to list Domain Workspace Assignments https://learn.microsoft.com/fabric/governance/domains. - -> This item does not support Service Principal. Please use a User context authentication. + -> This item supports Service Principal authentication. ~> This data-source is in preview. To access it, you must explicitly enable the preview mode in the provider level configuration. --- @@ -15,7 +15,7 @@ List a Fabric Domain Workspace Assignments. Use this data source to list [Domain Workspace Assignments](https://learn.microsoft.com/fabric/governance/domains). --> This item does not support Service Principal. Please use a User context authentication. +-> This item supports Service Principal authentication. ~> This data-source is in **preview**. To access it, you must explicitly enable the `preview` mode in the provider level configuration. diff --git a/docs/data-sources/domains.md b/docs/data-sources/domains.md index 62aabb1d..ca1d2f30 100644 --- a/docs/data-sources/domains.md +++ b/docs/data-sources/domains.md @@ -5,7 +5,7 @@ subcategory: "" description: |- List a Fabric Domains. Use this data source to list Domains https://learn.microsoft.com/fabric/governance/domains. - -> This item does not support Service Principal. Please use a User context authentication. + -> This item supports Service Principal authentication. --- # fabric_domains (Data Source) @@ -14,7 +14,7 @@ List a Fabric Domains. Use this data source to list [Domains](https://learn.microsoft.com/fabric/governance/domains). --> This item does not support Service Principal. Please use a User context authentication. +-> This item supports Service Principal authentication. ## Example Usage diff --git a/docs/resources/domain.md b/docs/resources/domain.md index 97222f14..56bf4485 100644 --- a/docs/resources/domain.md +++ b/docs/resources/domain.md @@ -5,7 +5,7 @@ subcategory: "" description: |- Manage a Fabric Domain. Use this resource to manage Domain https://learn.microsoft.com/fabric/governance/domains. - -> This item does not support Service Principal. Please use a User context authentication. + -> This item supports Service Principal authentication. ~> This resource is in preview. To access it, you must explicitly enable the preview mode in the provider level configuration. --- @@ -15,7 +15,7 @@ Manage a Fabric Domain. Use this resource to manage [Domain](https://learn.microsoft.com/fabric/governance/domains). --> This item does not support Service Principal. Please use a User context authentication. +-> This item supports Service Principal authentication. ~> This resource is in **preview**. To access it, you must explicitly enable the `preview` mode in the provider level configuration. diff --git a/docs/resources/domain_role_assignments.md b/docs/resources/domain_role_assignments.md index d1a35121..0940ae16 100644 --- a/docs/resources/domain_role_assignments.md +++ b/docs/resources/domain_role_assignments.md @@ -5,7 +5,7 @@ subcategory: "" description: |- Manage a Fabric Domain Role Assignments. Use this resource to manage Domain Role Assignments https://learn.microsoft.com/fabric/governance/domains. - -> This item does not support Service Principal. Please use a User context authentication. + -> This item supports Service Principal authentication. ~> This resource is in preview. To access it, you must explicitly enable the preview mode in the provider level configuration. --- @@ -15,7 +15,7 @@ Manage a Fabric Domain Role Assignments. Use this resource to manage [Domain Role Assignments](https://learn.microsoft.com/fabric/governance/domains). --> This item does not support Service Principal. Please use a User context authentication. +-> This item supports Service Principal authentication. ~> This resource is in **preview**. To access it, you must explicitly enable the `preview` mode in the provider level configuration. diff --git a/docs/resources/domain_workspace_assignments.md b/docs/resources/domain_workspace_assignments.md index d73b28f2..9abefcd8 100644 --- a/docs/resources/domain_workspace_assignments.md +++ b/docs/resources/domain_workspace_assignments.md @@ -5,7 +5,7 @@ subcategory: "" description: |- Manage a Fabric Domain Workspace Assignments. Use this resource to manage Domain Workspace Assignments https://learn.microsoft.com/fabric/governance/domains. - -> This item does not support Service Principal. Please use a User context authentication. + -> This item supports Service Principal authentication. ~> This resource is in preview. To access it, you must explicitly enable the preview mode in the provider level configuration. --- @@ -15,7 +15,7 @@ Manage a Fabric Domain Workspace Assignments. Use this resource to manage [Domain Workspace Assignments](https://learn.microsoft.com/fabric/governance/domains). --> This item does not support Service Principal. Please use a User context authentication. +-> This item supports Service Principal authentication. ~> This resource is in **preview**. To access it, you must explicitly enable the `preview` mode in the provider level configuration. diff --git a/internal/services/domain/base.go b/internal/services/domain/base.go index 16a1a0ea..6cb28612 100644 --- a/internal/services/domain/base.go +++ b/internal/services/domain/base.go @@ -12,7 +12,7 @@ const ( ItemTFName = "domain" ItemsName = "Domains" ItemsTFName = "domains" - ItemDocsSPNSupport = common.DocsSPNNotSupported + ItemDocsSPNSupport = common.DocsSPNSupported ItemDocsURL = "https://learn.microsoft.com/fabric/governance/domains" DomainWorkspaceAssignmentsName = "Domain Workspace Assignments" DomainWorkspaceAssignmentsTFName = "domain_workspace_assignments" diff --git a/internal/services/domain/data_domain.go b/internal/services/domain/data_domain.go index f45c725c..6df8c2ae 100644 --- a/internal/services/domain/data_domain.go +++ b/internal/services/domain/data_domain.go @@ -98,13 +98,8 @@ func (d *dataSourceDomain) Configure(_ context.Context, req datasource.Configure d.pConfigData = pConfigData d.client = fabadmin.NewClientFactoryWithClient(*pConfigData.FabricClient).NewDomainsClient() - diags := fabricitem.IsPreviewMode(d.Name, d.IsPreview, d.pConfigData.Preview) - if diags != nil { - resp.Diagnostics.Append(diags...) - - if diags.HasError() { - return - } + if resp.Diagnostics.Append(fabricitem.IsPreviewMode(d.Name, d.IsPreview, d.pConfigData.Preview)...); resp.Diagnostics.HasError() { + return } } diff --git a/internal/services/domain/data_domain_workspace_assignments.go b/internal/services/domain/data_domain_workspace_assignments.go index 50126b7e..e5cb2390 100644 --- a/internal/services/domain/data_domain_workspace_assignments.go +++ b/internal/services/domain/data_domain_workspace_assignments.go @@ -99,13 +99,8 @@ func (d *dataSourceDomainWorkspaceAssignments) Configure(_ context.Context, req d.pConfigData = pConfigData d.client = fabadmin.NewClientFactoryWithClient(*pConfigData.FabricClient).NewDomainsClient() - diags := fabricitem.IsPreviewMode(d.Name, d.IsPreview, d.pConfigData.Preview) - if diags != nil { - resp.Diagnostics.Append(diags...) - - if diags.HasError() { - return - } + if resp.Diagnostics.Append(fabricitem.IsPreviewMode(d.Name, d.IsPreview, d.pConfigData.Preview)...); resp.Diagnostics.HasError() { + return } } diff --git a/internal/services/domain/data_domains.go b/internal/services/domain/data_domains.go index 63bd260f..46005f6a 100644 --- a/internal/services/domain/data_domains.go +++ b/internal/services/domain/data_domains.go @@ -110,13 +110,8 @@ func (d *dataSourceDomains) Configure(_ context.Context, req datasource.Configur d.pConfigData = pConfigData d.client = fabadmin.NewClientFactoryWithClient(*pConfigData.FabricClient).NewDomainsClient() - diags := fabricitem.IsPreviewMode(d.Name, d.IsPreview, d.pConfigData.Preview) - if diags != nil { - resp.Diagnostics.Append(diags...) - - if diags.HasError() { - return - } + if resp.Diagnostics.Append(fabricitem.IsPreviewMode(d.Name, d.IsPreview, d.pConfigData.Preview)...); resp.Diagnostics.HasError() { + return } } diff --git a/internal/services/domain/resource_domain.go b/internal/services/domain/resource_domain.go index 457bc9e3..ca9ebe8b 100644 --- a/internal/services/domain/resource_domain.go +++ b/internal/services/domain/resource_domain.go @@ -130,13 +130,8 @@ func (r *resourceDomain) Configure(_ context.Context, req resource.ConfigureRequ r.pConfigData = pConfigData r.client = fabadmin.NewClientFactoryWithClient(*pConfigData.FabricClient).NewDomainsClient() - diags := fabricitem.IsPreviewMode(r.Name, r.IsPreview, r.pConfigData.Preview) - if diags != nil { - resp.Diagnostics.Append(diags...) - - if diags.HasError() { - return - } + if resp.Diagnostics.Append(fabricitem.IsPreviewMode(r.Name, r.IsPreview, r.pConfigData.Preview)...); resp.Diagnostics.HasError() { + return } } diff --git a/internal/services/domain/resource_domain_role_assignments.go b/internal/services/domain/resource_domain_role_assignments.go index a52fa760..6c1fbce4 100644 --- a/internal/services/domain/resource_domain_role_assignments.go +++ b/internal/services/domain/resource_domain_role_assignments.go @@ -7,6 +7,7 @@ import ( "context" "fmt" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/diag" @@ -17,6 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" fabadmin "github.com/microsoft/fabric-sdk-go/fabric/admin" + fabcore "github.com/microsoft/fabric-sdk-go/fabric/core" supertypes "github.com/orange-cloudavenue/terraform-plugin-framework-supertypes" "github.com/microsoft/terraform-provider-fabric/internal/common" @@ -131,13 +133,8 @@ func (r *resourceDomainRoleAssignments) Configure(_ context.Context, req resourc r.pConfigData = pConfigData r.client = fabadmin.NewClientFactoryWithClient(*pConfigData.FabricClient).NewDomainsClient() - diags := fabricitem.IsPreviewMode(r.Name, r.IsPreview, r.pConfigData.Preview) - if diags != nil { - resp.Diagnostics.Append(diags...) - - if diags.HasError() { - return - } + if resp.Diagnostics.Append(fabricitem.IsPreviewMode(r.Name, r.IsPreview, r.pConfigData.Preview)...); resp.Diagnostics.HasError() { + return } } @@ -335,10 +332,30 @@ func (r *resourceDomainRoleAssignments) Delete(ctx context.Context, req resource } _, err := r.client.RoleAssignmentsBulkUnassign(ctx, state.DomainID.ValueString(), reqDelete.DomainRoleUnassignmentRequest, nil) - if resp.Diagnostics.Append(utils.GetDiagsFromError(ctx, err, utils.OperationDelete, nil)...); resp.Diagnostics.HasError() { + diags = utils.GetDiagsFromError(ctx, err, utils.OperationDelete, fabcore.ErrDomain.DomainSpecificUsersScopeCannotBeEmptyError) + + if diags.HasError() && !utils.IsErr(diags, fabcore.ErrDomain.DomainSpecificUsersScopeCannotBeEmptyError) { + resp.Diagnostics.Append(diags...) + return } + if diags.HasError() && utils.IsErr(diags, fabcore.ErrDomain.DomainSpecificUsersScopeCannotBeEmptyError) { + _, err := r.client.UpdateDomain(ctx, state.DomainID.ValueString(), fabadmin.UpdateDomainRequest{ + ContributorsScope: to.Ptr(fabadmin.ContributorsScopeTypeAllTenant), + }, nil) + if resp.Diagnostics.Append(utils.GetDiagsFromError(ctx, err, utils.OperationDelete, nil)...); resp.Diagnostics.HasError() { + return + } + + _, err = r.client.UpdateDomain(ctx, state.DomainID.ValueString(), fabadmin.UpdateDomainRequest{ + ContributorsScope: to.Ptr(fabadmin.ContributorsScopeTypeSpecificUsersAndGroups), + }, nil) + if resp.Diagnostics.Append(utils.GetDiagsFromError(ctx, err, utils.OperationDelete, nil)...); resp.Diagnostics.HasError() { + return + } + } + resp.State.RemoveResource(ctx) tflog.Debug(ctx, "DELETE", map[string]any{ diff --git a/internal/services/domain/resource_domain_role_assignments_test.go b/internal/services/domain/resource_domain_role_assignments_test.go index d19b6aff..aea57d28 100644 --- a/internal/services/domain/resource_domain_role_assignments_test.go +++ b/internal/services/domain/resource_domain_role_assignments_test.go @@ -9,7 +9,7 @@ import ( at "github.com/dcarbone/terraform-plugin-framework-utils/v3/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/microsoft/fabric-sdk-go/fabric/admin" + fabadmin "github.com/microsoft/fabric-sdk-go/fabric/admin" "github.com/microsoft/terraform-provider-fabric/internal/common" "github.com/microsoft/terraform-provider-fabric/internal/framework/customtypes" @@ -32,7 +32,7 @@ func TestUnit_DomainRoleAssignmentsResource_Attributes(t *testing.T) { testResourceDomainRoleAssignmentsHeader, map[string]any{ "principals": []map[string]any{}, - "role": string(admin.DomainRoleContributors), + "role": string(fabadmin.DomainRoleContributors), }, ), ExpectError: regexp.MustCompile(`The argument "domain_id" is required, but no definition was found.`), @@ -44,7 +44,7 @@ func TestUnit_DomainRoleAssignmentsResource_Attributes(t *testing.T) { testResourceDomainRoleAssignmentsHeader, map[string]any{ "domain_id": "00000000-0000-0000-0000-000000000000", - "role": string(admin.DomainRoleContributors), + "role": string(fabadmin.DomainRoleContributors), }, ), ExpectError: regexp.MustCompile(`The argument "principals" is required, but no definition was found.`), @@ -69,7 +69,7 @@ func TestUnit_DomainRoleAssignmentsResource_Attributes(t *testing.T) { map[string]any{ "domain_id": "invalid uuid", "principals": []map[string]any{}, - "role": string(admin.DomainRoleContributors), + "role": string(fabadmin.DomainRoleContributors), }, ), ExpectError: regexp.MustCompile(customtypes.UUIDTypeErrorInvalidStringHeader), @@ -94,10 +94,10 @@ func TestUnit_DomainRoleAssignmentsResource_Attributes(t *testing.T) { testResourceDomainRoleAssignmentsHeader, map[string]any{ "domain_id": "00000000-0000-0000-0000-000000000000", - "role": string(admin.DomainRoleContributors), + "role": string(fabadmin.DomainRoleContributors), "principals": []map[string]any{ { - "type": string(admin.PrincipalTypeUser), + "type": string(fabadmin.PrincipalTypeUser), }, }, }, @@ -111,7 +111,7 @@ func TestUnit_DomainRoleAssignmentsResource_Attributes(t *testing.T) { testResourceDomainRoleAssignmentsHeader, map[string]any{ "domain_id": "00000000-0000-0000-0000-000000000000", - "role": string(admin.DomainRoleContributors), + "role": string(fabadmin.DomainRoleContributors), "principals": []map[string]any{ { "id": "00000000-0000-0000-0000-000000000000", @@ -128,11 +128,11 @@ func TestUnit_DomainRoleAssignmentsResource_Attributes(t *testing.T) { testResourceDomainRoleAssignmentsHeader, map[string]any{ "domain_id": "00000000-0000-0000-0000-000000000000", - "role": string(admin.DomainRoleContributors), + "role": string(fabadmin.DomainRoleContributors), "principals": []map[string]any{ { "id": "invalid uuid", - "type": string(admin.PrincipalTypeUser), + "type": string(fabadmin.PrincipalTypeUser), }, }, }, @@ -146,73 +146,71 @@ func TestUnit_DomainRoleAssignmentsResource_Attributes(t *testing.T) { // HOWEVER, AFTER CREATING A ROLE ASSIGNMENT, TRYING TO DELETE IT WILL RESULT IN AN ERROR. // IN ITS CURRENT STATE, THE TEST WILL FAIL WHEN RUNNING THE DESTROY OPERATION AFTER THE PLAN. -// func TestAcc_DomainRoleAssignmentsResource_CRUD(t *testing.T) { -// if testhelp.ShouldSkipTest(t) { -// t.Skip("No SPN support") -// } -// domainResourceHCL := at.CompileConfig( -// at.ResourceHeader(testhelp.TypeName("fabric", itemTFName), "test"), -// map[string]any{ -// "display_name": testhelp.RandomName(), -// "contributors_scope": string(admin.ContributorsScopeTypeSpecificUsersAndGroups), -// }, -// ) +func TestAcc_DomainRoleAssignmentsResource_CRUD(t *testing.T) { + domainResourceHCL := at.CompileConfig( + at.ResourceHeader(testhelp.TypeName("fabric", itemTFName), "test"), + map[string]any{ + "display_name": testhelp.RandomName(), + "contributors_scope": string(fabadmin.ContributorsScopeTypeSpecificUsersAndGroups), + }, + ) -// domainResourceFQN := testhelp.ResourceFQN("fabric", itemTFName, "test") + domainResourceFQN := testhelp.ResourceFQN("fabric", itemTFName, "test") -// entity := testhelp.WellKnown().Group + entity := testhelp.WellKnown()["Group"].(map[string]any) + entityID := entity["id"].(string) + entityType := entity["type"].(string) -//nolint:dupword -// resource.Test(t, testhelp.NewTestAccCase(t, nil, nil, []resource.TestStep{ -// // Create and Read -// { -// ResourceName: testResourceDomainRoleAssignments, -// Config: at.JoinConfigs( -// domainResourceHCL, -// at.CompileConfig( -// testResourceDomainRoleAssignmentsHeader, -// map[string]any{ -// "domain_id": testhelp.RefByFQN(domainResourceFQN, "id"), -// "role": string(admin.DomainRoleContributors), -// "principals": []map[string]any{ -// { -// "id": *entity.ID, -// "type": *entity.Type, -// }, -// }, -// }, -// ), -// ), -// Check: resource.ComposeAggregateTestCheckFunc( -// resource.TestCheckResourceAttrPtr(testResourceDomainRoleAssignments, "principals.0.id", entity.ID), -// resource.TestCheckResourceAttrPtr(testResourceDomainRoleAssignments, "principals.0.type", entity.Type), -// resource.TestCheckResourceAttr(testResourceDomainRoleAssignments, "role", string(admin.DomainRoleContributors)), -// ), -// }, -// // Update and Read -// { -// ResourceName: testResourceDomainRoleAssignments, -// Config: at.JoinConfigs( -// domainResourceHCL, -// at.CompileConfig( -// testResourceDomainRoleAssignmentsHeader, -// map[string]any{ -// "domain_id": testhelp.RefByFQN(domainResourceFQN, "id"), -// "role": string(admin.DomainRoleAdmins), -// "principals": []map[string]any{ -// { -// "id": *entity.ID, -// "type": *entity.Type, -// }, -// }, -// }, -// ), -// ), -// Check: resource.ComposeAggregateTestCheckFunc( -// resource.TestCheckResourceAttrPtr(testResourceDomainRoleAssignments, "principals.0.id", entity.ID), -// resource.TestCheckResourceAttrPtr(testResourceDomainRoleAssignments, "principals.0.type", entity.Type), -// resource.TestCheckResourceAttr(testResourceDomainRoleAssignments, "role", string(admin.DomainRoleAdmins)), -// ), -// }, -// })) -// } + resource.Test(t, testhelp.NewTestAccCase(t, nil, nil, []resource.TestStep{ + // Create and Read + { + ResourceName: testResourceDomainRoleAssignments, + Config: at.JoinConfigs( + domainResourceHCL, + at.CompileConfig( + testResourceDomainRoleAssignmentsHeader, + map[string]any{ + "domain_id": testhelp.RefByFQN(domainResourceFQN, "id"), + "role": string(fabadmin.DomainRoleContributors), + "principals": []map[string]any{ + { + "id": entityID, + "type": entityType, + }, + }, + }, + ), + ), + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(testResourceDomainRoleAssignments, "principals.0.id", entityID), + resource.TestCheckResourceAttr(testResourceDomainRoleAssignments, "principals.0.type", entityType), + resource.TestCheckResourceAttr(testResourceDomainRoleAssignments, "role", string(fabadmin.DomainRoleContributors)), + ), + }, + // Update and Read + { + ResourceName: testResourceDomainRoleAssignments, + Config: at.JoinConfigs( + domainResourceHCL, + at.CompileConfig( + testResourceDomainRoleAssignmentsHeader, + map[string]any{ + "domain_id": testhelp.RefByFQN(domainResourceFQN, "id"), + "role": string(fabadmin.DomainRoleAdmins), + "principals": []map[string]any{ + { + "id": entityID, + "type": entityType, + }, + }, + }, + ), + ), + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(testResourceDomainRoleAssignments, "principals.0.id", entityID), + resource.TestCheckResourceAttr(testResourceDomainRoleAssignments, "principals.0.type", entityType), + resource.TestCheckResourceAttr(testResourceDomainRoleAssignments, "role", string(fabadmin.DomainRoleAdmins)), + ), + }, + })) +} diff --git a/internal/services/domain/resource_domain_test.go b/internal/services/domain/resource_domain_test.go index b11f284d..67c74ae5 100644 --- a/internal/services/domain/resource_domain_test.go +++ b/internal/services/domain/resource_domain_test.go @@ -201,10 +201,6 @@ func TestUnit_DomainResource_CRUD(t *testing.T) { } func TestAcc_DomainResource_CRUD(t *testing.T) { - if testhelp.ShouldSkipTest(t) { - t.Skip("No SPN support") - } - entityCreateDisplayName := testhelp.RandomName() entityUpdateDisplayName := testhelp.RandomName() entityUpdateDescription := testhelp.RandomName() diff --git a/internal/services/domain/resource_domain_workspace_assignments.go b/internal/services/domain/resource_domain_workspace_assignments.go index 5ef29708..358d3932 100644 --- a/internal/services/domain/resource_domain_workspace_assignments.go +++ b/internal/services/domain/resource_domain_workspace_assignments.go @@ -102,13 +102,8 @@ func (r *resourceDomainWorkspaceAssignments) Configure(_ context.Context, req re r.pConfigData = pConfigData r.client = fabadmin.NewClientFactoryWithClient(*pConfigData.FabricClient).NewDomainsClient() - diags := fabricitem.IsPreviewMode(r.Name, r.IsPreview, r.pConfigData.Preview) - if diags != nil { - resp.Diagnostics.Append(diags...) - - if diags.HasError() { - return - } + if resp.Diagnostics.Append(fabricitem.IsPreviewMode(r.Name, r.IsPreview, r.pConfigData.Preview)...); resp.Diagnostics.HasError() { + return } } diff --git a/internal/services/domain/resource_domain_workspace_assignments_test.go b/internal/services/domain/resource_domain_workspace_assignments_test.go index 408cf338..10b1ace6 100644 --- a/internal/services/domain/resource_domain_workspace_assignments_test.go +++ b/internal/services/domain/resource_domain_workspace_assignments_test.go @@ -75,10 +75,6 @@ func TestUnit_DomainWorkspaceAssignmentsResource_Attributes(t *testing.T) { } func TestAcc_DomainWorkspaceAssignmentsResource_CRUD(t *testing.T) { - if testhelp.ShouldSkipTest(t) { - t.Skip("No SPN support") - } - domainResourceHCL := at.CompileConfig( at.ResourceHeader(testhelp.TypeName("fabric", itemTFName), "test"), map[string]any{ diff --git a/internal/services/workspace/resource_workspace_git.go b/internal/services/workspace/resource_workspace_git.go index 2b1dc366..457758ab 100644 --- a/internal/services/workspace/resource_workspace_git.go +++ b/internal/services/workspace/resource_workspace_git.go @@ -188,13 +188,8 @@ func (r *resourceWorkspaceGit) Configure(_ context.Context, req resource.Configu r.pConfigData = pConfigData r.client = fabcore.NewClientFactoryWithClient(*pConfigData.FabricClient).NewGitClient() - diags := fabricitem.IsPreviewMode(r.Name, r.IsPreview, r.pConfigData.Preview) - if diags != nil { - resp.Diagnostics.Append(diags...) - - if diags.HasError() { - return - } + if resp.Diagnostics.Append(fabricitem.IsPreviewMode(r.Name, r.IsPreview, r.pConfigData.Preview)...); resp.Diagnostics.HasError() { + return } } diff --git a/tools/scripts/Set-WellKnown.ps1 b/tools/scripts/Set-WellKnown.ps1 index 1b8a0a49..cf25e17f 100644 --- a/tools/scripts/Set-WellKnown.ps1 +++ b/tools/scripts/Set-WellKnown.ps1 @@ -813,7 +813,7 @@ if (!$entraGroup) { } Write-Log -Message "Group - Name: $($entraGroup.DisplayName) / ID: $($entraGroup.Id)" $wellKnown['Group'] = @{ - type = 'group' + type = 'Group' id = $entraGroup.Id name = $entraGroup.DisplayName }