`app_service` - add authv2 to functionapps and functionapp slots #20722

jackofallops · 2023-03-01T18:12:43Z

azurerm_linux_function_app - add support for AuthV2 (EasyAuthV2) auth_settings_v2
azurerm_linux_function_app_slot - add support for AuthV2 (EasyAuthV2) auth_settings_v2
azurerm_windows_function_app - add support for AuthV2 (EasyAuthV2) auth_settings_v2
azurerm_windows_function_app_slot - add support for AuthV2 (EasyAuthV2) auth_settings_v2
Data Source: azurerm_linux_function_app - add support for AuthV2 (EasyAuthV2) auth_settings_v2
Data Source:azurerm_windows_function_app - add support for AuthV2 (EasyAuthV2) auth_settings_v2

TODO - Update all docs

manicminer

Spotted a few error texts, but otherwise LGTM 🪕

manicminer · 2023-03-02T10:48:32Z

internal/services/appservice/windows_function_app_data_source.go

@@ -316,6 +319,11 @@ func (d WindowsFunctionAppDataSource) Read() sdk.ResourceFunc {
 				return fmt.Errorf("reading Auth Settings for Windows %s: %+v", id, err)
 			}

+			authV2, err := client.GetAuthSettingsV2(ctx, id.ResourceGroup, id.SiteName)
+			if err != nil {
+				return fmt.Errorf("reading authV2 settings for Linux %s: %+v", id, err)


Suggested change

return fmt.Errorf("reading authV2 settings for Linux %s: %+v", id, err)

return fmt.Errorf("reading authV2 settings for Windows %s: %+v", id, err)

manicminer · 2023-03-02T10:48:56Z

internal/services/appservice/windows_function_app_resource.go

+			authv2 := helpers.ExpandAuthV2Settings(functionApp.AuthV2Settings)
+			if authv2.SiteAuthSettingsV2Properties != nil {
+				if _, err = client.UpdateAuthSettingsV2(ctx, id.ResourceGroup, id.SiteName, *authv2); err != nil {
+					return fmt.Errorf("updating AuthV2 settings for Linux %s: %+v", id, err)


Suggested change

return fmt.Errorf("updating AuthV2 settings for Linux %s: %+v", id, err)

return fmt.Errorf("updating AuthV2 settings for Windows %s: %+v", id, err)

manicminer · 2023-03-02T10:49:09Z

internal/services/appservice/windows_function_app_resource.go

+			if strings.EqualFold(pointer.From(auth.ConfigVersion), "v2") {
+				authV2, err = client.GetAuthSettingsV2(ctx, id.ResourceGroup, id.SiteName)
+				if err != nil {
+					return fmt.Errorf("reading authV2 settings for Linux %s: %+v", *id, err)


Suggested change

return fmt.Errorf("reading authV2 settings for Linux %s: %+v", *id, err)

return fmt.Errorf("reading authV2 settings for Windows %s: %+v", *id, err)

manicminer · 2023-03-02T10:49:30Z

internal/services/appservice/windows_function_app_resource.go

 				if _, err := client.UpdateAuthSettings(ctx, id.ResourceGroup, id.SiteName, *authUpdate); err != nil {
-					return fmt.Errorf("updating Auth Settings for Windows %s: %+v", id, err)
+					return fmt.Errorf("updating Auth Settings for Linux %s: %+v", id, err)


Suggested change

return fmt.Errorf("updating Auth Settings for Linux %s: %+v", id, err)

return fmt.Errorf("updating Auth Settings for Windows %s: %+v", id, err)

manicminer · 2023-03-02T10:49:39Z

internal/services/appservice/windows_function_app_resource.go

+			if metadata.ResourceData.HasChange("auth_settings_v2") {
+				authV2Update := helpers.ExpandAuthV2Settings(state.AuthV2Settings)
+				if _, err := client.UpdateAuthSettingsV2(ctx, id.ResourceGroup, id.SiteName, *authV2Update); err != nil {
+					return fmt.Errorf("updating AuthV2 Settings for Linux %s: %+v", id, err)


Suggested change

return fmt.Errorf("updating AuthV2 Settings for Linux %s: %+v", id, err)

return fmt.Errorf("updating AuthV2 Settings for Windows %s: %+v", id, err)

manicminer · 2023-03-02T10:50:35Z

internal/services/appservice/windows_function_app_slot_resource.go

+			authv2 := helpers.ExpandAuthV2Settings(functionAppSlot.AuthV2Settings)
+			if authv2.SiteAuthSettingsV2Properties != nil {
+				if _, err = client.UpdateAuthSettingsV2Slot(ctx, id.ResourceGroup, id.SiteName, *authv2, id.SlotName); err != nil {
+					return fmt.Errorf("updating AuthV2 settings for Linux %s: %+v", id, err)


Suggested change

return fmt.Errorf("updating AuthV2 settings for Linux %s: %+v", id, err)

return fmt.Errorf("updating AuthV2 settings for Windows %s: %+v", id, err)

manicminer · 2023-03-02T10:50:52Z

internal/services/appservice/windows_function_app_slot_resource.go

+			if strings.EqualFold(pointer.From(auth.ConfigVersion), "v2") {
+				authV2, err = client.GetAuthSettingsV2Slot(ctx, id.ResourceGroup, id.SiteName, id.SlotName)
+				if err != nil {
+					return fmt.Errorf("reading authV2 settings for Linux %s: %+v", *id, err)


Suggested change

return fmt.Errorf("reading authV2 settings for Linux %s: %+v", *id, err)

return fmt.Errorf("reading authV2 settings for Windows %s: %+v", *id, err)

manicminer · 2023-03-02T10:51:07Z

internal/services/appservice/windows_function_app_slot_resource.go

 				if _, err := client.UpdateAuthSettingsSlot(ctx, id.ResourceGroup, id.SiteName, *authUpdate, id.SlotName); err != nil {
-					return fmt.Errorf("updating Auth Settings for Windows %s: %+v", id, err)
+					return fmt.Errorf("updating Auth Settings for Linux %s: %+v", id, err)


Suggested change

return fmt.Errorf("updating Auth Settings for Linux %s: %+v", id, err)

return fmt.Errorf("updating Auth Settings for Windows %s: %+v", id, err)

manicminer · 2023-03-02T10:51:14Z

internal/services/appservice/windows_function_app_slot_resource.go

+			if metadata.ResourceData.HasChange("auth_settings_v2") {
+				authV2Update := helpers.ExpandAuthV2Settings(state.AuthV2Settings)
+				if _, err := client.UpdateAuthSettingsV2Slot(ctx, id.ResourceGroup, id.SiteName, *authV2Update, id.SlotName); err != nil {
+					return fmt.Errorf("updating AuthV2 Settings for Linux %s: %+v", id, err)


Suggested change

return fmt.Errorf("updating AuthV2 Settings for Linux %s: %+v", id, err)

return fmt.Errorf("updating AuthV2 Settings for Windows %s: %+v", id, err)

github-actions · 2023-03-06T14:42:11Z

This functionality has been released in v3.46.0 of the Terraform Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

github-actions · 2023-04-17T02:09:21Z

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.

add authv2 to functionapps and functionapp slots

a8ec414

jackofallops self-assigned this Mar 1, 2023

github-actions bot added service/app-service size/XL labels Mar 1, 2023

jackofallops added 2 commits March 1, 2023 18:51

fixup complete tests

b18b235

add docs for authv2

77907fe

jackofallops marked this pull request as ready for review March 1, 2023 19:14

github-actions bot added the documentation label Mar 1, 2023

fix win function app slot read, update test steps

48530d1

jackofallops requested a review from a team March 2, 2023 09:12

fixup upgrade tests

9e5d812

manicminer added the enhancement label Mar 2, 2023

manicminer approved these changes Mar 2, 2023

View reviewed changes

manicminer added this to the v3.46.0 milestone Mar 2, 2023

jackofallops added 3 commits March 2, 2023 15:02

fix copy paste errors in err msg

c8295f9

fix copy paste errors in err msg

45c390a

fix more copy paste errors in err msg

d61fec4

jackofallops merged commit 29b0355 into main Mar 2, 2023

jackofallops deleted the f/function-apps-authv2 branch March 2, 2023 16:23

jackofallops added a commit that referenced this pull request Mar 2, 2023

Update for #20722

a3b0749

drdamour mentioned this pull request Mar 17, 2023

App Service Auth v2 stuff won't let anything through (many issues in arm doc generated) #21021

Closed

1 task

github-actions bot locked as resolved and limited conversation to collaborators Apr 17, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`app_service` - add authv2 to functionapps and functionapp slots #20722

`app_service` - add authv2 to functionapps and functionapp slots #20722

jackofallops commented Mar 1, 2023 •

edited

Loading

manicminer left a comment

manicminer Mar 2, 2023

manicminer Mar 2, 2023

manicminer Mar 2, 2023

manicminer Mar 2, 2023

manicminer Mar 2, 2023

manicminer Mar 2, 2023

manicminer Mar 2, 2023

manicminer Mar 2, 2023

manicminer Mar 2, 2023

github-actions bot commented Mar 6, 2023

github-actions bot commented Apr 17, 2023

	return fmt.Errorf("reading authV2 settings for Linux %s: %+v", id, err)
	return fmt.Errorf("reading authV2 settings for Windows %s: %+v", id, err)

	return fmt.Errorf("updating AuthV2 settings for Linux %s: %+v", id, err)
	return fmt.Errorf("updating AuthV2 settings for Windows %s: %+v", id, err)

	return fmt.Errorf("updating Auth Settings for Linux %s: %+v", id, err)
	return fmt.Errorf("updating Auth Settings for Windows %s: %+v", id, err)

app_service - add authv2 to functionapps and functionapp slots #20722

app_service - add authv2 to functionapps and functionapp slots #20722

Conversation

jackofallops commented Mar 1, 2023 • edited Loading

manicminer 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

github-actions bot commented Mar 6, 2023

github-actions bot commented Apr 17, 2023

`app_service` - add authv2 to functionapps and functionapp slots #20722

`app_service` - add authv2 to functionapps and functionapp slots #20722

jackofallops commented Mar 1, 2023 •

edited

Loading