r/elastic_transcoder_pipeline - add validations

.changelog/13973.txt

@@ -0,0 +1,5 @@
+```release-note:enhancement
+resource/aws_elastictranscoder_pipeline: Add plan time validations `content_config.storage_class`, `content_config_permissions.access`, `content_config_permissions.grantee`, `content_config_permissions.grantee_type`,
+`notifications.completed`, `notifications.error`, `notifications.progressing`, `notifications.warning`,
+`thumbnail_config.storage_class`, `thumbnail_config_permissions.access`, `thumbnail_config_permissions.grantee`, `thumbnail_config_permissions.grantee_type`
+```

aws/resource_aws_elastic_transcoder_pipeline.go

@@ -9,6 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/elastictranscoder"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
 
 func resourceAwsElasticTranscoderPipeline() *schema.Resource {
@@ -51,6 +52,10 @@ func resourceAwsElasticTranscoderPipeline() *schema.Resource {
 						"storage_class": {
 							Type:     schema.TypeString,
 							Optional: true,
+							ValidateFunc: validation.StringInSlice([]string{
+								"Standard",
+								"ReducedRedundancy",
+							}, false),
 						},
 					},
 				},
@@ -64,15 +69,33 @@ func resourceAwsElasticTranscoderPipeline() *schema.Resource {
 						"access": {
 							Type:     schema.TypeList,
 							Optional: true,
-							Elem:     &schema.Schema{Type: schema.TypeString},
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+								ValidateFunc: validation.StringInSlice([]string{
+									"Read",
+									"ReadAcp",
+									"WriteAcp",
+									"FullControl",
+								}, false),
+							},
 						},
 						"grantee": {
 							Type:     schema.TypeString,
 							Optional: true,
+							ValidateFunc: validation.StringInSlice([]string{
+								"AllUsers",
+								"AuthenticatedUsers",
+								"LogDelivery",
+							}, false),
 						},
 						"grantee_type": {
 							Type:     schema.TypeString,
 							Optional: true,
+							ValidateFunc: validation.StringInSlice([]string{
+								"Canonical",
+								"Email",
+								"Group",
+							}, false),
 						},
 					},
 				},
@@ -88,17 +111,11 @@ func resourceAwsElasticTranscoderPipeline() *schema.Resource {
 				Optional: true,
 				Computed: true,
 				ForceNew: true,
-				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
-					value := v.(string)
-					if !regexp.MustCompile(`^[.0-9A-Za-z-_]+$`).MatchString(value) {
-						errors = append(errors, fmt.Errorf(
-							"only alphanumeric characters, hyphens, underscores, and periods allowed in %q", k))
-					}
-					if len(value) > 40 {
-						errors = append(errors, fmt.Errorf("%q cannot be longer than 40 characters", k))
-					}
-					return
-				},
+				ValidateFunc: validation.All(
+					validation.StringMatch(regexp.MustCompile(`^[.0-9A-Za-z-_]+$`),
+						"only alphanumeric characters, hyphens, underscores, and periods allowed"),
+					validation.StringLenBetween(1, 40),
+				),
 			},
 
 			"notifications": {
@@ -108,20 +125,24 @@ func resourceAwsElasticTranscoderPipeline() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"completed": {
-							Type:     schema.TypeString,
-							Optional: true,
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validateArn,
 						},
 						"error": {
-							Type:     schema.TypeString,
-							Optional: true,
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validateArn,
 						},
 						"progressing": {
-							Type:     schema.TypeString,
-							Optional: true,
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validateArn,
 						},
 						"warning": {
-							Type:     schema.TypeString,
-							Optional: true,
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validateArn,
 						},
 					},
 				},
@@ -160,6 +181,10 @@ func resourceAwsElasticTranscoderPipeline() *schema.Resource {
 						"storage_class": {
 							Type:     schema.TypeString,
 							Optional: true,
+							ValidateFunc: validation.StringInSlice([]string{
+								"Standard",
+								"ReducedRedundancy",
+							}, false),
 						},
 					},
 				},
@@ -173,15 +198,33 @@ func resourceAwsElasticTranscoderPipeline() *schema.Resource {
 						"access": {
 							Type:     schema.TypeList,
 							Optional: true,
-							Elem:     &schema.Schema{Type: schema.TypeString},
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+								ValidateFunc: validation.StringInSlice([]string{
+									"Read",
+									"ReadAcp",
+									"WriteAcp",
+									"FullControl",
+								}, false),
+							},
 						},
 						"grantee": {
 							Type:     schema.TypeString,
 							Optional: true,
+							ValidateFunc: validation.StringInSlice([]string{
+								"AllUsers",
+								"AuthenticatedUsers",
+								"LogDelivery",
+							}, false),
 						},
 						"grantee_type": {
 							Type:     schema.TypeString,
 							Optional: true,
+							ValidateFunc: validation.StringInSlice([]string{
+								"Canonical",
+								"Email",
+								"Group",
+							}, false),
 						},
 					},
 				},
@@ -408,7 +451,8 @@ func resourceAwsElasticTranscoderPipelineUpdate(d *schema.ResourceData, meta int
 	}
 
 	for _, w := range output.Warnings {
-		log.Printf("[WARN] Elastic Transcoder Pipeline %v: %v", *w.Code, *w.Message)
+		log.Printf("[WARN] Elastic Transcoder Pipeline %v: %v", aws.StringValue(w.Code),
+			aws.StringValue(w.Message))
 	}
 
 	return resourceAwsElasticTranscoderPipelineRead(d, meta)

aws/resource_aws_elastic_transcoder_pipeline_test.go

@@ -3,11 +3,11 @@ package aws
 import (
 	"fmt"
 	"reflect"
+	"regexp"
 	"sort"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/elastictranscoder"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -29,6 +29,7 @@ func TestAccAWSElasticTranscoderPipeline_basic(t *testing.T) {
 				Config: awsElasticTranscoderPipelineConfigBasic(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSElasticTranscoderPipelineExists(resourceName, pipeline),
+					testAccMatchResourceAttrRegionalARN(resourceName, "arn", "elastictranscoder", regexp.MustCompile(`pipeline/.+`)),
 				),
 			},
 			{
@@ -110,16 +111,16 @@ func testAccCheckAWSElasticTranscoderPipeline_notifications(
 	return func(s *terraform.State) error {
 
 		var notes []string
-		if p.Notifications.Completed != nil && *p.Notifications.Completed != "" {
+		if p.Notifications.Completed != nil && aws.StringValue(p.Notifications.Completed) != "" {
 			notes = append(notes, "completed")
 		}
-		if p.Notifications.Error != nil && *p.Notifications.Error != "" {
+		if p.Notifications.Error != nil && aws.StringValue(p.Notifications.Error) != "" {
 			notes = append(notes, "error")
 		}
-		if p.Notifications.Progressing != nil && *p.Notifications.Progressing != "" {
+		if p.Notifications.Progressing != nil && aws.StringValue(p.Notifications.Progressing) != "" {
 			notes = append(notes, "progressing")
 		}
-		if p.Notifications.Warning != nil && *p.Notifications.Warning != "" {
+		if p.Notifications.Warning != nil && aws.StringValue(p.Notifications.Warning) != "" {
 			notes = append(notes, "warning")
 		}
 
@@ -212,7 +213,7 @@ func TestAccAWSElasticTranscoderPipeline_disappears(t *testing.T) {
 				Config: awsElasticTranscoderPipelineConfigBasic(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSElasticTranscoderPipelineExists(resourceName, pipeline),
-					testAccCheckAWSElasticTranscoderPipelineDisappears(pipeline),
+					testAccCheckResourceDisappears(testAccProvider, resourceAwsElasticTranscoderPipeline(), resourceName),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -247,18 +248,6 @@ func testAccCheckAWSElasticTranscoderPipelineExists(n string, res *elastictransc
 	}
 }
 
-func testAccCheckAWSElasticTranscoderPipelineDisappears(res *elastictranscoder.Pipeline) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		conn := testAccProvider.Meta().(*AWSClient).elastictranscoderconn
-
-		_, err := conn.DeletePipeline(&elastictranscoder.DeletePipelineInput{
-			Id: res.Id,
-		})
-
-		return err
-	}
-}
-
 func testAccCheckElasticTranscoderPipelineDestroy(s *terraform.State) error {
 	conn := testAccProvider.Meta().(*AWSClient).elastictranscoderconn
 
@@ -272,20 +261,14 @@ func testAccCheckElasticTranscoderPipelineDestroy(s *terraform.State) error {
 		})
 
 		if err == nil {
-			if out.Pipeline != nil && *out.Pipeline.Id == rs.Primary.ID {
+			if out.Pipeline != nil && aws.StringValue(out.Pipeline.Id) == rs.Primary.ID {
 				return fmt.Errorf("Elastic Transcoder Pipeline still exists")
 			}
 		}
 
-		awsErr, ok := err.(awserr.Error)
-		if !ok {
-			return err
-		}
-
-		if awsErr.Code() != "ResourceNotFoundException" {
-			return fmt.Errorf("unexpected error: %s", awsErr)
+		if !isAWSErr(err, elastictranscoder.ErrCodeResourceNotFoundException, "") {
+			return fmt.Errorf("unexpected error: %s", err)
 		}
-
 	}
 	return nil
 }