New resources azurerm_mssql_virtual_machine_group and `azurerm_mssq…

…l_virtual_machine_availability_group_listener` (#22808) * sql vm high availability * update * resolve comments * flatten private_ip_address and update doc * fix lint --------- Co-authored-by: Catriona <catriona@hashicorp.com>
hashicorp · Aug 14, 2023 · 5b57b45 · 5b57b45
1 parent 87cd096
commit 5b57b45
Show file tree

Hide file tree

Showing 51 changed files with 4,716 additions and 31 deletions.
diff --git a/.github/labeler-issue-triage.yml b/.github/labeler-issue-triage.yml
@@ -229,7 +229,7 @@ service/monitor:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_monitor_((.|\n)*)###'
 
 service/mssql:
-  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(mssql_database\W+|mssql_database_extended_auditing_policy\W+|mssql_database_vulnerability_assessment_rule_baseline\W+|mssql_elasticpool\W+|mssql_failover_group\W+|mssql_firewall_rule\W+|mssql_job_agent\W+|mssql_job_credential\W+|mssql_outbound_firewall_rule\W+|mssql_server\W+|mssql_server_dns_alias\W+|mssql_server_extended_auditing_policy\W+|mssql_server_microsoft_support_auditing_policy\W+|mssql_server_security_alert_policy\W+|mssql_server_transparent_data_encryption\W+|mssql_server_vulnerability_assessment\W+|mssql_virtual_machine\W+|mssql_virtual_network_rule\W+)((.|\n)*)###'
+  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(mssql_database\W+|mssql_database_extended_auditing_policy\W+|mssql_database_vulnerability_assessment_rule_baseline\W+|mssql_elasticpool\W+|mssql_failover_group\W+|mssql_firewall_rule\W+|mssql_job_agent\W+|mssql_job_credential\W+|mssql_outbound_firewall_rule\W+|mssql_server\W+|mssql_server_dns_alias\W+|mssql_server_extended_auditing_policy\W+|mssql_server_microsoft_support_auditing_policy\W+|mssql_server_security_alert_policy\W+|mssql_server_transparent_data_encryption\W+|mssql_server_vulnerability_assessment\W+|mssql_virtual_machine\W+|mssql_virtual_machine_availability_group_listener\W+|mssql_virtual_machine_group\W+|mssql_virtual_network_rule\W+)((.|\n)*)###'
 
 service/mssqlmanagedinstance:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_mssql_managed_((.|\n)*)###'

diff --git a/internal/services/mssql/client/client.go b/internal/services/mssql/client/client.go
@@ -5,6 +5,8 @@ package client
 
 import (
 	"github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/v5.0/sql" // nolint: staticcheck
+	"github.com/hashicorp/go-azure-sdk/resource-manager/sqlvirtualmachine/2022-02-01/availabilitygrouplisteners"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/sqlvirtualmachine/2022-02-01/sqlvirtualmachinegroups"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/sqlvirtualmachine/2022-02-01/sqlvirtualmachines"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
 )
@@ -37,7 +39,9 @@ type Client struct {
 	ServerVulnerabilityAssessmentsClient               *sql.ServerVulnerabilityAssessmentsClient
 	ServersClient                                      *sql.ServersClient
 	TransparentDataEncryptionsClient                   *sql.TransparentDataEncryptionsClient
+	VirtualMachinesAvailabilityGroupListenersClient    *availabilitygrouplisteners.AvailabilityGroupListenersClient
 	VirtualMachinesClient                              *sqlvirtualmachines.SqlVirtualMachinesClient
+	VirtualMachineGroupsClient                         *sqlvirtualmachinegroups.SqlVirtualMachineGroupsClient
 	VirtualNetworkRulesClient                          *sql.VirtualNetworkRulesClient
 }
 
@@ -123,9 +127,15 @@ func NewClient(o *common.ClientOptions) *Client {
 	transparentDataEncryptionsClient := sql.NewTransparentDataEncryptionsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&transparentDataEncryptionsClient.Client, o.ResourceManagerAuthorizer)
 
+	virtualMachinesAvailabilityGroupListenersClient := availabilitygrouplisteners.NewAvailabilityGroupListenersClientWithBaseURI(o.ResourceManagerEndpoint)
+	o.ConfigureClient(&virtualMachinesAvailabilityGroupListenersClient.Client, o.ResourceManagerAuthorizer)
+
 	virtualMachinesClient := sqlvirtualmachines.NewSqlVirtualMachinesClientWithBaseURI(o.ResourceManagerEndpoint)
 	o.ConfigureClient(&virtualMachinesClient.Client, o.ResourceManagerAuthorizer)
 
+	virtualMachineGroupsClient := sqlvirtualmachinegroups.NewSqlVirtualMachineGroupsClientWithBaseURI(o.ResourceManagerEndpoint)
+	o.ConfigureClient(&virtualMachineGroupsClient.Client, o.ResourceManagerAuthorizer)
+
 	virtualNetworkRulesClient := sql.NewVirtualNetworkRulesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&virtualNetworkRulesClient.Client, o.ResourceManagerAuthorizer)
 
@@ -134,30 +144,32 @@ func NewClient(o *common.ClientOptions) *Client {
 		DatabaseExtendedBlobAuditingPoliciesClient:         &databaseExtendedBlobAuditingPoliciesClient,
 		DatabaseSecurityAlertPoliciesClient:                &databaseSecurityAlertPoliciesClient,
 		DatabaseVulnerabilityAssessmentRuleBaselinesClient: &databaseVulnerabilityAssessmentRuleBaselinesClient,
-		DatabasesClient:                          &databasesClient,
-		ElasticPoolsClient:                       &elasticPoolsClient,
-		EncryptionProtectorClient:                &encryptionProtectorClient,
-		FailoverGroupsClient:                     &failoverGroupsClient,
-		FirewallRulesClient:                      &firewallRulesClient,
-		GeoBackupPoliciesClient:                  &geoBackupPoliciesClient,
-		JobAgentsClient:                          &jobAgentsClient,
-		JobCredentialsClient:                     &jobCredentialsClient,
-		LongTermRetentionPoliciesClient:          &longTermRetentionPoliciesClient,
-		OutboundFirewallRulesClient:              &outboundFirewallRulesClient,
-		ReplicationLinksClient:                   &replicationLinksClient,
-		RestorableDroppedDatabasesClient:         &restorableDroppedDatabasesClient,
-		ServerAzureADAdministratorsClient:        &serverAzureADAdministratorsClient,
-		ServerAzureADOnlyAuthenticationsClient:   &serverAzureADOnlyAuthenticationsClient,
-		ServerConnectionPoliciesClient:           &serverConnectionPoliciesClient,
-		ServerDNSAliasClient:                     &serverDNSAliasClient,
-		ServerDevOpsAuditSettingsClient:          &serverDevOpsAuditSettingsClient,
-		ServerExtendedBlobAuditingPoliciesClient: &serverExtendedBlobAuditingPoliciesClient,
-		ServerKeysClient:                         &serverKeysClient,
-		ServerSecurityAlertPoliciesClient:        &serverSecurityAlertPoliciesClient,
-		ServerVulnerabilityAssessmentsClient:     &serverVulnerabilityAssessmentsClient,
-		ServersClient:                            &serversClient,
-		TransparentDataEncryptionsClient:         &transparentDataEncryptionsClient,
-		VirtualMachinesClient:                    &virtualMachinesClient,
-		VirtualNetworkRulesClient:                &virtualNetworkRulesClient,
+		DatabasesClient:                                 &databasesClient,
+		ElasticPoolsClient:                              &elasticPoolsClient,
+		EncryptionProtectorClient:                       &encryptionProtectorClient,
+		FailoverGroupsClient:                            &failoverGroupsClient,
+		FirewallRulesClient:                             &firewallRulesClient,
+		GeoBackupPoliciesClient:                         &geoBackupPoliciesClient,
+		JobAgentsClient:                                 &jobAgentsClient,
+		JobCredentialsClient:                            &jobCredentialsClient,
+		LongTermRetentionPoliciesClient:                 &longTermRetentionPoliciesClient,
+		OutboundFirewallRulesClient:                     &outboundFirewallRulesClient,
+		ReplicationLinksClient:                          &replicationLinksClient,
+		RestorableDroppedDatabasesClient:                &restorableDroppedDatabasesClient,
+		ServerAzureADAdministratorsClient:               &serverAzureADAdministratorsClient,
+		ServerAzureADOnlyAuthenticationsClient:          &serverAzureADOnlyAuthenticationsClient,
+		ServerConnectionPoliciesClient:                  &serverConnectionPoliciesClient,
+		ServerDNSAliasClient:                            &serverDNSAliasClient,
+		ServerDevOpsAuditSettingsClient:                 &serverDevOpsAuditSettingsClient,
+		ServerExtendedBlobAuditingPoliciesClient:        &serverExtendedBlobAuditingPoliciesClient,
+		ServerKeysClient:                                &serverKeysClient,
+		ServerSecurityAlertPoliciesClient:               &serverSecurityAlertPoliciesClient,
+		ServerVulnerabilityAssessmentsClient:            &serverVulnerabilityAssessmentsClient,
+		ServersClient:                                   &serversClient,
+		TransparentDataEncryptionsClient:                &transparentDataEncryptionsClient,
+		VirtualMachinesAvailabilityGroupListenersClient: &virtualMachinesAvailabilityGroupListenersClient,
+		VirtualMachinesClient:                           &virtualMachinesClient,
+		VirtualMachineGroupsClient:                      &virtualMachineGroupsClient,
+		VirtualNetworkRulesClient:                       &virtualNetworkRulesClient,
 	}
 }