Skip to content

Conversation

@jeevanions
Copy link
Contributor

Fix authentication context ClaimValue being overwritten during policy update.

This PR fixes a bug where the required_conditional_access_authentication_context field in azuread_group_role_management_policy resource sets claimValue to null instead of the user-provided value.

This bug prevented users from setting conditional access authentication contexts for PIM for Groups policies, forcing them to use workarounds with the msgraph provider. With this fix, users can now properly configure authentication contexts using the typed azuread_group_role_management_policy resource as intended.

The Read function already correctly reads the ClaimValue, confirming this is purely an update bug and the fix is complete.

Community Note

  • Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
  • Please do not leave comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

In internal/services/policies/group_role_management_policy_resource.go, the buildPolicyForUpdate function overwrites the user input with old value and hence we need to remove the line rule.ClaimValue = existingRule.ClaimValue:

   

   if metadata.ResourceData.HasChange("activation_rules.0.required_conditional_access_authentication_context") {
   rule := stable.UnifiedRoleManagementPolicyAuthenticationContextRule{
   Id:         pointer.To("AuthenticationContext_EndUser_Assignment"),
   IsEnabled:  nullable.Value(model.ActivationRules[0].RequireConditionalAccessContext != ""),
   ClaimValue: nullable.NoZero(model.ActivationRules[0].RequireConditionalAccessContext),  // Line 824: Correctly sets from user input
   }
    
   if existingRule, ok := policyRules["AuthenticationContext_EndUser_Assignment"].(stable.UnifiedRoleManagementPolicyAuthenticationContextRule); ok {
   rule.ClaimValue = existingRule.ClaimValue
   rule.Target = existingRule.Target
   }
    
   updatedRules = append(updatedRules, rule)
   }

The pattern is clear: only copy Target from existing rule (API-controlled field that shouldn't change), never copy user-controlled data fields.

Changes to existing Resource / Data Source

  • I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
  • I have written new tests for my resource or datasource changes & updated any relevant documentation.
  • I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
  • (For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

  • My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

  • azuread_resource - support for the thing1 property [GH-00000]

This is a (please select all that apply):

  • Bug Fix
  • New Feature (ie adding a service, resource, or data source)
  • Enhancement
  • Breaking Change

Related Issue(s)

Fixes #1605

Rollback Plan

If a change needs to be reverted, we will publish an updated version of the provider.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

Copy link
Member

@jackofallops jackofallops left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jeevanions - LGTM 👍

@jackofallops jackofallops merged commit b8c8421 into hashicorp:main Nov 4, 2025
21 checks passed
@github-actions github-actions bot added this to the v3.7.0 milestone Nov 4, 2025
jackofallops added a commit that referenced this pull request Nov 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

azuread_group_role_management_policy does not work and result in Invalid policy when authentication context is setup

2 participants