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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/elastic_transcoder_pipeline - remove getStringPtr calls + refactor tests #12575

Merged
merged 1 commit into from
Apr 1, 2020
Merged

r/elastic_transcoder_pipeline - remove getStringPtr calls + refactor tests #12575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 27 additions & 23 deletions aws/resource_aws_elastic_transcoder_pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"regexp"

"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/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
Expand Down Expand Up @@ -139,8 +138,9 @@ func resourceAwsElasticTranscoderPipeline() *schema.Resource {
},

"role": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Required: true,
ValidateFunc: validateArn,
},

"thumbnail_config": {
Expand Down Expand Up @@ -191,18 +191,21 @@ func resourceAwsElasticTranscoderPipeline() *schema.Resource {
}

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

req := &elastictranscoder.CreatePipelineInput{
AwsKmsKeyArn: getStringPtr(d, "aws_kms_key_arn"),
AwsKmsKeyArn: aws.String(d.Get("aws_kms_key_arn").(string)),
ContentConfig: expandETPiplineOutputConfig(d, "content_config"),
InputBucket: aws.String(d.Get("input_bucket").(string)),
Notifications: expandETNotifications(d),
OutputBucket: getStringPtr(d, "output_bucket"),
Role: getStringPtr(d, "role"),
Role: aws.String(d.Get("role").(string)),
ThumbnailConfig: expandETPiplineOutputConfig(d, "thumbnail_config"),
}

if v, ok := d.GetOk("output_bucket"); ok && v.(string) != "" {
req.OutputBucket = aws.String(v.(string))
}

if name, ok := d.GetOk("name"); ok {
req.Name = aws.String(name.(string))
} else {
Expand All @@ -217,7 +220,7 @@ func resourceAwsElasticTranscoderPipelineCreate(d *schema.ResourceData, meta int
}

log.Printf("[DEBUG] Elastic Transcoder Pipeline create opts: %s", req)
resp, err := elastictranscoderconn.CreatePipeline(req)
resp, err := conn.CreatePipeline(req)
if err != nil {
return fmt.Errorf("Error creating Elastic Transcoder Pipeline: %s", err)
}
Expand Down Expand Up @@ -299,8 +302,8 @@ func expandETPiplineOutputConfig(d *schema.ResourceData, key string) *elastictra
cc := s.List()[0].(map[string]interface{})

cfg := &elastictranscoder.PipelineOutputConfig{
Bucket: getStringPtr(cc, "bucket"),
StorageClass: getStringPtr(cc, "storage_class"),
Bucket: aws.String(cc["bucket"].(string)),
StorageClass: aws.String(cc["storage_class"].(string)),
}

switch key {
Expand Down Expand Up @@ -334,8 +337,8 @@ func expandETPermList(permissions *schema.Set) []*elastictranscoder.Permission {

perm := &elastictranscoder.Permission{
Access: expandStringList(m["access"].([]interface{})),
Grantee: getStringPtr(p, "grantee"),
GranteeType: getStringPtr(p, "grantee_type"),
Grantee: aws.String(m["grantee"].(string)),
GranteeType: aws.String(m["grantee_type"].(string)),
}

perms = append(perms, perm)
Expand All @@ -358,42 +361,42 @@ func flattenETPermList(perms []*elastictranscoder.Permission) []map[string]inter
}

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

req := &elastictranscoder.UpdatePipelineInput{
Id: aws.String(d.Id()),
}

if d.HasChange("aws_kms_key_arn") {
req.AwsKmsKeyArn = getStringPtr(d, "aws_kms_key_arn")
req.AwsKmsKeyArn = aws.String(d.Get("aws_kms_key_arn").(string))
}

if d.HasChange("content_config") {
req.ContentConfig = expandETPiplineOutputConfig(d, "content_config")
}

if d.HasChange("input_bucket") {
req.InputBucket = getStringPtr(d, "input_bucket")
req.InputBucket = aws.String(d.Get("input_bucket").(string))
}

if d.HasChange("name") {
req.Name = getStringPtr(d, "name")
req.Name = aws.String(d.Get("name").(string))
}

if d.HasChange("notifications") {
req.Notifications = expandETNotifications(d)
}

if d.HasChange("role") {
req.Role = getStringPtr(d, "role")
req.Role = aws.String(d.Get("role").(string))
}

if d.HasChange("thumbnail_config") {
req.ThumbnailConfig = expandETPiplineOutputConfig(d, "thumbnail_config")
}

log.Printf("[DEBUG] Updating Elastic Transcoder Pipeline: %#v", req)
output, err := elastictranscoderconn.UpdatePipeline(req)
output, err := conn.UpdatePipeline(req)
if err != nil {
return fmt.Errorf("Error updating Elastic Transcoder pipeline: %s", err)
}
Expand All @@ -406,14 +409,15 @@ func resourceAwsElasticTranscoderPipelineUpdate(d *schema.ResourceData, meta int
}

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

resp, err := elastictranscoderconn.ReadPipeline(&elastictranscoder.ReadPipelineInput{
resp, err := conn.ReadPipeline(&elastictranscoder.ReadPipelineInput{
Id: aws.String(d.Id()),
})

if err != nil {
if err, ok := err.(awserr.Error); ok && err.Code() == "ResourceNotFoundException" {
if isAWSErr(err, elastictranscoder.ErrCodeResourceNotFoundException, "") {
log.Printf("[WARN] No such resource found for Elastic Transcoder Pipeline (%s)", d.Id())
d.SetId("")
return nil
}
Expand Down Expand Up @@ -478,10 +482,10 @@ func resourceAwsElasticTranscoderPipelineRead(d *schema.ResourceData, meta inter
}

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

log.Printf("[DEBUG] Elastic Transcoder Delete Pipeline: %s", d.Id())
_, err := elastictranscoderconn.DeletePipeline(&elastictranscoder.DeletePipelineInput{
_, err := conn.DeletePipeline(&elastictranscoder.DeletePipelineInput{
Id: aws.String(d.Id()),
})
if err != nil {
Expand Down
Loading