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.

Sign up for GitHub

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_linux_web_app_slot - fix container_registry_managed_identity_client_id validation #16149

Merged
merged 1 commit into from
Mar 31, 2022
Merged

azurerm_linux_web_app_slot - fix container_registry_managed_identity_client_id validation #16149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions internal/services/appservice/helpers/web_app_slot_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2021-02-01/web"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
apimValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/validate"
msiValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/msi/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/utils"
Expand Down Expand Up @@ -101,7 +100,7 @@ func SiteConfigSchemaLinuxWebAppSlot() *pluginsdk.Schema {
"container_registry_managed_identity_client_id": {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: msiValidate.UserAssignedIdentityID,
ValidateFunc: validation.IsUUID,
},

"default_documents": {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/appservice/linux_web_app_slot_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,7 @@ resource "azurerm_linux_web_app_slot" "test" {
}

container_registry_use_managed_identity = true
container_registry_managed_identity_client_id = azurerm_user_assigned_identity.test.id
container_registry_managed_identity_client_id = azurerm_user_assigned_identity.test.client_id

auto_swap_slot_name = "Production"
auto_heal_enabled = true
Expand Down