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/azurerm_windows_web_app - Support for Storage Mount add "Deployment Slot Setting" #26021

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

azurerm_linux_web_app/azurerm_windows_web_app - Support for Storage Mount add "Deployment Slot Setting" #26021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
434a57d
Add azure_storage_config_names property
nnstt1 May 19, 2024
da395a4
Update docs
nnstt1 May 19, 2024
ee5787a
Merge branch 'main' of github.com:nnstt1/terraform-provider-azurerm i…
nnstt1 May 19, 2024
000a38d
fix test template name
nnstt1 May 19, 2024
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
42 changes: 37 additions & 5 deletions internal/services/appservice/helpers/shared_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1571,8 +1571,9 @@ func FlattenSiteCredentials(input *webapps.User) []SiteCredential {
}

type StickySettings struct {
AppSettingNames []string `tfschema:"app_setting_names"`
ConnectionStringNames []string `tfschema:"connection_string_names"`
AppSettingNames []string `tfschema:"app_setting_names"`
AzureStorageConfigNames []string `tfschema:"azure_storage_config_names"`
ConnectionStringNames []string `tfschema:"connection_string_names"`
}

func StickySettingsSchema() *pluginsdk.Schema {
Expand All @@ -1592,6 +1593,22 @@ func StickySettingsSchema() *pluginsdk.Schema {
},
AtLeastOneOf: []string{
"sticky_settings.0.app_setting_names",
"sticky_settings.0.azure_storage_config_names",
"sticky_settings.0.connection_string_names",
},
},

"azure_storage_config_names": {
Type: pluginsdk.TypeList,
MinItems: 1,
Optional: true,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
},
AtLeastOneOf: []string{
"sticky_settings.0.app_setting_names",
"sticky_settings.0.azure_storage_config_names",
"sticky_settings.0.connection_string_names",
},
},
Expand All @@ -1606,6 +1623,7 @@ func StickySettingsSchema() *pluginsdk.Schema {
},
AtLeastOneOf: []string{
"sticky_settings.0.app_setting_names",
"sticky_settings.0.azure_storage_config_names",
"sticky_settings.0.connection_string_names",
},
},
Expand All @@ -1628,6 +1646,14 @@ func StickySettingsComputedSchema() *pluginsdk.Schema {
},
},

"azure_storage_config_names": {
Type: pluginsdk.TypeList,
Computed: true,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
},
},

"connection_string_names": {
Type: pluginsdk.TypeList,
Computed: true,
Expand All @@ -1646,21 +1672,27 @@ func ExpandStickySettings(input []StickySettings) *webapps.SlotConfigNames {
}

return &webapps.SlotConfigNames{
AppSettingNames: &input[0].AppSettingNames,
ConnectionStringNames: &input[0].ConnectionStringNames,
AppSettingNames: &input[0].AppSettingNames,
AzureStorageConfigNames: &input[0].AzureStorageConfigNames,
ConnectionStringNames: &input[0].ConnectionStringNames,
}
}

func FlattenStickySettings(input *webapps.SlotConfigNames) []StickySettings {
result := StickySettings{}
if input == nil || (input.AppSettingNames == nil && input.ConnectionStringNames == nil) || (len(*input.AppSettingNames) == 0 && len(*input.ConnectionStringNames) == 0) {
if input == nil || (input.AppSettingNames == nil && input.AzureStorageConfigNames == nil && input.ConnectionStringNames == nil) ||
(len(*input.AppSettingNames) == 0 && len(*input.AzureStorageConfigNames) == 0 && len(*input.ConnectionStringNames) == 0) {
return []StickySettings{}
}

if input.AppSettingNames != nil && len(*input.AppSettingNames) > 0 {
result.AppSettingNames = *input.AppSettingNames
}

if input.AzureStorageConfigNames != nil && len(*input.AzureStorageConfigNames) > 0 {
result.AzureStorageConfigNames = *input.AzureStorageConfigNames
}

if input.ConnectionStringNames != nil && len(*input.ConnectionStringNames) > 0 {
result.ConnectionStringNames = *input.ConnectionStringNames
}
Expand Down
8 changes: 6 additions & 2 deletions internal/services/appservice/linux_web_app_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,15 +873,19 @@ func (r LinuxWebAppResource) Update() sdk.ResourceFunc {
stickySettings := helpers.ExpandStickySettings(state.StickySettings)
stickySettingsUpdate := webapps.SlotConfigNamesResource{
Properties: &webapps.SlotConfigNames{
AppSettingNames: &emptySlice,
ConnectionStringNames: &emptySlice,
AppSettingNames: &emptySlice,
AzureStorageConfigNames: &emptySlice,
ConnectionStringNames: &emptySlice,
},
}

if stickySettings != nil {
if stickySettings.AppSettingNames != nil {
stickySettingsUpdate.Properties.AppSettingNames = stickySettings.AppSettingNames
}
if stickySettings.AzureStorageConfigNames != nil {
stickySettingsUpdate.Properties.AzureStorageConfigNames = stickySettings.AzureStorageConfigNames
}
if stickySettings.ConnectionStringNames != nil {
stickySettingsUpdate.Properties.ConnectionStringNames = stickySettings.ConnectionStringNames
}
Expand Down
171 changes: 166 additions & 5 deletions internal/services/appservice/linux_web_app_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,6 +1448,9 @@ func TestAccLinuxWebApp_stickySettings(t *testing.T) {
check.That(data.ResourceName).Key("app_settings.foo").HasValue("bar"),
check.That(data.ResourceName).Key("sticky_settings.0.app_setting_names.#").HasValue("2"),
check.That(data.ResourceName).Key("sticky_settings.0.app_setting_names.0").HasValue("foo"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.#").HasValue("2"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.0").HasValue("Second"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.1").HasValue("Fourth"),
check.That(data.ResourceName).Key("sticky_settings.0.connection_string_names.#").HasValue("2"),
check.That(data.ResourceName).Key("sticky_settings.0.connection_string_names.0").HasValue("First"),
),
Expand Down Expand Up @@ -1477,6 +1480,9 @@ func TestAccLinuxWebApp_stickySettingsUpdate(t *testing.T) {
check.That(data.ResourceName).Key("app_settings.foo").HasValue("bar"),
check.That(data.ResourceName).Key("sticky_settings.0.app_setting_names.#").HasValue("2"),
check.That(data.ResourceName).Key("sticky_settings.0.app_setting_names.0").HasValue("foo"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.#").HasValue("2"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.0").HasValue("Second"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.1").HasValue("Fourth"),
check.That(data.ResourceName).Key("sticky_settings.0.connection_string_names.#").HasValue("2"),
check.That(data.ResourceName).Key("sticky_settings.0.connection_string_names.0").HasValue("First"),
),
Expand All @@ -1489,6 +1495,9 @@ func TestAccLinuxWebApp_stickySettingsUpdate(t *testing.T) {
check.That(data.ResourceName).Key("app_settings.foo").HasValue("bar"),
check.That(data.ResourceName).Key("sticky_settings.0.app_setting_names.#").HasValue("3"),
check.That(data.ResourceName).Key("sticky_settings.0.app_setting_names.0").HasValue("foo"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.#").HasValue("4"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.0").HasValue("First"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.1").HasValue("Second"),
),
},
data.ImportStep("site_credential.0.password"),
Expand All @@ -1499,6 +1508,9 @@ func TestAccLinuxWebApp_stickySettingsUpdate(t *testing.T) {
check.That(data.ResourceName).Key("app_settings.foo").HasValue("bar"),
check.That(data.ResourceName).Key("sticky_settings.0.app_setting_names.#").HasValue("2"),
check.That(data.ResourceName).Key("sticky_settings.0.app_setting_names.0").HasValue("foo"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.#").HasValue("2"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.0").HasValue("Second"),
check.That(data.ResourceName).Key("sticky_settings.0.azure_storage_config_names.1").HasValue("Fourth"),
check.That(data.ResourceName).Key("sticky_settings.0.connection_string_names.#").HasValue("2"),
check.That(data.ResourceName).Key("sticky_settings.0.connection_string_names.0").HasValue("First"),
),
Expand Down Expand Up @@ -2290,12 +2302,49 @@ resource "azurerm_linux_web_app" "test" {
type = "PostgreSQL"
}

storage_account {
name = "First"
type = "AzureBlob"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_container.first.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/first"
}

storage_account {
name = "Second"
type = "AzureBlob"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_container.second.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/second"
}

storage_account {
name = "Third"
type = "AzureFiles"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_share.third.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/third"
}

storage_account {
name = "Fourth"
type = "AzureFiles"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_share.fourth.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/fourth"
}

sticky_settings {
app_setting_names = ["foo", "secret"]
connection_string_names = ["First", "Third"]
app_setting_names = ["foo", "secret"]
azure_storage_config_names = ["Second", "Fourth"]
connection_string_names = ["First", "Third"]
}
}
`, r.baseTemplate(data), data.RandomInteger)
`, r.templateWithStorageAccount_stickySettings(data), data.RandomInteger)
}

func (r LinuxWebAppResource) stickySettingsRemoved(data acceptance.TestData) string {
Expand Down Expand Up @@ -2337,8 +2386,44 @@ resource "azurerm_linux_web_app" "test" {
value = "some-postgresql-connection-string"
type = "PostgreSQL"
}

storage_account {
name = "First"
type = "AzureBlob"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_container.first.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/first"
}

storage_account {
name = "Second"
type = "AzureBlob"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_container.second.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/second"
}

storage_account {
name = "Third"
type = "AzureFiles"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_share.third.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/third"
}

storage_account {
name = "Fourth"
type = "AzureFiles"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_share.fourth.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/fourth"
}
}
`, r.baseTemplate(data), data.RandomInteger)
`, r.templateWithStorageAccount_stickySettings(data), data.RandomInteger)
}

func (r LinuxWebAppResource) stickySettingsUpdate(data acceptance.TestData) string {
Expand Down Expand Up @@ -2381,11 +2466,48 @@ resource "azurerm_linux_web_app" "test" {
type = "PostgreSQL"
}

storage_account {
name = "First"
type = "AzureBlob"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_container.first.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/first"
}

storage_account {
name = "Second"
type = "AzureBlob"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_container.second.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/second"
}

storage_account {
name = "Third"
type = "AzureFiles"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_share.third.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/third"
}

storage_account {
name = "Fourth"
type = "AzureFiles"
account_name = azurerm_storage_account.test.name
share_name = azurerm_storage_share.fourth.name
access_key = azurerm_storage_account.test.primary_access_key
mount_path = "/fourth"
}

sticky_settings {
app_setting_names = ["foo", "secret", "third"]
azure_storage_config_names = ["First", "Second", "Third", "Fourth"]
}
}
`, r.baseTemplate(data), data.RandomInteger)
`, r.templateWithStorageAccount_stickySettings(data), data.RandomInteger)
}

func (r LinuxWebAppResource) secondServicePlan(data acceptance.TestData) string {
Expand Down Expand Up @@ -3707,6 +3829,45 @@ data "azurerm_storage_account_sas" "test" {
`, r.standardPlanTemplate(data), data.RandomInteger, data.RandomString)
}

func (r LinuxWebAppResource) templateWithStorageAccount_stickySettings(data acceptance.TestData) string {
return fmt.Sprintf(`

%s

resource "azurerm_storage_account" "test" {
name = "acctestsa%s"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
account_tier = "Standard"
account_replication_type = "LRS"
}

resource "azurerm_storage_container" "first" {
name = "first"
storage_account_name = azurerm_storage_account.test.name
container_access_type = "private"
}

resource "azurerm_storage_container" "second" {
name = "second"
storage_account_name = azurerm_storage_account.test.name
container_access_type = "private"
}

resource "azurerm_storage_share" "third" {
name = "third"
storage_account_name = azurerm_storage_account.test.name
quota = 1
}

resource "azurerm_storage_share" "fourth" {
name = "fourth"
storage_account_name = azurerm_storage_account.test.name
quota = 1
}
`, r.standardPlanTemplate(data), data.RandomString)
}

func (r LinuxWebAppResource) vNetIntegrationWebApp_basic(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down
8 changes: 6 additions & 2 deletions internal/services/appservice/windows_web_app_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,15 +933,19 @@ func (r WindowsWebAppResource) Update() sdk.ResourceFunc {
stickySettings := helpers.ExpandStickySettings(state.StickySettings)
stickySettingsUpdate := webapps.SlotConfigNamesResource{
Properties: &webapps.SlotConfigNames{
AppSettingNames: &emptySlice,
ConnectionStringNames: &emptySlice,
AppSettingNames: &emptySlice,
AzureStorageConfigNames: &emptySlice,
ConnectionStringNames: &emptySlice,
},
}

if stickySettings != nil {
if stickySettings.AppSettingNames != nil {
stickySettingsUpdate.Properties.AppSettingNames = stickySettings.AppSettingNames
}
if stickySettings.AzureStorageConfigNames != nil {
stickySettingsUpdate.Properties.AzureStorageConfigNames = stickySettings.AzureStorageConfigNames
}
if stickySettings.ConnectionStringNames != nil {
stickySettingsUpdate.Properties.ConnectionStringNames = stickySettings.ConnectionStringNames
}
Expand Down
Loading