Merge pull request #92 from spring-media/fix/OTT-6909

Fix/ott 6909

Author: thatsddr

.github/workflows/ci.yaml

@@ -5,7 +5,7 @@ on:
     branches:
       - "**"
 env:
-  GO_VERSION: 1.22
+  GO_VERSION: 1.24
 
 permissions:
   id-token: write
@@ -24,7 +24,7 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
       - uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.62
+          version: latest
       - run: |
           pip install -r requirements.txt
           mkdocs build -f ../../mkdocs.yaml --strict

awsmt/data_source_source_location.go

@@ -104,7 +104,7 @@ func (d *dataSourceSourceLocation) Read(ctx context.Context, req datasource.Read
 		return
 	}
 
-	data = writeSourceLocationToPlan(data, mediatailor.CreateSourceLocationOutput(*sourceLocation), false)
+	data = writeSourceLocationToPlan(data, mediatailor.CreateSourceLocationOutput(*sourceLocation))
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }

awsmt/helpers_source_location.go

@@ -137,12 +137,12 @@ func getUpdateSourceLocationInput(model models.SourceLocationModel) mediatailor.
 	return params
 }
 
-func writeSourceLocationToPlan(model models.SourceLocationModel, sourceLocation mediatailor.CreateSourceLocationOutput, isResource bool) models.SourceLocationModel {
+func writeSourceLocationToPlan(model models.SourceLocationModel, sourceLocation mediatailor.CreateSourceLocationOutput) models.SourceLocationModel {
 	// Set state
 
 	model = readSourceLocationComputedValues(model, sourceLocation)
 
-	model = readAccessConfiguration(model, sourceLocation, isResource)
+	model = readAccessConfiguration(model, sourceLocation)
 
 	model = readDefaultSegmentDeliveryConfiguration(model, sourceLocation)
 
@@ -179,17 +179,14 @@ func readSourceLocationComputedValues(model models.SourceLocationModel, sourceLo
 	return model
 }
 
-func readAccessConfiguration(model models.SourceLocationModel, sourceLocation mediatailor.CreateSourceLocationOutput, isResource bool) models.SourceLocationModel {
+func readAccessConfiguration(model models.SourceLocationModel, sourceLocation mediatailor.CreateSourceLocationOutput) models.SourceLocationModel {
 	if sourceLocation.AccessConfiguration == nil {
 		return model
 	}
-	if model.AccessConfiguration == nil && isResource {
-		return model
-	}
 
 	model.AccessConfiguration = &models.AccessConfigurationModel{}
 
-	if !(isResource && model.AccessConfiguration == nil) {
+	if string(sourceLocation.AccessConfiguration.AccessType) != "" {
 		accessType := string(sourceLocation.AccessConfiguration.AccessType)
 		model.AccessConfiguration.AccessType = &accessType
 	}
@@ -304,6 +301,6 @@ func recreateSourceLocation(client *mediatailor.Client, plan models.SourceLocati
 	if err != nil {
 		return nil, fmt.Errorf("error while creating new source location with new access configuration %v", err.Error())
 	}
-	model := writeSourceLocationToPlan(plan, *sourceLocation, true)
+	model := writeSourceLocationToPlan(plan, *sourceLocation)
 	return &model, nil
 }

awsmt/resource_source_location.go

@@ -8,6 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"strings"
 	"terraform-provider-mediatailor/awsmt/models"
 )
 
@@ -108,7 +109,7 @@ func (r *resourceSourceLocation) Create(ctx context.Context, req resource.Create
 		return
 	}
 
-	plan = writeSourceLocationToPlan(plan, *sourceLocation, true)
+	plan = writeSourceLocationToPlan(plan, *sourceLocation)
 
 	diags = resp.State.Set(ctx, plan)
 	resp.Diagnostics.Append(diags...)
@@ -133,7 +134,7 @@ func (r *resourceSourceLocation) Read(ctx context.Context, req resource.ReadRequ
 		return
 	}
 
-	state = writeSourceLocationToPlan(state, mediatailor.CreateSourceLocationOutput(*sourceLocation), true)
+	state = writeSourceLocationToPlan(state, mediatailor.CreateSourceLocationOutput(*sourceLocation))
 
 	diags = resp.State.Set(ctx, &state)
 	resp.Diagnostics.Append(diags...)
@@ -189,7 +190,7 @@ func (r *resourceSourceLocation) Update(ctx context.Context, req resource.Update
 			)
 			return
 		}
-		plan = writeSourceLocationToPlan(plan, mediatailor.CreateSourceLocationOutput(*sourceLocationUpdated), true)
+		plan = writeSourceLocationToPlan(plan, mediatailor.CreateSourceLocationOutput(*sourceLocationUpdated))
 	}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, plan)...)
@@ -218,5 +219,29 @@ func (r *resourceSourceLocation) Delete(ctx context.Context, req resource.Delete
 }
 
 func (r *resourceSourceLocation) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
-	resource.ImportStatePassthroughID(ctx, path.Root("name"), req, resp)
+	// Split the import ID to support various import formats
+	idParts := strings.Split(req.ID, "/")
+
+	if len(idParts) == 1 {
+		resource.ImportStatePassthroughID(ctx, path.Root("name"), req, resp)
+		return
+	}
+
+	// Support ARN import format
+	if strings.HasPrefix(req.ID, "arn:aws:mediatailor:") {
+		arnParts := strings.Split(req.ID, ":")
+		if len(arnParts) >= 6 {
+			resourcePath := arnParts[5]
+			resourceParts := strings.Split(resourcePath, "/")
+			if len(resourceParts) >= 2 && resourceParts[0] == "sourceLocation" {
+				resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("name"), resourceParts[1])...)
+				return
+			}
+		}
+	}
+
+	resp.Diagnostics.AddError(
+		"Invalid import ID",
+		"Expected import ID to be either the source location name or the full ARN",
+	)
 }

awsmt/resource_source_location_test.go

@@ -112,6 +112,12 @@ func TestAccSourceLocationResourceUpdateAccessControl(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "tags.Environment", "dev"),
 				),
 			},
+			// Import resource by arn
+			{
+				ResourceName:  resourceName,
+				ImportState:   true,
+				ImportStateId: "arn:aws:mediatailor:eu-central-1:985600762523:sourceLocation/" + name,
+			},
 			// Update and Read testing
 			{
 				Config: basicSourceLocationWithAccessConfig(name, baseUrl2, k3, v3, k2, v2),
@@ -130,6 +136,37 @@ func TestAccSourceLocationResourceUpdateAccessControl(t *testing.T) {
 	})
 }
 
+func TestAccSourceLocationAccessConfiguration_SMATC(t *testing.T) {
+	secretStringKey := "access-token"
+	headerName := "ACCESS-TOKEN"
+	secretArn := "arn:aws:secretsmanager:eu-central-1:985600762523:secret:terraform-provider-aws-acceptance-testing-Hr2kg1"
+
+	resourceName := "awsmt_source_location.test_source_location_smatc"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: sourceLocationWithSMATC(secretArn, secretStringKey, headerName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "access_configuration.access_type", "SECRETS_MANAGER_ACCESS_TOKEN"),
+					resource.TestCheckResourceAttr(resourceName, "access_configuration.smatc.header_name", headerName),
+					resource.TestCheckResourceAttr(resourceName, "access_configuration.smatc.secret_arn", secretArn),
+					resource.TestCheckResourceAttr(resourceName, "access_configuration.smatc.secret_string_key", secretStringKey),
+				),
+			},
+			// Import resource
+			{
+				ResourceName: resourceName,
+				ImportState:  true,
+			},
+		},
+	})
+}
+
 func TestAccSourceLocationDeleteVodResource(t *testing.T) {
 	resourceName := "awsmt_source_location.test_source_location"
 	resource.Test(t, resource.TestCase{
@@ -260,3 +297,29 @@ func basicSourceLocationWithVodSource() string {
 		}
 `
 }
+
+func sourceLocationWithSMATC(secretArn, secretStringKey, headerName string) string {
+	return fmt.Sprintf(`
+		resource "awsmt_source_location" "test_source_location_smatc"{
+			name = "sl-smatc"
+			http_configuration = {
+				base_url = "https://ott-mediatailor-test.s3.eu-central-1.amazonaws.com"
+			}
+			access_configuration = {
+				access_type = "SECRETS_MANAGER_ACCESS_TOKEN"
+				smatc = {
+			  		header_name        = "%[1]s"
+			  		secret_arn         = "%[2]s"
+			  		secret_string_key  = "%[3]s"
+				}
+		  	}
+		}
+		data "awsmt_source_location" "read" {
+			name = awsmt_source_location.test_source_location_smatc.name
+		}
+		output "awsmt_source_location" {
+			value = data.awsmt_source_location.read
+		}
+
+`, headerName, secretArn, secretStringKey)
+}

docs/resources/awsmt_source_location.md

@@ -60,7 +60,7 @@ In addition to all arguments above, the following attributes are exported:
 
 ## Import
 
-Source Locations can be imported using their name as identifier. For example:
+Source Locations can be imported using either their name or their ARN as identifier. For example:
 
 ```
   $ terraform import awsmt_source_location.example example-source-location

examples/source_location.tf

@@ -15,6 +15,3 @@ data "awsmt_source_location" "read" {
 output "awsmt_source_location" {
   value = data.awsmt_source_location.read
 }
-
-
-

go.mod

@@ -1,60 +1,59 @@
 module terraform-provider-mediatailor
 
-go 1.22.7
-
-toolchain go1.23.3
+go 1.24.1
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.32.8
-	github.com/aws/aws-sdk-go-v2/config v1.28.9
-	github.com/aws/aws-sdk-go-v2/service/mediatailor v1.42.9
-	github.com/hashicorp/terraform-plugin-framework v1.13.0
+	github.com/aws/aws-sdk-go-v2 v1.36.3
+	github.com/aws/aws-sdk-go-v2/config v1.29.9
+	github.com/aws/aws-sdk-go-v2/service/mediatailor v1.45.1
+	github.com/hashicorp/terraform-plugin-framework v1.14.1
 	github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0
-	github.com/hashicorp/terraform-plugin-framework-validators v0.16.0
-	github.com/hashicorp/terraform-plugin-go v0.25.0
+	github.com/hashicorp/terraform-plugin-framework-validators v0.17.0
+	github.com/hashicorp/terraform-plugin-go v0.26.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
-	github.com/onsi/ginkgo/v2 v2.22.0
-	github.com/onsi/gomega v1.36.1
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
+	github.com/onsi/ginkgo/v2 v2.23.1
+	github.com/onsi/gomega v1.36.2
 )
 
 require (
-	github.com/ProtonMail/go-crypto v1.1.0-alpha.5-proton // indirect
+	github.com/ProtonMail/go-crypto v1.1.3 // indirect
 	github.com/agext/levenshtein v1.2.2 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.50 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.5 // indirect
-	github.com/aws/smithy-go v1.22.1 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.62 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 // indirect
+	github.com/aws/smithy-go v1.22.3 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-plugin v1.6.2 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/go-version v1.6.0 // indirect
-	github.com/hashicorp/hc-install v0.6.4 // indirect
-	github.com/hashicorp/hcl/v2 v2.20.1 // indirect
+	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/hc-install v0.9.1 // indirect
+	github.com/hashicorp/hcl/v2 v2.23.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-exec v0.21.0 // indirect
-	github.com/hashicorp/terraform-json v0.22.1 // indirect
-	github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
+	github.com/hashicorp/terraform-exec v0.22.0 // indirect
+	github.com/hashicorp/terraform-json v0.24.0 // indirect
+	github.com/hashicorp/terraform-registry-address v0.2.4 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/yamux v0.1.2 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
@@ -68,17 +67,17 @@ require (
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	github.com/zclconf/go-cty v1.14.4 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/tools v0.26.0 // indirect
+	github.com/zclconf/go-cty v1.16.2 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/net v0.37.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/tools v0.31.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
-	google.golang.org/grpc v1.69.2 // indirect
-	google.golang.org/protobuf v1.36.2 // indirect
+	google.golang.org/grpc v1.69.4 // indirect
+	google.golang.org/protobuf v1.36.3 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )