New Resource: AWS Glue Catalog Database

aws/config.go

@@ -50,6 +50,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/iam"
 	"github.com/aws/aws-sdk-go/service/inspector"
 	"github.com/aws/aws-sdk-go/service/iot"
@@ -182,6 +183,7 @@ type AWSClient struct {
 	wafregionalconn       *wafregional.WAFRegional
 	iotconn               *iot.IoT
 	batchconn             *batch.Batch
+	glueconn              *glue.Glue
 	athenaconn            *athena.Athena
 	dxconn                *directconnect.DirectConnect
 }
@@ -394,6 +396,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)
 

aws/import_aws_glue_catalog_database_test.go

@@ -0,0 +1,30 @@
+package aws
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccAWSGlueCatalogDatabaseVault_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{
+			resource.TestStep{
+				Config: testAccGlueCatalogDatabase_basic(rInt),
+			},
+
+			resource.TestStep{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

aws/provider.go

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

aws/resource_aws_glue_catalog_database.go

@@ -0,0 +1,149 @@
+package aws
+
+import (
+	"fmt"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/glue"
+	"github.com/hashicorp/terraform/helper/schema"
+	"log"
+)
+
+func resourceAwsGlueCatalogDatabase() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAwsGlueCatalogDatabaseCreate,
+		Read:   resourceAwsGlueCatalogDatabaseRead,
+		Update: resourceAwsGlueCatalogDatabaseUpdate,
+		Delete: resourceAwsGlueCatalogDatabaseDelete,
+
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"location_uri": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				ForceNew: true,
+				Required: true,
+			},
+			"parameters": &schema.Schema{
+				Type:     schema.TypeMap,
+				Elem:     schema.TypeString,
+				Optional: true,
+			},
+			"create_time": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func resourceAwsGlueCatalogDatabaseCreate(d *schema.ResourceData, meta interface{}) error {
+	glueconn := meta.(*AWSClient).glueconn
+	name := d.Get("name").(string)
+
+	input := &glue.CreateDatabaseInput{
+		DatabaseInput: &glue.DatabaseInput{
+			Name: aws.String(name),
+		},
+	}
+
+	_, err := glueconn.CreateDatabase(input)
+	if err != nil {
+		return fmt.Errorf("Error creating Catalogue Database: %s", err)
+	}
+
+	d.SetId(name)
+
+	return resourceAwsGlueCatalogDatabaseUpdate(d, meta)
+}
+
+func resourceAwsGlueCatalogDatabaseUpdate(d *schema.ResourceData, meta interface{}) error {
+	glueconn := meta.(*AWSClient).glueconn
+	doUpdate := false
+	input := &glue.UpdateDatabaseInput{
+		DatabaseInput: &glue.DatabaseInput{
+			Name: aws.String(d.Id()),
+		},
+		Name: aws.String(d.Id()),
+	}
+
+	if ok := d.HasChange("description"); ok {
+		doUpdate = true
+		input.DatabaseInput.Description = aws.String(
+			d.Get("description").(string),
+		)
+	}
+
+	if ok := d.HasChange("location_uri"); ok {
+		doUpdate = true
+		input.DatabaseInput.LocationUri = aws.String(
+			d.Get("location_uri").(string),
+		)
+	}
+
+	if ok := d.HasChange("parameters"); ok {
+		doUpdate = true
+		input.DatabaseInput.Parameters = make(map[string]*string)
+		for key, value := range d.Get("parameters").(map[string]interface{}) {
+			input.DatabaseInput.Parameters[key] = aws.String(value.(string))
+		}
+	}
+
+	if doUpdate {
+		if _, err := glueconn.UpdateDatabase(input); err != nil {
+			return err
+		}
+	}
+
+	return resourceAwsGlueCatalogDatabaseRead(d, meta)
+}
+
+func resourceAwsGlueCatalogDatabaseRead(d *schema.ResourceData, meta interface{}) error {
+	glueconn := meta.(*AWSClient).glueconn
+
+	input := &glue.GetDatabaseInput{
+		Name: aws.String(d.Id()),
+	}
+
+	out, err := glueconn.GetDatabase(input)
+	if err != nil {
+		return fmt.Errorf("Error reading Glue Cataloge Database: %s", err.Error())
+	}
+
+	d.Set("name", d.Id())
+	d.Set("create_time", out.Database.CreateTime)
+	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
+
+	log.Printf("[DEBUG] Glue Catalog Database: %s", d.Id())
+	_, err := glueconn.DeleteDatabase(&glue.DeleteDatabaseInput{
+		Name: aws.String(d.Id()),
+	})
+	if err != nil {
+		return fmt.Errorf("Error deleting Glue Catalog Database: %s", err.Error())
+	}
+	return nil
+}

aws/resource_aws_glue_catalog_database_test.go

@@ -0,0 +1,128 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/service/glue"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccAWSGlueCatalogDatabase_basic(t *testing.T) {
+	rInt := acctest.RandInt()
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckGlueDatabaseDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccGlueCatalogDatabase_basic(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGlueCatalogDatabaseExists("aws_glue_catalog_database.test"),
+					resource.TestCheckResourceAttr(
+						"aws_glue_catalog_database.test",
+						"description",
+						"A test catalog from terraform",
+					),
+					resource.TestCheckResourceAttr(
+						"aws_glue_catalog_database.test",
+						"location_uri",
+						"my-location",
+					),
+					resource.TestCheckResourceAttr(
+						"aws_glue_catalog_database.test",
+						"parameters.param1",
+						"value1",
+					),
+					resource.TestCheckResourceAttr(
+						"aws_glue_catalog_database.test",
+						"parameters.param2",
+						"1",
+					),
+					resource.TestCheckResourceAttr(
+						"aws_glue_catalog_database.test",
+						"parameters.param3",
+						"50",
+					),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckGlueDatabaseDestroy(s *terraform.State) error {
+	conn := testAccProvider.Meta().(*AWSClient).glueconn
+
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "aws_glue_catalog_database" {
+			continue
+		}
+
+		input := &glue.GetDatabaseInput{
+			Name: aws.String(rs.Primary.ID),
+		}
+		if _, err := conn.GetDatabase(input); err != nil {
+			//Verify the error is what we want
+			if ae, ok := err.(awserr.Error); ok && ae.Code() == "EntityNotFoundException" {
+				continue
+			}
+
+			return err
+		}
+		return fmt.Errorf("still exists")
+	}
+	return nil
+}
+
+func testAccGlueCatalogDatabase_basic(rInt int) string {
+	return fmt.Sprintf(`
+resource "aws_glue_catalog_database" "test" {
+  name = "my_test_catalog_database_%d"
+  description = "A test catalog from terraform"
+  location_uri = "my-location"
+  parameters {
+	param1 = "value1"
+	param2 = true
+	param3 = 50
+  }
+}
+`, rInt)
+}
+
+func testAccCheckGlueCatalogDatabaseExists(name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[name]
+		if !ok {
+			return fmt.Errorf("Not found: %s", name)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No ID is set")
+		}
+
+		glueconn := testAccProvider.Meta().(*AWSClient).glueconn
+		out, err := glueconn.GetDatabase(&glue.GetDatabaseInput{
+			Name: aws.String(rs.Primary.ID),
+		})
+
+		if err != nil {
+			return err
+		}
+
+		if out.Database == nil {
+			return fmt.Errorf("No Glue Database Found")
+		}
+
+		if *out.Database.Name != rs.Primary.ID {
+			return fmt.Errorf("Glue Database Mismatch - existing: %q, state: %q",
+				*out.Database, rs.Primary.ID)
+		}
+
+		return nil
+	}
+}

website/aws.erb

@@ -894,6 +894,14 @@
                     </ul>
                  </li>
 
+                 <li<%= sidebar_current("docs-aws-resource-glue") %>>
+                    <a href="#">Glue Resources</a>
+                    <ul class="nav nav-visible">
+                        <li<%= sidebar_current("docs-aws-resource-glue-catalog-database") %>>
+                            <a href="/docs/providers/aws/r/glue_catalog_database.html">aws_glue_catalog_database</a>
+                        </li>
+                    </ul>
+                 </li>
 
                 <li<%= sidebar_current("docs-aws-resource-iam") %>>
                     <a href="#">IAM Resources</a>

website/docs/r/glue_catalog_database.html.markdown

@@ -0,0 +1,42 @@
+---
+layout: "aws"
+page_title: "AWS: aws_glue_catalog_database"
+sidebar_current: "docs-aws-resource-glue-catalog-database"
+description: |-
+  Provides a Glue Catalog Database.
+---
+
+# aws\_glue\_catalog\_database
+
+Provides a Glue Catalog Database Resource. You can refer to the [Glue Developer Guide](http://docs.aws.amazon.com/glue/latest/dg/populate-data-catalog.html) for a full explanation of the Glue Data Catalog functionality
+
+## Example Usage
+
+```hcl-terraform
+resource "aws_glue_catalog_database" "aws_glue_catalog_database" {
+  name = "MyCatalogDatabase"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name` - (Required) The name of the database.
+* `description` - (Optional) Description of the database.
+* `location_uri` - (Optional) The location of the database (for example, an HDFS path).
+* `parameters` - (Optional) A list of key-value pairs that define parameters and properties of the database.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `create_time` - The time at which the metadata database was created in the catalog.
+
+## Import
+
+Glue Catalog Databasess can be imported using the `name`, e.g.
+
+```
+$ terraform import aws_glue_catalog_database.database my_database
+```