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.

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

Fix - azurerm_api_management_named_value would not enforce secret=true when using value_from_key_vault #26150

Merged
merged 7 commits into from
Jun 4, 2024

Conversation

CSymes
Copy link
Contributor

@CSymes CSymes commented May 30, 2024

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 "+1" or "me too" comments, they generate extra noise for PR followers and do not help prioritize for review

Description

When creating a azurerm_api_management_named_value and linking it to a value sourced from a Key Vault via the value_from_key_vault block, if the secret attribute is not set to true, you receive an unexpected 400 error, ala:

β”‚ Error: creating or updating Named Value
β”‚ Named Value: "http-function-key"): performing CreateOrUpdate: unexpected status 400 (400 Bad Request) with error: ValidationError: One or more fields contain incorrect values:
β”‚ 
β”‚   with azurerm_api_management_named_value.http-function-key,
β”‚   on def_apim.tf line 187, in resource "azurerm_api_management_named_value" "http-function-key":
β”‚  187: resource "azurerm_api_management_named_value" "http-function-key" {

This is pretty un-helpful, so this PR adds validation to ensure that these two attributes are defined compatibly.
Unfortunately I couldn't see a way to validate an attribute value based on the state of another attribute, so this is necessarily performed at apply-time, rather than during validation.

This constraint is not well documented, however MS' examples do display the correct form.


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.

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 relevent 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.

Change Log

  • azurerm_api_management_named_value - enforce secret = true when a value_from_key_vault block is defined

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)

No existing issue that I could see.

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks for adding some validation for this @CSymes! There's one minor comment for the error message for consistency but otherwise this looks good.

@CSymes
Copy link
Contributor Author

CSymes commented May 31, 2024

Sounds good!

CSymes and others added 2 commits May 31, 2024 12:41
…ource.go

Co-authored-by: stephybun <steph@hashicorp.com>
…ource_test.go

Co-authored-by: stephybun <steph@hashicorp.com>
@CSymes
Copy link
Contributor Author

CSymes commented May 31, 2024

Looks like I've managed to brick the check suite somehow β€” it was failing on one unit test, so re-ran them since that test is fine locally.
I now note that it's likely a main issue as other PRs are failing on the same test, so not sure what's going on there.

@stephybun
Copy link
Member

@CSymes this should be fixed now. Another rebase on top of main should fix the CI.

@CSymes
Copy link
Contributor Author

CSymes commented Jun 3, 2024

@stephybun thanks, all green again.

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.

Thanks @CSymes - LGTM now 🚜

@katbyte katbyte merged commit 396d859 into hashicorp:main Jun 4, 2024
33 checks passed
@github-actions github-actions bot added this to the v3.107.0 milestone Jun 4, 2024
katbyte added a commit that referenced this pull request Jun 4, 2024
dduportal added a commit to jenkins-infra/azure that referenced this pull request Jun 11, 2024
<Actions>
<action
id="f410411e63aff4bb73a81c2aec1d373cf8a903e63b30dee2006b0030d8a94cc8">
        <h3>Bump Terraform `azurerm` provider version</h3>
<details
id="1d9343c012f5434ac9fe8a98135bae3667b399259be16d9b14302ea3bd424a24">
            <summary>Update Terraform lock file</summary>
<p>changes detected:&#xA;&#x9;&#34;hashicorp/azurerm&#34; updated from
&#34;3.104.2&#34; to &#34;3.107.0&#34; in file
&#34;.terraform.lock.hcl&#34;</p>
            <details>
                <summary>3.107.0</summary>
<pre>Changelog retrieved
from:&#xA;&#x9;https://github.com/hashicorp/terraform-provider-azurerm/releases/tag/v3.107.0&#xA;FEATURES:&#xA;&#xA;*
**New Resource:**
`azurerm_data_protection_backup_policy_postgresql_flexible_server`
([#26024](https://github.com/hashicorp/terraform-provider-azurerm/issues/26024))&#xA;&#xA;ENHANCEMENTS:&#xA;&#xA;*
dependencies: updating to `v0.20240604.1114748` of
`github.com/hashicorp/go-azure-sdk`
([#26216](https://github.com/hashicorp/terraform-provider-azurerm/issues/26216))&#xA;*
`advisor`: update API version to `2023-01-01`
([#26205](https://github.com/hashicorp/terraform-provider-azurerm/issues/26205))&#xA;*
`keyvault`: handling the Resources API returning Key Vaults that have
been deleted when populating the cache
([#26199](https://github.com/hashicorp/terraform-provider-azurerm/issues/26199))&#xA;*
`machinelearning`: update API version to `2024-04-01`
([#26168](https://github.com/hashicorp/terraform-provider-azurerm/issues/26168))&#xA;*
`network/privatelinkservices` - update to use `hashicorp/go-azure-sdk`
([#26212](https://github.com/hashicorp/terraform-provider-azurerm/issues/26212))&#xA;*
`network/serviceendpointpolicies` - update to use
`hashicorp/go-azure-sdk`
([#26196](https://github.com/hashicorp/terraform-provider-azurerm/issues/26196))&#xA;*
`network/virtualnetworks` - update to use `hashicorp/go-azure-sdk`
([#26217](https://github.com/hashicorp/terraform-provider-azurerm/issues/26217))&#xA;*
`network/virtualwans`: update route resources to use
`hashicorp/go-azure-sdk`
([#26189](https://github.com/hashicorp/terraform-provider-azurerm/issues/26189))&#xA;*
`azurerm_container_app_job` - support for the `key_vault_secret_id` and
`identity` properties in the `secret` block
([#25969](https://github.com/hashicorp/terraform-provider-azurerm/issues/25969))&#xA;*
`azurerm_kubernetes_cluster` - support forthe `dns_zone_ids` popperty in
the `web_app_routing` block
([#26117](https://github.com/hashicorp/terraform-provider-azurerm/issues/26117))&#xA;*
`azurerm_notification_hub_authorization_rule` - support for the
`primary_connection_string` and `secondary_connection_string` properties
([#26188](https://github.com/hashicorp/terraform-provider-azurerm/issues/26188))&#xA;*
`azurerm_subnet` - support for the `default_outbound_access_enabled`
property
([#25259](https://github.com/hashicorp/terraform-provider-azurerm/issues/25259))&#xA;&#xA;BUG
FIXES:&#xA;&#xA;* `azurerm_api_management_named_value` - will now
enforce setting the `secret` property when setting the
`value_from_key_vault` property
([#26150](https://github.com/hashicorp/terraform-provider-azurerm/issues/26150))&#xA;*
`azurerm_storage_sync_server_endpoint` - improve pooling to work around
api inconsistencies
([#26204](https://github.com/hashicorp/terraform-provider-azurerm/issues/26204))&#xA;*
`azurerm_virtual_network` - split create and update function to fix
lifecycle - ignore
([#26246](https://github.com/hashicorp/terraform-provider-azurerm/issues/26246))&#xA;*
`azurerm_vpn_server_configuration` - split create and update function to
fix lifecycle - ignore
([#26175](https://github.com/hashicorp/terraform-provider-azurerm/issues/26175))&#xA;*
`azurerm_vpn_server_configuration_policy_group` - split create and
update function to fix lifecycle - ignore
([#26207](https://github.com/hashicorp/terraform-provider-azurerm/issues/26207))&#xA;*
`azurerm_vpn_site` - split create and update function to fix lifecycle -
ignore changes
([#26163](https://github.com/hashicorp/terraform-provider-azurerm/issues/26163))&#xA;&#xA;DEPRECATIONS:&#xA;&#xA;*
`azurerm_kubernetes_cluster` - the property `dns_zone_id` has been
superseded by the property `dns_zone_ids` in the `web_app_routing` block
([#26117](https://github.com/hashicorp/terraform-provider-azurerm/issues/26117))&#xA;*
`azurerm_nginx_deployment` - the block `configuration` has been
deprecated and superseded by the resource `azurerm_nginx_configuration`
([#25773](https://github.com/hashicorp/terraform-provider-azurerm/issues/25773))&#xA;&#xA;&#xA;</pre>
            </details>
        </details>
<a
href="https://infra.ci.jenkins.io/job/updatecli/job/azure/job/main/229/">Jenkins
pipeline link</a>
    </action>
</Actions>

---

<table>
  <tr>
    <td width="77">
<img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli
logo" width="50" height="50">
    </td>
    <td>
      <p>
Created automatically by <a
href="https://www.updatecli.io/">Updatecli</a>
      </p>
      <details><summary>Options:</summary>
        <br />
<p>Most of Updatecli configuration is done via <a
href="https://www.updatecli.io/docs/prologue/quick-start/">its
manifest(s)</a>.</p>
        <ul>
<li>If you close this pull request, Updatecli will automatically reopen
it, the next time it runs.</li>
<li>If you close this pull request and delete the base branch, Updatecli
will automatically recreate it, erasing all previous commits made.</li>
        </ul>
        <p>
Feel free to report any issues at <a
href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br
/>
If you find this tool useful, do not hesitate to star <a
href="https://github.com/updatecli/updatecli/stargazers">our GitHub
repository</a> as a sign of appreciation, and/or to tell us directly on
our <a
href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>!
        </p>
      </details>
    </td>
  </tr>
</table>

---------

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
Co-authored-by: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-bot@users.noreply.github.com>
Co-authored-by: Damien Duportal <damien.duportal@gmail.com>
Copy link

github-actions bot commented Jul 4, 2024

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants