From eeca71efaa128776eec1974fe4fc352b03c61e34 Mon Sep 17 00:00:00 2001 From: isadora lopes <93722096+isadoral@users.noreply.github.com> Date: Tue, 7 Nov 2023 16:16:47 +0100 Subject: [PATCH] fix: flickering values --- awsmt/data_source_playback_configuration_test.go | 1 - awsmt/helpers_playback_configuration.go | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/awsmt/data_source_playback_configuration_test.go b/awsmt/data_source_playback_configuration_test.go index ba8b77f..d6175f3 100644 --- a/awsmt/data_source_playback_configuration_test.go +++ b/awsmt/data_source_playback_configuration_test.go @@ -27,7 +27,6 @@ func TestAccPlaybackConfigurationDataSourceBasic(t *testing.T) { resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "dash_configuration.origin_manifest_type", "SINGLE_PERIOD"), resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "live_pre_roll_configuration.ad_decision_server_url", "https://exampleurl.com/"), resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "live_pre_roll_configuration.max_duration_seconds", "2"), - resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "manifest_processing_rules.ad_marker_passthrough.enabled", "false"), resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "name", "example-playback-configuration-awsmt"), resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "personalization_threshold_seconds", "2"), resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "slate_ad_url", "https://exampleurl.com/"), diff --git a/awsmt/helpers_playback_configuration.go b/awsmt/helpers_playback_configuration.go index fd170c3..4f2fa7b 100644 --- a/awsmt/helpers_playback_configuration.go +++ b/awsmt/helpers_playback_configuration.go @@ -71,13 +71,13 @@ func playbackConfigurationInput(plan playbackConfigurationModel) mediatailor.Put func getAvailSuppressionInput(availSuppression *availSupressionModel) *mediatailor.AvailSuppression { params := &mediatailor.AvailSuppression{} if availSuppression != nil { - if availSuppression.Mode != nil && *availSuppression.Mode != "" { + if availSuppression.Mode != nil { params.Mode = availSuppression.Mode } - if availSuppression.Value != nil && *availSuppression.Value != "" { + if availSuppression.Value != nil { params.Value = availSuppression.Value } - if availSuppression.FillPolicy != nil && *availSuppression.FillPolicy != "" { + if availSuppression.FillPolicy != nil { params.FillPolicy = availSuppression.FillPolicy } } @@ -220,7 +220,7 @@ func readPlaybackConfigurationTemps(plan playbackConfigurationModel, playbackCon } func readAvailSuppression(plan playbackConfigurationModel, playbackConfiguration mediatailor.PutPlaybackConfigurationOutput) playbackConfigurationModel { - if playbackConfiguration.AvailSuppression != nil { + if playbackConfiguration.AvailSuppression != nil && *playbackConfiguration.AvailSuppression.Mode != "OFF" { plan.AvailSupression = &availSupressionModel{} if playbackConfiguration.AvailSuppression.Mode != nil { plan.AvailSupression.Mode = playbackConfiguration.AvailSuppression.Mode @@ -289,7 +289,7 @@ func readLivePreRollConfiguration(plan playbackConfigurationModel, playbackConfi } func readManifestProcessingRules(plan playbackConfigurationModel, playbackConfiguration mediatailor.PutPlaybackConfigurationOutput) playbackConfigurationModel { - if playbackConfiguration.ManifestProcessingRules != nil { + if playbackConfiguration.ManifestProcessingRules != nil && *playbackConfiguration.ManifestProcessingRules.AdMarkerPassthrough.Enabled != false { plan.ManifestProcessingRules = &manifestProcessingRulesModel{} if playbackConfiguration.ManifestProcessingRules.AdMarkerPassthrough != nil && playbackConfiguration.ManifestProcessingRules.AdMarkerPassthrough.Enabled != nil { plan.ManifestProcessingRules.AdMarkerPassthrough = &adMarkerPassthroughModel{}