Merge pull request #84 from spring-media/OTT-6159

Ott 6159

.github/workflows/ci.yaml

@@ -19,7 +19,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v2
       - uses: actions/setup-python@v3
-      - uses: golangci/golangci-lint-action@v2.5.2
+      - uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.59
       - run: |
           pip install -r requirements.txt
           mkdocs build -f ../../mkdocs.yaml --strict

awsmt/data_source_playback_configuration_test.go

@@ -45,7 +45,7 @@ func TestAccPlaybackConfigurationDataSourceErrors(t *testing.T) {
 		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
-				Config:      plabackConfigDSError(),
+				Config:      playbackConfigDSError(),
 				ExpectError: regexp.MustCompile("Error while retrieving the playback configuration "),
 			},
 		},
@@ -98,7 +98,7 @@ func playbackConfigDS() string {
 						`
 }
 
-func plabackConfigDSError() string {
+func playbackConfigDSError() string {
 	return `resource "awsmt_playback_configuration" "r1" {
   							ad_decision_server_url = "https://exampleurl.com/"
   							avail_suppression = {

awsmt/helpers_playback_configuration.go

@@ -1,6 +1,7 @@
 package awsmt
 
 import (
+	"context"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/mediatailor"
 	awsTypes "github.com/aws/aws-sdk-go-v2/service/mediatailor/types"
@@ -18,6 +19,8 @@ type putPlaybackConfigurationModelbuilder struct {
 	isResource bool
 }
 
+// Input Builder functions
+
 func (i *putPlaybackConfigurationInputBuilder) getInput() *mediatailor.PutPlaybackConfigurationInput {
 
 	i.addAvailSuppressionToInput()
@@ -173,6 +176,8 @@ func (i *putPlaybackConfigurationInputBuilder) addRequiredFieldsToInput() {
 	i.input.Name = i.model.Name
 }
 
+// Model Builder functions
+
 func (m *putPlaybackConfigurationModelbuilder) getModel() playbackConfigurationModel {
 
 	m.addAvailSuppressionToModel()
@@ -293,9 +298,11 @@ func (m *putPlaybackConfigurationModelbuilder) addOptionalFieldsToModel() {
 	}
 
 	if m.output.LogConfiguration != nil {
-		m.model.LogConfigurationPercentEnabled = types.Int64Value(int64(m.output.LogConfiguration.PercentEnabled))
-	} else {
-		m.model.LogConfigurationPercentEnabled = types.Int64Value(0)
+		if m.isResource && int(m.model.LogConfigurationPercentEnabled.ValueInt64()) > 0 {
+			m.model.LogConfigurationPercentEnabled = types.Int64Value(int64(m.output.LogConfiguration.PercentEnabled))
+		} else if !m.isResource {
+			m.model.LogConfigurationPercentEnabled = types.Int64Value(int64(m.output.LogConfiguration.PercentEnabled))
+		}
 	}
 
 	if m.output.PersonalizationThresholdSeconds != nil {
@@ -318,3 +325,22 @@ func (m *putPlaybackConfigurationModelbuilder) addOptionalFieldsToModel() {
 		m.model.Tags = m.output.Tags
 	}
 }
+
+// Log percentage configuration helper
+func setLogPercentage(client *mediatailor.Client, model playbackConfigurationModel) (*mediatailor.PutPlaybackConfigurationOutput, error) {
+	_, err := client.ConfigureLogsForPlaybackConfiguration(context.TODO(), &mediatailor.ConfigureLogsForPlaybackConfigurationInput{
+		PlaybackConfigurationName: model.Name,
+		PercentEnabled:            int32(model.LogConfigurationPercentEnabled.ValueInt64()),
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	playbackConfiguration, err := client.GetPlaybackConfiguration(context.TODO(), &mediatailor.GetPlaybackConfigurationInput{Name: model.Name})
+	if err != nil {
+		return nil, err
+	}
+	output := mediatailor.PutPlaybackConfigurationOutput(*playbackConfiguration)
+	return &output, nil
+}

awsmt/resource_playback_configuration.go

@@ -3,10 +3,12 @@ package awsmt
 import (
 	"context"
 	"github.com/aws/aws-sdk-go-v2/service/mediatailor"
+	"github.com/hashicorp/terraform-plugin-framework-validators/int64validator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/objectplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
@@ -93,7 +95,15 @@ func (r *resourcePlaybackConfiguration) Schema(_ context.Context, _ resource.Sch
 				},
 			},
 			"hls_configuration_manifest_endpoint_prefix": computedStringWithStateForUnknown,
-			"log_configuration_percent_enabled":          computedInt64WithStateForUnknown,
+			"log_configuration_percent_enabled": schema.Int64Attribute{
+				Optional: true,
+				Validators: []validator.Int64{
+					int64validator.Between(0, 100),
+				},
+				PlanModifiers: []planmodifier.Int64{
+					int64planmodifier.UseStateForUnknown(),
+				},
+			},
 			"live_pre_roll_configuration": schema.SingleNestedAttribute{
 				Optional: true,
 				Attributes: map[string]schema.Attribute{
@@ -149,7 +159,7 @@ func (r *resourcePlaybackConfiguration) Create(ctx context.Context, req resource
 
 	p := putPlaybackConfigurationInputBuilder{input: &mediatailor.PutPlaybackConfigurationInput{}, model: plan}
 
-	playbackConfiguration, err := r.client.PutPlaybackConfiguration(context.TODO(), p.getInput())
+	_, err := r.client.PutPlaybackConfiguration(context.TODO(), p.getInput())
 	if err != nil {
 		resp.Diagnostics.AddError(
 			"Error while creating playback configuration "+err.Error(),
@@ -158,6 +168,15 @@ func (r *resourcePlaybackConfiguration) Create(ctx context.Context, req resource
 		return
 	}
 
+	playbackConfiguration, err := setLogPercentage(r.client, plan)
+	if err != nil {
+		resp.Diagnostics.AddError(
+			"Error while setting the log percentage "+err.Error(),
+			err.Error(),
+		)
+		return
+	}
+
 	m := putPlaybackConfigurationModelbuilder{model: &plan, output: *playbackConfiguration, isResource: true}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, m.getModel())...)
@@ -233,7 +252,7 @@ func (r *resourcePlaybackConfiguration) Update(ctx context.Context, req resource
 	p := putPlaybackConfigurationInputBuilder{input: &mediatailor.PutPlaybackConfigurationInput{}, model: plan}
 
 	// Update the playback configuration
-	playbackConfigurationUpdate, err := r.client.PutPlaybackConfiguration(context.TODO(), p.getInput())
+	_, err = r.client.PutPlaybackConfiguration(context.TODO(), p.getInput())
 	if err != nil {
 		resp.Diagnostics.AddError(
 			"Error while updating playback configuration "+err.Error(),
@@ -242,6 +261,15 @@ func (r *resourcePlaybackConfiguration) Update(ctx context.Context, req resource
 		return
 	}
 
+	playbackConfigurationUpdate, err := setLogPercentage(r.client, plan)
+	if err != nil {
+		resp.Diagnostics.AddError(
+			"Error while setting the log percentage "+err.Error(),
+			err.Error(),
+		)
+		return
+	}
+
 	m := putPlaybackConfigurationModelbuilder{model: &plan, output: *playbackConfigurationUpdate, isResource: true}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, m.getModel())...)

awsmt/resource_playback_configuration_test.go

@@ -40,6 +40,37 @@ func TestAccPlaybackConfigurationMinimal(t *testing.T) {
 	})
 }
 
+func TestAccPlaybackConfigurationLogPercentage(t *testing.T) {
+	resourceName := "awsmt_playback_configuration.r3"
+	name := "test-acc-playback-configuration-log-percentage"
+	adUrl := "https://www.foo.de/"
+	videoSourceUrl := "https://www.bar.at"
+	p1 := "5"
+	p2 := "8"
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: logPercentagePlaybackConfiguration(name, adUrl, videoSourceUrl, p1),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "id", name),
+					resource.TestCheckResourceAttr(resourceName, "name", name),
+					resource.TestCheckResourceAttr(resourceName, "log_configuration_percent_enabled", p1),
+				),
+			},
+			{
+				Config: logPercentagePlaybackConfiguration(name, adUrl, videoSourceUrl, p2),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "id", name),
+					resource.TestCheckResourceAttr(resourceName, "name", name),
+					resource.TestCheckResourceAttr(resourceName, "log_configuration_percent_enabled", p2),
+				),
+			},
+		},
+	})
+}
+
 func TestAccPlaybackConfigurationCreationFail(t *testing.T) {
 	name := "test-acc-playback-configuration-delete"
 	adUrl := "invalid"
@@ -142,7 +173,6 @@ func TestAccPlaybackConfigurationResource(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("awsmt_playback_configuration.r1", "name", "example-playback-configuration-awsmt"),
 					resource.TestCheckResourceAttr("awsmt_playback_configuration.r1", "personalization_threshold_seconds", "3"),
-					resource.TestCheckResourceAttr("awsmt_playback_configuration.r1", "log_configuration_percent_enabled", "0"),
 					resource.TestCheckResourceAttr("awsmt_playback_configuration.r1", "ad_decision_server_url", "https://exampleurl2.com/"),
 					resource.TestCheckResourceAttr("awsmt_playback_configuration.r1", "bumper.end_url", "https://wxample.com/endbumper2"),
 					resource.TestCheckResourceAttr("awsmt_playback_configuration.r1", "bumper.start_url", "https://wxample.com/startbumper2"),
@@ -167,6 +197,18 @@ func minimalPlaybackConfiguration(name, adUrl, videoSourceUrl string) string {
 	)
 }
 
+func logPercentagePlaybackConfiguration(name, adUrl, videoSourceUrl, logPercentage string) string {
+	return fmt.Sprintf(`
+		resource "awsmt_playback_configuration" "r3" {
+			ad_decision_server_url = "%[2]s"
+			name = "%[1]s"
+			video_content_source_url = "%[3]s"
+			log_configuration_percent_enabled = "%[4]s"
+		}
+		`, name, adUrl, videoSourceUrl, logPercentage,
+	)
+}
+
 func completePlaybackConfiguration(name, adUrl, bumperE, bumperS, cdnUrl, maxD, pS, k1, v1, k2, v2 string) string {
 	return fmt.Sprintf(`
 		resource "awsmt_playback_configuration" "r1" {

awsmt/schemas.go

@@ -23,13 +23,6 @@ var computedInt64 = schema.Int64Attribute{
 	Computed: true,
 }
 
-var computedInt64WithStateForUnknown = schema.Int64Attribute{
-	Computed: true,
-	PlanModifiers: []planmodifier.Int64{
-		int64planmodifier.UseStateForUnknown(),
-	},
-}
-
 var computedMap = schema.MapAttribute{
 	Computed:    true,
 	ElementType: types.StringType,

docs/resources/awsmt_playback_configuration.md

@@ -57,6 +57,7 @@ The following arguments are supported:
 - `live_pre_roll_configuration` - The configuration for pre-roll ad insertion.
   - `ad_decision_server_url` - The URL for the ad decision server (ADS) for pre-roll ads.
   - `max_duration_seconds` - The maximum allowed duration for the pre-roll ad avail.
+- `log_configuration_percent_enabled` - The percentage of session logs that MediaTailor sends to your Cloudwatch Logs account.
 - `manifest_processing_rules` – The configuration for manifest processing rules
   - `ad_marker_passthrough` – For HLS, when set to true, MediaTailor passes through EXT-X-CUE-IN, EXT-X-CUE-OUT, and EXT-X-SPLICEPOINT-SCTE35 ad markers from the origin manifest to the MediaTailor personalized manifest.
     - `enabled` - Enables ad marker passthrough for your configuration.
@@ -73,8 +74,6 @@ In addition to all arguments above, the following attributes are exported:
 - `dash_configuration` - The configuration for DASH content.
   - `manifest_endpoint_prefix` - URL generated by MediaTailor to initiate a playback session.
 - `hls_configuration_manifest_endpoint_prefix` - URL generated by MediaTailor to initiate a playback session on devices that support Apple HLS.
-- `log_configuration` - The Amazon CloudWatch log settings for a playback configuration.
-  - `percent_enabled` - The percentage of session logs that MediaTailor sends to your Cloudwatch Logs account.
 - `playback_configuration_arn` - The Amazon Resource Name (ARN) for the playback configuration.
 - `playback_endpoint_prefix` - The URL that the player accesses to get a manifest from AWS Elemental MediaTailor.
 - `session_initialization_endpoint_prefix` - The URL that the player uses to initialize a session that uses client-side reporting.

examples/playback_configuration.tf

@@ -16,6 +16,7 @@ resource "awsmt_playback_configuration" "r1" {
       enabled = "false"
     }
   }
+  log_configuration_percent_enabled = 5
   name                              = "example-playback-configuration-awsmt"
   personalization_threshold_seconds = 2
   tags                              = { "Environment" : "dev" }