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.

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

Upgrade Go-SDK version to v55.2 #12153

Merged
merged 13 commits into from
Jun 15, 2021
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ func expandDataFactoryIntegrationRuntimeAzureSsisProperties(d *pluginsdk.Resourc
if adminPassword := catalogInfo["administrator_password"]; adminPassword.(string) != "" {
ssisProperties.CatalogInfo.CatalogAdminPassword = &datafactory.SecureString{
Value: utils.String(adminPassword.(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}
}
}
Expand All @@ -404,7 +404,7 @@ func expandDataFactoryIntegrationRuntimeAzureSsisProperties(d *pluginsdk.Resourc

sasToken := &datafactory.SecureString{
Value: utils.String(customSetupScript["sas_token"].(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}

ssisProperties.CustomSetupScriptProperties = &datafactory.IntegrationRuntimeCustomSetupScriptProperties{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ func expandDataFactoryIntegrationRuntimeManagedSsisProperties(d *pluginsdk.Resou
if adminPassword := catalogInfo["administrator_password"]; adminPassword.(string) != "" {
ssisProperties.CatalogInfo.CatalogAdminPassword = &datafactory.SecureString{
Value: utils.String(adminPassword.(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}
}
}
Expand All @@ -404,7 +404,7 @@ func expandDataFactoryIntegrationRuntimeManagedSsisProperties(d *pluginsdk.Resou

sasToken := &datafactory.SecureString{
Value: utils.String(customSetupScript["sas_token"].(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}

ssisProperties.CustomSetupScriptProperties = &datafactory.IntegrationRuntimeCustomSetupScriptProperties{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func expandAzureRmDataFactoryIntegrationRuntimeSelfHostedTypeProperties(d *plugi
linkedInfo := &datafactory.SelfHostedIntegrationRuntimeTypeProperties{
LinkedInfo: &datafactory.LinkedIntegrationRuntimeRbacAuthorization{
ResourceID: &rbac,
AuthorizationType: datafactory.AuthorizationTypeAuthorizationTypeRBAC,
AuthorizationType: datafactory.AuthorizationTypeRBAC,
},
}
return linkedInfo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,14 @@ func resourceDataFactoryLinkedServiceBlobStorageCreateUpdate(d *pluginsdk.Resour
if v, ok := d.GetOk("connection_string"); ok {
blobStorageProperties.ConnectionString = &datafactory.SecureString{
Value: utils.String(v.(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}
}

if v, ok := d.GetOk("sas_uri"); ok {
blobStorageProperties.SasURI = &datafactory.SecureString{
Value: utils.String(v.(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}
}

Expand All @@ -193,7 +193,7 @@ func resourceDataFactoryLinkedServiceBlobStorageCreateUpdate(d *pluginsdk.Resour
} else {
secureString := datafactory.SecureString{
Value: utils.String(d.Get("service_principal_key").(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}

blobStorageProperties.ServicePrincipalID = utils.String(d.Get("service_principal_id").(string))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ func resourceDataFactoryLinkedServiceDatabricksCreateUpdate(d *pluginsdk.Resourc
databricksProperties = &datafactory.AzureDatabricksLinkedServiceTypeProperties{
AccessToken: &datafactory.SecureString{
Value: utils.String(accessTokenAuth),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func resourceDataFactoryLinkedServiceAzureFileStorageCreateUpdate(d *pluginsdk.R
fileStorageProperties := &datafactory.AzureFileStorageLinkedServiceTypeProperties{
ConnectionString: &datafactory.SecureString{
Value: utils.String(d.Get("connection_string").(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
},
FileShare: d.Get("file_share").(string),
Host: d.Get("host").(string),
Expand All @@ -180,7 +180,7 @@ func resourceDataFactoryLinkedServiceAzureFileStorageCreateUpdate(d *pluginsdk.R
if password != "" {
fileStorageProperties.Password = &datafactory.SecureString{
Value: utils.String(d.Get("password").(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func resourceDataFactoryLinkedServiceAzureFunctionCreateUpdate(d *pluginsdk.Reso
FunctionAppURL: d.Get("url").(string),
FunctionKey: &datafactory.SecureString{
Value: utils.String(d.Get("key").(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
},
},
Type: datafactory.TypeBasicLinkedServiceTypeAzureFunction,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func resourceDataFactoryLinkedServiceAzureSearchCreateUpdate(d *pluginsdk.Resour
AzureSearchLinkedServiceTypeProperties: &datafactory.AzureSearchLinkedServiceTypeProperties{
URL: d.Get("url").(string),
Key: &datafactory.SecureString{
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
Value: utils.String(d.Get("search_service_key").(string)),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func resourceDataFactoryLinkedServiceAzureSQLDatabaseCreateUpdate(d *pluginsdk.R
if v, ok := d.GetOk("connection_string"); ok {
sqlDatabaseProperties.ConnectionString = &datafactory.SecureString{
Value: utils.String(v.(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}
}

Expand All @@ -214,7 +214,7 @@ func resourceDataFactoryLinkedServiceAzureSQLDatabaseCreateUpdate(d *pluginsdk.R
} else {
secureString := datafactory.SecureString{
Value: utils.String(d.Get("service_principal_key").(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}

sqlDatabaseProperties.ServicePrincipalID = utils.String(d.Get("service_principal_id").(string))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func resourceDataFactoryLinkedServiceTableStorageCreateUpdate(d *pluginsdk.Resou
AzureStorageLinkedServiceTypeProperties: &datafactory.AzureStorageLinkedServiceTypeProperties{
ConnectionString: &datafactory.SecureString{
Value: utils.String(d.Get("connection_string").(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
},
},
Type: datafactory.TypeBasicLinkedServiceTypeAzureTableStorage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func resourceDataFactoryLinkedServiceCosmosDbCreateUpdate(d *pluginsdk.ResourceD
if isAccountDetailUsed {
accountKeySecureString := datafactory.SecureString{
Value: &accountKey,
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}
cosmosdbProperties.AccountEndpoint = endpoint
cosmosdbProperties.AccountKey = accountKeySecureString
Expand All @@ -163,7 +163,7 @@ func resourceDataFactoryLinkedServiceCosmosDbCreateUpdate(d *pluginsdk.ResourceD
connectionString := d.Get("connection_string").(string)
connectionStringSecureString := datafactory.SecureString{
Value: &connectionString,
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}
cosmosdbProperties.ConnectionString = connectionStringSecureString
cosmosdbProperties.Database = databaseName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,13 @@ func resourceDataFactoryLinkedServiceDataLakeStorageGen2CreateUpdate(d *pluginsd
URL: utils.String(d.Get("url").(string)),
AccountKey: datafactory.SecureString{
Value: utils.String(v.(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
},
}
} else {
secureString := datafactory.SecureString{
Value: utils.String(d.Get("service_principal_key").(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}

datalakeStorageGen2Properties = &datafactory.AzureBlobFSLinkedServiceTypeProperties{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func resourceDataFactoryLinkedServiceKustoCreateUpdate(d *pluginsdk.ResourceData
ServicePrincipalID: v.(string),
ServicePrincipalKey: &datafactory.SecureString{
Value: utils.String(d.Get("service_principal_key").(string)),
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
},
Tenant: utils.String(d.Get("tenant").(string)),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func resourceDataFactoryLinkedServiceMySQLCreateUpdate(d *pluginsdk.ResourceData
connectionString := d.Get("connection_string").(string)
secureString := datafactory.SecureString{
Value: &connectionString,
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}

mysqlProperties := &datafactory.MySQLLinkedServiceTypeProperties{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func resourceDataFactoryLinkedServicePostgreSQLCreateUpdate(d *pluginsdk.Resourc
connectionString := d.Get("connection_string").(string)
secureString := datafactory.SecureString{
Value: &connectionString,
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}

postgresqlProperties := &datafactory.PostgreSQLLinkedServiceTypeProperties{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func resourceDataFactoryLinkedServiceSFTPCreateUpdate(d *pluginsdk.ResourceData,

passwordSecureString := datafactory.SecureString{
Value: &password,
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}

sftpProperties := &datafactory.SftpServerLinkedServiceTypeProperties{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func resourceDataFactoryLinkedServiceWebCreateUpdate(d *pluginsdk.ResourceData,
password := d.Get("password").(string)
passwordSecureString := datafactory.SecureString{
Value: &password,
Type: datafactory.TypeTypeSecureString,
Type: datafactory.TypeSecureString,
}
basicAuthProperties := &datafactory.WebBasicAuthentication{
AuthenticationType: datafactory.AuthenticationType(authenticationType),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ func expandFirewallPolicyRuleCollectionNat(input []interface{}) []network.BasicF
for _, e := range input {
rule := e.(map[string]interface{})
output := &network.FirewallPolicyNatRuleCollection{
RuleCollectionType: network.RuleCollectionTypeRuleCollectionTypeFirewallPolicyNatRuleCollection,
RuleCollectionType: network.RuleCollectionTypeFirewallPolicyNatRuleCollection,
Name: utils.String(rule["name"].(string)),
Priority: utils.Int32(int32(rule["priority"].(int))),
Action: &network.FirewallPolicyNatRuleCollectionAction{
Expand All @@ -543,7 +543,7 @@ func expandFirewallPolicyFilterRuleCollection(input []interface{}, f func(input
},
Name: utils.String(rule["name"].(string)),
Priority: utils.Int32(int32(rule["priority"].(int))),
RuleCollectionType: network.RuleCollectionTypeRuleCollectionTypeFirewallPolicyFilterRuleCollection,
RuleCollectionType: network.RuleCollectionTypeFirewallPolicyFilterRuleCollection,
Rules: f(rule["rule"].(*pluginsdk.Set).List()),
}
result = append(result, output)
Expand All @@ -565,7 +565,7 @@ func expandFirewallPolicyRuleApplication(input []interface{}) *[]network.BasicFi
}
output := &network.ApplicationRule{
Name: utils.String(condition["name"].(string)),
RuleType: network.RuleTypeRuleTypeApplicationRule,
RuleType: network.RuleTypeApplicationRule,
Protocols: &protocols,
SourceAddresses: utils.ExpandStringSlice(condition["source_addresses"].(*pluginsdk.Set).List()),
SourceIPGroups: utils.ExpandStringSlice(condition["source_ip_groups"].(*pluginsdk.Set).List()),
Expand All @@ -587,7 +587,7 @@ func expandFirewallPolicyRuleNetwork(input []interface{}) *[]network.BasicFirewa
}
output := &network.Rule{
Name: utils.String(condition["name"].(string)),
RuleType: network.RuleTypeRuleTypeNetworkRule,
RuleType: network.RuleTypeNetworkRule,
IPProtocols: &protocols,
SourceAddresses: utils.ExpandStringSlice(condition["source_addresses"].(*pluginsdk.Set).List()),
SourceIPGroups: utils.ExpandStringSlice(condition["source_ip_groups"].(*pluginsdk.Set).List()),
Expand All @@ -612,7 +612,7 @@ func expandFirewallPolicyRuleNat(input []interface{}) *[]network.BasicFirewallPo
destinationAddresses := []string{condition["destination_address"].(string)}
output := &network.NatRule{
Name: utils.String(condition["name"].(string)),
RuleType: network.RuleTypeRuleTypeNatRule,
RuleType: network.RuleTypeNatRule,
IPProtocols: &protocols,
SourceAddresses: utils.ExpandStringSlice(condition["source_addresses"].(*pluginsdk.Set).List()),
SourceIPGroups: utils.ExpandStringSlice(condition["source_ip_groups"].(*pluginsdk.Set).List()),
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/terraform-providers/terraform-provider-azurerm

require (
github.com/Azure/azure-sdk-for-go v54.3.0+incompatible
github.com/Azure/azure-sdk-for-go v55.2.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.18
github.com/Azure/go-autorest/autorest/date v0.3.0
github.com/Azure/go-autorest/autorest/to v0.4.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ github.com/Azure/azure-sdk-for-go v42.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo
github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v47.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v51.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v54.3.0+incompatible h1:aJ/WT32eVP8YmWpuSHLgnFJWjZzUFmhR3wBxxszo4PE=
github.com/Azure/azure-sdk-for-go v54.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v55.2.0+incompatible h1:TL2/vJWJEPOrmv97nHcbvjXES0Ntlb9P95hqGA1J2dU=
github.com/Azure/azure-sdk-for-go v55.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading