diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..6b8710a7 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +.git diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e9351963..00000000 --- a/.travis.yml +++ /dev/null @@ -1,44 +0,0 @@ -language: go -sudo: false -addons: - apt: - packages: - - redis-server - - docker-ce -services: - - redis-server -env: - global: - - GO111MODULE=on - - GO_FOR_RELEASE=1.x - - CGO_ENABLED=0 - - GOPROXY=https://proxy.golang.org -go: - - 1.x -install: - - make testdeps -script: - - make coverage - - go build -o video-transcoding-api -after_success: - - bash <(curl -s https://codecov.io/bash) - - travis-scripts/docker.bash -deploy: - - provider: script - skip_cleanup: true - script: travis-scripts/deploy.bash dev-stg - on: - repo: nytimes/video-transcoding-api - branch: master - go: 1.x - - provider: script - skip_cleanup: true - script: travis-scripts/deploy.bash prd - on: - repo: nytimes/video-transcoding-api - tags: true - go: 1.x -matrix: - fast_finish: true -notifications: - email: false diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..c105949f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +FROM golang:1.12.7-alpine AS build + +ARG GOPROXY=https://proxy.golang.org + +ENV CGO_ENABLED 0 +WORKDIR /code +ADD . ./ +RUN go install + +FROM alpine:3.10.1 +RUN apk add --no-cache ca-certificates +COPY --from=build /go/bin/video-transcoding-api /usr/bin/video-transcoding-api +ENTRYPOINT ["/usr/bin/video-transcoding-api"] diff --git a/Makefile b/Makefile index 31cb52ac..457f63ee 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,7 @@ -.PHONY: all testdeps lint test gotest build run +.PHONY: all testdeps lint runlint test gotest coverage gocoverage build run HTTP_PORT ?= 8080 LOG_LEVEL ?= debug -CI_TAG ?= $(shell git describe --tags $(shell git rev-list --tags --max-count=1)) all: test @@ -10,7 +9,9 @@ testdeps: GO111MODULE=off go get github.com/golangci/golangci-lint/cmd/golangci-lint go mod download -lint: testdeps +lint: testdeps runlint + +runlint: golangci-lint run \ --enable-all \ -D errcheck \ @@ -24,16 +25,18 @@ lint: testdeps -D unparam \ --deadline 5m ./... -gotest: testdeps - go test ./... +gotest: + go test -vet=all -mod=readonly $(GO_TEST_EXTRA_FLAGS) ./... + +test: lint testdeps gotest -test: lint gotest +coverage: lint gocoverage -coverage: lint - go test -coverprofile=coverage.txt -covermode=atomic ./... +gocoverage: + make gotest GO_TEST_EXTRA_FLAGS="-coverprofile=coverage.txt -covermode=atomic" build: - go build + go build -mod=readonly run: build HTTP_PORT=$(HTTP_PORT) APP_LOG_LEVEL=$(LOG_LEVEL) ./video-transcoding-api diff --git a/README.md b/README.md index 5bd4933e..a44f5e24 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ # Video Transcoding API -[![Build Status](https://travis-ci.org/nytimes/video-transcoding-api.svg?branch=master)](https://travis-ci.org/nytimes/video-transcoding-api) -[![codecov](https://codecov.io/gh/nytimes/video-transcoding-api/branch/master/graph/badge.svg)](https://codecov.io/gh/nytimes/video-transcoding-api) -[![Go Report Card](https://goreportcard.com/badge/github.com/nytimes/video-transcoding-api)](https://goreportcard.com/report/github.com/nytimes/video-transcoding-api) +[![Build Status](https://cloud.drone.io/api/badges/video-dev/video-transcoding-api/status.svg)](https://cloud.drone.io/video-dev/video-transcoding-api) +[![codecov](https://codecov.io/gh/video-dev/video-transcoding-api/branch/master/graph/badge.svg)](https://codecov.io/gh/video-dev/video-transcoding-api) +[![Go Report Card](https://goreportcard.com/badge/github.com/video-dev/video-transcoding-api)](https://goreportcard.com/report/github.com/video-dev/video-transcoding-api) The Video Transcoding API provides an agnostic API to transcode media assets across different cloud services. Currently, it supports the following @@ -126,7 +126,7 @@ With all environment variables set and redis up and running, clone this repository and run: ``` -$ git clone https://github.com/NYTimes/video-transcoding-api.git +$ git clone https://github.com/video-dev/video-transcoding-api.git $ make run ``` @@ -139,7 +139,7 @@ $ make test ## Using the API Check out on our Wiki [how -to](https://github.com/NYTimes/video-transcoding-api/wiki/Using-Video-Transcoding-API) +to](https://github.com/video-dev/video-transcoding-api/wiki/Using-Video-Transcoding-API) use this API. ## Contributing @@ -153,7 +153,7 @@ use this API. ## License - This code is under [Apache 2.0 - license](https://github.com/NYTimes/video-transcoding-api/blob/master/LICENSE). + license](https://github.com/video-dev/video-transcoding-api/blob/master/LICENSE). - The video-transcoding-api logo is a variation on the Go gopher that was designed by Renee French and copyrighted under the [Creative Commons Attribution 3.0 license](https://creativecommons.org/licenses/by/3.0/). diff --git a/bin/build b/bin/build deleted file mode 100755 index 064d9281..00000000 --- a/bin/build +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -e -cd $(cd `dirname "$0"`; cd ..; pwd) - -if [ -z "$TARBALL" ]; then - echo "Error: destination TARBALL must be set" - exit 1 -fi - -# Create a temporary GOPATH -export GOTMP=/tmp/video-transcoding-api-$RANDOM - -# And a place to dump the output -export OUTPUT=$GOTMP/output - -# Download dependencies and build -GOARCH=amd64 GOOS=linux CGO_ENABLED=0 go build -o $OUTPUT/video-transcoding-api -cp swagger.json $OUTPUT/. - -# Create the output tarball -pushd $OUTPUT -tar -czf $TARBALL . -popd - -# Clean up the temporary GOPATH -rm -rf $GOTMP diff --git a/bump.sh b/bump.sh deleted file mode 100755 index 44ca4a84..00000000 --- a/bump.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -e - -PROJECT=$(git config --local remote.origin.url|sed -n 's#.*/\([^.]*\)\.git#\1#p') -GH_LOG_TEMPLATE="([%h](https://github.com/NYTimes/$PROJECT/commit/%h)) %s %n" -EMAIL_LOG_TEMPLATE="[%h] %s - by %an, %ci.
" -RECIPIENT=mediafactory@nytimes.com - -increment_version() { - digits=$(echo $1 | grep -o '[0-9.]\+') - arr=(${digits//[.,-]/ }) - if [ "$2" == "major" ]; then - ((arr[0]++)) - arr[1]=0 - arr[2]=0 - elif [ "$2" == "minor" ]; then - ((arr[1]++)) - arr[2]=0 - elif [ "$2" == "bugfix" ]; then - ((arr[2]++)) - fi - - echo "v${arr[0]}.${arr[1]}.${arr[2]}" -} - -update_changelog() { - OLD_CHANGELOG="$(cat CHANGELOG.md)" - - echo "## Version $2 (Release date: $(date +%F))" > CHANGELOG.md - git log $1..master --pretty="$GH_LOG_TEMPLATE" | grep -v Merge | grep -v bump >> CHANGELOG.md - printf "\n\n\n${OLD_CHANGELOG}" >> CHANGELOG.md -} - -bump_version() { - git tag $1 - git add CHANGELOG.md - git commit -m "bump to $1 [CI SKIP]" - git push origin master --tags -} - -send_mail() { - git log $1..$2 --pretty="$EMAIL_LOG_TEMPLATE" | grep -v Merge | grep -v bump >> .tmp_mail - - TITLE="[$PROJECT] New version released: $2" - - HEADER="

Changelog

" - BODY=$(cat .tmp_mail) - FOOTER="You can also see the full changelog on GitHub.

Media Factory Team." - MESSAGE="${HEADER}
${BODY}
${FOOTER}" - - SUBJECT="$TITLE\nFrom: Media Factory \nContent-Type: text/html\n" - - rm -rf .tmp_mail - echo -e $MESSAGE | mail -s "$(echo -e "$SUBJECT")" $RECIPIENT -} - -if [ "$1" != "" ]; then - last_version=$(git describe --tags $(git rev-list --tags --max-count=1)) - new_version=$(increment_version $last_version $1) - read -p "You're about to bump a new version ($new_version) and push to master. Is that what you intended? [y|n] " -n 1 -r < /dev/tty - if echo $REPLY | grep -E '^[Yy]$' > /dev/null; then - update_changelog $last_version $new_version - bump_version $new_version - send_mail $last_version $new_version - else - echo " Bump aborted." - fi -else - echo "Usage: ./bump.sh [major|minor|bugfix]" -fi - diff --git a/drone/.drone.jsonnet b/drone/.drone.jsonnet new file mode 100644 index 00000000..9834b340 --- /dev/null +++ b/drone/.drone.jsonnet @@ -0,0 +1,138 @@ +// the first version is used to build the binary that gets shipped to Docker Hub. +local go_versions = ['1.12.7', '1.11.12', '1.13beta1']; + +local test_dockerfile = { + name: 'test-dockerfile', + image: 'plugins/docker', + settings: { + repo: 'videodev/video-transcoding-api', + dry_run: true, + }, + when: { + event: ['push', 'pull_request'], + }, + depends_on: ['clone'], +}; + +local push_to_dockerhub = { + name: 'build-and-push-to-dockerhub', + image: 'plugins/docker', + settings: { + repo: 'videodev/video-transcoding-api', + auto_tag: true, + dockerfile: 'drone/Dockerfile', + username: { from_secret: 'docker_username' }, + password: { from_secret: 'docker_password' }, + }, + when: { + ref: [ + 'refs/tags/*', + 'refs/heads/master', + ], + }, + depends_on: ['coverage', 'lint', 'build'], +}; + +local goreleaser = { + name: 'goreleaser', + image: 'goreleaser/goreleaser', + commands: [ + 'git fetch --tags', + 'goreleaser release', + ], + environment: { + GITHUB_TOKEN: { + from_secret: 'github_token', + }, + }, + depends_on: ['coverage', 'lint'], + when: { + event: ['tag'], + }, +}; + +local release_steps = [ + test_dockerfile, + push_to_dockerhub, + goreleaser, +]; + +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' }, + depends_on: ['clone'], +}; + +// TODO(fsouza): run redis as a service in Drone. This actually requires a +// change to our test suite, because it requires Redis to be running on +// localhost and that's not how Drone works. +local coverage(go_version) = { + name: 'coverage', + image: 'golang:%(go_version)s' % { go_version: go_version }, + commands: [ + 'apt update', + 'apt install -y redis-server', + 'redis-server &>/dev/null &', + 'timeout 10 sh -c "while ! redis-cli ping; do echo waiting for redis-server to start; sleep 1; done"', + 'make gocoverage', + ], + depends_on: ['mod-download'], +}; + +local lint = { + name: 'lint', + image: 'golangci/golangci-lint', + pull: 'always', + commands: ['make runlint'], + depends_on: ['mod-download'], +}; + +local build(go_version) = { + name: 'build', + image: 'golang:%(go_version)s' % { go_version: go_version }, + commands: ['make build'], + environment: { CGO_ENABLED: '0' }, + depends_on: ['mod-download'], +}; + +local coverage_report = { + name: 'codecov-report', + image: 'golang', + commands: ['curl -s https://codecov.io/bash | bash'], + depends_on: ['coverage'], +}; + +local test_ci_dockerfile = { + name: 'test-ci-dockerfile', + image: 'plugins/docker', + settings: { + repo: 'videodev/video-transcoding-api', + dockerfile: 'drone/Dockerfile', + dry_run: true, + }, + when: { + event: ['pull_request'], + }, + depends_on: ['build'], +}; + +local pipeline(go_version) = { + kind: 'pipeline', + name: 'go-%(go_version)s' % { go_version: go_version }, + workspace: { + base: '/go', + path: 'video-transcoding-api', + }, + steps: [ + mod_download(go_version), + coverage(go_version), + coverage_report, + lint, + build(go_version), + test_ci_dockerfile, + ] + if go_version == go_versions[0] then release_steps else [], +}; + +std.map(pipeline, go_versions) diff --git a/drone/.drone.yml b/drone/.drone.yml new file mode 100644 index 00000000..02205942 --- /dev/null +++ b/drone/.drone.yml @@ -0,0 +1,254 @@ +--- +kind: pipeline +name: go-1.12.7 + +platform: + os: linux + arch: amd64 + +workspace: + base: /go + path: video-transcoding-api + +steps: +- name: mod-download + image: golang:1.12.7 + commands: + - go mod download + environment: + GOPROXY: https://proxy.golang.org + depends_on: + - clone + +- name: coverage + image: golang:1.12.7 + commands: + - apt update + - apt install -y redis-server + - "redis-server &>/dev/null &" + - "timeout 10 sh -c \"while ! redis-cli ping; do echo waiting for redis-server to start; sleep 1; done\"" + - make gocoverage + depends_on: + - mod-download + +- name: codecov-report + image: golang + commands: + - "curl -s https://codecov.io/bash | bash" + depends_on: + - coverage + +- name: lint + pull: always + image: golangci/golangci-lint + commands: + - make runlint + depends_on: + - mod-download + +- name: build + image: golang:1.12.7 + commands: + - make build + environment: + CGO_ENABLED: 0 + depends_on: + - mod-download + +- name: test-ci-dockerfile + image: plugins/docker + settings: + dockerfile: drone/Dockerfile + dry_run: true + repo: videodev/video-transcoding-api + when: + event: + - pull_request + depends_on: + - build + +- name: test-dockerfile + image: plugins/docker + settings: + dry_run: true + repo: videodev/video-transcoding-api + when: + event: + - push + - pull_request + depends_on: + - clone + +- name: build-and-push-to-dockerhub + image: plugins/docker + settings: + auto_tag: true + dockerfile: drone/Dockerfile + password: + from_secret: docker_password + repo: videodev/video-transcoding-api + username: + from_secret: docker_username + when: + ref: + - "refs/tags/*" + - refs/heads/master + depends_on: + - coverage + - lint + - build + +- name: goreleaser + image: goreleaser/goreleaser + commands: + - git fetch --tags + - goreleaser release + environment: + GITHUB_TOKEN: + from_secret: github_token + when: + event: + - tag + depends_on: + - coverage + - lint + +--- +kind: pipeline +name: go-1.11.12 + +platform: + os: linux + arch: amd64 + +workspace: + base: /go + path: video-transcoding-api + +steps: +- name: mod-download + image: golang:1.11.12 + commands: + - go mod download + environment: + GOPROXY: https://proxy.golang.org + depends_on: + - clone + +- name: coverage + image: golang:1.11.12 + commands: + - apt update + - apt install -y redis-server + - "redis-server &>/dev/null &" + - "timeout 10 sh -c \"while ! redis-cli ping; do echo waiting for redis-server to start; sleep 1; done\"" + - make gocoverage + depends_on: + - mod-download + +- name: codecov-report + image: golang + commands: + - "curl -s https://codecov.io/bash | bash" + depends_on: + - coverage + +- name: lint + pull: always + image: golangci/golangci-lint + commands: + - make runlint + depends_on: + - mod-download + +- name: build + image: golang:1.11.12 + commands: + - make build + environment: + CGO_ENABLED: 0 + depends_on: + - mod-download + +- name: test-ci-dockerfile + image: plugins/docker + settings: + dockerfile: drone/Dockerfile + dry_run: true + repo: videodev/video-transcoding-api + when: + event: + - pull_request + depends_on: + - build + +--- +kind: pipeline +name: go-1.13beta1 + +platform: + os: linux + arch: amd64 + +workspace: + base: /go + path: video-transcoding-api + +steps: +- name: mod-download + image: golang:1.13beta1 + commands: + - go mod download + environment: + GOPROXY: https://proxy.golang.org + depends_on: + - clone + +- name: coverage + image: golang:1.13beta1 + commands: + - apt update + - apt install -y redis-server + - "redis-server &>/dev/null &" + - "timeout 10 sh -c \"while ! redis-cli ping; do echo waiting for redis-server to start; sleep 1; done\"" + - make gocoverage + depends_on: + - mod-download + +- name: codecov-report + image: golang + commands: + - "curl -s https://codecov.io/bash | bash" + depends_on: + - coverage + +- name: lint + pull: always + image: golangci/golangci-lint + commands: + - make runlint + depends_on: + - mod-download + +- name: build + image: golang:1.13beta1 + commands: + - make build + environment: + CGO_ENABLED: 0 + depends_on: + - mod-download + +- name: test-ci-dockerfile + image: plugins/docker + settings: + dockerfile: drone/Dockerfile + dry_run: true + repo: videodev/video-transcoding-api + when: + event: + - pull_request + depends_on: + - build + +... diff --git a/Dockerfile.ci b/drone/Dockerfile similarity index 92% rename from Dockerfile.ci rename to drone/Dockerfile index f5509221..f69801ac 100644 --- a/Dockerfile.ci +++ b/drone/Dockerfile @@ -1,7 +1,7 @@ # This Dockerfile is intended to be used in the CI environment and depends on # an existing binary built outside Docker. -FROM alpine:3.10 +FROM alpine:3.10.1 RUN apk add --no-cache ca-certificates ADD video-transcoding-api /bin/video-transcoding-api diff --git a/go.sum b/go.sum index b8b02d0a..46ec817a 100644 --- 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/encoding-wrapper v0.2.0 h1:vROHVfKOacKZraOpJ+4M+gQUJzhSm8wIm92f7AFaamQ= github.com/NYTimes/encoding-wrapper v0.2.0/go.mod h1:ZwppWY1bsnSUXy9aw0RblcC6mXvCwDD+qji7zqvoi2U= -github.com/NYTimes/gizmo v1.2.7 h1:+y65huEXFxuv/JZ2kw32YL663BIYU6DdeRISKpe3nUE= -github.com/NYTimes/gizmo v1.2.7/go.mod h1:+Ic0KePzIxrkcfIXnII7WMmrciukqbXuQcTOWAzJQNg= -github.com/NYTimes/gizmo v1.2.8 h1:I+F25mbIDyGiQWUsAR0WKBhos/NPH9NKvXrkTN2TF9M= -github.com/NYTimes/gizmo v1.2.8/go.mod h1:+Ic0KePzIxrkcfIXnII7WMmrciukqbXuQcTOWAzJQNg= 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/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= @@ -34,42 +30,12 @@ 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.19.28 h1:u0KMC+Qv0YVyz8YR6mREEtslSPkdUMzXgDJFD5196O8= -github.com/aws/aws-sdk-go v1.19.28/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.20.15 h1:y9ts8MJhB7ReUidS6Rq+0KxdFeL01J+pmOlGq6YqpiQ= -github.com/aws/aws-sdk-go v1.20.15/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.20.16 h1:Dq68fBH39XnSjjb2hX/iW6mui8JtXcVAuhRYGSRiisY= -github.com/aws/aws-sdk-go v1.20.16/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.20.17 h1:ZQ0cM9FpuufVDHlNViD8vD68IkEQL/VUOMwJPBqkaaM= -github.com/aws/aws-sdk-go v1.20.17/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.20.18 h1:k8y5kuh6w8Jw8AOoXAZBygCTDmGNMqfkZK5/OffOB0E= -github.com/aws/aws-sdk-go v1.20.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.20.19 h1:RQDLGGlcffQzAceEXGdMu+uGGPGhNu+vNG3BrUZAMPI= -github.com/aws/aws-sdk-go v1.20.19/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.20.20 h1:OAR/GtjMOhenkp1NNKr1N1FgIP3mQXHeGbRhvVIAQp0= -github.com/aws/aws-sdk-go v1.20.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.20.21 h1:22vHWL9rur+SRTYPHAXlxJMFIA9OSYsYDIAHFDhQ7Z0= -github.com/aws/aws-sdk-go v1.20.21/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.21.0 h1:dRGzi4XZe5GFSJssHkRNUf/hRD/HL8bdqTYa9hpAO8c= -github.com/aws/aws-sdk-go v1.21.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.21.1 h1:IOFDnCEDybcw4V8nbKqyyjBu+vpu7hFYSfZqNuogi7I= -github.com/aws/aws-sdk-go v1.21.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.21.2 h1:CqbWrQzi7s8J2F0TRRdLvTr0+bt5Zxo2IDoFNGsAiUg= -github.com/aws/aws-sdk-go v1.21.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.21.3 h1:Qw/NpqIrCxuZL6sFVvoDlcatEe8woEx1d4gB+tRPsjw= -github.com/aws/aws-sdk-go v1.21.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.21.4 h1:1xB+x6Dzev8ETmeHEiSfUVbIzmC/0EyFfXMkJpzKPCE= -github.com/aws/aws-sdk-go v1.21.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.21.5 h1:Z3u6BJ0XYn5uY3Acwy7FMF3XfDEm0FZyWk9vYojqZns= github.com/aws/aws-sdk-go v1.21.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go-v2 v0.9.0 h1:dWtJKGRFv3UZkMBQaIzMsF0/y4ge3iQPWTzeC4r/vl4= -github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod h1:sa1GePZ/LfBGI4dSq30f6uR4Tthll8axxtEPvlpXZ8U= 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= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/bitmovin/bitmovin-go v1.28.0 h1:0Oro1v1SJgYXJzEGXXUAWIRdoVU/9X997lLEYh1M8Jg= -github.com/bitmovin/bitmovin-go v1.28.0/go.mod h1:FnQ++AxR0BZAH5UpAPU10bpSzeV4a7Gu5Sazpkpr7cE= github.com/bitmovin/bitmovin-go v1.29.0 h1:xhTvsSRLTHy3KPl3wBD5X6c9nVelF5YPyJbQt2KlAAk= github.com/bitmovin/bitmovin-go v1.29.0/go.mod h1:FnQ++AxR0BZAH5UpAPU10bpSzeV4a7Gu5Sazpkpr7cE= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= @@ -96,8 +62,6 @@ github.com/fluent/fluent-logger-golang v1.4.0/go.mod h1:2/HCT/jTy78yGyeNGQLGQsjF github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsouza/ctxlogger v1.5.5 h1:+/g7Rg7WBmyy8L/rrTwr8DGv6dc/0UCUkP0PckCv+Qo= -github.com/fsouza/ctxlogger v1.5.5/go.mod h1:V1zLRNET5/aYUVE2LM/8GrVNCMu7FMZXO7XYqG8mzsc= github.com/fsouza/ctxlogger v1.5.6 h1:4NM8fXuUkcXDmc2wQuwmb5VJvomkeipMtobom0hCzJc= github.com/fsouza/ctxlogger v1.5.6/go.mod h1:DEN8leLPGSuvwwXtiiJXkgAkaorWGHAUT1V10ZyE+1w= github.com/fsouza/gizmo-stackdriver-logging v1.3.0 h1:9Oj6+VWGSHRG6mDRGhwNRKxtwqb15I4kAXlIlpwY92k= @@ -110,8 +74,6 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= -github.com/go-redis/redis v6.15.1+incompatible h1:BZ9s4/vHrIqwOb0OPtTQ5uABxETJ3NRuUNoSUurnkew= -github.com/go-redis/redis v6.15.1+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-redis/redis v6.15.2+incompatible h1:9SpNVG76gr6InJGxoZ6IuuxaCOQwDAhzyXg+Bs+0Sb4= github.com/go-redis/redis v6.15.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -145,8 +107,6 @@ github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA= github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= -github.com/gorilla/handlers v1.4.1 h1:BHvcRGJe/TrL+OqFxoKQGddTgeibiOjaBssV5a/N9sw= -github.com/gorilla/handlers v1.4.1/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg= github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U= @@ -262,8 +222,6 @@ github.com/sirupsen/logrus v1.1.1/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= diff --git a/travis-scripts/deploy.bash b/travis-scripts/deploy.bash deleted file mode 100755 index 7e0b490c..00000000 --- a/travis-scripts/deploy.bash +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -e - -# This script triggers the deployment through a remote Drone server. - -DRONE_VERSION=v0.8.6 - -function install_drone() { - version=$1 - curl -sL https://github.com/drone/drone-cli/releases/download/${version}/drone_linux_amd64.tar.gz | tar -xzf - - export PATH=:$PATH -} - -function main() { - env=$1 - commit_version=${TRAVIS_COMMIT:0:7} - - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then - echo >&2 "skipping deployment on cron" - return 0 - fi - - if [ -z "$env" ]; then - echo >&2 "missing env name" - return 2 - fi - - install_drone $DRONE_VERSION - last_build=$(drone build last --format "{{.Number}}" $DRONE_REPO) - drone deploy -p APP_VERSION=$commit_version $DRONE_REPO $last_build transcoding-api-$env -} - -main "$@" diff --git a/travis-scripts/docker.bash b/travis-scripts/docker.bash deleted file mode 100755 index 2ec15268..00000000 --- a/travis-scripts/docker.bash +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -e - -if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then - echo >&2 "Skipping image build on pull requests..." - exit 0 -fi - -if [ "${TRAVIS_EVENT_TYPE}" = "cron" ]; then - echo >&2 "Skipping image build on cron..." - exit 0 -fi - -if [ "${TRAVIS_GO_VERSION}" != "${GO_FOR_RELEASE}" ]; then - echo >&2 "Skipping image build on Go ${TRAVIS_GO_VERSION}" - exit 0 -fi - -if [ "${TRAVIS_BRANCH}" != "master" ] && [ -z "${TRAVIS_TAG}" ]; then - echo >&2 "Skipping image build on branch ${TRAVIS_BRANCH}" - exit 0 -fi - -IMAGE_NAME=nytimes/video-transcoding-api - -docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" -docker build -t ${IMAGE_NAME}:latest -f Dockerfile.ci . - -if [ -n "${TRAVIS_TAG}" ]; then - docker tag ${IMAGE_NAME}:latest ${IMAGE_NAME}:${TRAVIS_TAG} -fi - -docker push ${IMAGE_NAME}