fix: source location import

OTT-6909

Author: thatsddr

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",
+	)
 }