New Resource: azurerm_sql_active_directory_administrator

azurerm/config.go

@@ -112,18 +112,19 @@ type ArmClient struct {
 	vmClient               compute.VirtualMachinesClient
 
 	// Databases
-	mysqlConfigurationsClient      mysql.ConfigurationsClient
-	mysqlDatabasesClient           mysql.DatabasesClient
-	mysqlFirewallRulesClient       mysql.FirewallRulesClient
-	mysqlServersClient             mysql.ServersClient
-	postgresqlConfigurationsClient postgresql.ConfigurationsClient
-	postgresqlDatabasesClient      postgresql.DatabasesClient
-	postgresqlFirewallRulesClient  postgresql.FirewallRulesClient
-	postgresqlServersClient        postgresql.ServersClient
-	sqlDatabasesClient             sql.DatabasesClient
-	sqlElasticPoolsClient          sql.ElasticPoolsClient
-	sqlFirewallRulesClient         sql.FirewallRulesClient
-	sqlServersClient               sql.ServersClient
+	mysqlConfigurationsClient            mysql.ConfigurationsClient
+	mysqlDatabasesClient                 mysql.DatabasesClient
+	mysqlFirewallRulesClient             mysql.FirewallRulesClient
+	mysqlServersClient                   mysql.ServersClient
+	postgresqlConfigurationsClient       postgresql.ConfigurationsClient
+	postgresqlDatabasesClient            postgresql.DatabasesClient
+	postgresqlFirewallRulesClient        postgresql.FirewallRulesClient
+	postgresqlServersClient              postgresql.ServersClient
+	sqlDatabasesClient                   sql.DatabasesClient
+	sqlElasticPoolsClient                sql.ElasticPoolsClient
+	sqlFirewallRulesClient               sql.FirewallRulesClient
+	sqlServersClient                     sql.ServersClient
+	sqlServerAzureADAdministratorsClient sql.ServerAzureADAdministratorsClient
 
 	// KeyVault
 	keyVaultClient           keyvault.VaultsClient
@@ -586,6 +587,13 @@ func (c *ArmClient) registerDatabases(endpoint, subscriptionId string, auth auto
 	sqlSrvClient.Sender = sender
 	sqlSrvClient.SkipResourceProviderRegistration = c.skipProviderRegistration
 	c.sqlServersClient = sqlSrvClient
+
+	sqlADClient := sql.NewServerAzureADAdministratorsClientWithBaseURI(endpoint, subscriptionId)
+	setUserAgent(&sqlADClient.Client)
+	sqlADClient.Authorizer = auth
+	sqlADClient.Sender = sender
+	sqlADClient.SkipResourceProviderRegistration = c.skipProviderRegistration
+	c.sqlServerAzureADAdministratorsClient = sqlADClient
 }
 
 func (c *ArmClient) registerDNSClients(endpoint, subscriptionId string, auth autorest.Authorizer, sender autorest.Sender) {

azurerm/import_arm_sql_administrator_test.go

@@ -0,0 +1,31 @@
+package azurerm
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccAzureRMSqlAdministrator_importBasic(t *testing.T) {
+	resourceName := "azurerm_sql_active_directory_administrator.test"
+
+	ri := acctest.RandInt()
+	config := testAccAzureRMSqlAdministrator_basic(ri, testLocation())
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMSqlAdministratorDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

azurerm/provider.go

@@ -181,6 +181,7 @@ func Provider() terraform.ResourceProvider {
 			"azurerm_sql_database":                        resourceArmSqlDatabase(),
 			"azurerm_sql_elasticpool":                     resourceArmSqlElasticPool(),
 			"azurerm_sql_firewall_rule":                   resourceArmSqlFirewallRule(),
+			"azurerm_sql_active_directory_administrator":  resourceArmSqlAdministrator(),
 			"azurerm_sql_server":                          resourceArmSqlServer(),
 			"azurerm_storage_account":                     resourceArmStorageAccount(),
 			"azurerm_storage_blob":                        resourceArmStorageBlob(),

azurerm/resource_arm_sql_administrator.go

@@ -0,0 +1,143 @@
+package azurerm
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2015-05-01-preview/sql"
+	"github.com/hashicorp/terraform/helper/schema"
+	uuid "github.com/satori/go.uuid"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
+)
+
+func resourceArmSqlAdministrator() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceArmSqlActiveDirectoryAdministratorCreateUpdate,
+		Read:   resourceArmSqlActiveDirectoryAdministratorRead,
+		Update: resourceArmSqlActiveDirectoryAdministratorCreateUpdate,
+		Delete: resourceArmSqlActiveDirectoryAdministratorDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"server_name": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"resource_group_name": resourceGroupNameSchema(),
+
+			"login": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+
+			"object_id": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateUUID,
+			},
+
+			"tenant_id": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateUUID,
+			},
+		},
+	}
+}
+
+func resourceArmSqlActiveDirectoryAdministratorCreateUpdate(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*ArmClient).sqlServerAzureADAdministratorsClient
+	ctx := meta.(*ArmClient).StopContext
+
+	serverName := d.Get("server_name").(string)
+	resGroup := d.Get("resource_group_name").(string)
+	administratorName := "activeDirectory"
+	login := d.Get("login").(string)
+	objectId := uuid.FromStringOrNil(d.Get("object_id").(string))
+	tenantId := uuid.FromStringOrNil(d.Get("tenant_id").(string))
+	parameters := sql.ServerAzureADAdministrator{
+		ServerAdministratorProperties: &sql.ServerAdministratorProperties{
+			AdministratorType: utils.String("ActiveDirectory"),
+			Login:             utils.String(login),
+			Sid:               &objectId,
+			TenantID:          &tenantId,
+		},
+	}
+
+	future, err := client.CreateOrUpdate(ctx, resGroup, serverName, administratorName, parameters)
+	if err != nil {
+		return err
+	}
+
+	err = future.WaitForCompletion(ctx, client.Client)
+	if err != nil {
+		return err
+	}
+
+	resp, err := client.Get(ctx, resGroup, serverName, administratorName)
+	if err != nil {
+		return err
+	}
+
+	d.SetId(*resp.ID)
+
+	return nil
+}
+
+func resourceArmSqlActiveDirectoryAdministratorRead(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*ArmClient).sqlServerAzureADAdministratorsClient
+	ctx := meta.(*ArmClient).StopContext
+
+	id, err := parseAzureResourceID(d.Id())
+	if err != nil {
+		return err
+	}
+
+	resourceGroup := id.ResourceGroup
+	serverName := id.Path["servers"]
+	administratorName := id.Path["administrators"]
+
+	resp, err := client.Get(ctx, resourceGroup, serverName, administratorName)
+	if err != nil {
+		if utils.ResponseWasNotFound(resp.Response) {
+			log.Printf("[INFO] Error reading SQL AD administrator %q - removing from state", d.Id())
+			d.SetId("")
+			return nil
+		}
+
+		return fmt.Errorf("Error reading SQL AD administrator: %+v", err)
+	}
+
+	d.Set("resource_group_name", resourceGroup)
+	d.Set("server_name", serverName)
+	d.Set("login", resp.Login)
+	d.Set("object_id", resp.Sid.String())
+	d.Set("tenant_id", resp.TenantID.String())
+
+	return nil
+}
+
+func resourceArmSqlActiveDirectoryAdministratorDelete(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*ArmClient).sqlServerAzureADAdministratorsClient
+	ctx := meta.(*ArmClient).StopContext
+
+	id, err := parseAzureResourceID(d.Id())
+	if err != nil {
+		return err
+	}
+
+	resourceGroup := id.ResourceGroup
+	serverName := id.Path["servers"]
+	administratorName := id.Path["administrators"]
+
+	_, err = client.Delete(ctx, resourceGroup, serverName, administratorName)
+	if err != nil {
+		return fmt.Errorf("Error deleting SQL AD administrator: %+v", err)
+	}
+
+	return nil
+}