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

Jump to bottom

Fix function slot WEBSITE_CONTENTSHARE secretly changes #14211

Merged
merged 3 commits into from
Nov 25, 2021
Merged

Fix function slot WEBSITE_CONTENTSHARE secretly changes #14211

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77f77c2
fix website_contentes_share in function slot hidden changes
uolter Nov 16, 2021
d6f8da9
removed line of codes with comments and unreleased files
uolter Nov 25, 2021
a72d1ba
fix: commend in wrong plance
uolter Nov 25, 2021
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
31 changes: 16 additions & 15 deletions internal/services/web/function_app_slot_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,14 +362,13 @@ func resourceFunctionAppSlotUpdate(d *pluginsdk.ResourceData, meta interface{})
return err
}

existing, err := client.GetConfiguration(ctx, id.ResourceGroup, id.SiteName)
var currentAppSettings map[string]*string
appSettingsList, err := client.ListApplicationSettingsSlot(ctx, id.ResourceGroup, id.SiteName, id.SlotName)
if err != nil {
return fmt.Errorf("reading %s: %+v", id, err)
return fmt.Errorf("reading App Settings for %s: %+v", id, err)
}

var currentAppSettings *[]web.NameValuePair
if existing.AppSettings != nil {
currentAppSettings = existing.AppSettings
if appSettingsList.Properties != nil {
currentAppSettings = appSettingsList.Properties
}

basicAppSettings := getBasicFunctionAppSlotAppSettings(d, appServiceTier, endpointSuffix, currentAppSettings)
Expand Down Expand Up @@ -632,7 +631,7 @@ func resourceFunctionAppSlotDelete(d *pluginsdk.ResourceData, meta interface{})
return nil
}

func getBasicFunctionAppSlotAppSettings(d *pluginsdk.ResourceData, appServiceTier, endpointSuffix string, existingSettings *[]web.NameValuePair) []web.NameValuePair {
func getBasicFunctionAppSlotAppSettings(d *pluginsdk.ResourceData, appServiceTier, endpointSuffix string, existingSettings map[string]*string) []web.NameValuePair {
// TODO: This is a workaround since there are no public Functions API
// You may track the API request here: https://github.com/Azure/azure-rest-api-specs/issues/3750
dashboardPropName := "AzureWebJobsDashboard"
Expand All @@ -647,17 +646,14 @@ func getBasicFunctionAppSlotAppSettings(d *pluginsdk.ResourceData, appServiceTie

functionVersion := d.Get("version").(string)
var contentShare string
if existingSettings == nil {
contentSharePreviouslySet := false
if currentContentShare, ok := existingSettings[contentSharePropName]; ok {
contentShare = *currentContentShare
contentSharePreviouslySet = true
} else {
// generate and use a new value
suffix := uuid.New().String()[0:4]
contentShare = strings.ToLower(d.Get("name").(string)) + suffix
} else {
// find and re-use the current
for _, v := range *existingSettings {
if v.Name != nil && *v.Name == contentSharePropName {
contentShare = *v.Name
}
}
}

basicSettings := []web.NameValuePair{
Expand All @@ -677,6 +673,11 @@ func getBasicFunctionAppSlotAppSettings(d *pluginsdk.ResourceData, appServiceTie
{Name: &contentFileConnStringPropName, Value: &storageConnection},
}

// If there's an existing value for content, we need to send it. This can be the case for PremiumV2/PremiumV3 plans where the value has been previously configured.
if contentSharePreviouslySet {
return append(basicSettings, consumptionSettings...)
}

// On consumption and premium plans include WEBSITE_CONTENT components, unless it's a Linux consumption plan
// (see https://github.com/Azure/azure-functions-python-worker/issues/598)
if (strings.EqualFold(appServiceTier, "dynamic") || strings.EqualFold(appServiceTier, "elasticpremium") || strings.HasPrefix(strings.ToLower(appServiceTier), "premium")) &&
Expand Down