Skip to content
This repository was archived by the owner on Apr 21, 2020. It is now read-only.

Commit 7badfc6

Browse files
authored
updating the sdk breaks some tests (#147)
* updating the sdk breaks some tests * ugh why did this behavior change
1 parent 8964019 commit 7badfc6

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ replace github.com/bitmovin/bitmovin-api-sdk-go => github.com/zsiec/bitmovin-api
55
require (
66
github.com/NYTimes/gizmo v1.3.5
77
github.com/NYTimes/gziphandler v1.1.1
8-
github.com/aws/aws-sdk-go-v2 v0.19.0
8+
github.com/aws/aws-sdk-go-v2 v0.20.0
99
github.com/aws/aws-xray-sdk-go v1.0.0-rc.15
1010
github.com/bitmovin/bitmovin-api-sdk-go v1.36.0-alpha.0
1111
github.com/cbsinteractive/hybrik-sdk-go v0.0.0-20191031180025-00f04ed90532

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ github.com/aws/aws-sdk-go v1.29.24 h1:KOnds/LwADMDBaALL4UB98ZR+TUR1A1mYmAYbdLixL
3737
github.com/aws/aws-sdk-go v1.29.24/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg=
3838
github.com/aws/aws-sdk-go-v2 v0.19.0 h1:jVKVeRBQah2OwqXRoy8bnWWgpo2sXk/bWf2J2tog+lk=
3939
github.com/aws/aws-sdk-go-v2 v0.19.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
40+
github.com/aws/aws-sdk-go-v2 v0.20.0 h1:/yefUjgMrda9PNFwWctBU63nL10CJMdBwkAmaQ4w4Hs=
41+
github.com/aws/aws-sdk-go-v2 v0.20.0/go.mod h1:2LhT7UgHOXK3UXONKI5OMgIyoQL6zTAw/jwIeX6yqzw=
4042
github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04=
4143
github.com/aws/aws-xray-sdk-go v1.0.0-rc.15 h1:7XzuhQu1cTMaeKnBzEKpMG/d/wH214AoC/UZBEhht1U=
4244
github.com/aws/aws-xray-sdk-go v1.0.0-rc.15/go.mod h1:tmxq1c+yeEbMh39OmRFuXOrse5ajRlMmDXJ6LrCVsIs=

provider/mediaconvert/factory_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,13 @@ func Test_mediaconvertFactory(t *testing.T) {
5757
wantRegion: "us-cfg-region-1",
5858
},
5959
{
60-
name: "when a config does not specify aws credentials or region, credentials and region are loaded " +
60+
name: "when a config does not specify aws credentials, region, or profile, credentials and region are loaded " +
6161
"from the environment",
6262
envVars: map[string]string{
6363
"AWS_ACCESS_KEY_ID": "env_access_key_id",
6464
"AWS_SECRET_ACCESS_KEY": "env_secret_access_key",
6565
"AWS_DEFAULT_REGION": "us-north-1",
66+
"AWS_PROFILE": "",
6667
},
6768
cfg: cfgWithoutCredsAndRegion,
6869
wantCreds: aws.Credentials{

provider/mediaconvert/fake_client_test.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type testMediaConvertClient struct {
2828
func (c *testMediaConvertClient) CreatePresetRequest(input *mediaconvert.CreatePresetInput) mediaconvert.CreatePresetRequest {
2929
c.createPresetCalledWith = input
3030
return mediaconvert.CreatePresetRequest{
31-
Request: &aws.Request{HTTPRequest: &http.Request{}, Data: &mediaconvert.CreatePresetOutput{
31+
Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &mediaconvert.CreatePresetOutput{
3232
Preset: &mediaconvert.Preset{
3333
Name: input.Name,
3434
Settings: &mediaconvert.PresetSettings{
@@ -44,6 +44,7 @@ func (c *testMediaConvertClient) CreatePresetRequest(input *mediaconvert.CreateP
4444
func (c *testMediaConvertClient) GetJobRequest(*mediaconvert.GetJobInput) mediaconvert.GetJobRequest {
4545
return mediaconvert.GetJobRequest{Request: &aws.Request{
4646
HTTPRequest: &http.Request{},
47+
Retryer: aws.NoOpRetryer{},
4748
Data: &mediaconvert.GetJobOutput{
4849
Job: &c.jobReturnedByGetJob,
4950
},
@@ -54,14 +55,15 @@ func (c *testMediaConvertClient) ListJobsRequest(*mediaconvert.ListJobsInput) me
5455
c.listJobsCalled = true
5556
return mediaconvert.ListJobsRequest{Request: &aws.Request{
5657
HTTPRequest: &http.Request{},
58+
Retryer: aws.NoOpRetryer{},
5759
Data: &mediaconvert.ListJobsOutput{},
5860
}}
5961
}
6062

6163
func (c *testMediaConvertClient) CreateJobRequest(input *mediaconvert.CreateJobInput) mediaconvert.CreateJobRequest {
6264
c.createJobCalledWith = *input
6365
return mediaconvert.CreateJobRequest{
64-
Request: &aws.Request{HTTPRequest: &http.Request{}, Data: &mediaconvert.CreateJobOutput{
66+
Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &mediaconvert.CreateJobOutput{
6567
Job: &mediaconvert.Job{
6668
Id: aws.String(c.jobIDReturnedByCreateJob),
6769
},
@@ -73,14 +75,15 @@ func (c *testMediaConvertClient) CancelJobRequest(input *mediaconvert.CancelJobI
7375
c.cancelJobCalledWith = *input.Id
7476
return mediaconvert.CancelJobRequest{Request: &aws.Request{
7577
HTTPRequest: &http.Request{},
78+
Retryer: aws.NoOpRetryer{},
7679
Data: &mediaconvert.CancelJobOutput{},
7780
}}
7881
}
7982

8083
func (c *testMediaConvertClient) GetPresetRequest(input *mediaconvert.GetPresetInput) mediaconvert.GetPresetRequest {
8184
c.getPresetCalledWith = *input.Name
8285
return mediaconvert.GetPresetRequest{
83-
Request: &aws.Request{HTTPRequest: &http.Request{}, Data: &mediaconvert.GetPresetOutput{
86+
Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &mediaconvert.GetPresetOutput{
8487
Preset: &mediaconvert.Preset{
8588
Name: input.Name,
8689
Settings: &mediaconvert.PresetSettings{
@@ -97,6 +100,7 @@ func (c *testMediaConvertClient) DeletePresetRequest(input *mediaconvert.DeleteP
97100
c.deletePresetCalledWith = *input.Name
98101
return mediaconvert.DeletePresetRequest{Request: &aws.Request{
99102
HTTPRequest: &http.Request{},
103+
Retryer: aws.NoOpRetryer{},
100104
Data: &mediaconvert.DeletePresetOutput{},
101105
}}
102106
}

0 commit comments

Comments
 (0)