Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/glue_catalog_table - add arn attribute #13456

Merged
merged 4 commits into from
Jun 18, 2020
Merged

r/glue_catalog_table - add arn attribute #13456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
232e8af
add arn attribute
DrFaust92 May 21, 2020
4938ebf
fix
DrFaust92 May 21, 2020
6d868e2
add index
DrFaust92 Jun 18, 2020
c76a72a
sdk wrapper
DrFaust92 Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions aws/resource_aws_glue_catalog_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"strings"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/arn"
"github.com/aws/aws-sdk-go/service/glue"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)
Expand All @@ -21,6 +22,10 @@ func resourceAwsGlueCatalogTable() *schema.Resource {
},

Schema: map[string]*schema.Schema{
"arn": {
Type: schema.TypeString,
Computed: true,
},
"catalog_id": {
Type: schema.TypeString,
ForceNew: true,
Expand Down Expand Up @@ -224,7 +229,7 @@ func readAwsGlueTableID(id string) (catalogID string, dbName string, name string
}

func resourceAwsGlueCatalogTableCreate(d *schema.ResourceData, meta interface{}) error {
glueconn := meta.(*AWSClient).glueconn
conn := meta.(*AWSClient).glueconn
catalogID := createAwsGlueCatalogID(d, meta.(*AWSClient).accountid)
dbName := d.Get("database_name").(string)
name := d.Get("name").(string)
Expand All @@ -235,7 +240,7 @@ func resourceAwsGlueCatalogTableCreate(d *schema.ResourceData, meta interface{})
TableInput: expandGlueTableInput(d),
}

_, err := glueconn.CreateTable(input)
_, err := conn.CreateTable(input)
if err != nil {
return fmt.Errorf("Error creating Catalog Table: %s", err)
}
Expand All @@ -246,7 +251,7 @@ func resourceAwsGlueCatalogTableCreate(d *schema.ResourceData, meta interface{})
}

func resourceAwsGlueCatalogTableRead(d *schema.ResourceData, meta interface{}) error {
glueconn := meta.(*AWSClient).glueconn
conn := meta.(*AWSClient).glueconn

catalogID, dbName, name, err := readAwsGlueTableID(d.Id())
if err != nil {
Expand All @@ -259,7 +264,7 @@ func resourceAwsGlueCatalogTableRead(d *schema.ResourceData, meta interface{}) e
Name: aws.String(name),
}

out, err := glueconn.GetTable(input)
out, err := conn.GetTable(input)
if err != nil {

if isAWSErr(err, glue.ErrCodeEntityNotFoundException, "") {
Expand All @@ -271,6 +276,15 @@ func resourceAwsGlueCatalogTableRead(d *schema.ResourceData, meta interface{}) e
return fmt.Errorf("Error reading Glue Catalog Table: %s", err)
}

tableArn := arn.ARN{
Partition: meta.(*AWSClient).partition,
Service: "glue",
Region: meta.(*AWSClient).region,
AccountID: meta.(*AWSClient).accountid,
bflad marked this conversation as resolved.
Show resolved Hide resolved
Resource: fmt.Sprintf("table/%s/%s", dbName, aws.StringValue(out.Table.Name)),
}.String()
d.Set("arn", tableArn)

d.Set("name", out.Table.Name)
d.Set("catalog_id", catalogID)
d.Set("database_name", dbName)
Expand Down Expand Up @@ -298,7 +312,7 @@ func resourceAwsGlueCatalogTableRead(d *schema.ResourceData, meta interface{}) e
}

func resourceAwsGlueCatalogTableUpdate(d *schema.ResourceData, meta interface{}) error {
glueconn := meta.(*AWSClient).glueconn
conn := meta.(*AWSClient).glueconn

catalogID, dbName, _, err := readAwsGlueTableID(d.Id())
if err != nil {
Expand All @@ -311,23 +325,23 @@ func resourceAwsGlueCatalogTableUpdate(d *schema.ResourceData, meta interface{})
TableInput: expandGlueTableInput(d),
}

if _, err := glueconn.UpdateTable(updateTableInput); err != nil {
if _, err := conn.UpdateTable(updateTableInput); err != nil {
return fmt.Errorf("Error updating Glue Catalog Table: %s", err)
}

return resourceAwsGlueCatalogTableRead(d, meta)
}

func resourceAwsGlueCatalogTableDelete(d *schema.ResourceData, meta interface{}) error {
glueconn := meta.(*AWSClient).glueconn
conn := meta.(*AWSClient).glueconn

catalogID, dbName, name, tableIdErr := readAwsGlueTableID(d.Id())
if tableIdErr != nil {
return tableIdErr
}

log.Printf("[DEBUG] Glue Catalog Table: %s:%s:%s", catalogID, dbName, name)
_, err := glueconn.DeleteTable(&glue.DeleteTableInput{
_, err := conn.DeleteTable(&glue.DeleteTableInput{
CatalogId: aws.String(catalogID),
Name: aws.String(name),
DatabaseName: aws.String(dbName),
Expand Down
Loading