Replacement Service: `appservice` #12132

jackofallops · 2021-06-09T07:03:45Z

This PR introduces a new Service that will, over time, replace the Web service resources. This first change brings several new resources:

azurerm_windows_web_app, azurerm_linux_web_app, which are intended to replace azurerm_web_app with O/S specific resources to better support their respective configuration and property validation within the provider.
azurerm_app_service_source_control - a new meta resource to better support the Source Control configuration of Web Apps (and Function Apps later, when they are added).
azurerm_source_control_token - A replacement typed resource and data source for adding an Access Token to App Service (GtHub, BitBucket, OneDrive, or DropBox). Note: This is a contextual resource and is created for the account, identity, or principal that creates it. This means that the whichever identity that needs to access it for App Service Deployments must be the account to run the Terraform to create it.

Still outstanding:

Tags!
App Service Plan replacement resource
Data Sources
Lots more tests
Fix azurerm_app_service_source_control resource - not working as intended
Docs
General tidying up
~~Switch to local SDK (Nice to have)~~
update azurerm_app_service_github_token to generic token as previous resource

Note:
These new features are the first part of what will become version 3.0 of the provider, so are only available when the appropriate environment variable is set, details will be included in the change notes, but setting ARM_PROVIDER_THREEPOINTZERO_RESOURCES=true will permit the use of these new resource.

katbyte

Thanks @jackofallops - comments left inline

azurerm/internal/services/appservice/helpers/shared_schema.go

katbyte · 2021-07-21T00:14:48Z

azurerm/internal/services/appservice/helpers/shared_schema.go

+					Optional: true,
+					Elem: &pluginsdk.Schema{
+						Type: pluginsdk.TypeString,
+					},


should we at last validate this is not an empty string?

azurerm/internal/services/appservice/helpers/shared_schema.go

katbyte · 2021-07-21T00:16:47Z

azurerm/internal/services/appservice/helpers/shared_schema.go

+					Type:     pluginsdk.TypeList,
+					Optional: true,
+					Elem:     &pluginsdk.Schema{Type: pluginsdk.TypeString},
+				},


should we validate this is at least not empty??

katbyte · 2021-07-21T00:18:02Z

azurerm/internal/services/appservice/serviceplan/service_plan_resource.go

+			ValidateFunc: webValidate.AppServiceEnvironmentID, // TODO - Bring over to this service
+		},
+
+		"per_site_scaling": {


should this be

Suggested change

"per_site_scaling": {

"per_site_scaling_enabled": {

azurerm/internal/services/appservice/serviceplan/service_plan_resource_test.go

azurerm/internal/services/appservice/sourcecontrol/source_control_resource.go

katbyte · 2021-08-12T23:31:44Z

internal/services/appservice/source_control_resource.go

+
+func (r AppServiceSourceControlResource) Create() sdk.ResourceFunc {
+	return sdk.ResourceFunc{
+		Timeout: 30 * time.Minute,


should we be passing this through from somewhere?

Not to the best of my knowledge, this is the Typed SDK equivalent of Create: pluginsdk.DefaultTimeout(30 * time.Minute), so should be defined here with the function rather than collected from elsewhere? Happy to discuss alternatives.

katbyte · 2021-08-12T23:31:56Z

internal/services/appservice/source_control_resource.go

+
+func (r AppServiceSourceControlResource) Read() sdk.ResourceFunc {
+	return sdk.ResourceFunc{
+		Timeout: 5 * time.Minute,


katbyte · 2021-08-12T23:32:54Z

internal/services/appservice/source_control_token_resource.go

+
+func (r AppServiceSourceControlTokenResource) Read() sdk.ResourceFunc {
+	return sdk.ResourceFunc{
+		Timeout: 5 * time.Minute,


website/docs/r/linux_web_app.html.markdown

katbyte · 2021-08-12T23:40:38Z

website/docs/r/linux_web_app.html.markdown

+
+* `scm_use_main_ip_restriction` - (Optional) Should the Linux Web App `ip_restriction` configuration be used for the SCM also.
+
+* `use_32_bit_worker` - (Optional) Should the Linux Web App use a 32-bit worker.


use seems redundant?

Suggested change

* `use_32_bit_worker` - (Optional) Should the Linux Web App use a 32-bit worker.

* `32_bit_worker` - (Optional) Should the Linux Web App use a 32-bit worker.

This was a carry over from the superseded resource, I'll update it 👍

website/docs/r/linux_web_app.html.markdown

katbyte · 2021-08-12T23:42:03Z

website/docs/r/service_plan.html.markdown

+
+* `os_type` - (Optional) The O/S type for the App Services to be hosted in this plan. Possible values include `Windows` (default), `Linux`, and `WindowsContainer`.
+
+* `per_site_scaling` - (Optional) Should Per Site Scaling be enabled. Defaults to `false`.


Suggested change

* `per_site_scaling` - (Optional) Should Per Site Scaling be enabled. Defaults to `false`.

* `per_site_scaling_enabled` - (Optional) Should Per Site Scaling be enabled. Defaults to `false`.

This was a carry over from the superseded resource, I'll update it 👍

…an type

stephybun · 2021-09-09T08:48:20Z

website/docs/guides/3.0-upgrade-guide.html.markdown

+
+## App Service
+
+App Service, aka `web`, was one of the earliest supported services in the provider and has evolved significantly over time, both as a Service and the resources within the provider. Over that time feature additions, behavioural changes, and a host of other change have made the current resources increasingly difficult to maintain and update. We're taking the opportunity in 3.0 to rewrite this service from the ground up.    


I think there's an s missing here

Suggested change

App Service, aka `web`, was one of the earliest supported services in the provider and has evolved significantly over time, both as a Service and the resources within the provider. Over that time feature additions, behavioural changes, and a host of other change have made the current resources increasingly difficult to maintain and update. We're taking the opportunity in 3.0 to rewrite this service from the ground up.

App Service, aka `web`, was one of the earliest supported services in the provider and has evolved significantly over time, both as a Service and the resources within the provider. Over that time feature additions, behavioural changes, and a host of other changes have made the current resources increasingly difficult to maintain and update. We're taking the opportunity in 3.0 to rewrite this service from the ground up.

katbyte

Aside from a couple minor comments this LGTM 🚀🚀🚀🚀

website/docs/r/app_service_github_token.html.markdown

website/docs/r/windows_web_app.html.markdown

website/docs/r/service_plan.html.markdown

website/docs/r/linux_web_app.html.markdown

website/docs/r/app_service_source_control.html.markdown

github-actions · 2021-10-10T02:07:25Z

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.

jackofallops self-assigned this Jun 9, 2021

ghost added size/XXL labels Jun 9, 2021

github-actions bot added the dependencies label Jun 9, 2021

jackofallops changed the title ~~reqs SDK bump~~ Replacement Service: appservice Jun 9, 2021

jackofallops added new-resource service/app-service labels Jun 9, 2021

github-actions bot added the size/XL label Jun 14, 2021

jackofallops force-pushed the f/app-service-three-point-oh branch from 5bf652e to e4074cb Compare June 15, 2021 14:01

github-actions bot added the documentation label Jun 17, 2021

jackofallops force-pushed the f/app-service-three-point-oh branch from d53ea91 to 94dbf06 Compare June 28, 2021 14:05

jackofallops force-pushed the f/app-service-three-point-oh branch 2 times, most recently from 837f73d to e32a27f Compare July 14, 2021 14:32

jackofallops mentioned this pull request Jul 19, 2021

Tooling: allow TC Service Package Tests to look in subfolders for acceptance tests #12646

Closed

jackofallops force-pushed the f/app-service-three-point-oh branch from 51532d6 to 71ab73c Compare July 19, 2021 14:24

tombuildsstuff mentioned this pull request Jul 19, 2021

serverFarm in IDs is accepted as lowercase 'serverfarm' only #11250

Closed

jackofallops force-pushed the f/app-service-three-point-oh branch from 71ab73c to 040b837 Compare July 20, 2021 09:46

katbyte requested changes Jul 21, 2021

View reviewed changes

jackofallops force-pushed the f/app-service-three-point-oh branch from 64806d7 to c98872b Compare July 26, 2021 08:22

github-actions bot removed the dependencies label Jul 26, 2021

jackofallops added the new-data-source label Jul 29, 2021

jackofallops force-pushed the f/app-service-three-point-oh branch from c90a3fe to 27f4ffd Compare August 9, 2021 15:00

katbyte requested changes Aug 12, 2021

View reviewed changes

jackofallops force-pushed the f/app-service-three-point-oh branch 2 times, most recently from 91428d8 to 70cc7fa Compare August 20, 2021 06:04

tombuildsstuff mentioned this pull request Aug 26, 2021

Support for Logic App (Standard) #12023

Closed

jackofallops added 4 commits September 7, 2021 08:38

add clients and vendoring

3e83b15

add resourceids and generated files

2035330

add service plan resource and tests

1602a84

add linux_web_app and shared schema

8f716e3

make site_config not computed, fix property names and enums

982ce4b

jackofallops force-pushed the f/app-service-three-point-oh branch from 3ec1e98 to 982ce4b Compare September 7, 2021 07:39

jackofallops added 13 commits September 7, 2021 08:45

tflint

bd9c00f

linter fixes

7008925

make logs non-computed

4a11191

windows create logs check...

6321da5

add connection_string tests and tweak udpates

2d74628

nil checking bools in flattens

e165c1a

remove computed from app_settings

04db63e

fix duplicate config in test for linux dotnet

d7dcfb6

fix ds and multiple test configs

b562453

add custom importers to check apps are being imported into correct pl…

2e361f9

…an type

fix attribut name and update model names

50b9d93

docs tweaks

3271b65

add beta docs and issue and feedback template

8b1fe73

stephybun reviewed Sep 9, 2021

View reviewed changes

jackofallops added 3 commits September 9, 2021 13:41

typo

f21bfb3

test fixes

a06e99f

fix diff in auto_heal config removal

ac549d4

jackofallops marked this pull request as ready for review September 9, 2021 13:06

jackofallops added 2 commits September 9, 2021 14:47

fix storage test config

f09db71

fixup linux app backup test

f252e7e

katbyte approved these changes Sep 9, 2021

View reviewed changes

jackofallops added 2 commits September 9, 2021 19:09

docs updates

6c6a9e7

beta 3.0 link added

c585354

jackofallops merged commit 65c0e7e into main Sep 9, 2021

jackofallops deleted the f/app-service-three-point-oh branch September 9, 2021 18:42

jackofallops added a commit that referenced this pull request Sep 9, 2021

Update CHANGELOG.md for #12132

e9a204d

github-actions bot locked as resolved and limited conversation to collaborators Oct 10, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replacement Service: `appservice` #12132

Replacement Service: `appservice` #12132

jackofallops commented Jun 9, 2021 •

edited

Loading

katbyte left a comment

katbyte Jul 21, 2021

katbyte Jul 21, 2021

katbyte Jul 21, 2021

katbyte Aug 12, 2021

jackofallops Aug 13, 2021

katbyte Aug 12, 2021

katbyte Aug 12, 2021

katbyte Aug 12, 2021

jackofallops Aug 13, 2021

katbyte Aug 12, 2021

jackofallops Aug 13, 2021

stephybun Sep 9, 2021

katbyte left a comment

github-actions bot commented Oct 10, 2021


		* `scm_use_main_ip_restriction` - (Optional) Should the Linux Web App `ip_restriction` configuration be used for the SCM also.

		* `use_32_bit_worker` - (Optional) Should the Linux Web App use a 32-bit worker.

	* `use_32_bit_worker` - (Optional) Should the Linux Web App use a 32-bit worker.
	* `32_bit_worker` - (Optional) Should the Linux Web App use a 32-bit worker.


		* `os_type` - (Optional) The O/S type for the App Services to be hosted in this plan. Possible values include `Windows` (default), `Linux`, and `WindowsContainer`.

		* `per_site_scaling` - (Optional) Should Per Site Scaling be enabled. Defaults to `false`.

	* `per_site_scaling` - (Optional) Should Per Site Scaling be enabled. Defaults to `false`.
	* `per_site_scaling_enabled` - (Optional) Should Per Site Scaling be enabled. Defaults to `false`.


		## App Service

		App Service, aka `web`, was one of the earliest supported services in the provider and has evolved significantly over time, both as a Service and the resources within the provider. Over that time feature additions, behavioural changes, and a host of other change have made the current resources increasingly difficult to maintain and update. We're taking the opportunity in 3.0 to rewrite this service from the ground up.

Replacement Service: appservice #12132

Replacement Service: appservice #12132

Conversation

jackofallops commented Jun 9, 2021 • edited Loading

katbyte 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

Choose a reason for hiding this comment

katbyte left a comment

Choose a reason for hiding this comment

github-actions bot commented Oct 10, 2021

Replacement Service: `appservice` #12132

Replacement Service: `appservice` #12132

jackofallops commented Jun 9, 2021 •

edited

Loading