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_service_plan Add support for new Flex Consumption plan #26351

Merged
merged 1 commit into from
Jul 2, 2024

Conversation

oWretch
Copy link
Contributor

@oWretch oWretch commented Jun 17, 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 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

Add support for the new Flex Consumption function app SKU currently in preview.

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. (if this is not possible for any reason, please include details of why you did or could not add test coverage)
--- PASS: TestAccServicePlan_requiresImport (142.78s)
--- PASS: TestAccServicePlan_linuxFlexConsumption (154.57s)
--- PASS: TestAccServicePlan_basic (155.03s)
--- PASS: TestAccServicePlan_linuxConsumption (158.35s)
--- PASS: TestAccServicePlan_complete (200.69s)
--- PASS: TestAccServicePlan_completeUpdate (208.61s)

Change Log

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

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 #26043

@oWretch oWretch changed the title azurerm_linux_function_app Add support for new Flex Consumption plan azurerm_service_plan Add support for new Flex Consumption plan Jun 17, 2024
@oWretch oWretch marked this pull request as ready for review June 17, 2024 05:21
@catriona-m catriona-m requested a review from jackofallops June 25, 2024 15:35
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 @oWretch - LGTM 🎬

@katbyte katbyte merged commit af7329c into hashicorp:main Jul 2, 2024
33 checks passed
@github-actions github-actions bot added this to the v3.111.0 milestone Jul 2, 2024
katbyte added a commit that referenced this pull request Jul 2, 2024
dduportal referenced this pull request in jenkins-infra/azure Jul 8, 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.110.0&#34; to &#34;3.111.0&#34; in file
&#34;.terraform.lock.hcl&#34;</p>
            <details>
                <summary>3.111.0</summary>
<pre>Changelog retrieved
from:&#xA;&#x9;https://github.com/hashicorp/terraform-provider-azurerm/releases/tag/v3.111.0&#xA;FEATURES:&#xA;&#xA;*
**New Resource:** `azurerm_restore_point_collection`
([#26518](https://github.com/hashicorp/terraform-provider-azurerm/issues/26518))&#xA;&#xA;ENHANCEMENTS:&#xA;&#xA;*
dependencies: updating to `v0.20240701.1082110` of
`github.com/hashicorp/go-azure-sdk`
([#26502](hashicorp/terraform-provider-azurerm#26502
`azurerm_disk_encryption_set` - support for the `managed_hsm_key_id`
property
([#26201](hashicorp/terraform-provider-azurerm#26201
`azurerm_firewall_policy` - remove Computed from the `sku` property and
add a default of `Standard` in 4.0
([#26499](hashicorp/terraform-provider-azurerm#26499
`azurerm_kubernetes_cluster` - support updating
`default_node_pool.os_sku` between `Ubuntu` and `AzureLinux`
([#26262](hashicorp/terraform-provider-azurerm#26262
`azurerm_kubernetes_cluster_node_pool` - support updating `os_sku`
between `Ubuntu` and `AzureLinux`
([#26139](hashicorp/terraform-provider-azurerm#26139
`azurerm_service_plan` - support for new the Flex Consumption plan
([#26351](https://github.com/hashicorp/terraform-provider-azurerm/issues/26351))&#xA;&#xA;BUG
FIXES:&#xA;&#xA;* `azurerm_kubernetes_cluster` - prevent a panic
([#26478](hashicorp/terraform-provider-azurerm#26478
`azurerm_kubernetes_cluster` - prevent a diff in `upgrade_settings` when
the API returns an empty object
([#26541](hashicorp/terraform-provider-azurerm#26541
`azurerm_kubernetes_cluster_node_pool` - prevent a diff in
`upgrade_settings` when the API returns an empty object
([#26541](hashicorp/terraform-provider-azurerm#26541
`azurerm_virtual_network_gateway` - split create and update function to
fix lifecycle - ignore
([#26451](hashicorp/terraform-provider-azurerm#26451
`azurerm_virtual_network_gateway_connection` - split create and update
function to fix lifecycle - ignore
([#26431](https://github.com/hashicorp/terraform-provider-azurerm/issues/26431))&#xA;&#xA;&#xA;</pre>
            </details>
        </details>
<a
href="https://infra.ci.jenkins.io/job/updatecli/job/azure/job/main/306/">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) <[email protected]>
@oWretch oWretch deleted the flex-consumption branch July 10, 2024 00:18
jimwashbrook added a commit to DFE-Digital/sts-plan-technology-for-your-school that referenced this pull request Jul 26, 2024
Includes functionality to [use the new Flex Consumption](hashicorp/terraform-provider-azurerm#26351) plan for an Azure Function App.
jimwashbrook added a commit to DFE-Digital/sts-plan-technology-for-your-school that referenced this pull request Jul 31, 2024
* chore(tf): Update azurerm version to 3.111.0

Includes functionality to [use the new Flex Consumption](hashicorp/terraform-provider-azurerm#26351) plan for an Azure Function App.

* feat: Flex consumption plan

* chore(tf): upgrade azurerm + azureapi verisons

* change: Switch to AzAPI for Azure Function App

AzureRM provider is currently bugged for Flex Consumption

* attempt change endpoint name

* feat: Update TF to match manual changes

* feat: add website cache clear settings

* feat(tf): Use locals + variables

- Adds cache clear settings to app settings
- Creates variables for various variables
- Creates local(s) for most Function variables
- Move things such as Key Vault references to locals
- Add tags to Function
- Ignore tags changes
- Remove no longer needed (??) resources - service connections

* terraform-docs: automated action

* change(tf): Set HTTP2, min TLS version, HTTPS only

* fix(tf): Secret name

* feat(tf): Add null_resource to set Key Vault Reference Identity setting

* terraform-docs: automated action

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Copy link

github-actions bot commented Aug 9, 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 Aug 9, 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.

Support for flex consumption in azurerm_service_plan and related resources
2 participants