Skip to content

Commit

Permalink
hdinsight - fixup tests and deprecation for 4.0 (#26784)
Browse files Browse the repository at this point in the history 
* fixup tests for 4.0
fixup deprecation to correctly reflect service change

* update from reserved username, fixup nsg config typo

* remove invalid commas

* update RG name to identify service creating the RG to make it easier to target cleanups via tooling

* correctly flip pn policies to disabled

* add ignore_changes

* update doc to reflect schema change for 4.0

* missed a schema change

* update tests for private_link_service_network_policies_enabled

* remove ignore_changes after revert of configmodeattr

* fixup test config formatting

* fix accidentally flipped bool

* fix subnet ref to account for set

* disable due to error: "code":"BadRequest","message":"The subnet is not configured correctly for provisioning private link services. Please set PrivateLinkServiceNetworkPolicies to 'Disabled' on the target subnet.

* missed sql deprecation
  • Loading branch information
@jackofallops
jackofallops authored Aug 1, 2024
1 parent 1712e1b commit b0f5811
Show file tree
Hide file tree
Showing 9 changed files with 514 additions and 383 deletions.
2 changes: 1 addition & 1 deletion internal/services/hdinsight/hdinsight_cluster_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ resource "azurerm_subnet" "test" {
name = "acctestSubnet-%[1]d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = [cidrsubnet(azurerm_virtual_network.test.address_space.0, 8, 0)]
address_prefixes = ["10.10.1.0/24"]
}
resource "azurerm_network_security_group" "test" {
Expand Down
126 changes: 56 additions & 70 deletions internal/services/hdinsight/hdinsight_hadoop_cluster_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ func testAccHDInsightHadoopCluster_securityProfile(t *testing.T) {
})
}

func (t HDInsightHadoopClusterResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
func (r HDInsightHadoopClusterResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := commonids.ParseHDInsightClusterID(state.ID)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1441,7 +1441,7 @@ resource "azurerm_subnet" "test" {
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["172.16.11.0/26"]
enforce_private_link_service_network_policies = true
private_link_service_network_policies_enabled = false
}
resource "azurerm_public_ip" "test" {
Expand Down Expand Up @@ -1772,7 +1772,7 @@ provider "azurerm" {
}
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
name = "acctestRG-hdi-%d"
location = "%s"
}
Expand All @@ -1799,7 +1799,7 @@ provider "azurerm" {
}
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
name = "acctestRG-hdi-%d"
location = "%s"
}
Expand Down Expand Up @@ -1931,47 +1931,37 @@ resource "azurerm_hdinsight_hadoop_cluster" "test" {
func (r HDInsightHadoopClusterResource) allMetastores(data acceptance.TestData) string {
return fmt.Sprintf(`
%s
resource "azurerm_sql_server" "test" {
resource "azurerm_mssql_server" "test" {
name = "acctestsql-%d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
administrator_login = "sql_admin"
administrator_login_password = "TerrAform123!"
version = "12.0"
}
resource "azurerm_sql_database" "hive" {
name = "hive"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
server_name = azurerm_sql_server.test.name
collation = "SQL_Latin1_General_CP1_CI_AS"
create_mode = "Default"
requested_service_objective_name = "GP_Gen5_2"
}
resource "azurerm_sql_database" "oozie" {
name = "oozie"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
server_name = azurerm_sql_server.test.name
collation = "SQL_Latin1_General_CP1_CI_AS"
create_mode = "Default"
requested_service_objective_name = "GP_Gen5_2"
}
resource "azurerm_sql_database" "ambari" {
name = "ambari"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
server_name = azurerm_sql_server.test.name
collation = "SQL_Latin1_General_CP1_CI_AS"
create_mode = "Default"
requested_service_objective_name = "GP_Gen5_2"
}
resource "azurerm_sql_firewall_rule" "AzureServices" {
name = "allow-azure-services"
resource_group_name = azurerm_resource_group.test.name
server_name = azurerm_sql_server.test.name
start_ip_address = "0.0.0.0"
end_ip_address = "0.0.0.0"
resource "azurerm_mssql_database" "hive" {
name = "hive"
server_id = azurerm_mssql_server.test.id
collation = "SQL_Latin1_General_CP1_CI_AS"
create_mode = "Default"
}
resource "azurerm_mssql_database" "oozie" {
name = "oozie"
server_id = azurerm_mssql_server.test.id
collation = "SQL_Latin1_General_CP1_CI_AS"
create_mode = "Default"
}
resource "azurerm_mssql_database" "ambari" {
name = "ambari"
server_id = azurerm_mssql_server.test.id
collation = "SQL_Latin1_General_CP1_CI_AS"
create_mode = "Default"
}
resource "azurerm_mssql_firewall_rule" "AzureServices" {
name = "allow-azure-services"
server_id = azurerm_mssql_server.test.id
start_ip_address = "0.0.0.0"
end_ip_address = "0.0.0.0"
}
resource "azurerm_hdinsight_hadoop_cluster" "test" {
name = "acctesthdi-%d"
Expand Down Expand Up @@ -2011,22 +2001,22 @@ resource "azurerm_hdinsight_hadoop_cluster" "test" {
}
metastores {
hive {
server = azurerm_sql_server.test.fully_qualified_domain_name
database_name = azurerm_sql_database.hive.name
username = azurerm_sql_server.test.administrator_login
password = azurerm_sql_server.test.administrator_login_password
server = azurerm_mssql_server.test.fully_qualified_domain_name
database_name = azurerm_mssql_database.hive.name
username = azurerm_mssql_server.test.administrator_login
password = azurerm_mssql_server.test.administrator_login_password
}
oozie {
server = azurerm_sql_server.test.fully_qualified_domain_name
database_name = azurerm_sql_database.oozie.name
username = azurerm_sql_server.test.administrator_login
password = azurerm_sql_server.test.administrator_login_password
server = azurerm_mssql_server.test.fully_qualified_domain_name
database_name = azurerm_mssql_database.oozie.name
username = azurerm_mssql_server.test.administrator_login
password = azurerm_mssql_server.test.administrator_login_password
}
ambari {
server = azurerm_sql_server.test.fully_qualified_domain_name
database_name = azurerm_sql_database.ambari.name
username = azurerm_sql_server.test.administrator_login
password = azurerm_sql_server.test.administrator_login_password
server = azurerm_mssql_server.test.fully_qualified_domain_name
database_name = azurerm_mssql_database.ambari.name
username = azurerm_mssql_server.test.administrator_login
password = azurerm_mssql_server.test.administrator_login_password
}
}
}
Expand All @@ -2036,29 +2026,25 @@ resource "azurerm_hdinsight_hadoop_cluster" "test" {
func (r HDInsightHadoopClusterResource) hiveMetastore(data acceptance.TestData) string {
return fmt.Sprintf(`
%s
resource "azurerm_sql_server" "test" {
resource "azurerm_mssql_server" "test" {
name = "acctestsql-%d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
administrator_login = "sql_admin"
administrator_login_password = "TerrAform123!"
version = "12.0"
}
resource "azurerm_sql_database" "hive" {
name = "hive"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
server_name = azurerm_sql_server.test.name
collation = "SQL_Latin1_General_CP1_CI_AS"
create_mode = "Default"
requested_service_objective_name = "GP_Gen5_2"
}
resource "azurerm_sql_firewall_rule" "AzureServices" {
name = "allow-azure-services"
resource_group_name = azurerm_resource_group.test.name
server_name = azurerm_sql_server.test.name
start_ip_address = "0.0.0.0"
end_ip_address = "0.0.0.0"
resource "azurerm_mssql_database" "hive" {
name = "hive"
server_id = azurerm_mssql_server.test.id
collation = "SQL_Latin1_General_CP1_CI_AS"
create_mode = "Default"
}
resource "azurerm_mssql_firewall_rule" "AzureServices" {
name = "allow-azure-services"
server_id = azurerm_mssql_server.test.id
start_ip_address = "0.0.0.0"
end_ip_address = "0.0.0.0"
}
resource "azurerm_hdinsight_hadoop_cluster" "test" {
name = "acctesthdi-%d"
Expand Down Expand Up @@ -2098,10 +2084,10 @@ resource "azurerm_hdinsight_hadoop_cluster" "test" {
}
metastores {
hive {
server = azurerm_sql_server.test.fully_qualified_domain_name
database_name = azurerm_sql_database.hive.name
username = azurerm_sql_server.test.administrator_login
password = azurerm_sql_server.test.administrator_login_password
server = azurerm_mssql_server.test.fully_qualified_domain_name
database_name = azurerm_mssql_database.hive.name
username = azurerm_mssql_server.test.administrator_login
password = azurerm_mssql_server.test.administrator_login_password
}
}
}
Expand Down
Loading

0 comments on commit b0f5811

Please sign in to comment.