Skip to content

identity_governance: Updates access_package_resource_package_association to handle MS Graph resource ID changes #1830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
philband wants to merge 1 commit into from
+42 −0
Closed

identity_governance: Updates access_package_resource_package_association to handle MS Graph resource ID changes #1830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions internal/services/identitygovernance/access_package_resource_package_association_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,14 @@ func accessPackageResourcePackageAssociationResourceRead(ctx context.Context, d
return nil
}

if roleScope.Id != nil {
newId := parse.NewAccessPackageResourcePackageAssociationID(resourceId.AccessPackageId, *roleScope.Id, resourceId.OriginId, resourceId.AccessType)
if newId.ID() != resourceId.ID() {
log.Printf("[DEBUG] %s ID has changed from %q to %q - updating state!", id, d.Id(), newId)
d.SetId(newId.ID())
}
}

accessPackageId := beta.NewIdentityGovernanceEntitlementManagementAccessPackageID(resourceId.AccessPackageId)

accessPackageResp, err := accessPackageClient.GetEntitlementManagementAccessPackage(ctx, accessPackageId, entitlementmanagementaccesspackage.DefaultGetEntitlementManagementAccessPackageOperationOptions())
Expand All @@ -194,6 +202,7 @@ func accessPackageResourcePackageAssociationResourceRead(ctx context.Context, d

func accessPackageResourcePackageAssociationResourceDelete(ctx context.Context, d *pluginsdk.ResourceData, meta interface{}) pluginsdk.Diagnostics {
client := meta.(*clients.Client).IdentityGovernance.AccessPackageResourceRoleScopeClient
accessPackageClient := meta.(*clients.Client).IdentityGovernance.AccessPackageClient

resourceId, err := parse.AccessPackageResourcePackageAssociationID(d.Id())
if err != nil {
Expand All @@ -202,6 +211,27 @@ func accessPackageResourcePackageAssociationResourceDelete(ctx context.Context,

id := beta.NewIdentityGovernanceEntitlementManagementAccessPackageIdAccessPackageResourceRoleScopeID(resourceId.AccessPackageId, resourceId.ResourceRoleScopeId)

if _, err = client.DeleteEntitlementManagementAccessPackageResourceRoleScope(ctx, id, entitlementmanagementaccesspackageaccesspackageresourcerolescope.DefaultDeleteEntitlementManagementAccessPackageResourceRoleScopeOperationOptions()); err != nil {
log.Printf("[DEBUG] %s ID was not found for deletion, falling back to old id format", id)
}

roleScope, err := GetAccessPackageResourcesRoleScope(ctx, accessPackageClient, id)
if err != nil {
return tf.ErrorDiagF(err, "Retrieving %s", id)
}

if roleScope == nil {
err = errors.New("roleScope was nil")
return tf.ErrorDiagPathF(err, "id", "Deleting %s", id)
}

if roleScope.AccessPackageResourceRole == nil || roleScope.AccessPackageResourceRole.Id == nil ||
roleScope.AccessPackageResourceScope == nil || roleScope.AccessPackageResourceScope.Id == nil {
err = errors.New("roleScope does not contain resourceRole or resourceScope ID")
return tf.ErrorDiagPathF(err, "id", "Deleting %s", id)
}

id = beta.NewIdentityGovernanceEntitlementManagementAccessPackageIdAccessPackageResourceRoleScopeID(resourceId.AccessPackageId, fmt.Sprintf("%s_%s", *roleScope.AccessPackageResourceRole.Id, *roleScope.AccessPackageResourceScope.Id))
if _, err = client.DeleteEntitlementManagementAccessPackageResourceRoleScope(ctx, id, entitlementmanagementaccesspackageaccesspackageresourcerolescope.DefaultDeleteEntitlementManagementAccessPackageResourceRoleScopeOperationOptions()); err != nil {
return tf.ErrorDiagPathF(err, "id", "Deleting %s", id)
}
Expand Down
12 changes: 12 additions & 0 deletions internal/services/identitygovernance/identitygovernance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ func GetAccessPackageResourcesRoleScope(ctx context.Context, client *entitlement
if roleScope.Id != nil && *roleScope.Id == id.AccessPackageResourceRoleScopeId {
return &roleScope, nil
}
if strings.Contains(id.AccessPackageResourceRoleScopeId, "_") {
parts := strings.Split(id.AccessPackageResourceRoleScopeId, "_")
if len(parts) != 2 {
continue
}
accessPackageResourceRoleId := parts[0]
accessPackageResourceScopeId := parts[1]
if roleScope.AccessPackageResourceRole != nil && roleScope.AccessPackageResourceRole.Id != nil && *roleScope.AccessPackageResourceRole.Id == accessPackageResourceRoleId &&
roleScope.AccessPackageResourceScope != nil && roleScope.AccessPackageResourceScope.Id != nil && *roleScope.AccessPackageResourceScope.Id == accessPackageResourceScopeId {
return &roleScope, nil
}
}
}

return nil, nil
Expand Down