Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/ott 6255 #83

Merged
merged 15 commits into from
Jul 22, 2024
Merged

Fix/ott 6255 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
038fba9
fix: typo in `avail_suppression`
thatsddr Jul 18, 2024
ad1ac0f
fix: use state for unknown in computed fields
thatsddr Jul 18, 2024
0bab6e9
refactor: prepare playback configuration schemas for migration to sdk v2
thatsddr Jul 18, 2024
d39a4a0
fix: use sdk v2 for playback configuration
thatsddr Jul 18, 2024
9dd9577
fix: flickering values
thatsddr Jul 18, 2024
8b180fd
refactor: helper functions
thatsddr Jul 18, 2024
ecbae44
refactor: use structs for playback configuration helper functions
thatsddr Jul 19, 2024
a4b7a8b
fix: playback configuration resource schema
thatsddr Jul 19, 2024
2a9e4bf
docs: fix typos
thatsddr Jul 19, 2024
cc27ce0
fix: reading of avail suppression model
thatsddr Jul 19, 2024
6f201c4
fix: allow creation of playback configuration with minimal amount of …
thatsddr Jul 22, 2024
70e1006
chore: remove unused code
thatsddr Jul 22, 2024
7bce684
test: playback config creation failure
thatsddr Jul 22, 2024
a52b907
test: playback config update failure
thatsddr Jul 22, 2024
b755728
docs: update playback config example
thatsddr Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions awsmt/data_source_playback_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
Expand All @@ -18,7 +18,7 @@ func DataSourcePlaybackConfiguration() datasource.DataSource {
}

type dataSourcePlaybackConfiguration struct {
client *mediatailor.MediaTailor
client *mediatailor.Client
}

func (d *dataSourcePlaybackConfiguration) Metadata(_ context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
Expand All @@ -30,7 +30,7 @@ func (d *dataSourcePlaybackConfiguration) Schema(_ context.Context, _ datasource
Attributes: map[string]schema.Attribute{
"id": computedString,
"ad_decision_server_url": computedString,
"avail_supression": schema.SingleNestedAttribute{
"avail_suppression": schema.SingleNestedAttribute{
Computed: true,
Attributes: map[string]schema.Attribute{
"fill_policy": computedString,
Expand Down Expand Up @@ -107,20 +107,20 @@ func (d *dataSourcePlaybackConfiguration) Configure(_ context.Context, req datas
return
}

d.client = req.ProviderData.(clients).v1
d.client = req.ProviderData.(clients).v2
}

func (d *dataSourcePlaybackConfiguration) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
var data playbackConfigurationModel
diags := req.Config.Get(ctx, &data)
resp.Diagnostics.Append(diags...)

resp.Diagnostics.Append(req.Config.Get(ctx, &data)...)
if resp.Diagnostics.HasError() {
return
}

name := data.Name

playbackConfiguration, err := d.client.GetPlaybackConfiguration(&mediatailor.GetPlaybackConfigurationInput{Name: name})
playbackConfiguration, err := d.client.GetPlaybackConfiguration(context.TODO(), &mediatailor.GetPlaybackConfigurationInput{Name: name})
if err != nil {
resp.Diagnostics.AddError(
"Error while retrieving the playback configuration "+err.Error(),
Expand All @@ -129,7 +129,7 @@ func (d *dataSourcePlaybackConfiguration) Read(ctx context.Context, req datasour
return
}

data = readPlaybackConfigToPlan(data, mediatailor.PutPlaybackConfigurationOutput(*playbackConfiguration))
m := putPlaybackConfigurationModelbuilder{model: &data, output: mediatailor.PutPlaybackConfigurationOutput(*playbackConfiguration), isResource: false}

resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
resp.Diagnostics.Append(resp.State.Set(ctx, m.getModel())...)
}
10 changes: 5 additions & 5 deletions awsmt/data_source_playback_configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ func TestAccPlaybackConfigurationDataSourceBasic(t *testing.T) {
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "id", "example-playback-configuration-awsmt"),
resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "ad_decision_server_url", "https://exampleurl.com/"),
resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "avail_supression.fill_policy", "FULL_AVAIL_ONLY"),
resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "avail_supression.mode", "BEHIND_LIVE_EDGE"),
resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "avail_supression.value", "00:00:00"),
resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "avail_suppression.fill_policy", "FULL_AVAIL_ONLY"),
resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "avail_suppression.mode", "BEHIND_LIVE_EDGE"),
resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "avail_suppression.value", "00:00:00"),
resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "bumper.end_url", "https://wxample.com/endbumper"),
resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "bumper.start_url", "https://wxample.com/startbumper"),
resource.TestCheckResourceAttr("data.awsmt_playback_configuration.test", "cdn_configuration.ad_segment_url_prefix", "https://exampleurl.com/"),
Expand Down Expand Up @@ -55,7 +55,7 @@ func TestAccPlaybackConfigurationDataSourceErrors(t *testing.T) {
func playbackConfigDS() string {
return `resource "awsmt_playback_configuration" "r1" {
ad_decision_server_url = "https://exampleurl.com/"
avail_supression = {
avail_suppression = {
fill_policy = "FULL_AVAIL_ONLY"
mode = "BEHIND_LIVE_EDGE"
value = "00:00:00"
Expand Down Expand Up @@ -101,7 +101,7 @@ func playbackConfigDS() string {
func plabackConfigDSError() string {
return `resource "awsmt_playback_configuration" "r1" {
ad_decision_server_url = "https://exampleurl.com/"
avail_supression = {
avail_suppression = {
fill_policy = "FULL_AVAIL_ONLY"
mode = "BEHIND_LIVE_EDGE"
value = "00:00:00"
Expand Down
Loading
Loading