Merge pull request #16612 from DrFaust92/r/glue_schema

r/glue_schema - new resource
hashicorp · Dec 8, 2020 · afa18a2 · afa18a2
2 parents af919bf + 7243d6d
commit afa18a2
Show file tree

Hide file tree

Showing 8 changed files with 905 additions and 8 deletions.
diff --git a/aws/internal/service/glue/finder/finder.go b/aws/internal/service/glue/finder/finder.go
@@ -1,6 +1,7 @@
 package finder
 
 import (
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/glue"
 	tfglue "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/glue"
 )
@@ -18,3 +19,34 @@ func RegistryByID(conn *glue.Glue, id string) (*glue.GetRegistryOutput, error) {
 
 	return output, nil
 }
+
+// SchemaByID returns the Schema corresponding to the specified ID.
+func SchemaByID(conn *glue.Glue, id string) (*glue.GetSchemaOutput, error) {
+	input := &glue.GetSchemaInput{
+		SchemaId: tfglue.CreateAwsGlueSchemaID(id),
+	}
+
+	output, err := conn.GetSchema(input)
+	if err != nil {
+		return nil, err
+	}
+
+	return output, nil
+}
+
+// SchemaVersionByID returns the Schema corresponding to the specified ID.
+func SchemaVersionByID(conn *glue.Glue, id string) (*glue.GetSchemaVersionOutput, error) {
+	input := &glue.GetSchemaVersionInput{
+		SchemaId: tfglue.CreateAwsGlueSchemaID(id),
+		SchemaVersionNumber: &glue.SchemaVersionNumber{
+			LatestVersion: aws.Bool(true),
+		},
+	}
+
+	output, err := conn.GetSchemaVersion(input)
+	if err != nil {
+		return nil, err
+	}
+
+	return output, nil
+}
diff --git a/aws/internal/service/glue/id.go b/aws/internal/service/glue/id.go
@@ -38,3 +38,9 @@ func CreateAwsGlueRegistryID(id string) *glue.RegistryId {
 		RegistryArn: aws.String(id),
 	}
 }
+
+func CreateAwsGlueSchemaID(id string) *glue.SchemaId {
+	return &glue.SchemaId{
+		SchemaArn: aws.String(id),
+	}
+}
diff --git a/aws/internal/service/glue/waiter/status.go b/aws/internal/service/glue/waiter/status.go
@@ -11,9 +11,11 @@ import (
 )
 
 const (
-	MLTransformStatusUnknown = "Unknown"
-	RegistryStatusUnknown    = "Unknown"
-	TriggerStatusUnknown     = "Unknown"
+	MLTransformStatusUnknown   = "Unknown"
+	RegistryStatusUnknown      = "Unknown"
+	SchemaStatusUnknown        = "Unknown"
+	SchemaVersionStatusUnknown = "Unknown"
+	TriggerStatusUnknown       = "Unknown"
 )
 
 // MLTransformStatus fetches the MLTransform and its Status
@@ -53,6 +55,38 @@ func RegistryStatus(conn *glue.Glue, id string) resource.StateRefreshFunc {
 	}
 }
 
+// SchemaStatus fetches the Schema and its Status
+func SchemaStatus(conn *glue.Glue, id string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		output, err := finder.SchemaByID(conn, id)
+		if err != nil {
+			return nil, SchemaStatusUnknown, err
+		}
+
+		if output == nil {
+			return output, SchemaStatusUnknown, nil
+		}
+
+		return output, aws.StringValue(output.SchemaStatus), nil
+	}
+}
+
+// SchemaVersionStatus fetches the Schema Version and its Status
+func SchemaVersionStatus(conn *glue.Glue, id string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		output, err := finder.SchemaVersionByID(conn, id)
+		if err != nil {
+			return nil, SchemaVersionStatusUnknown, err
+		}
+
+		if output == nil {
+			return output, SchemaVersionStatusUnknown, nil
+		}
+
+		return output, aws.StringValue(output.Status), nil
+	}
+}
+
 // TriggerStatus fetches the Trigger and its Status
 func TriggerStatus(conn *glue.Glue, triggerName string) resource.StateRefreshFunc {
 	return func() (interface{}, string, error) {

diff --git a/aws/internal/service/glue/waiter/waiter.go b/aws/internal/service/glue/waiter/waiter.go
@@ -9,10 +9,13 @@ import (
 
 const (
 	// Maximum amount of time to wait for an Operation to return Deleted
-	MLTransformDeleteTimeout = 2 * time.Minute
-	RegistryDeleteTimeout    = 2 * time.Minute
-	TriggerCreateTimeout     = 2 * time.Minute
-	TriggerDeleteTimeout     = 2 * time.Minute
+	MLTransformDeleteTimeout      = 2 * time.Minute
+	RegistryDeleteTimeout         = 2 * time.Minute
+	SchemaAvailableTimeout        = 2 * time.Minute
+	SchemaDeleteTimeout           = 2 * time.Minute
+	SchemaVersionAvailableTimeout = 2 * time.Minute
+	TriggerCreateTimeout          = 2 * time.Minute
+	TriggerDeleteTimeout          = 2 * time.Minute
 )
 
 // MLTransformDeleted waits for an MLTransform to return Deleted
@@ -51,6 +54,60 @@ func RegistryDeleted(conn *glue.Glue, registryID string) (*glue.GetRegistryOutpu
 	return nil, err
 }
 
+// SchemaAvailable waits for a Schema to return Available
+func SchemaAvailable(conn *glue.Glue, registryID string) (*glue.GetSchemaOutput, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{glue.SchemaStatusPending},
+		Target:  []string{glue.SchemaStatusAvailable},
+		Refresh: SchemaStatus(conn, registryID),
+		Timeout: SchemaAvailableTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if output, ok := outputRaw.(*glue.GetSchemaOutput); ok {
+		return output, err
+	}
+
+	return nil, err
+}
+
+// SchemaDeleted waits for a Schema to return Deleted
+func SchemaDeleted(conn *glue.Glue, registryID string) (*glue.GetSchemaOutput, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{glue.SchemaStatusDeleting},
+		Target:  []string{},
+		Refresh: SchemaStatus(conn, registryID),
+		Timeout: SchemaDeleteTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if output, ok := outputRaw.(*glue.GetSchemaOutput); ok {
+		return output, err
+	}
+
+	return nil, err
+}
+
+// SchemaVersionAvailable waits for a Schema to return Available
+func SchemaVersionAvailable(conn *glue.Glue, registryID string) (*glue.GetSchemaVersionOutput, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{glue.SchemaVersionStatusPending},
+		Target:  []string{glue.SchemaVersionStatusAvailable},
+		Refresh: SchemaVersionStatus(conn, registryID),
+		Timeout: SchemaVersionAvailableTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if output, ok := outputRaw.(*glue.GetSchemaVersionOutput); ok {
+		return output, err
+	}
+
+	return nil, err
+}
+
 // TriggerCreated waits for a Trigger to return Created
 func TriggerCreated(conn *glue.Glue, triggerName string) (*glue.GetTriggerOutput, error) {
 	stateConf := &resource.StateChangeConf{

diff --git a/aws/provider.go b/aws/provider.go
@@ -674,11 +674,12 @@ func Provider() *schema.Provider {
 			"aws_glue_ml_transform":                                   resourceAwsGlueMLTransform(),
 			"aws_glue_partition":                                      resourceAwsGluePartition(),
 			"aws_glue_registry":                                       resourceAwsGlueRegistry(),
+			"aws_glue_resource_policy":                                resourceAwsGlueResourcePolicy(),
+			"aws_glue_schema":                                         resourceAwsGlueSchema(),
 			"aws_glue_security_configuration":                         resourceAwsGlueSecurityConfiguration(),
 			"aws_glue_trigger":                                        resourceAwsGlueTrigger(),
 			"aws_glue_user_defined_function":                          resourceAwsGlueUserDefinedFunction(),
 			"aws_glue_workflow":                                       resourceAwsGlueWorkflow(),
-			"aws_glue_resource_policy":                                resourceAwsGlueResourcePolicy(),
 			"aws_guardduty_detector":                                  resourceAwsGuardDutyDetector(),
 			"aws_guardduty_filter":                                    resourceAwsGuardDutyFilter(),
 			"aws_guardduty_invite_accepter":                           resourceAwsGuardDutyInviteAccepter(),