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

azurerm_mariadb_server: Add support for ssl_minimal_tls_version_enforced #20556

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ resource "azurerm_data_factory" "test" {
}

resource "azurerm_data_factory_linked_service_azure_blob_storage" "test" {
name = "acctestlsblob%d"
name = "acctestlsblob%d"
data_factory_id = azurerm_data_factory.test.id
connection_string_insecure = "DefaultEndpointsProtocol=https;AccountName=foo;AccountKey=bar"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ func (DataShareDatasetDataLakeGen2DataSource) basic(data acceptance.TestData) st
%s

data "azurerm_data_share_dataset_data_lake_gen2" "test" {
name = azurerm_data_share_dataset_data_lake_gen2.test.name
share_id = azurerm_data_share_dataset_data_lake_gen2.test.share_id
name = azurerm_data_share_dataset_data_lake_gen2.test.name
share_id = azurerm_data_share_dataset_data_lake_gen2.test.share_id
}
`, DataShareDataSetDataLakeGen2Resource{}.basicFile(data))
}
Original file line number Diff line number Diff line change
Expand Up @@ -108,54 +108,54 @@ func (t DataShareDataSetDataLakeGen2Resource) Exists(ctx context.Context, client
func (DataShareDataSetDataLakeGen2Resource) template(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
features {}
}

provider "azuread" {
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-datashare-%[1]d"
location = "%[2]s"
name = "acctestRG-datashare-%[1]d"
location = "%[2]s"
}

resource "azurerm_data_share_account" "test" {
name = "acctest-dsa-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
identity {
type = "SystemAssigned"
}
name = "acctest-dsa-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
identity {
type = "SystemAssigned"
}
}

resource "azurerm_data_share" "test" {
name = "acctest_ds_%[1]d"
account_id = azurerm_data_share_account.test.id
kind = "CopyBased"
name = "acctest_ds_%[1]d"
account_id = azurerm_data_share_account.test.id
kind = "CopyBased"
}

resource "azurerm_storage_account" "test" {
name = "accteststr%[3]s"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
account_kind = "BlobStorage"
account_tier = "Standard"
account_replication_type = "LRS"
name = "accteststr%[3]s"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
account_kind = "BlobStorage"
account_tier = "Standard"
account_replication_type = "LRS"
}

resource "azurerm_storage_data_lake_gen2_filesystem" "test" {
name = "acctest-%[1]d"
storage_account_id = azurerm_storage_account.test.id
name = "acctest-%[1]d"
storage_account_id = azurerm_storage_account.test.id
}

data "azuread_service_principal" "test" {
display_name = azurerm_data_share_account.test.name
display_name = azurerm_data_share_account.test.name
}

resource "azurerm_role_assignment" "test" {
scope = azurerm_storage_account.test.id
role_definition_name = "Storage Blob Data Reader"
principal_id = data.azuread_service_principal.test.object_id
scope = azurerm_storage_account.test.id
role_definition_name = "Storage Blob Data Reader"
principal_id = data.azuread_service_principal.test.object_id
}
`, data.RandomInteger, data.Locations.Primary, data.RandomString)
}
Expand All @@ -165,14 +165,14 @@ func (r DataShareDataSetDataLakeGen2Resource) basicFile(data acceptance.TestData
%s

resource "azurerm_data_share_dataset_data_lake_gen2" "test" {
name = "acctest-dlds-%d"
share_id = azurerm_data_share.test.id
storage_account_id = azurerm_storage_account.test.id
file_system_name = azurerm_storage_data_lake_gen2_filesystem.test.name
file_path = "myfile.txt"
depends_on = [
azurerm_role_assignment.test,
]
name = "acctest-dlds-%d"
share_id = azurerm_data_share.test.id
storage_account_id = azurerm_storage_account.test.id
file_system_name = azurerm_storage_data_lake_gen2_filesystem.test.name
file_path = "myfile.txt"
depends_on = [
azurerm_role_assignment.test,
]
}
`, r.template(data), data.RandomInteger)
}
Expand All @@ -182,14 +182,14 @@ func (r DataShareDataSetDataLakeGen2Resource) basicFolder(data acceptance.TestDa
%s

resource "azurerm_data_share_dataset_data_lake_gen2" "test" {
name = "acctest-dlds-%d"
share_id = azurerm_data_share.test.id
storage_account_id = azurerm_storage_account.test.id
file_system_name = azurerm_storage_data_lake_gen2_filesystem.test.name
folder_path = "test"
depends_on = [
azurerm_role_assignment.test,
]
name = "acctest-dlds-%d"
share_id = azurerm_data_share.test.id
storage_account_id = azurerm_storage_account.test.id
file_system_name = azurerm_storage_data_lake_gen2_filesystem.test.name
folder_path = "test"
depends_on = [
azurerm_role_assignment.test,
]
}
`, r.template(data), data.RandomInteger)
}
Expand All @@ -199,13 +199,13 @@ func (r DataShareDataSetDataLakeGen2Resource) basicSystem(data acceptance.TestDa
%s

resource "azurerm_data_share_dataset_data_lake_gen2" "test" {
name = "acctest-dlds-%d"
share_id = azurerm_data_share.test.id
storage_account_id = azurerm_storage_account.test.id
file_system_name = azurerm_storage_data_lake_gen2_filesystem.test.name
depends_on = [
azurerm_role_assignment.test,
]
name = "acctest-dlds-%d"
share_id = azurerm_data_share.test.id
storage_account_id = azurerm_storage_account.test.id
file_system_name = azurerm_storage_data_lake_gen2_filesystem.test.name
depends_on = [
azurerm_role_assignment.test,
]
}
`, r.template(data), data.RandomInteger)
}
Expand All @@ -215,11 +215,11 @@ func (r DataShareDataSetDataLakeGen2Resource) requiresImport(data acceptance.Tes
%s

resource "azurerm_data_share_dataset_data_lake_gen2" "import" {
name = azurerm_data_share_dataset_data_lake_gen2.test.name
share_id = azurerm_data_share.test.id
storage_account_id = azurerm_data_share_dataset_data_lake_gen2.test.storage_account_id
file_system_name = azurerm_data_share_dataset_data_lake_gen2.test.file_system_name
file_path = azurerm_data_share_dataset_data_lake_gen2.test.file_path
name = azurerm_data_share_dataset_data_lake_gen2.test.name
share_id = azurerm_data_share.test.id
storage_account_id = azurerm_data_share_dataset_data_lake_gen2.test.storage_account_id
file_system_name = azurerm_data_share_dataset_data_lake_gen2.test.file_system_name
file_path = azurerm_data_share_dataset_data_lake_gen2.test.file_path
}
`, r.basicFile(data))
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ func (DataShareKustoClusterDatasetDataSource) basic(data acceptance.TestData) st
%s

data "azurerm_data_share_dataset_kusto_cluster" "test" {
name = azurerm_data_share_dataset_kusto_cluster.test.name
share_id = azurerm_data_share_dataset_kusto_cluster.test.share_id
name = azurerm_data_share_dataset_kusto_cluster.test.name
share_id = azurerm_data_share_dataset_kusto_cluster.test.share_id
}
`, ShareKustoClusterDataSetResource{}.basic(data))
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,44 +72,44 @@ func (t ShareKustoClusterDataSetResource) Exists(ctx context.Context, clients *c
func (ShareKustoClusterDataSetResource) template(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-datashare-%[1]d"
location = "%[2]s"
name = "acctestRG-datashare-%[1]d"
location = "%[2]s"
}

resource "azurerm_data_share_account" "test" {
name = "acctest-DSA-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
identity {
type = "SystemAssigned"
}
name = "acctest-DSA-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
identity {
type = "SystemAssigned"
}
}

resource "azurerm_data_share" "test" {
name = "acctest_DS_%[1]d"
account_id = azurerm_data_share_account.test.id
kind = "InPlace"
name = "acctest_DS_%[1]d"
account_id = azurerm_data_share_account.test.id
kind = "InPlace"
}

resource "azurerm_kusto_cluster" "test" {
name = "acctestkc%[3]s"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name

sku {
name = "Dev(No SLA)_Standard_D11_v2"
capacity = 1
}
name = "acctestkc%[3]s"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name

sku {
name = "Dev(No SLA)_Standard_D11_v2"
capacity = 1
}
}

resource "azurerm_role_assignment" "test" {
scope = azurerm_kusto_cluster.test.id
role_definition_name = "Contributor"
principal_id = azurerm_data_share_account.test.identity.0.principal_id
scope = azurerm_kusto_cluster.test.id
role_definition_name = "Contributor"
principal_id = azurerm_data_share_account.test.identity.0.principal_id
}
`, data.RandomInteger, data.Locations.Primary, data.RandomString)
}
Expand All @@ -119,12 +119,12 @@ func (r ShareKustoClusterDataSetResource) basic(data acceptance.TestData) string
%s

resource "azurerm_data_share_dataset_kusto_cluster" "test" {
name = "acctest-DSKC-%d"
share_id = azurerm_data_share.test.id
kusto_cluster_id = azurerm_kusto_cluster.test.id
depends_on = [
azurerm_role_assignment.test,
]
name = "acctest-DSKC-%d"
share_id = azurerm_data_share.test.id
kusto_cluster_id = azurerm_kusto_cluster.test.id
depends_on = [
azurerm_role_assignment.test,
]
}
`, r.template(data), data.RandomInteger)
}
Expand All @@ -134,9 +134,9 @@ func (r ShareKustoClusterDataSetResource) requiresImport(data acceptance.TestDat
%s

resource "azurerm_data_share_dataset_kusto_cluster" "import" {
name = azurerm_data_share_dataset_kusto_cluster.test.name
share_id = azurerm_data_share.test.id
kusto_cluster_id = azurerm_kusto_cluster.test.id
name = azurerm_data_share_dataset_kusto_cluster.test.name
share_id = azurerm_data_share.test.id
kusto_cluster_id = azurerm_kusto_cluster.test.id
}
`, r.basic(data))
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ func (DataShareDatasetKustoDatabaseDataSource) basic(data acceptance.TestData) s
%s

data "azurerm_data_share_dataset_kusto_database" "test" {
name = azurerm_data_share_dataset_kusto_database.test.name
share_id = azurerm_data_share_dataset_kusto_database.test.share_id
name = azurerm_data_share_dataset_kusto_database.test.name
share_id = azurerm_data_share_dataset_kusto_database.test.share_id
}
`, DataShareDataSetKustoDatabaseResource{}.basic(data))
}
Loading