Skip to content

azurerm_data_factory[_customer_managed_key] - fix parsing error and removal of encryption UAMI#31858

Merged
sreallymatt merged 2 commits intomainfrom
mp/df-cmk
Feb 28, 2026
Merged

azurerm_data_factory[_customer_managed_key] - fix parsing error and removal of encryption UAMI#31858
sreallymatt merged 2 commits intomainfrom
mp/df-cmk

Conversation

@sreallymatt
Copy link
Collaborator

@sreallymatt sreallymatt commented Feb 27, 2026

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

  • azurerm_data_factory_customer_managed_key - skip parsing and setting of user_assigned_identity_id when Azure returns an empty string
  • azurerm_data_factory - fixes the logic for removal of encryption UAMI (customer_managed_key_identity_id) preventing empty string returns
  • azurerm_data_factory_customer_managed_key - fixes the logic for removal of encryption UAMI (user_assigned_identity_id) preventing empty string returns

Due to the logic in the Update for both resources, the provider was sending the following to Azure on removal of CMK/Encryption UAMI. This was then persisted by Azure, which caused parsing errors (parsing error: "": parsing "": cannot parse an empty string

        "encryption": {
			"identity": {
				"userAssignedIdentity": ""
			},
			"keyName": "{name}",
			"keyVersion": "{version}",
			"vaultBaseUrl": "{url}"
		},

New logic sends nil which omits the encryption.identity object, properly removing it.

PR Checklist

  • I have followed the guidelines in our Contributing Documentation.
  • I have checked to ensure there aren't other open Pull Requests for the same update/change.
  • I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
  • I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
  • I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
    For example: “resource_name_here - description of change e.g. adding property new_property_name_here

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)

New test cases covering the removal logic:

--- PASS: TestAccDataFactory_keyVaultKeyEncryptionSystemAssignedUserAssigned (406.61s)
--- PASS: TestAccDataFactoryCustomerManagedKey_systemAssignedUserAssignedUpdate (438.95s)

Remaining tests running in TeamCity

Change Log

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

  • azurerm_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

AI Assistance Disclosure

  • AI Assisted - This contribution was made by, or with the assistance of, AI/LLMs

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
Collaborator

@katbyte katbyte left a comment

Choose a reason for hiding this comment

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

LGTM 🔐

@sreallymatt sreallymatt merged commit a8a3262 into main Feb 28, 2026
52 checks passed
@sreallymatt sreallymatt deleted the mp/df-cmk branch February 28, 2026 00:55
@github-actions github-actions bot added this to the v4.63.0 milestone Feb 28, 2026
@sreallymatt sreallymatt modified the milestones: v4.63.0, v4.62.1 Mar 2, 2026
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.

2 participants