From 2321e7ede5ebc242ea74d5cfebed23025cf1b5a5 Mon Sep 17 00:00:00 2001 From: Domenico Di Ruocco Date: Fri, 12 Jul 2024 14:48:55 +0200 Subject: [PATCH] chore: remove unused code and fix ineffectual assignments to err OTT-6230 --- awsmt/helpers_playback_configuration.go | 11 ----------- awsmt/provider.go | 8 +++++--- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/awsmt/helpers_playback_configuration.go b/awsmt/helpers_playback_configuration.go index 0b4e7f2..671dda3 100644 --- a/awsmt/helpers_playback_configuration.go +++ b/awsmt/helpers_playback_configuration.go @@ -290,14 +290,3 @@ func readLivePreRollConfiguration(plan playbackConfigurationModel, playbackConfi } return plan } - -func readManifestProcessingRules(plan playbackConfigurationModel, playbackConfiguration mediatailor.PutPlaybackConfigurationOutput) playbackConfigurationModel { - if playbackConfiguration.ManifestProcessingRules != nil && *playbackConfiguration.ManifestProcessingRules.AdMarkerPassthrough.Enabled { - plan.ManifestProcessingRules = &manifestProcessingRulesModel{} - if playbackConfiguration.ManifestProcessingRules.AdMarkerPassthrough != nil && playbackConfiguration.ManifestProcessingRules.AdMarkerPassthrough.Enabled != nil { - plan.ManifestProcessingRules.AdMarkerPassthrough = &adMarkerPassthroughModel{} - plan.ManifestProcessingRules.AdMarkerPassthrough.Enabled = playbackConfiguration.ManifestProcessingRules.AdMarkerPassthrough.Enabled - } - } - return plan -} diff --git a/awsmt/provider.go b/awsmt/provider.go index ddfa33f..05c1a97 100644 --- a/awsmt/provider.go +++ b/awsmt/provider.go @@ -68,6 +68,8 @@ func (p *awsmtProvider) Configure(ctx context.Context, req provider.ConfigureReq var region = "eu-central-1" var profile = "" + + var v1err error var err error // Old sdk version creation var sess *session.Session @@ -90,7 +92,7 @@ func (p *awsmtProvider) Configure(ctx context.Context, req provider.ConfigureReq if profile != "" { // Old sdk - sess, err = session.NewSessionWithOptions(session.Options{ + sess, v1err = session.NewSessionWithOptions(session.Options{ SharedConfigState: session.SharedConfigEnable, Config: aws.Config{ Region: aws.String(region), @@ -101,12 +103,12 @@ func (p *awsmtProvider) Configure(ctx context.Context, req provider.ConfigureReq cfg, err = v2config.LoadDefaultConfig(ctx, v2config.WithSharedConfigProfile(profile), v2config.WithRegion(region)) } else { // Old sdk - sess, err = session.NewSession(&aws.Config{Region: aws.String(region)}) + sess, v1err = session.NewSession(&aws.Config{Region: aws.String(region)}) // New sdk cfg, err = v2config.LoadDefaultConfig(ctx, v2config.WithRegion(region)) } - if err != nil { + if err != nil || v1err != nil { resp.Diagnostics.AddError("Failed to Initialize Provider in Region", "unable to initialize provider in the specified region: "+err.Error()) return }