Skip to content

Commit

Permalink
dependencies: bump hashicorp/go-azure-sdk to v0.20241009.1142232 (h…
Browse files Browse the repository at this point in the history 
…ashicorp#27610)

* bump go-azure-sdk to v0.20241009.1142232

* updated Url casing to URL

* fix type for additional properties and JSON fields
  • Loading branch information
@stephybun
stephybun authored Oct 11, 2024
1 parent 6b77615 commit 8da4254
Show file tree
Hide file tree
Showing 1,775 changed files with 19,004 additions and 9,544 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ require (
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/hashicorp/go-azure-helpers v0.70.1
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240923.1151247
github.com/hashicorp/go-azure-sdk/sdk v0.20240923.1151247
github.com/hashicorp/go-azure-sdk/resource-manager v0.20241009.1142232
github.com/hashicorp/go-azure-sdk/sdk v0.20241009.1142232
github.com/hashicorp/go-hclog v1.6.3
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.3
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-azure-helpers v0.70.1 h1:7hlnRrZobMZxpOzdlNEsayzAayj/KRG4wpDS1jgo4GM=
github.com/hashicorp/go-azure-helpers v0.70.1/go.mod h1:BmbF4JDYXK5sEmFeU5hcn8Br21uElcqLfdQxjatwQKw=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240923.1151247 h1:G0gRbm6sT00wzkQeCexQzdH58QO6Liwd19V0wJSoVCA=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240923.1151247/go.mod h1:JBcndQhypLhEDHUK7HNmM2e8WrEAnEua7SiJuw/z/po=
github.com/hashicorp/go-azure-sdk/sdk v0.20240923.1151247 h1:kzNr/Oqfn72C+k9rL5/G/T3maNo1d87u1aAgjNsKOEQ=
github.com/hashicorp/go-azure-sdk/sdk v0.20240923.1151247/go.mod h1:dMKF6bXrgGmy1d3pLzkmBpG2JIHgSAV2/OMSCEgyMwE=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20241009.1142232 h1:LAN6wm2cHFo56ly09tg0jXHioh4ygq3SzDoX+XBsMOU=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20241009.1142232/go.mod h1:Zifz0xUVKdiNCzvp3HTa0CNCueZlxD2tdgqPf2QA3qs=
github.com/hashicorp/go-azure-sdk/sdk v0.20241009.1142232 h1:CxBWfnrsR/Vdyd+4N782xzYoqw5bczBSguwOpiF7VO8=
github.com/hashicorp/go-azure-sdk/sdk v0.20241009.1142232/go.mod h1:dMKF6bXrgGmy1d3pLzkmBpG2JIHgSAV2/OMSCEgyMwE=
github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU=
github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg=
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
Expand Down
2 changes: 0 additions & 2 deletions internal/clients/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
servicenetworking_2023_11_01 "github.com/hashicorp/go-azure-sdk/resource-manager/servicenetworking/2023-11-01"
storagecache_2023_05_01 "github.com/hashicorp/go-azure-sdk/resource-manager/storagecache/2023-05-01"
systemcentervirtualmachinemanager_2023_10_07 "github.com/hashicorp/go-azure-sdk/resource-manager/systemcentervirtualmachinemanager/2023-10-07"
timeseriesinsights_v2020_05_15 "github.com/hashicorp/go-azure-sdk/resource-manager/timeseriesinsights/2020-05-15"
workloads_v2023_04_01 "github.com/hashicorp/go-azure-sdk/resource-manager/workloads/2023-04-01"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
Expand Down Expand Up @@ -212,7 +211,6 @@ type Client struct {
HealthCare *healthcare.Client
IoTCentral *iotcentral.Client
IoTHub *iothub.Client
IoTTimeSeriesInsights *timeseriesinsights_v2020_05_15.Client
KeyVault *keyvault.Client
Kusto *kusto.Client
Lighthouse *lighthouse.Client
Expand Down
2 changes: 1 addition & 1 deletion internal/services/apimanagement/api_management_api_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func dataSourceApiManagementApiRead(d *pluginsdk.ResourceData, meta interface{})
d.Set("is_online", pointer.From(props.IsOnline))
d.Set("path", props.Path)
d.Set("revision", pointer.From(props.ApiRevision))
d.Set("service_url", pointer.From(props.ServiceUrl))
d.Set("service_url", pointer.From(props.ServiceURL))
d.Set("soap_pass_through", pointer.From(props.Type) == api.ApiTypeSoap)
d.Set("subscription_required", pointer.From(props.SubscriptionRequired))
d.Set("version", pointer.From(props.ApiVersion))
Expand Down
2 changes: 1 addition & 1 deletion internal/services/apimanagement/api_management_api_diagnostic_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func resourceApiManagementApiDiagnostic() *pluginsdk.Resource {
Default: string(apidiagnostic.OperationNameFormatName),
ValidateFunc: validation.StringInSlice([]string{
string(apidiagnostic.OperationNameFormatName),
string(apidiagnostic.OperationNameFormatUrl),
string(apidiagnostic.OperationNameFormatURL),
}, false),
},
},
Expand Down
10 changes: 5 additions & 5 deletions internal/services/apimanagement/api_management_api_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ func resourceApiManagementApiCreateUpdate(d *pluginsdk.ResourceData, meta interf
}

if v, ok := d.GetOk("service_url"); ok {
apiParams.Properties.ServiceUrl = pointer.To(v.(string))
apiParams.Properties.ServiceURL = pointer.To(v.(string))
}

wsdlSelectorVs := importV["wsdl_selector"].([]interface{})
Expand Down Expand Up @@ -485,7 +485,7 @@ func resourceApiManagementApiCreateUpdate(d *pluginsdk.ResourceData, meta interf
Description: pointer.To(description),
Path: path,
Protocols: protocols,
ServiceUrl: pointer.To(serviceUrl),
ServiceURL: pointer.To(serviceUrl),
SubscriptionKeyParameterNames: subscriptionKeyParameterNames,
SubscriptionRequired: &subscriptionRequired,
AuthenticationSettings: authenticationSettings,
Expand All @@ -512,7 +512,7 @@ func resourceApiManagementApiCreateUpdate(d *pluginsdk.ResourceData, meta interf
}

if v, ok := d.GetOk("terms_of_service_url"); ok {
params.Properties.TermsOfServiceUrl = pointer.To(v.(string))
params.Properties.TermsOfServiceURL = pointer.To(v.(string))
}

if err := client.CreateOrUpdateThenPoll(ctx, newId, params, api.CreateOrUpdateOperationOptions{IfMatch: pointer.To("*")}); err != nil {
Expand Down Expand Up @@ -560,7 +560,7 @@ func resourceApiManagementApiRead(d *pluginsdk.ResourceData, meta interface{}) e
d.Set("is_current", pointer.From(props.IsCurrent))
d.Set("is_online", pointer.From(props.IsOnline))
d.Set("path", props.Path)
d.Set("service_url", pointer.From(props.ServiceUrl))
d.Set("service_url", pointer.From(props.ServiceURL))
d.Set("revision", pointer.From(props.ApiRevision))
if !features.FourPointOhBeta() {
d.Set("soap_pass_through", apiType == string(api.ApiTypeSoap))
Expand All @@ -570,7 +570,7 @@ func resourceApiManagementApiRead(d *pluginsdk.ResourceData, meta interface{}) e
d.Set("version_set_id", pointer.From(props.ApiVersionSetId))
d.Set("revision_description", pointer.From(props.ApiRevisionDescription))
d.Set("version_description", pointer.From(props.ApiVersionDescription))
d.Set("terms_of_service_url", pointer.From(props.TermsOfServiceUrl))
d.Set("terms_of_service_url", pointer.From(props.TermsOfServiceURL))

if err := d.Set("protocols", flattenApiManagementApiProtocols(props.Protocols)); err != nil {
return fmt.Errorf("setting `protocols`: %s", err)
Expand Down
4 changes: 2 additions & 2 deletions internal/services/apimanagement/api_management_api_tag_description_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func resourceApiManagementApiTagDescriptionCreateUpdate(d *pluginsdk.ResourceDat
}

if v, ok := d.GetOk("external_documentation_url"); ok {
tagDescParameter.Properties.ExternalDocsUrl = pointer.To(v.(string))
tagDescParameter.Properties.ExternalDocsURL = pointer.To(v.(string))
}

if v, ok := d.GetOk("external_documentation_description"); ok {
Expand Down Expand Up @@ -145,7 +145,7 @@ func resourceApiManagementApiTagDescriptionRead(d *pluginsdk.ResourceData, meta
if model := resp.Model; model != nil {
if props := model.Properties; props != nil {
d.Set("description", pointer.From(props.Description))
d.Set("external_documentation_url", pointer.From(props.ExternalDocsUrl))
d.Set("external_documentation_url", pointer.From(props.ExternalDocsURL))
d.Set("external_documentation_description", pointer.From(props.ExternalDocsDescription))
}
}
Expand Down
14 changes: 7 additions & 7 deletions internal/services/apimanagement/api_management_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,12 +269,12 @@ func dataSourceApiManagementRead(d *pluginsdk.ResourceData, meta interface{}) er
d.Set("publisher_email", model.Properties.PublisherEmail)
d.Set("publisher_name", model.Properties.PublisherName)
d.Set("notification_sender_email", pointer.From(model.Properties.NotificationSenderEmail))
d.Set("gateway_url", pointer.From(model.Properties.GatewayUrl))
d.Set("gateway_regional_url", pointer.From(model.Properties.GatewayRegionalUrl))
d.Set("portal_url", pointer.From(model.Properties.PortalUrl))
d.Set("developer_portal_url", pointer.From(model.Properties.DeveloperPortalUrl))
d.Set("management_api_url", pointer.From(model.Properties.ManagementApiUrl))
d.Set("scm_url", pointer.From(model.Properties.ScmUrl))
d.Set("gateway_url", pointer.From(model.Properties.GatewayURL))
d.Set("gateway_regional_url", pointer.From(model.Properties.GatewayRegionalURL))
d.Set("portal_url", pointer.From(model.Properties.PortalURL))
d.Set("developer_portal_url", pointer.From(model.Properties.DeveloperPortalURL))
d.Set("management_api_url", pointer.From(model.Properties.ManagementApiURL))
d.Set("scm_url", pointer.From(model.Properties.ScmURL))
d.Set("public_ip_addresses", pointer.From(model.Properties.PublicIPAddresses))
d.Set("public_ip_address_id", pointer.From(model.Properties.PublicIPAddressId))
d.Set("private_ip_addresses", pointer.From(model.Properties.PrivateIPAddresses))
Expand Down Expand Up @@ -376,7 +376,7 @@ func flattenDataSourceApiManagementAdditionalLocations(input *[]apimanagementser
for _, prop := range *input {
results = append(results, map[string]interface{}{
"capacity": int32(prop.Sku.Capacity),
"gateway_regional_url": pointer.From(prop.GatewayRegionalUrl),
"gateway_regional_url": pointer.From(prop.GatewayRegionalURL),
"location": location.NormalizeNilable(pointer.To(prop.Location)),
"private_ip_addresses": pointer.From(prop.PrivateIPAddresses),
"public_ip_address_id": pointer.From(prop.PublicIPAddressId),
Expand Down
2 changes: 1 addition & 1 deletion internal/services/apimanagement/api_management_diagnostic_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func resourceApiManagementDiagnostic() *pluginsdk.Resource {
Optional: true,
ValidateFunc: validation.StringInSlice([]string{
string(diagnostic.OperationNameFormatName),
string(diagnostic.OperationNameFormatUrl),
string(diagnostic.OperationNameFormatURL),
}, false),
},
},
Expand Down
14 changes: 7 additions & 7 deletions internal/services/apimanagement/api_management_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1287,12 +1287,12 @@ func resourceApiManagementServiceRead(d *pluginsdk.ResourceData, meta interface{
d.Set("publisher_email", model.Properties.PublisherEmail)
d.Set("publisher_name", model.Properties.PublisherName)
d.Set("notification_sender_email", pointer.From(model.Properties.NotificationSenderEmail))
d.Set("gateway_url", pointer.From(model.Properties.GatewayUrl))
d.Set("gateway_regional_url", pointer.From(model.Properties.GatewayRegionalUrl))
d.Set("portal_url", pointer.From(model.Properties.PortalUrl))
d.Set("developer_portal_url", pointer.From(model.Properties.DeveloperPortalUrl))
d.Set("management_api_url", pointer.From(model.Properties.ManagementApiUrl))
d.Set("scm_url", pointer.From(model.Properties.ScmUrl))
d.Set("gateway_url", pointer.From(model.Properties.GatewayURL))
d.Set("gateway_regional_url", pointer.From(model.Properties.GatewayRegionalURL))
d.Set("portal_url", pointer.From(model.Properties.PortalURL))
d.Set("developer_portal_url", pointer.From(model.Properties.DeveloperPortalURL))
d.Set("management_api_url", pointer.From(model.Properties.ManagementApiURL))
d.Set("scm_url", pointer.From(model.Properties.ScmURL))
d.Set("public_ip_addresses", pointer.From(model.Properties.PublicIPAddresses))
d.Set("public_ip_address_id", pointer.From(model.Properties.PublicIPAddressId))
d.Set("public_network_access_enabled", pointer.From(model.Properties.PublicNetworkAccess) == apimanagementservice.PublicNetworkAccessEnabled)
Expand Down Expand Up @@ -1739,7 +1739,7 @@ func flattenApiManagementAdditionalLocations(input *[]apimanagementservice.Addit

results = append(results, map[string]interface{}{
"capacity": int32(prop.Sku.Capacity),
"gateway_regional_url": pointer.From(prop.GatewayRegionalUrl),
"gateway_regional_url": pointer.From(prop.GatewayRegionalURL),
"location": location.NormalizeNilable(pointer.To(prop.Location)),
"private_ip_addresses": pointer.From(prop.PrivateIPAddresses),
"public_ip_address_id": pointer.From(prop.PublicIPAddressId),
Expand Down
4 changes: 2 additions & 2 deletions internal/services/applicationinsights/application_insights_standard_webtests_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ func expandApplicationInsightsStandardWebTestRequest(input []RequestModel) (requ
}

if v := requestInput.URL; v != "" {
request.RequestUrl = pointer.To(v)
request.RequestURL = pointer.To(v)
}

return request
Expand Down Expand Up @@ -593,7 +593,7 @@ func flattenApplicationInsightsStandardWebTestRequest(input *webtests.WebTestPro
FollowRedirects: pointer.From(req.FollowRedirects),
HTTPVerb: pointer.From(req.HTTPVerb),
ParseDependentRequests: pointer.From(req.ParseDependentRequests),
URL: pointer.From(req.RequestUrl),
URL: pointer.From(req.RequestURL),
Header: flattenApplicationInsightsStandardWebTestRequestHeaders(req.Headers),
}

Expand Down
14 changes: 7 additions & 7 deletions internal/services/appservice/helpers/auth_v2_schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ func expandAuthV2LoginSettings(input []AuthV2Login) *webapps.Login {
FileSystem: &webapps.FileSystemTokenStore{},
AzureBlobStorage: &webapps.BlobStorageTokenStore{},
},
PreserveUrlFragmentsForLogins: pointer.To(login.PreserveURLFragmentsForLogins),
PreserveURLFragmentsForLogins: pointer.To(login.PreserveURLFragmentsForLogins),
Nonce: &webapps.Nonce{
ValidateNonce: pointer.To(login.ValidateNonce),
NonceExpirationInterval: pointer.To(login.NonceExpirationTime),
Expand All @@ -503,7 +503,7 @@ func expandAuthV2LoginSettings(input []AuthV2Login) *webapps.Login {
}
if login.TokenBlobStorageSAS != "" {
result.TokenStore.AzureBlobStorage = &webapps.BlobStorageTokenStore{
SasUrlSettingName: pointer.To(login.TokenBlobStorageSAS),
SasURLSettingName: pointer.To(login.TokenBlobStorageSAS),
}
}
}
Expand All @@ -521,10 +521,10 @@ func expandAuthV2LoginSettings(input []AuthV2Login) *webapps.Login {
}
if login.TokenBlobStorageSAS != "" {
result.TokenStore.AzureBlobStorage = &webapps.BlobStorageTokenStore{
SasUrlSettingName: pointer.To(login.TokenBlobStorageSAS),
SasURLSettingName: pointer.To(login.TokenBlobStorageSAS),
}
}
result.AllowedExternalRedirectUrls = pointer.To(login.AllowedExternalRedirectURLs)
result.AllowedExternalRedirectURLs = pointer.To(login.AllowedExternalRedirectURLs)

return result
}
Expand All @@ -534,8 +534,8 @@ func flattenAuthV2LoginSettings(input *webapps.Login) []AuthV2Login {
return []AuthV2Login{}
}
result := AuthV2Login{
PreserveURLFragmentsForLogins: pointer.From(input.PreserveUrlFragmentsForLogins),
AllowedExternalRedirectURLs: pointer.From(input.AllowedExternalRedirectUrls),
PreserveURLFragmentsForLogins: pointer.From(input.PreserveURLFragmentsForLogins),
AllowedExternalRedirectURLs: pointer.From(input.AllowedExternalRedirectURLs),
}
if routes := input.Routes; routes != nil {
result.LogoutEndpoint = pointer.From(routes.LogoutEndpoint)
Expand All @@ -547,7 +547,7 @@ func flattenAuthV2LoginSettings(input *webapps.Login) []AuthV2Login {
result.TokenFilesystemPath = pointer.From(fs.Directory)
}
if bs := token.AzureBlobStorage; bs != nil {
result.TokenBlobStorageSAS = pointer.From(bs.SasUrlSettingName)
result.TokenBlobStorageSAS = pointer.From(bs.SasURLSettingName)
}
}

Expand Down
26 changes: 13 additions & 13 deletions internal/services/appservice/helpers/common_web_app_schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ func StorageAccountSchemaComputed() *pluginsdk.Schema {

type Backup struct {
Name string `tfschema:"name"`
StorageAccountUrl string `tfschema:"storage_account_url"`
StorageAccountURL string `tfschema:"storage_account_url"`
Enabled bool `tfschema:"enabled"`
Schedule []BackupSchedule `tfschema:"schedule"`
}
Expand Down Expand Up @@ -570,7 +570,7 @@ type ApplicationLog struct {

type AzureBlobStorage struct {
Level string `tfschema:"level"`
SasUrl string `tfschema:"sas_url"`
SasURL string `tfschema:"sas_url"`
RetentionInDays int64 `tfschema:"retention_in_days"`
}

Expand All @@ -580,7 +580,7 @@ type HttpLog struct {
}

type AzureBlobStorageHttp struct {
SasUrl string `tfschema:"sas_url"`
SasURL string `tfschema:"sas_url"`
RetentionInDays int64 `tfschema:"retention_in_days"`
}

Expand Down Expand Up @@ -875,7 +875,7 @@ func ExpandLogsConfig(config []LogsConfig) *webapps.SiteLogsConfig {
appLogsBlobs := appLogs.AzureBlobStorage[0]
result.Properties.ApplicationLogs.AzureBlobStorage = &webapps.AzureBlobStorageApplicationLogsConfig{
Level: pointer.To(webapps.LogLevel(appLogsBlobs.Level)),
SasUrl: pointer.To(appLogsBlobs.SasUrl),
SasURL: pointer.To(appLogsBlobs.SasURL),
RetentionInDays: pointer.To(appLogsBlobs.RetentionInDays),
}
}
Expand All @@ -897,8 +897,8 @@ func ExpandLogsConfig(config []LogsConfig) *webapps.SiteLogsConfig {
if len(httpLogs.AzureBlobStorage) == 1 {
httpLogsBlobStorage := httpLogs.AzureBlobStorage[0]
result.Properties.HTTPLogs.AzureBlobStorage = &webapps.AzureBlobStorageHTTPLogsConfig{
Enabled: pointer.To(httpLogsBlobStorage.SasUrl != ""),
SasUrl: pointer.To(httpLogsBlobStorage.SasUrl),
Enabled: pointer.To(httpLogsBlobStorage.SasURL != ""),
SasURL: pointer.To(httpLogsBlobStorage.SasURL),
RetentionInDays: pointer.To(httpLogsBlobStorage.RetentionInDays),
}
}
Expand Down Expand Up @@ -926,7 +926,7 @@ func ExpandBackupConfig(backupConfigs []Backup) (*webapps.BackupRequest, error)
result.Properties = &webapps.BackupRequestProperties{
Enabled: pointer.To(backupConfig.Enabled),
BackupName: pointer.To(backupConfig.Name),
StorageAccountUrl: backupConfig.StorageAccountUrl,
StorageAccountURL: backupConfig.StorageAccountURL,
BackupSchedule: &webapps.BackupSchedule{
FrequencyInterval: backupSchedule.FrequencyInterval,
FrequencyUnit: webapps.FrequencyUnit(backupSchedule.FrequencyUnit),
Expand Down Expand Up @@ -1105,7 +1105,7 @@ func FlattenBackupConfig(backupRequest *webapps.BackupRequest) []Backup {
}
props := *backupRequest.Properties
backup := Backup{
StorageAccountUrl: props.StorageAccountUrl,
StorageAccountURL: props.StorageAccountURL,
}
if props.BackupName != nil {
backup.Name = *props.BackupName
Expand Down Expand Up @@ -1162,12 +1162,12 @@ func FlattenLogsConfig(logsConfig *webapps.SiteLogsConfig) []LogsConfig {

if appLogs.FileSystem != nil && pointer.From(appLogs.FileSystem.Level) != webapps.LogLevelOff {
applicationLog.FileSystemLevel = string(pointer.From(appLogs.FileSystem.Level))
if appLogs.AzureBlobStorage != nil && appLogs.AzureBlobStorage.SasUrl != nil {
if appLogs.AzureBlobStorage != nil && appLogs.AzureBlobStorage.SasURL != nil {
blobStorage := AzureBlobStorage{
Level: string(pointer.From(appLogs.AzureBlobStorage.Level)),
}

blobStorage.SasUrl = pointer.From(appLogs.AzureBlobStorage.SasUrl)
blobStorage.SasURL = pointer.From(appLogs.AzureBlobStorage.SasURL)

blobStorage.RetentionInDays = pointer.From(appLogs.AzureBlobStorage.RetentionInDays)

Expand Down Expand Up @@ -1196,15 +1196,15 @@ func FlattenLogsConfig(logsConfig *webapps.SiteLogsConfig) []LogsConfig {

if httpLogs.AzureBlobStorage != nil && (httpLogs.AzureBlobStorage.Enabled != nil && *httpLogs.AzureBlobStorage.Enabled) {
blobStorage := AzureBlobStorageHttp{}
if httpLogs.AzureBlobStorage.SasUrl != nil {
blobStorage.SasUrl = *httpLogs.AzureBlobStorage.SasUrl
if httpLogs.AzureBlobStorage.SasURL != nil {
blobStorage.SasURL = *httpLogs.AzureBlobStorage.SasURL
}

if httpLogs.AzureBlobStorage.RetentionInDays != nil {
blobStorage.RetentionInDays = pointer.From(httpLogs.AzureBlobStorage.RetentionInDays)
}

if blobStorage.RetentionInDays != 0 || blobStorage.SasUrl != "" {
if blobStorage.RetentionInDays != 0 || blobStorage.SasURL != "" {
httpLog.AzureBlobStorage = []AzureBlobStorageHttp{blobStorage}
}
}
Expand Down
Loading

0 comments on commit 8da4254

Please sign in to comment.