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

azurerm_storage_container and azurerm_storage_blob: support for encryption scope #25551

Merged
merged 5 commits into from Apr 10, 2024

Conversation

manicminer
Copy link
Member

@manicminer manicminer commented Apr 9, 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

Support for setting encryption scope when creating a storage container, blob, or datalake gen2 filesystem.

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

ENHANCEMENTS:

  • dependencies: updating to v0.26.1 of github.com/tombuildsstuff/giovanni
  • azurerm_storage_blob - support for the encryption_scope property
  • azurerm_storage_container - support for the default_encryption_scope and encryption_scope_override_enabled properties
  • azurerm_storage_data_lake_gen2_filesystem - support for the default_encryption_scope property

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)

Closes: #12055
Closes: #17272
Closes: #23232

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 💾

@manicminer manicminer force-pushed the f/storage-blob-container-encryption-scope branch from a4aa8b0 to 4d1d622 Compare April 9, 2024 23:06
@manicminer
Copy link
Member Author

Test results (failure unrelated)

Screenshot 2024-04-10 at 11 40 03

@manicminer manicminer merged commit 00d040e into main Apr 10, 2024
32 checks passed
@manicminer manicminer deleted the f/storage-blob-container-encryption-scope branch April 10, 2024 11:57
@github-actions github-actions bot added this to the v3.99.0 milestone Apr 10, 2024
manicminer added a commit that referenced this pull request Apr 10, 2024
dduportal pushed a commit to jenkins-infra/azure that referenced this pull request Apr 15, 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.98.0&#34; to &#34;3.99.0&#34; in file
&#34;.terraform.lock.hcl&#34;</p>
            <details>
                <summary>3.99.0</summary>
<pre>Changelog retrieved
from:&#xA;&#x9;https://github.com/hashicorp/terraform-provider-azurerm/releases/tag/v3.99.0&#xA;BREAKING
CHANGE: &#xA;&#xA;* `azurerm_linux_web_app` -
`site_config.0.application_stack.0.java_version` must be specified with
`java_server` and `java_server_version`
([#25553](https://github.com/hashicorp/terraform-provider-azurerm/issues/25553))&#xA;&#xA;ENHANCEMENTS:&#xA;&#xA;*
dependencies: updating to `v0.20240411.1104331` of
`github.com/hashicorp/go-azure-sdk/resourcemanager` and
`github.com/hashicorp/go-azure-sdk/sdk`
([#25546](https://github.com/hashicorp/terraform-provider-azurerm/issues/25546))&#xA;*
dependencies: updating to `v0.26.1` of
`github.com/tombuildsstuff/giovanni`
([#25551](https://github.com/hashicorp/terraform-provider-azurerm/issues/25551))&#xA;*
`azurerm_key_vault` - deprecate the `contact` property from v3.x
provider and update properties to Computed &amp; Optional
([#25552](https://github.com/hashicorp/terraform-provider-azurerm/issues/25552))&#xA;*
`azurerm_key_vault_certificate_contacts` - in v4.0 make the `contact`
property optional to allow for deletion of contacts from the key vault
([#25552](https://github.com/hashicorp/terraform-provider-azurerm/issues/25552))&#xA;*
`azurerm_signalr_service` - support for setting the `sku` property to
`Premium_P2`
([#25578](https://github.com/hashicorp/terraform-provider-azurerm/issues/25578))&#xA;*
`azurerm_snapshot` - support for the `network_access_policy` and
`public_network_access_enabled` properties
([#25421](https://github.com/hashicorp/terraform-provider-azurerm/issues/25421))&#xA;*
`azurerm_storage_account` - extend the support level of
`(blob|queue|share)_properties` for Storage kind
([#25427](https://github.com/hashicorp/terraform-provider-azurerm/issues/25427))&#xA;*
`azurerm_storage_blob` - support for the `encryption_scope` property
([#25551](https://github.com/hashicorp/terraform-provider-azurerm/issues/25551))&#xA;*
`azurerm_storage_container` - support for the `default_encryption_scope`
and `encryption_scope_override_enabled` properties
([#25551](https://github.com/hashicorp/terraform-provider-azurerm/issues/25551))&#xA;*
`azurerm_storage_data_lake_gen2_filesystem` - support for the
`default_encryption_scope` property
([#25551](https://github.com/hashicorp/terraform-provider-azurerm/issues/25551))&#xA;*
`azurerm_subnet` - the `delegation.x.service_delegation.x.name` property
now supports `Oracle.Database/networkAttachments`
([#25571](https://github.com/hashicorp/terraform-provider-azurerm/issues/25571))&#xA;*
`azurerm_web_pubsub` - support setting the `sku` property to
`Premium_P2`
([#25578](https://github.com/hashicorp/terraform-provider-azurerm/issues/25578))&#xA;&#xA;BUG
FIXES:&#xA;&#xA;* provider: fix an issue where the provider was not
correctly configured when using a custom metadata host
([#25546](https://github.com/hashicorp/terraform-provider-azurerm/issues/25546))&#xA;*
storage: fix a number of potential crashes during plan/apply with
resources using the Storage data plane API
([#25525](https://github.com/hashicorp/terraform-provider-azurerm/issues/25525))&#xA;*
`azurerm_application_insights` - fix issue where the wrong Application
ID was set into the property `app_id`
([#25520](https://github.com/hashicorp/terraform-provider-azurerm/issues/25520))&#xA;*
`azurerm_application_insights_api_key` - add a state migration to
re-case static segments of the resource ID
([#25567](https://github.com/hashicorp/terraform-provider-azurerm/issues/25567))&#xA;*
`azurerm_container_app_environment_certificate` - the `subject_name`
attribute is now correctly populated
([#25516](https://github.com/hashicorp/terraform-provider-azurerm/issues/25516))&#xA;*
`azurerm_function_app_slot` - will now taint the resource when partially
created
([#24520](https://github.com/hashicorp/terraform-provider-azurerm/issues/24520))&#xA;*
`azurerm_linux_function_app` - will now taint the resource when
partially created
([#24520](https://github.com/hashicorp/terraform-provider-azurerm/issues/24520))&#xA;*
`azurerm_managed_disk` - filtering the Resource SKUs response to reduce
the memory overhead, when determining whether a Managed Disk can be
online resized or not
([#25549](https://github.com/hashicorp/terraform-provider-azurerm/issues/25549))&#xA;*
`azurerm_monitor_alert_prometheus_rule_group` - the `severity` property
is now set correctly when `0`
([#25408](https://github.com/hashicorp/terraform-provider-azurerm/issues/25408))&#xA;*
`azurerm_monitor_smart_detector_alert_rule` - normalising the value for
`id` within the `action_group` block
([#25559](https://github.com/hashicorp/terraform-provider-azurerm/issues/25559))&#xA;*
`azurerm_redis_cache_access_policy_assignment` - the `object_id_alias`
property now allows usernames
([#25523](https://github.com/hashicorp/terraform-provider-azurerm/issues/25523))&#xA;*
`azurerm_windows_function_app` - will not taint the resource when
partially created
([#24520](https://github.com/hashicorp/terraform-provider-azurerm/issues/24520))&#xA;*
`azurerm_windows_function_app` - will not taint the resource when
partially created
([#24520](https://github.com/hashicorp/terraform-provider-azurerm/issues/24520))&#xA;&#xA;DEPRECATIONS:&#xA;&#xA;*
`azurerm_cosmosdb_account` - the `connection_strings` property has been
superseded by the primary and secondary connection strings for sql,
mongodb and readonly
([#25510](https://github.com/hashicorp/terraform-provider-azurerm/issues/25510))&#xA;*
`azurerm_cosmosdb_account` - the `enable_free_tier` property has been
superseded by `free_tier_enabled`
([#25510](https://github.com/hashicorp/terraform-provider-azurerm/issues/25510))&#xA;*
`azurerm_cosmosdb_account` - the `enable_multiple_write_locations`
property has been superseded by `multiple_write_locations_enabled`
([#25510](https://github.com/hashicorp/terraform-provider-azurerm/issues/25510))&#xA;*
`azurerm_cosmosdb_account` - the `enable_automatic_failover` property
has been superseded by `automatic_failover_enabled`
([#25510](https://github.com/hashicorp/terraform-provider-azurerm/issues/25510))&#xA;&#xA;&#xA;</pre>
            </details>
        </details>
<a
href="https://infra.ci.jenkins.io/job/updatecli/job/azure/job/main/105/">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>

Co-authored-by: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-bot@users.noreply.github.com>
Copy link

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 May 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.