New Resource `azurerm_function_app_on_container` #27249

xiaxyi · 2024-08-30T08:31:51Z

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

Support the new resource - hosting azure function app in container app environment.

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)

--- PASS: TestAccLinuxFunctionAppOnContainer_completePublicRegistry (1043.98s)
PASS
ok github.com/hashicorp/terraform-provider-azurerm/internal/services/appservice 1067.438s

--- PASS: TestAccLinuxFunctionAppOnContainer_basicPublicRegistry (1093.35s)
PASS
ok github.com/hashicorp/terraform-provider-azurerm/internal/services/appservice 1116.159s
--- PASS: TestAccLinuxFunctionAppOnContainer_storageUsesMSI (1073.56s)
PASS
ok github.com/hashicorp/terraform-provider-azurerm/internal/services/appservice 1082.432s

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

Related Issue(s)

#23470

Note

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

ms-zhenhua

Hi @xiaxyi ,

Thanks for this PR - I've taken a look through and left some comments inline. If we can fix those up, this should be good to go 👍

ms-zhenhua · 2024-09-03T07:59:06Z

internal/services/appservice/linux_function_app_on_container_resource.go

+
+		"resource_group_name": commonschema.ResourceGroupName(),
+
+		"container_app_environment_id": {


shall we use "container_app_environment_id": commonschema.ResourceIDReferenceForceNew(managedenvironments.ManagedEnvironmentID{}), ?

ms-zhenhua · 2024-09-03T08:01:24Z

internal/services/appservice/linux_function_app_on_container_resource.go

+
+		"registry": helpers.RegistrySchemaLinuxFunctionAppOnContainer(),
+
+		"container_image": {


please put Required fields ahead of Optional ones

ms-zhenhua · 2024-09-03T08:24:55Z

internal/services/appservice/helpers/function_app_on_container.go

+					Description:  "The Connection String for linking the Linux Function App to Application Insights.",
+				},
+
+				"app_scale_limit": {


please add ValidateFunc to set the value range

ms-zhenhua · 2024-09-03T08:25:05Z

internal/services/appservice/helpers/function_app_on_container.go

+					Description: "The number of workers this function app can scale out to. Only applicable to apps on the Consumption and Premium plan.",
+				},
+
+				"elastic_instance_minimum": {


please add ValidateFunc to set the value range

ms-zhenhua · 2024-09-04T02:25:33Z

internal/services/appservice/linux_function_app_on_container_resource.go

+				storageString = fmt.Sprintf(helpers.StorageStringFmtKV, linuxFunctionAppOnContainer.StorageKeyVaultSecretID)
+			}
+
+			siteConfig := helpers.ExpandSiteConfigLinuxFunctionAppOnContainer(linuxFunctionAppOnContainer.SiteConfig, nil, metadata, linuxFunctionAppOnContainer.Registries[0], linuxFunctionAppOnContainer.FunctionExtensionsVersion, storageString)


what if len(linuxFunctionAppOnContainer.Registries) == 0?

This is the required field

ms-zhenhua · 2024-09-04T05:52:54Z

website/docs/r/linux_function_app_on_container.html.markdown

+
+* `functions_extension_version` - (Optional) The runtime version associated with the Function App. Defaults to `~4`.
+
+* `key_vault_reference_identity_id` - (Optional) The User Assigned Identity ID used for accessing KeyVault secrets. The identity must be assigned to the application in the `identity` block. [For more information see - Access vaults with a user-assigned identity](https://docs.microsoft.com/azure/app-service/app-service-key-vault-references#access-vaults-with-a-user-assigned-identity)


Suggested change

* `key_vault_reference_identity_id` - (Optional) The User Assigned Identity ID used for accessing KeyVault secrets. The identity must be assigned to the application in the `identity` block. [For more information see - Access vaults with a user-assigned identity](https://docs.microsoft.com/azure/app-service/app-service-key-vault-references#access-vaults-with-a-user-assigned-identity)

* `key_vault_reference_identity_id` - (Optional) The User Assigned Identity ID used for accessing KeyVault secrets. The identity must be assigned to the application in the `identity` block. See [Access vaults with a user-assigned identity](https://docs.microsoft.com/azure/app-service/app-service-key-vault-references#access-vaults-with-a-user-assigned-identity) for more information.

ms-zhenhua · 2024-09-04T05:54:17Z

website/docs/r/linux_function_app_on_container.html.markdown

+
+* `key_vault_reference_identity_id` - (Optional) The User Assigned Identity ID used for accessing KeyVault secrets. The identity must be assigned to the application in the `identity` block. [For more information see - Access vaults with a user-assigned identity](https://docs.microsoft.com/azure/app-service/app-service-key-vault-references#access-vaults-with-a-user-assigned-identity)
+
+* `storage_account_access_key` - (Optional) The access key which will be used to access the backend storage account for the Function App. Conflicts with `storage_uses_managed_identity`.


could you please put Conflicts with ... into **NOTE** ?

ms-zhenhua · 2024-09-04T05:59:16Z

website/docs/r/linux_function_app_on_container.html.markdown

+
+* `application_insights_key` - (Optional) The Instrumentation Key for connecting the Containerized Linux Function App to Application Insights.
+
+* `app_scale_limit` - (Optional) The number of workers this function app can scale out to. Only applicable to apps on the Consumption and Premium plan.


Suggested change

* `app_scale_limit` - (Optional) The number of workers this function app can scale out to. Only applicable to apps on the Consumption and Premium plan.

* `app_scale_limit` - (Optional) The number of workers this function app can scale out to, which is only applicable to apps on the Consumption and Premium plan. Defaults to `10`

ms-zhenhua · 2024-09-04T06:08:15Z

internal/services/appservice/linux_function_app_on_container_resource_test.go

+
+  registry {
+    registry_server_url = "mcr.microsoft.com"
+    registry_username   = ""


could you also test registry_username and registry_password with values?

ms-zhenhua · 2024-09-04T06:09:31Z

internal/services/appservice/linux_function_app_on_container_resource_test.go

+
+type LinuxFunctionAppOnContainerResource struct{}
+
+func TestAccLinuxFunctionAppOnContainer_basicDocker(t *testing.T) {


seems storage_key_vault_secret_id, site_config.application_insights_key, site_config.elastic_instance_minimum ,site_config.linux_fx_version, identity are not test. Could you add these testcases?

github-actions · 2024-10-07T06:03:41Z

This PR is being labeled as "stale" because it has not been updated for 30 or more days.

If this PR is still valid, please remove the "stale" label. If this PR is blocked, please add it to the "Blocked" milestone.

If you need some help completing this PR, please leave a comment letting us know. Thank you!

xiaxyi · 2024-10-17T09:55:04Z

Thanks @ms-zhenhua for the review, I updated the code per comment, also made the PR to "ready to review" status as the api issue was fixed.

dgensert · 2024-12-02T13:25:06Z

Looks like a feature we have been looking for. When can we expect a release?

katbyte

test failure


------- Stdout: -------
=== RUN   TestAccLinuxFunctionAppOnContainer_basicMCRUpdate
=== PAUSE TestAccLinuxFunctionAppOnContainer_basicMCRUpdate
=== CONT  TestAccLinuxFunctionAppOnContainer_basicMCRUpdate
    testcase.go:173: Step 2/3 error: Pre-apply plan check(s) failed:
        'azurerm_linux_function_app_on_container.test' - expected action to not be Replace, path: [[name]] tried to update a value that is ForceNew
--- FAIL: TestAccLinuxFunctionAppOnContainer_basicMCRUpdate (1118.55s)
FAIL

new resource - azure function on container apps

edc43ca

github-actions bot added documentation service/app-service size/XL labels Aug 30, 2024

xiaxyi marked this pull request as draft August 30, 2024 08:32

github-actions bot added the waiting-response label Aug 30, 2024

fix ci error

cc4dc9a

github-actions bot added waiting-response and removed waiting-response labels Aug 30, 2024

fix ci error

a2ba13e

github-actions bot added waiting-response and removed waiting-response labels Aug 31, 2024

terrafmt fmt on test cases

330a948

github-actions bot removed the waiting-response label Aug 31, 2024

ms-zhenhua suggested changes Sep 4, 2024

View reviewed changes

github-actions bot added the waiting-response label Sep 4, 2024

github-actions bot added the stale label Oct 7, 2024

rcskosir added the new-resource label Oct 14, 2024

xiaxyi marked this pull request as ready for review October 17, 2024 09:53

github-actions bot removed waiting-response stale labels Oct 17, 2024

xiaxyi added 3 commits October 17, 2024 18:59

Merge remote-tracking branch 'upstream/main' into functionOnAca

b521615

update code per review

5e63e01

remove log and sort imports

4db87e8

github-actions bot added the waiting-response label Oct 17, 2024

fix linter error

2332cd7

github-actions bot removed the waiting-response label Oct 17, 2024

update registration

d9c436b

xiaxyi requested review from katbyte and a team as code owners October 21, 2024 05:40

github-actions bot added the waiting-response label Oct 21, 2024

update create and update poller

94a8c2f

github-actions bot added waiting-response and removed waiting-response labels Oct 23, 2024

xiaxyi added 2 commits October 23, 2024 15:00

Merge remote-tracking branch 'upstream/main' into functionOnAca

4126c0d

update labeler-issue-triage.yml file

27c6aaa

github-actions bot removed the waiting-response label Oct 23, 2024

jackofallops assigned jackofallops and catriona-m Nov 4, 2024

merging upstream

a3288c5

github-actions bot added the waiting-response label Nov 18, 2024

resolve go linter

11ae80f

github-actions bot added waiting-response and removed waiting-response labels Nov 18, 2024

remove unnecessary line

3dde8f0

github-actions bot removed the waiting-response label Nov 18, 2024

katbyte requested changes Dec 4, 2024

View reviewed changes

github-actions bot added the waiting-response label Dec 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New Resource `azurerm_function_app_on_container` #27249

New Resource `azurerm_function_app_on_container` #27249

xiaxyi commented Aug 30, 2024 •

edited

Loading

ms-zhenhua left a comment

ms-zhenhua Sep 3, 2024

ms-zhenhua Sep 3, 2024

ms-zhenhua Sep 3, 2024

ms-zhenhua Sep 3, 2024

ms-zhenhua Sep 4, 2024

xiaxyi Oct 17, 2024

ms-zhenhua Sep 4, 2024

ms-zhenhua Sep 4, 2024

ms-zhenhua Sep 4, 2024

ms-zhenhua Sep 4, 2024

ms-zhenhua Sep 4, 2024

github-actions bot commented Oct 7, 2024

xiaxyi commented Oct 17, 2024

dgensert commented Dec 2, 2024

katbyte left a comment


		"resource_group_name": commonschema.ResourceGroupName(),

		"container_app_environment_id": {


		"registry": helpers.RegistrySchemaLinuxFunctionAppOnContainer(),

		"container_image": {


		* `functions_extension_version` - (Optional) The runtime version associated with the Function App. Defaults to `~4`.

		* `key_vault_reference_identity_id` - (Optional) The User Assigned Identity ID used for accessing KeyVault secrets. The identity must be assigned to the application in the `identity` block. [For more information see - Access vaults with a user-assigned identity](https://docs.microsoft.com/azure/app-service/app-service-key-vault-references#access-vaults-with-a-user-assigned-identity)


		* `key_vault_reference_identity_id` - (Optional) The User Assigned Identity ID used for accessing KeyVault secrets. The identity must be assigned to the application in the `identity` block. [For more information see - Access vaults with a user-assigned identity](https://docs.microsoft.com/azure/app-service/app-service-key-vault-references#access-vaults-with-a-user-assigned-identity)

		* `storage_account_access_key` - (Optional) The access key which will be used to access the backend storage account for the Function App. Conflicts with `storage_uses_managed_identity`.


		* `application_insights_key` - (Optional) The Instrumentation Key for connecting the Containerized Linux Function App to Application Insights.

		* `app_scale_limit` - (Optional) The number of workers this function app can scale out to. Only applicable to apps on the Consumption and Premium plan.


		type LinuxFunctionAppOnContainerResource struct{}

		func TestAccLinuxFunctionAppOnContainer_basicDocker(t *testing.T) {

New Resource azurerm_function_app_on_container #27249

Are you sure you want to change the base?

New Resource azurerm_function_app_on_container #27249

Conversation

xiaxyi commented Aug 30, 2024 • edited Loading

Community Note

Description

PR Checklist

Changes to existing Resource / Data Source

Testing

Change Log

Related Issue(s)

ms-zhenhua left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Oct 7, 2024

xiaxyi commented Oct 17, 2024

dgensert commented Dec 2, 2024

katbyte left a comment

Choose a reason for hiding this comment

New Resource `azurerm_function_app_on_container` #27249

New Resource `azurerm_function_app_on_container` #27249

xiaxyi commented Aug 30, 2024 •

edited

Loading