Skip to content
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

Jump to bottom

azuread_application: support ignore_changes lifecycle argument #1403

Merged
merged 3 commits into from
Jun 13, 2024
Merged

azuread_application: support ignore_changes lifecycle argument #1403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
352400e
azuread_application: support `ignore_changes` lifecycle argument for …
manicminer Jun 10, 2024
9ccbe48
azuread_application: basicFromTemplate test fix
manicminer Jun 10, 2024
bca227c
azuread_application: basicFromTemplate more test fix
manicminer Jun 10, 2024
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
45 changes: 31 additions & 14 deletions internal/services/applications/application_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,6 @@ func applicationResourceUpdate(ctx context.Context, d *pluginsdk.ResourceData, m
var imageContentType string
var imageData []byte
if v, ok := d.GetOk("logo_image"); ok && v != "" && d.HasChange("logo_image") {
var err error
imageContentType, imageData, err = applicationParseLogoImage(v.(string))
if err != nil {
return tf.ErrorDiagPathF(err, "image", "Could not decode image data")
Expand All @@ -1193,12 +1192,9 @@ func applicationResourceUpdate(ctx context.Context, d *pluginsdk.ResourceData, m
DirectoryObject: msgraph.DirectoryObject{
Id: pointer.To(id.ApplicationId),
},
Api: expandApplicationApi(d.Get("api").([]interface{})),
AppRoles: expandApplicationAppRoles(d.Get("app_role").(*pluginsdk.Set).List()),
Description: tf.NullableString(d.Get("description").(string)),
DisplayName: pointer.To(displayName),
GroupMembershipClaims: expandApplicationGroupMembershipClaims(d.Get("group_membership_claims").(*pluginsdk.Set).List()),
IdentifierUris: tf.ExpandStringSlicePtr(d.Get("identifier_uris").(*pluginsdk.Set).List()),
Info: &msgraph.InformationalUrl{
MarketingUrl: tf.NullableString(d.Get("marketing_url").(string)),
PrivacyStatementUrl: tf.NullableString(d.Get("privacy_statement_url").(string)),
Expand All @@ -1209,25 +1205,47 @@ func applicationResourceUpdate(ctx context.Context, d *pluginsdk.ResourceData, m
IsFallbackPublicClient: pointer.To(d.Get("fallback_public_client_enabled").(bool)),
Notes: tf.NullableString(d.Get("notes").(string)),
Oauth2RequirePostResponse: pointer.To(d.Get("oauth2_post_response_required").(bool)),
OptionalClaims: expandApplicationOptionalClaims(d.Get("optional_claims").([]interface{})),
PublicClient: expandApplicationPublicClient(d.Get("public_client").([]interface{})),
RequiredResourceAccess: expandApplicationRequiredResourceAccess(d.Get("required_resource_access").(*pluginsdk.Set).List()),
ServiceManagementReference: tf.NullableString(d.Get("service_management_reference").(string)),
SignInAudience: pointer.To(d.Get("sign_in_audience").(string)),
Spa: expandApplicationSpa(d.Get("single_page_application").([]interface{})),
Tags: &tags,
Web: expandApplicationWeb(d.Get("web").([]interface{})),
}

if err := applicationDisableAppRoles(ctx, client, &properties, expandApplicationAppRoles(d.Get("app_role").(*pluginsdk.Set).List())); err != nil {
return tf.ErrorDiagPathF(err, "app_role", "Could not disable App Roles for application with object ID %q", id.ApplicationId)
api := expandApplicationApi(d.Get("api").([]interface{}))

if d.HasChange("app_role") {
if err = applicationDisableAppRoles(ctx, client, &properties, expandApplicationAppRoles(d.Get("app_role").(*pluginsdk.Set).List())); err != nil {
return tf.ErrorDiagPathF(err, "app_role", "Could not disable App Roles for application with object ID %q", id.ApplicationId)
}

properties.AppRoles = expandApplicationAppRoles(d.Get("app_role").(*pluginsdk.Set).List())
}

if d.HasChange("api.0.oauth2_permission_scope") {
if err = applicationDisableOauth2PermissionScopes(ctx, client, &properties, expandApplicationOAuth2PermissionScope(d.Get("api.0.oauth2_permission_scope").(*pluginsdk.Set).List())); err != nil {
return tf.ErrorDiagPathF(err, "api.0.oauth2_permission_scope", "Could not disable OAuth2 Permission Scopes for application with object ID %q", id.ApplicationId)
}
} else {
api.OAuth2PermissionScopes = nil
}

if d.HasChange("identifier_uris") {
properties.IdentifierUris = tf.ExpandStringSlicePtr(d.Get("identifier_uris").(*pluginsdk.Set).List())
}

if err := applicationDisableOauth2PermissionScopes(ctx, client, &properties, expandApplicationOAuth2PermissionScope(d.Get("api.0.oauth2_permission_scope").(*pluginsdk.Set).List())); err != nil {
return tf.ErrorDiagPathF(err, "api.0.oauth2_permission_scope", "Could not disable OAuth2 Permission Scopes for application with object ID %q", id.ApplicationId)
if d.HasChange("optional_claims") {
properties.OptionalClaims = expandApplicationOptionalClaims(d.Get("optional_claims").([]interface{}))
}

if _, err := client.Update(ctx, properties); err != nil {
if d.HasChange("required_resource_access") {
properties.RequiredResourceAccess = expandApplicationRequiredResourceAccess(d.Get("required_resource_access").(*pluginsdk.Set).List())
}

properties.Api = api

if _, err = client.Update(ctx, properties); err != nil {
return tf.ErrorDiagF(err, "Could not update application with object ID: %q", id.ApplicationId)
}

Expand All @@ -1253,7 +1271,7 @@ func applicationResourceUpdate(ctx context.Context, d *pluginsdk.ResourceData, m
}

properties.Owners = &newOwners
if _, err := client.AddOwners(ctx, &properties); err != nil {
if _, err = client.AddOwners(ctx, &properties); err != nil {
return tf.ErrorDiagF(err, "Could not add owners to application with object ID: %q", id.ApplicationId)
}
}
Expand All @@ -1267,8 +1285,7 @@ func applicationResourceUpdate(ctx context.Context, d *pluginsdk.ResourceData, m

// Upload the application image
if imageContentType != "" && len(imageData) > 0 {
_, err := client.UploadLogo(ctx, id.ApplicationId, imageContentType, imageData)
if err != nil {
if _, err = client.UploadLogo(ctx, id.ApplicationId, imageContentType, imageData); err != nil {
return tf.ErrorDiagF(err, "Could not upload logo image for application with object ID: %q", id.ApplicationId)
}
}
Expand Down
25 changes: 24 additions & 1 deletion internal/services/applications/application_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,31 @@ resource "azuread_application" "test" {
display_name = "acctest-APP-%[1]d"
owners = [data.azuread_client_config.test.object_id]
template_id = "%[2]s"

api {
oauth2_permission_scope {
admin_consent_description = "Allow the application to access acctest-APP-%[1]d on behalf of the signed-in user."
admin_consent_display_name = "Access acctest-APP-%[1]d"
enabled = true
id = "%[3]s"
type = "User"
user_consent_description = "Allow the application to access acctest-APP-%[1]d on your behalf."
user_consent_display_name = "Access acctest-APP-%[1]d"
value = "user_impersonation"
}
}

app_role {
allowed_member_types = [
"User",
]
description = "msiam_access"
display_name = "msiam_access"
enabled = true
id = "dfd0e7dd-26fb-4b2c-98d2-e444486c1e37"
}
}
`, data.RandomInteger, testApplicationTemplateId)
`, data.RandomInteger, testApplicationTemplateId, data.UUID())
}

func (ApplicationResource) withGroupMembershipClaims(data acceptance.TestData) string {
Expand Down
Loading