New Resource: AWS Glue Catalog Database

aws/config.go

@@ -51,6 +51,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/emr"
 	"github.com/aws/aws-sdk-go/service/firehose"
 	"github.com/aws/aws-sdk-go/service/glacier"
+	"github.com/aws/aws-sdk-go/service/glue"
 	"github.com/aws/aws-sdk-go/service/guardduty"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/aws/aws-sdk-go/service/inspector"
@@ -198,6 +199,7 @@ type AWSClient struct {
 	wafregionalconn       *wafregional.WAFRegional
 	iotconn               *iot.IoT
 	batchconn             *batch.Batch
+	glueconn              *glue.Glue
 	athenaconn            *athena.Athena
 	dxconn                *directconnect.DirectConnect
 	mediastoreconn        *mediastore.MediaStore
@@ -445,6 +447,7 @@ func (c *Config) Client() (interface{}, error) {
 	client.wafconn = waf.New(sess)
 	client.wafregionalconn = wafregional.New(sess)
 	client.batchconn = batch.New(sess)
+	client.glueconn = glue.New(sess)
 	client.athenaconn = athena.New(sess)
 	client.dxconn = directconnect.New(sess)
 	client.mediastoreconn = mediastore.New(sess)

aws/import_aws_glue_catalog_database_test.go

@@ -0,0 +1,29 @@
+package aws
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccAWSGlueCatalogDatabase_importBasic(t *testing.T) {
+	resourceName := "aws_glue_catalog_database.test"
+	rInt := acctest.RandInt()
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckGlueDatabaseDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccGlueCatalogDatabase_full(rInt, "A test catalog from terraform"),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

aws/provider.go

@@ -356,6 +356,7 @@ func Provider() terraform.ResourceProvider {
 			"aws_emr_security_configuration":               resourceAwsEMRSecurityConfiguration(),
 			"aws_flow_log":                                 resourceAwsFlowLog(),
 			"aws_glacier_vault":                            resourceAwsGlacierVault(),
+			"aws_glue_catalog_database":                    resourceAwsGlueCatalogDatabase(),
 			"aws_guardduty_detector":                       resourceAwsGuardDutyDetector(),
 			"aws_iam_access_key":                           resourceAwsIamAccessKey(),
 			"aws_iam_account_alias":                        resourceAwsIamAccountAlias(),

aws/resource_aws_glue_catalog_database.go

@@ -0,0 +1,193 @@
+package aws
+
+import (
+	"fmt"
+	"log"
+	"strings"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/glue"
+
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func resourceAwsGlueCatalogDatabase() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAwsGlueCatalogDatabaseCreate,
+		Read:   resourceAwsGlueCatalogDatabaseRead,
+		Update: resourceAwsGlueCatalogDatabaseUpdate,
+		Delete: resourceAwsGlueCatalogDatabaseDelete,
+		Exists: resourceAwsGlueCatalogDatabaseExists,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"catalog_id": {
+				Type:     schema.TypeString,
+				ForceNew: true,
+				Optional: true,
+				Computed: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				ForceNew: true,
+				Required: true,
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"location_uri": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"parameters": {
+				Type:     schema.TypeMap,
+				Elem:     schema.TypeString,
+				Optional: true,
+			},
+		},
+	}
+}
+
+func resourceAwsGlueCatalogDatabaseCreate(d *schema.ResourceData, meta interface{}) error {
+	glueconn := meta.(*AWSClient).glueconn
+	catalogID := createAwsGlueCatalogID(d, meta.(*AWSClient).accountid)
+	name := d.Get("name").(string)
+
+	input := &glue.CreateDatabaseInput{
+		CatalogId: aws.String(catalogID),
+		DatabaseInput: &glue.DatabaseInput{
+			Name: aws.String(name),
+		},
+	}
+
+	_, err := glueconn.CreateDatabase(input)
+	if err != nil {
+		return fmt.Errorf("Error creating Catalog Database: %s", err)
+	}
+
+	d.SetId(fmt.Sprintf("%s:%s", catalogID, name))
+
+	return resourceAwsGlueCatalogDatabaseUpdate(d, meta)
+}
+
+func resourceAwsGlueCatalogDatabaseUpdate(d *schema.ResourceData, meta interface{}) error {
+	glueconn := meta.(*AWSClient).glueconn
+
+	catalogID, name := readAwsGlueCatalogID(d.Id())
+
+	dbUpdateInput := &glue.UpdateDatabaseInput{
+		CatalogId: aws.String(catalogID),
+		Name:      aws.String(name),
+	}
+
+	dbInput := &glue.DatabaseInput{
+		Name: aws.String(name),
+	}
+
+	if desc, ok := d.GetOk("description"); ok {
+		dbInput.Description = aws.String(desc.(string))
+	}
+
+	if loc, ok := d.GetOk("location_uri"); ok {
+		dbInput.LocationUri = aws.String(loc.(string))
+	}
+
+	if params, ok := d.GetOk("parameters"); ok {
+		parametersInput := make(map[string]*string)
+		for key, value := range params.(map[string]interface{}) {
+			parametersInput[key] = aws.String(value.(string))
+		}
+		dbInput.Parameters = parametersInput
+	}
+
+	dbUpdateInput.DatabaseInput = dbInput
+
+	if d.HasChange("description") || d.HasChange("location_uri") || d.HasChange("parameters") {
+		if _, err := glueconn.UpdateDatabase(dbUpdateInput); err != nil {
+			return err
+		}
+	}
+
+	return resourceAwsGlueCatalogDatabaseRead(d, meta)
+}
+
+func resourceAwsGlueCatalogDatabaseRead(d *schema.ResourceData, meta interface{}) error {
+	glueconn := meta.(*AWSClient).glueconn
+
+	catalogID, name := readAwsGlueCatalogID(d.Id())
+
+	input := &glue.GetDatabaseInput{
+		CatalogId: aws.String(catalogID),
+		Name:      aws.String(name),
+	}
+
+	out, err := glueconn.GetDatabase(input)
+	if err != nil {
+
+		if isAWSErr(err, glue.ErrCodeEntityNotFoundException, "") {
+			log.Printf("[WARN] Glue Catalog Database (%s) not found, removing from state", d.Id())
+			d.SetId("")
+		}
+
+		return fmt.Errorf("Error reading Glue Catalog Database: %s", err.Error())
+	}
+
+	d.Set("name", out.Database.Name)
+	d.Set("catalog_id", catalogID)
+	d.Set("description", out.Database.Description)
+	d.Set("location_uri", out.Database.LocationUri)
+
+	dParams := make(map[string]string)
+	if len(out.Database.Parameters) > 0 {
+		for key, value := range out.Database.Parameters {
+			dParams[key] = *value
+		}
+	}
+	d.Set("parameters", dParams)
+
+	return nil
+}
+
+func resourceAwsGlueCatalogDatabaseDelete(d *schema.ResourceData, meta interface{}) error {
+	glueconn := meta.(*AWSClient).glueconn
+	catalogID, name := readAwsGlueCatalogID(d.Id())
+
+	log.Printf("[DEBUG] Glue Catalog Database: %s:%s", catalogID, name)
+	_, err := glueconn.DeleteDatabase(&glue.DeleteDatabaseInput{
+		Name: aws.String(name),
+	})
+	if err != nil {
+		return fmt.Errorf("Error deleting Glue Catalog Database: %s", err.Error())
+	}
+	return nil
+}
+
+func resourceAwsGlueCatalogDatabaseExists(d *schema.ResourceData, meta interface{}) (bool, error) {
+	glueconn := meta.(*AWSClient).glueconn
+	catalogID, name := readAwsGlueCatalogID(d.Id())
+
+	input := &glue.GetDatabaseInput{
+		CatalogId: aws.String(catalogID),
+		Name:      aws.String(name),
+	}
+
+	_, err := glueconn.GetDatabase(input)
+	return err == nil, err
+}
+
+func readAwsGlueCatalogID(id string) (catalogID string, name string) {
+	idParts := strings.Split(id, ":")
+	return idParts[0], idParts[1]
+}
+
+func createAwsGlueCatalogID(d *schema.ResourceData, accountid string) (catalogID string) {
+	if rawCatalogID, ok := d.GetOkExists("catalog_id"); ok {
+		catalogID = rawCatalogID.(string)
+	} else {
+		catalogID = accountid
+	}
+	return
+}