Merge pull request #249 from video-dev/dependabot/go_modules/github.c…

…om/aws/aws-sdk-go-1.22.0
video-dev · Aug 7, 2019 · fc87ede · fc87ede
2 parents 049389c + 4acc67d
commit fc87ede
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/drone/.drone.jsonnet b/drone/.drone.jsonnet
@@ -7,6 +7,9 @@ local test_dockerfile = {
   settings: {
     repo: 'videodev/video-transcoding-api',
     dry_run: true,
+    build_args: [
+      'GOPROXY=https://goproxy.io',
+    ],
   },
   when: {
     event: ['push', 'pull_request'],
@@ -61,7 +64,7 @@ local mod_download(go_version) = {
   name: 'mod-download',
   image: 'golang:%(go_version)s' % { go_version: go_version },
   commands: ['go mod download'],
-  environment: { GOPROXY: 'https://proxy.golang.org' },
+  environment: { GOPROXY: 'https://goproxy.io' },
   depends_on: ['clone'],
 };
 
@@ -104,6 +107,7 @@ local coverage_report = {
   name: 'codecov-report',
   image: 'golang',
   commands: ['curl -s https://codecov.io/bash | bash -s -- -t ${CODECOV_TOKEN}'],
+  detach: true,
   environment: {
     CODECOV_TOKEN: {
       from_secret: 'codecov_token',

diff --git a/drone/.drone.yml b/drone/.drone.yml
@@ -16,7 +16,7 @@ steps:
   commands:
   - go mod download
   environment:
-    GOPROXY: https://proxy.golang.org
+    GOPROXY: https://goproxy.io
   depends_on:
   - clone
 
@@ -33,6 +33,7 @@ steps:
 
 - name: codecov-report
   image: golang
+  detach: true
   commands:
   - "curl -s https://codecov.io/bash | bash -s -- -t ${CODECOV_TOKEN}"
   environment:
@@ -77,6 +78,8 @@ steps:
 - name: test-dockerfile
   image: plugins/docker
   settings:
+    build_args:
+    - GOPROXY=https://goproxy.io
     dry_run: true
     repo: videodev/video-transcoding-api
   when:
@@ -138,7 +141,7 @@ steps:
   commands:
   - go mod download
   environment:
-    GOPROXY: https://proxy.golang.org
+    GOPROXY: https://goproxy.io
   depends_on:
   - clone
 
@@ -155,6 +158,7 @@ steps:
 
 - name: codecov-report
   image: golang
+  detach: true
   commands:
   - "curl -s https://codecov.io/bash | bash -s -- -t ${CODECOV_TOKEN}"
   environment:
@@ -214,7 +218,7 @@ steps:
   commands:
   - go mod download
   environment:
-    GOPROXY: https://proxy.golang.org
+    GOPROXY: https://goproxy.io
   depends_on:
   - clone
 
@@ -231,6 +235,7 @@ steps:
 
 - name: codecov-report
   image: golang
+  detach: true
   commands:
   - "curl -s https://codecov.io/bash | bash -s -- -t ${CODECOV_TOKEN}"
   environment:

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/NYTimes/video-transcoding-api
 require (
 	github.com/NYTimes/gizmo v1.2.12
 	github.com/NYTimes/gziphandler v1.1.1
-	github.com/aws/aws-sdk-go v1.21.10
+	github.com/aws/aws-sdk-go v1.22.0
 	github.com/aws/aws-sdk-go-v2 v0.10.0
 	github.com/bitmovin/bitmovin-go v1.29.0
 	github.com/fsouza/ctxlogger v1.5.6

diff --git a/go.sum b/go.sum
@@ -19,10 +19,6 @@ github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4 h1:vdT7QwBh
 github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4/go.mod h1:SvXOG8ElV28oAiG9zv91SDe5+9PfIr7PPccpr8YyXNs=
 github.com/NYTimes/gizmo v1.2.9 h1:DzAWlQBS7ZU4BlrJr6/U+A3Od1M1LH5sVuCpbwDsqgI=
 github.com/NYTimes/gizmo v1.2.9/go.mod h1:+Ic0KePzIxrkcfIXnII7WMmrciukqbXuQcTOWAzJQNg=
-github.com/NYTimes/gizmo v1.2.10 h1:0M2wSXQIlolVTyChFnBnXwqxhnheVKj6rk8YnXBEk9U=
-github.com/NYTimes/gizmo v1.2.10/go.mod h1:+Ic0KePzIxrkcfIXnII7WMmrciukqbXuQcTOWAzJQNg=
-github.com/NYTimes/gizmo v1.2.11 h1:PadcuT9T51hklWtjlS+U6Hkf4uZ3V7osAupDItC3NP8=
-github.com/NYTimes/gizmo v1.2.11/go.mod h1:+Ic0KePzIxrkcfIXnII7WMmrciukqbXuQcTOWAzJQNg=
 github.com/NYTimes/gizmo v1.2.12 h1:dz88yhOQNeOQ2BqCdEyHjl37BtHk0jfCXUVINFXagiw=
 github.com/NYTimes/gizmo v1.2.12/go.mod h1:+Ic0KePzIxrkcfIXnII7WMmrciukqbXuQcTOWAzJQNg=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
@@ -34,16 +30,8 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx
 github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/aws/aws-sdk-go v1.15.31/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
-github.com/aws/aws-sdk-go v1.21.6 h1:3GuIm55Uls52aQIDGBnSEZbk073jpasfQyeM5eZU61Q=
-github.com/aws/aws-sdk-go v1.21.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.21.7 h1:ml+k7szyVaq4YD+3LhqOGl9tgMTqgMbpnuUSkB6UJvQ=
-github.com/aws/aws-sdk-go v1.21.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.21.8 h1:Lv6hW2twBhC6mGZAuWtqplEpIIqtVctJg02sE7Qn0Zw=
-github.com/aws/aws-sdk-go v1.21.8/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.21.9 h1:+HXP97l4IbJvccwwNoweEknroEcX8QLwExcnc+Kxobg=
-github.com/aws/aws-sdk-go v1.21.9/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.21.10 h1:lTRdgyxraKbnNhx7kWeoW/Uow1TKnSNDpQGTtEXJQgk=
-github.com/aws/aws-sdk-go v1.21.10/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.22.0 h1:e88V6+dSEyBibUy0ekOydtTfNWzqG3hrtCR8SF6UqqY=
+github.com/aws/aws-sdk-go v1.22.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go-v2 v0.10.0 h1:qxZ7TyWFEIucMPQR2qymRx7JZ+hWF0N8HyCWh0XKh6Q=
 github.com/aws/aws-sdk-go-v2 v0.10.0/go.mod h1:cpXCmy3BB+lqwGweJjdawczHW3a+g8QgcFHcoOVoHao=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=