Merge pull request #87 from spring-media/chore/OTT-6361

Chore/ott 6361
spring-media · Sep 2, 2024 · c625ff0 · c625ff0
2 parents 3298ec4 + c11fdca
commit c625ff0
Show file tree

Hide file tree

Showing 8 changed files with 408 additions and 394 deletions.
diff --git a/awsmt/data_source_source_location.go b/awsmt/data_source_source_location.go
@@ -2,7 +2,7 @@ package awsmt
 
 import (
 	"context"
-	"github.com/aws/aws-sdk-go/service/mediatailor"
+	"github.com/aws/aws-sdk-go-v2/service/mediatailor"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
@@ -19,7 +19,7 @@ func DataSourceSourceLocation() datasource.DataSource {
 }
 
 type dataSourceSourceLocation struct {
-	client *mediatailor.MediaTailor
+	client *mediatailor.Client
 }
 
 func (d *dataSourceSourceLocation) Metadata(_ context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
@@ -84,7 +84,7 @@ func (d *dataSourceSourceLocation) Configure(_ context.Context, req datasource.C
 		return
 	}
 
-	d.client = req.ProviderData.(clients).v1
+	d.client = req.ProviderData.(clients).v2
 }
 
 func (d *dataSourceSourceLocation) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
@@ -97,13 +97,13 @@ func (d *dataSourceSourceLocation) Read(ctx context.Context, req datasource.Read
 
 	sourceLocationName := data.Name
 
-	sourceLocation, err := d.client.DescribeSourceLocation(&mediatailor.DescribeSourceLocationInput{SourceLocationName: sourceLocationName})
+	sourceLocation, err := d.client.DescribeSourceLocation(ctx, &mediatailor.DescribeSourceLocationInput{SourceLocationName: sourceLocationName})
 	if err != nil {
 		resp.Diagnostics.AddError("Error while describing source location", err.Error())
 		return
 	}
 
-	data = readSourceLocationToPlan(data, mediatailor.CreateSourceLocationOutput(*sourceLocation))
+	data = writeSourceLocationToPlan(data, mediatailor.CreateSourceLocationOutput(*sourceLocation), false)
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }
diff --git a/awsmt/helpers_channels.go b/awsmt/helpers_channels.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"github.com/aws/aws-sdk-go-v2/service/mediatailor"
 	awsTypes "github.com/aws/aws-sdk-go-v2/service/mediatailor/types"
-	"github.com/aws/aws-sdk-go/aws"
 	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"reflect"
@@ -230,11 +229,11 @@ func readChannelComputedValues(model channelModel, arn *string, channelName *str
 	model.Name = channelName
 
 	if creationTime != nil {
-		model.CreationTime = types.StringValue((aws.TimeValue(creationTime)).String())
+		model.CreationTime = types.StringValue(creationTime.String())
 	}
 
 	if lastModifiedTime != nil {
-		model.LastModifiedTime = types.StringValue((aws.TimeValue(lastModifiedTime)).String())
+		model.LastModifiedTime = types.StringValue(lastModifiedTime.String())
 	}
 
 	return model

diff --git a/awsmt/helpers_common.go b/awsmt/helpers_common.go
@@ -4,46 +4,11 @@ import (
 	"context"
 	"fmt"
 	mediatailorV2 "github.com/aws/aws-sdk-go-v2/service/mediatailor"
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/mediatailor"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
-	"reflect"
 	"strings"
 )
 
-func untagResource(client *mediatailor.MediaTailor, oldTags map[string]*string, resourceArn string) error {
-	var removeTags []*string
-	for k := range oldTags {
-		removeTags = append(removeTags, aws.String(k))
-	}
-	_, err := client.UntagResource(&mediatailor.UntagResourceInput{ResourceArn: &resourceArn, TagKeys: removeTags})
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func tagResource(client *mediatailor.MediaTailor, newTags map[string]*string, resourceArn string) error {
-	_, err := client.TagResource(&mediatailor.TagResourceInput{ResourceArn: &resourceArn, Tags: newTags})
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func updatesTags(client *mediatailor.MediaTailor, oldTags map[string]*string, newTags map[string]*string, resourceArn string) error {
-	if !reflect.DeepEqual(oldTags, newTags) {
-		if err := untagResource(client, oldTags, resourceArn); err != nil {
-			return err
-		}
-		if err := tagResource(client, newTags, resourceArn); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func v2Untag(client *mediatailorV2.Client, oldTags map[string]string, resourceArn string) error {
 	var removeTags []string
 	for k := range oldTags {