From ccb7392237ffe6a003eb3b40f89231a89b7dc77e Mon Sep 17 00:00:00 2001 From: francisco souza Date: Mon, 25 Nov 2019 17:28:44 -0500 Subject: [PATCH 1/6] drone: mirror the version on master --- drone/Dockerfile | 2 +- drone/ci.jsonnet | 2 +- drone/ci.yml | 92 +++++++----------------------------------------- 3 files changed, 15 insertions(+), 81 deletions(-) diff --git a/drone/Dockerfile b/drone/Dockerfile index 3107c948..d99777db 100644 --- a/drone/Dockerfile +++ 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.2 +FROM alpine:3.10.3 RUN apk add --no-cache ca-certificates ADD video-transcoding-api /bin/video-transcoding-api diff --git a/drone/ci.jsonnet b/drone/ci.jsonnet index 90e8d6aa..88c8c2d6 100644 --- a/drone/ci.jsonnet +++ b/drone/ci.jsonnet @@ -1,5 +1,5 @@ // the first version is used to build the binary that gets shipped to Docker Hub. -local go_versions = ['1.12.9', '1.11.13', '1.13beta1']; +local go_versions = ['1.13.4', '1.12.13']; local goproxy = 'https://proxy.golang.org'; diff --git a/drone/ci.yml b/drone/ci.yml index 9acb0c4f..27463d1f 100644 --- a/drone/ci.yml +++ b/drone/ci.yml @@ -2,7 +2,7 @@ # DO NOT MODIFY - AUTO GENERATED kind: pipeline -name: go-1.12.9 +name: go-1.13.4 platform: os: linux @@ -14,7 +14,7 @@ workspace: steps: - name: mod-download - image: golang:1.12.9 + image: golang:1.13.4 commands: - go mod download environment: @@ -23,12 +23,12 @@ steps: - clone - name: coverage - image: golang:1.12.9 + image: golang:1.13.4 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\"" + - 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 @@ -42,7 +42,7 @@ steps: - mod-download - name: build - image: golang:1.12.9 + image: golang:1.13.4 commands: - make build environment: @@ -92,7 +92,7 @@ steps: from_secret: docker_username when: ref: - - "refs/tags/*" + - refs/tags/* - refs/heads/master depends_on: - coverage @@ -116,7 +116,7 @@ steps: --- kind: pipeline -name: go-1.11.13 +name: go-1.12.13 platform: os: linux @@ -128,7 +128,7 @@ workspace: steps: - name: mod-download - image: golang:1.11.13 + image: golang:1.12.13 commands: - go mod download environment: @@ -137,12 +137,12 @@ steps: - clone - name: coverage - image: golang:1.11.13 + image: golang:1.12.13 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\"" + - 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 @@ -156,73 +156,7 @@ steps: - mod-download - name: build - image: golang:1.11.13 - commands: - - make build - environment: - CGO_ENABLED: 0 - when: - event: - - pull_request - - push - 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: lint - pull: always - image: golangci/golangci-lint - commands: - - make runlint - depends_on: - - mod-download - -- name: build - image: golang:1.13beta1 + image: golang:1.12.13 commands: - make build environment: From bc8496ba3dd3cea98d72304a56d2c7520adba4e2 Mon Sep 17 00:00:00 2001 From: francisco souza Date: Mon, 14 Oct 2019 10:10:50 -0400 Subject: [PATCH 2/6] fix lint violations --- .golangci.yaml | 18 ++++++++++++++++++ db/redis/storage/redis_test.go | 1 + 2 files changed, 19 insertions(+) create mode 100644 .golangci.yaml diff --git a/.golangci.yaml b/.golangci.yaml new file mode 100644 index 00000000..daaea519 --- /dev/null +++ b/.golangci.yaml @@ -0,0 +1,18 @@ +run: + deadline: 5m + +linters: + enable-all: true + disable: + - dupl + - errcheck + - funlen + - gochecknoglobals + - gochecknoinits + - gocognit + - goconst + - gocritic + - gocyclo + - lll + - unparam + - wsl diff --git a/db/redis/storage/redis_test.go b/db/redis/storage/redis_test.go index 4dc3b57a..dd860491 100644 --- a/db/redis/storage/redis_test.go +++ b/db/redis/storage/redis_test.go @@ -467,6 +467,7 @@ func startSentinels(ports []string) (func(), error) { fmt.Fprintf(f, string(configTemplate), port) f.Close() tempFiles[i] = f.Name() + //nolint:gosec cmd := exec.Command("redis-server", f.Name(), "--sentinel") cmd.Dir = os.TempDir() err = cmd.Start() From 4dc48e6a8c29f45bf78888025a76e58de8afbdf5 Mon Sep 17 00:00:00 2001 From: francisco souza Date: Mon, 25 Nov 2019 17:33:54 -0500 Subject: [PATCH 3/6] Fix lint violations and running --- .golangci.yaml | 2 ++ Makefile | 13 +------------ provider/bitmovin/bitmovin.go | 1 - provider/encodingcom/encodingcom_test.go | 2 -- provider/hybrik/hybrik.go | 1 - 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index daaea519..19663a78 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -13,6 +13,8 @@ linters: - goconst - gocritic - gocyclo + - godox + - gomnd - lll - unparam - wsl diff --git a/Makefile b/Makefile index c762ddf8..b0ee4024 100644 --- a/Makefile +++ b/Makefile @@ -12,18 +12,7 @@ testdeps: lint: testdeps runlint runlint: - golangci-lint run \ - --enable-all \ - -D errcheck \ - -D lll \ - -D gochecknoglobals \ - -D goconst \ - -D gocyclo \ - -D dupl \ - -D gocritic \ - -D gochecknoinits \ - -D unparam \ - --deadline 5m ./... + golangci-lint run gotest: go test -race -vet=all -mod=readonly $(GO_TEST_EXTRA_FLAGS) ./... diff --git a/provider/bitmovin/bitmovin.go b/provider/bitmovin/bitmovin.go index bf171e54..154099ad 100644 --- a/provider/bitmovin/bitmovin.go +++ b/provider/bitmovin/bitmovin.go @@ -825,7 +825,6 @@ func (p *bitmovinProvider) Transcode(job *db.Job) (*provider.JobStatus, error) { var audioStreamID, videoStreamID string if !isRepeatedAudio { - audioStream := &models.Stream{ CodecConfigurationID: &audioPresetID, InputStreams: aiss, diff --git a/provider/encodingcom/encodingcom_test.go b/provider/encodingcom/encodingcom_test.go index d22bd350..64ee2c11 100644 --- a/provider/encodingcom/encodingcom_test.go +++ b/provider/encodingcom/encodingcom_test.go @@ -1001,7 +1001,6 @@ func TestCreatePreset(t *testing.T) { if !reflect.DeepEqual(fakePreset.Request.Format[0], expectedFormat) { pretty.Fdiff(os.Stderr, fakePreset.Request.Format[0], expectedFormat) t.Errorf("wrong format provided\nWant %#v\nGot %#v", expectedFormat, fakePreset.Request.Format[0]) - } } @@ -1103,7 +1102,6 @@ func TestCreatePresetTwoPass(t *testing.T) { if !reflect.DeepEqual(fakePreset.Request.Format[0], expectedFormat) { pretty.Fdiff(os.Stderr, fakePreset.Request.Format[0], expectedFormat) t.Errorf("wrong format provided\nWant %#v\nGot %#v", expectedFormat, fakePreset.Request.Format[0]) - } } diff --git a/provider/hybrik/hybrik.go b/provider/hybrik/hybrik.go index d630a2c3..35c506aa 100644 --- a/provider/hybrik/hybrik.go +++ b/provider/hybrik/hybrik.go @@ -303,7 +303,6 @@ func (hp *hybrikProvider) presetsToTranscodeJob(job *db.Job) (string, error) { }, }, ) - } resp, err := json.Marshal(cj) From c1bf986cb81cd28173add25e9c6659ad55edab4f Mon Sep 17 00:00:00 2001 From: francisco souza Date: Mon, 25 Nov 2019 17:35:46 -0500 Subject: [PATCH 4/6] golangci: remove gomnd I'm running golangci-lint@master locally, and the CI is not. :facepalm: --- .golangci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.golangci.yaml b/.golangci.yaml index 19663a78..adac0f65 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -14,7 +14,6 @@ linters: - gocritic - gocyclo - godox - - gomnd - lll - unparam - wsl From 5408e58d2a672a227ffd9dfd15778ec4ac65cf97 Mon Sep 17 00:00:00 2001 From: francisco souza Date: Mon, 25 Nov 2019 17:39:55 -0500 Subject: [PATCH 5/6] drone: fix build process We need to build the binary on tag so it can be included in the docker image. --- drone/ci.jsonnet | 2 +- drone/ci.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drone/ci.jsonnet b/drone/ci.jsonnet index 88c8c2d6..d8bd178c 100644 --- a/drone/ci.jsonnet +++ b/drone/ci.jsonnet @@ -101,7 +101,7 @@ local build(go_version) = { environment: { CGO_ENABLED: '0' }, depends_on: ['mod-download'], when: { - event: ['pull_request', 'push'], + event: ['pull_request', 'push', 'tag'], }, }; diff --git a/drone/ci.yml b/drone/ci.yml index 27463d1f..ffbd8c66 100644 --- a/drone/ci.yml +++ b/drone/ci.yml @@ -51,6 +51,7 @@ steps: event: - pull_request - push + - tag depends_on: - mod-download @@ -165,6 +166,7 @@ steps: event: - pull_request - push + - tag depends_on: - mod-download From a40118c3377dd055cbb28f6907dad32539bdf8c6 Mon Sep 17 00:00:00 2001 From: Evan Sonderegger Date: Tue, 3 Dec 2019 16:46:43 -0500 Subject: [PATCH 6/6] change import paths from NYTimes to video-dev (#292) * change import paths from NYTimes to video-dev * fix import order --- config/config.go | 4 ++-- config/config_test.go | 2 +- db/dbtest/fake_db.go | 4 ++-- db/dbtest/fake_db_test.go | 2 +- db/redis/job.go | 4 ++-- db/redis/job_test.go | 6 +++--- db/redis/localpreset.go | 4 ++-- db/redis/localpreset_test.go | 6 +++--- db/redis/presetmap.go | 4 ++-- db/redis/presetmap_test.go | 6 +++--- db/redis/redis.go | 8 ++++---- db/redis/storage/redis.go | 2 +- db/repo.go | 2 +- go.mod | 4 +--- main.go | 18 +++++++++--------- provider/bitmovin/bitmovin.go | 8 ++++---- provider/bitmovin/bitmovin_test.go | 6 +++--- provider/elastictranscoder/aws.go | 12 ++++++------ provider/elastictranscoder/aws_test.go | 6 +++--- .../elementalconductor/elementalconductor.go | 12 ++++++------ .../elementalconductor_fake_transcode_test.go | 4 ++-- .../elementalconductor_test.go | 6 +++--- provider/encodingcom/encodingcom.go | 12 ++++++------ provider/encodingcom/encodingcom_test.go | 6 +++--- provider/fake_provider_test.go | 4 ++-- provider/hybrik/hybrik.go | 8 ++++---- provider/mediaconvert/factory_test.go | 2 +- provider/mediaconvert/mediaconvert.go | 6 +++--- provider/mediaconvert/mediaconvert_test.go | 6 +++--- provider/mediaconvert/preset_mapping.go | 4 ++-- provider/provider.go | 6 +++--- provider/provider_test.go | 2 +- provider/zencoder/zencoder.go | 14 +++++++------- provider/zencoder/zencoder_test.go | 8 ++++---- service/fake_provider_test.go | 6 +++--- service/preset.go | 6 +++--- service/preset_params.go | 2 +- service/preset_responses.go | 2 +- service/preset_test.go | 6 +++--- service/presetmap.go | 4 ++-- service/presetmap_params.go | 4 ++-- service/presetmap_test.go | 6 +++--- service/provider.go | 4 ++-- service/provider_responses.go | 4 ++-- service/provider_test.go | 2 +- service/service.go | 10 +++++----- service/swagger_test.go | 2 +- service/transcode.go | 6 +++--- service/transcode_params.go | 4 ++-- service/transcode_responses.go | 4 ++-- service/transcode_test.go | 8 ++++---- swagger/handler.go | 2 +- 52 files changed, 144 insertions(+), 146 deletions(-) diff --git a/config/config.go b/config/config.go index 32d9e81f..845469b9 100644 --- a/config/config.go +++ b/config/config.go @@ -1,10 +1,10 @@ -package config // import "github.com/NYTimes/video-transcoding-api/config" +package config // import "github.com/video-dev/video-transcoding-api/config" import ( "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/db/redis/storage" logging "github.com/fsouza/gizmo-stackdriver-logging" "github.com/kelseyhightower/envconfig" + "github.com/video-dev/video-transcoding-api/db/redis/storage" ) // Config is a struct to contain all the needed configuration for the diff --git a/config/config_test.go b/config/config_test.go index c7a7e0b0..245adab5 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/db/redis/storage" logging "github.com/fsouza/gizmo-stackdriver-logging" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/video-dev/video-transcoding-api/db/redis/storage" ) func TestLoadConfigFromEnv(t *testing.T) { diff --git a/db/dbtest/fake_db.go b/db/dbtest/fake_db.go index 9733cc0d..8d8a9b21 100644 --- a/db/dbtest/fake_db.go +++ b/db/dbtest/fake_db.go @@ -1,10 +1,10 @@ -package dbtest // import "github.com/NYTimes/video-transcoding-api/db/dbtest" +package dbtest // import "github.com/video-dev/video-transcoding-api/db/dbtest" import ( "errors" "time" - "github.com/NYTimes/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db" ) type fakeRepository struct { diff --git a/db/dbtest/fake_db_test.go b/db/dbtest/fake_db_test.go index 274a9f1b..5904a378 100644 --- a/db/dbtest/fake_db_test.go +++ b/db/dbtest/fake_db_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/NYTimes/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db" ) const dbErrorMsg = "database error" diff --git a/db/redis/job.go b/db/redis/job.go index 6f4b509c..c6666d95 100644 --- a/db/redis/job.go +++ b/db/redis/job.go @@ -5,9 +5,9 @@ import ( "strconv" "time" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/redis/storage" "github.com/go-redis/redis" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/redis/storage" ) const jobsSetKey = "jobs" diff --git a/db/redis/job_test.go b/db/redis/job_test.go index a8c225c7..f0db03d2 100644 --- a/db/redis/job_test.go +++ b/db/redis/job_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/redis/storage" "github.com/go-redis/redis" "github.com/kr/pretty" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/redis/storage" ) func TestCreateJob(t *testing.T) { diff --git a/db/redis/localpreset.go b/db/redis/localpreset.go index a6b190eb..74a51c7e 100644 --- a/db/redis/localpreset.go +++ b/db/redis/localpreset.go @@ -3,9 +3,9 @@ package redis import ( "errors" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/redis/storage" "github.com/go-redis/redis" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/redis/storage" ) const localPresetsSetKey = "localpresets" diff --git a/db/redis/localpreset_test.go b/db/redis/localpreset_test.go index ab1bbd95..f16dfe43 100644 --- a/db/redis/localpreset_test.go +++ b/db/redis/localpreset_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/redis/storage" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/redis/storage" ) func TestCreateLocalPreset(t *testing.T) { diff --git a/db/redis/presetmap.go b/db/redis/presetmap.go index 4a31b45e..60269396 100644 --- a/db/redis/presetmap.go +++ b/db/redis/presetmap.go @@ -1,9 +1,9 @@ package redis import ( - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/redis/storage" "github.com/go-redis/redis" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/redis/storage" ) const presetmapsSetKey = "presetmaps" diff --git a/db/redis/presetmap_test.go b/db/redis/presetmap_test.go index f18f45ed..37aba85e 100644 --- a/db/redis/presetmap_test.go +++ b/db/redis/presetmap_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/redis/storage" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/redis/storage" ) func TestCreatePresetMap(t *testing.T) { diff --git a/db/redis/redis.go b/db/redis/redis.go index 8126802f..a260dd64 100644 --- a/db/redis/redis.go +++ b/db/redis/redis.go @@ -1,9 +1,9 @@ -package redis // import "github.com/NYTimes/video-transcoding-api/db/redis" +package redis // import "github.com/video-dev/video-transcoding-api/db/redis" import ( - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/redis/storage" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/redis/storage" ) // NewRepository creates a new Repository that uses Redis for persistence. diff --git a/db/redis/storage/redis.go b/db/redis/storage/redis.go index 2343c4dc..34e53601 100644 --- a/db/redis/storage/redis.go +++ b/db/redis/storage/redis.go @@ -1,5 +1,5 @@ // Package storage provides a type for storing Go objects in Redis. -package storage // import "github.com/NYTimes/video-transcoding-api/db/redis/storage" +package storage // import "github.com/video-dev/video-transcoding-api/db/redis/storage" import ( "errors" diff --git a/db/repo.go b/db/repo.go index 36343460..5cff632a 100644 --- a/db/repo.go +++ b/db/repo.go @@ -1,4 +1,4 @@ -package db // import "github.com/NYTimes/video-transcoding-api/db" +package db // import "github.com/video-dev/video-transcoding-api/db" import ( "errors" diff --git a/go.mod b/go.mod index 506f00e8..48164143 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/NYTimes/video-transcoding-api +module github.com/video-dev/video-transcoding-api require ( github.com/NYTimes/gizmo v1.2.14 @@ -15,8 +15,6 @@ require ( github.com/hybrik/hybrik-sdk-go v0.0.0-20170516091026-c2eee0e66af9 github.com/kelseyhightower/envconfig v1.4.0 github.com/kr/pretty v0.1.0 - github.com/onsi/ginkgo v1.8.0 // indirect - github.com/onsi/gomega v1.5.0 // indirect github.com/pkg/errors v0.8.1 github.com/sirupsen/logrus v1.4.2 github.com/video-dev/go-elementalconductor v1.0.0 diff --git a/main.go b/main.go index f5801db4..fe98c224 100644 --- a/main.go +++ b/main.go @@ -5,16 +5,16 @@ import ( "log" "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/config" - _ "github.com/NYTimes/video-transcoding-api/provider/bitmovin" - _ "github.com/NYTimes/video-transcoding-api/provider/elastictranscoder" - _ "github.com/NYTimes/video-transcoding-api/provider/elementalconductor" - _ "github.com/NYTimes/video-transcoding-api/provider/encodingcom" - _ "github.com/NYTimes/video-transcoding-api/provider/hybrik" - _ "github.com/NYTimes/video-transcoding-api/provider/mediaconvert" - _ "github.com/NYTimes/video-transcoding-api/provider/zencoder" - "github.com/NYTimes/video-transcoding-api/service" "github.com/google/gops/agent" + "github.com/video-dev/video-transcoding-api/config" + _ "github.com/video-dev/video-transcoding-api/provider/bitmovin" + _ "github.com/video-dev/video-transcoding-api/provider/elastictranscoder" + _ "github.com/video-dev/video-transcoding-api/provider/elementalconductor" + _ "github.com/video-dev/video-transcoding-api/provider/encodingcom" + _ "github.com/video-dev/video-transcoding-api/provider/hybrik" + _ "github.com/video-dev/video-transcoding-api/provider/mediaconvert" + _ "github.com/video-dev/video-transcoding-api/provider/zencoder" + "github.com/video-dev/video-transcoding-api/service" ) func main() { diff --git a/provider/bitmovin/bitmovin.go b/provider/bitmovin/bitmovin.go index 154099ad..0def313e 100644 --- a/provider/bitmovin/bitmovin.go +++ b/provider/bitmovin/bitmovin.go @@ -1,4 +1,4 @@ -package bitmovin // import "github.com/NYTimes/video-transcoding-api/provider/bitmovin" +package bitmovin // import "github.com/video-dev/video-transcoding-api/provider/bitmovin" import ( "errors" @@ -11,13 +11,13 @@ import ( "strings" "time" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/bitmovin/bitmovin-go/bitmovin" "github.com/bitmovin/bitmovin-go/bitmovintypes" "github.com/bitmovin/bitmovin-go/models" "github.com/bitmovin/bitmovin-go/services" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) // Name is the name used for registering the bitmovin provider in the diff --git a/provider/bitmovin/bitmovin_test.go b/provider/bitmovin/bitmovin_test.go index 997f6911..15f15f08 100644 --- a/provider/bitmovin/bitmovin_test.go +++ b/provider/bitmovin/bitmovin_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/bitmovin/bitmovin-go/bitmovin" "github.com/bitmovin/bitmovin-go/bitmovintypes" "github.com/bitmovin/bitmovin-go/models" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) func TestFactoryIsRegistered(t *testing.T) { diff --git a/provider/elastictranscoder/aws.go b/provider/elastictranscoder/aws.go index 4afb7b48..ada5ff25 100644 --- a/provider/elastictranscoder/aws.go +++ b/provider/elastictranscoder/aws.go @@ -5,15 +5,15 @@ // import this package and then grab the factory from the provider package: // // import ( -// "github.com/NYTimes/video-transcoding-api/provider" -// "github.com/NYTimes/video-transcoding-api/provider/elastictranscoder" +// "github.com/video-dev/video-transcoding-api/provider" +// "github.com/video-dev/video-transcoding-api/provider/elastictranscoder" // ) // // func UseProvider() { // factory, err := provider.GetProviderFactory(elastictranscoder.Name) // // handle err and use factory to get an instance of the provider. // } -package elastictranscoder // import "github.com/NYTimes/video-transcoding-api/provider/elastictranscoder" +package elastictranscoder // import "github.com/video-dev/video-transcoding-api/provider/elastictranscoder" import ( "errors" @@ -24,14 +24,14 @@ import ( "strings" "time" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/elastictranscoder" "github.com/aws/aws-sdk-go/service/elastictranscoder/elastictranscoderiface" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) const ( diff --git a/provider/elastictranscoder/aws_test.go b/provider/elastictranscoder/aws_test.go index b93ca5bd..060e1eba 100644 --- a/provider/elastictranscoder/aws_test.go +++ b/provider/elastictranscoder/aws_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/service/elastictranscoder" "github.com/kr/pretty" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) func TestFactoryIsRegistered(t *testing.T) { diff --git a/provider/elementalconductor/elementalconductor.go b/provider/elementalconductor/elementalconductor.go index c8258e00..dbb5ee66 100644 --- a/provider/elementalconductor/elementalconductor.go +++ b/provider/elementalconductor/elementalconductor.go @@ -5,15 +5,15 @@ // import this package and then grab the factory from the provider package: // // import ( -// "github.com/NYTimes/video-transcoding-api/provider" -// "github.com/NYTimes/video-transcoding-api/provider/elementalconductor" +// "github.com/video-dev/video-transcoding-api/provider" +// "github.com/video-dev/video-transcoding-api/provider/elementalconductor" // ) // // func UseProvider() { // factory, err := provider.GetProviderFactory(elementalconductor.Name) // // handle err and use factory to get an instance of the provider. // } -package elementalconductor // import "github.com/NYTimes/video-transcoding-api/provider/elementalconductor" +package elementalconductor // import "github.com/video-dev/video-transcoding-api/provider/elementalconductor" import ( "encoding/xml" @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/video-dev/go-elementalconductor" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) // Name is the name used for registering the Elemental Conductor provider in the diff --git a/provider/elementalconductor/elementalconductor_fake_transcode_test.go b/provider/elementalconductor/elementalconductor_fake_transcode_test.go index 7b04c0eb..68005f45 100644 --- a/provider/elementalconductor/elementalconductor_fake_transcode_test.go +++ b/provider/elementalconductor/elementalconductor_fake_transcode_test.go @@ -3,9 +3,9 @@ package elementalconductor import ( "strings" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/video-dev/go-elementalconductor" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/provider" ) type fakeElementalConductorClient struct { diff --git a/provider/elementalconductor/elementalconductor_test.go b/provider/elementalconductor/elementalconductor_test.go index 26babd64..b8665fdc 100644 --- a/provider/elementalconductor/elementalconductor_test.go +++ b/provider/elementalconductor/elementalconductor_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/video-dev/go-elementalconductor" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) func TestFactoryIsRegistered(t *testing.T) { diff --git a/provider/encodingcom/encodingcom.go b/provider/encodingcom/encodingcom.go index 69c779fc..773994b8 100644 --- a/provider/encodingcom/encodingcom.go +++ b/provider/encodingcom/encodingcom.go @@ -5,15 +5,15 @@ // import this package and then grab the factory from the provider package: // // import ( -// "github.com/NYTimes/video-transcoding-api/provider" -// "github.com/NYTimes/video-transcoding-api/provider/encodingcom" +// "github.com/video-dev/video-transcoding-api/provider" +// "github.com/video-dev/video-transcoding-api/provider/encodingcom" // ) // // func UseProvider() { // factory, err := provider.GetProviderFactory(encodingcom.Name) // // handle err and use factory to get an instance of the provider. // } -package encodingcom // import "github.com/NYTimes/video-transcoding-api/provider/encodingcom" +package encodingcom // import "github.com/video-dev/video-transcoding-api/provider/encodingcom" import ( "errors" @@ -24,10 +24,10 @@ import ( "strconv" "strings" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/video-dev/go-encodingcom" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) // Name is the name used for registering the Encoding.com provider in the diff --git a/provider/encodingcom/encodingcom_test.go b/provider/encodingcom/encodingcom_test.go index 64ee2c11..3d1dc3f7 100644 --- a/provider/encodingcom/encodingcom_test.go +++ b/provider/encodingcom/encodingcom_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/kr/pretty" "github.com/video-dev/go-encodingcom" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) func TestFactoryIsRegistered(t *testing.T) { diff --git a/provider/fake_provider_test.go b/provider/fake_provider_test.go index fb6cfa34..d6ad74c2 100644 --- a/provider/fake_provider_test.go +++ b/provider/fake_provider_test.go @@ -1,8 +1,8 @@ package provider import ( - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" ) type fakeProvider struct { diff --git a/provider/hybrik/hybrik.go b/provider/hybrik/hybrik.go index 35c506aa..7ef1bf77 100644 --- a/provider/hybrik/hybrik.go +++ b/provider/hybrik/hybrik.go @@ -1,4 +1,4 @@ -package hybrik // import "github.com/NYTimes/video-transcoding-api/provider/hybrik" +package hybrik // import "github.com/video-dev/video-transcoding-api/provider/hybrik" import ( "encoding/json" @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" hwrapper "github.com/hybrik/hybrik-sdk-go" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) const ( diff --git a/provider/mediaconvert/factory_test.go b/provider/mediaconvert/factory_test.go index fced110b..802ece99 100644 --- a/provider/mediaconvert/factory_test.go +++ b/provider/mediaconvert/factory_test.go @@ -5,11 +5,11 @@ import ( "reflect" "testing" - "github.com/NYTimes/video-transcoding-api/config" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/external" "github.com/aws/aws-sdk-go-v2/service/mediaconvert" "github.com/google/go-cmp/cmp" + "github.com/video-dev/video-transcoding-api/config" ) var cfgWithoutCredsAndRegion = config.Config{ diff --git a/provider/mediaconvert/mediaconvert.go b/provider/mediaconvert/mediaconvert.go index b142a934..890237f0 100644 --- a/provider/mediaconvert/mediaconvert.go +++ b/provider/mediaconvert/mediaconvert.go @@ -7,13 +7,13 @@ import ( "strings" "sync" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/external" "github.com/aws/aws-sdk-go-v2/service/mediaconvert" "github.com/pkg/errors" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) const ( diff --git a/provider/mediaconvert/mediaconvert_test.go b/provider/mediaconvert/mediaconvert_test.go index 15fd32f9..08a67ea2 100644 --- a/provider/mediaconvert/mediaconvert_test.go +++ b/provider/mediaconvert/mediaconvert_test.go @@ -4,12 +4,12 @@ import ( "reflect" "testing" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/mediaconvert" "github.com/google/go-cmp/cmp" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) var ( diff --git a/provider/mediaconvert/preset_mapping.go b/provider/mediaconvert/preset_mapping.go index 3b55df04..ee436d17 100644 --- a/provider/mediaconvert/preset_mapping.go +++ b/provider/mediaconvert/preset_mapping.go @@ -5,11 +5,11 @@ import ( "strconv" "strings" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/mediaconvert" "github.com/pkg/errors" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) func providerStatusFrom(status mediaconvert.JobStatus) provider.Status { diff --git a/provider/provider.go b/provider/provider.go index 2a1a6566..b68e8684 100644 --- a/provider/provider.go +++ b/provider/provider.go @@ -1,4 +1,4 @@ -package provider // import "github.com/NYTimes/video-transcoding-api/provider" +package provider // import "github.com/video-dev/video-transcoding-api/provider" import ( "errors" @@ -6,8 +6,8 @@ import ( "sort" "time" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" ) var ( diff --git a/provider/provider_test.go b/provider/provider_test.go index 89650ea2..b6d2a914 100644 --- a/provider/provider_test.go +++ b/provider/provider_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/NYTimes/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/config" ) func noopFactory(*config.Config) (TranscodingProvider, error) { diff --git a/provider/zencoder/zencoder.go b/provider/zencoder/zencoder.go index f9b1414c..b068ec9b 100644 --- a/provider/zencoder/zencoder.go +++ b/provider/zencoder/zencoder.go @@ -5,15 +5,15 @@ // import this package and then grab the factory from the provider package: // // import ( -// "github.com/NYTimes/video-transcoding-api/provider" -// "github.com/NYTimes/video-transcoding-api/provider/zencoder" +// "github.com/video-dev/video-transcoding-api/provider" +// "github.com/video-dev/video-transcoding-api/provider/zencoder" // ) // // func UseProvider() { // factory, err := provider.GetProviderFactory(Zencoder.Name) // // handle err and use factory to get an instance of the provider. // } -package zencoder // import "github.com/NYTimes/video-transcoding-api/provider/zencoder" +package zencoder // import "github.com/video-dev/video-transcoding-api/provider/zencoder" import ( "fmt" @@ -25,10 +25,10 @@ import ( "strings" "time" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/redis" - "github.com/NYTimes/video-transcoding-api/provider" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/redis" + "github.com/video-dev/video-transcoding-api/provider" "github.com/video-dev/zencoder" ) diff --git a/provider/zencoder/zencoder_test.go b/provider/zencoder/zencoder_test.go index a98e21a8..86252464 100644 --- a/provider/zencoder/zencoder_test.go +++ b/provider/zencoder/zencoder_test.go @@ -6,11 +6,11 @@ import ( "reflect" "testing" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/dbtest" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/kr/pretty" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/dbtest" + "github.com/video-dev/video-transcoding-api/provider" "github.com/video-dev/zencoder" ) diff --git a/service/fake_provider_test.go b/service/fake_provider_test.go index aa4d7b59..3039b006 100644 --- a/service/fake_provider_test.go +++ b/service/fake_provider_test.go @@ -1,9 +1,9 @@ package service import ( - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) func init() { diff --git a/service/preset.go b/service/preset.go index e27d3cd9..9018ab3b 100644 --- a/service/preset.go +++ b/service/preset.go @@ -7,9 +7,9 @@ import ( "net/http" "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" - "github.com/NYTimes/video-transcoding-api/swagger" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" + "github.com/video-dev/video-transcoding-api/swagger" ) // swagger:route DELETE /presets/{name} presets deletePreset diff --git a/service/preset_params.go b/service/preset_params.go index 7df8594a..38285250 100644 --- a/service/preset_params.go +++ b/service/preset_params.go @@ -1,7 +1,7 @@ package service import ( - "github.com/NYTimes/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db" ) type newPresetInput struct { diff --git a/service/preset_responses.go b/service/preset_responses.go index 8e778156..fa6cf271 100644 --- a/service/preset_responses.go +++ b/service/preset_responses.go @@ -3,7 +3,7 @@ package service import ( "net/http" - "github.com/NYTimes/video-transcoding-api/swagger" + "github.com/video-dev/video-transcoding-api/swagger" ) type newPresetResponse struct { diff --git a/service/preset_test.go b/service/preset_test.go index ff3858ce..1a1fd268 100644 --- a/service/preset_test.go +++ b/service/preset_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/dbtest" "github.com/sirupsen/logrus" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/dbtest" ) func TestNewPreset(t *testing.T) { diff --git a/service/presetmap.go b/service/presetmap.go index 88429ced..fa6e7bc3 100644 --- a/service/presetmap.go +++ b/service/presetmap.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/swagger" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/swagger" ) // swagger:route POST /presetmaps presets newPreset diff --git a/service/presetmap_params.go b/service/presetmap_params.go index a40a7b07..4e1a5ccf 100644 --- a/service/presetmap_params.go +++ b/service/presetmap_params.go @@ -7,8 +7,8 @@ import ( "io" "net/http" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/swagger" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/swagger" ) // JSON-encoded preset returned on the newPreset and getPreset operations. diff --git a/service/presetmap_test.go b/service/presetmap_test.go index f9b67171..3dbc88c9 100644 --- a/service/presetmap_test.go +++ b/service/presetmap_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/dbtest" "github.com/sirupsen/logrus" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/dbtest" ) func TestNewPresetMap(t *testing.T) { diff --git a/service/provider.go b/service/provider.go index 30f739ca..6fbcc9e0 100644 --- a/service/provider.go +++ b/service/provider.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/provider" - "github.com/NYTimes/video-transcoding-api/swagger" + "github.com/video-dev/video-transcoding-api/provider" + "github.com/video-dev/video-transcoding-api/swagger" ) // swagger:route GET /providers providers listProviders diff --git a/service/provider_responses.go b/service/provider_responses.go index 2c8d7c87..6ca64b89 100644 --- a/service/provider_responses.go +++ b/service/provider_responses.go @@ -3,8 +3,8 @@ package service import ( "net/http" - "github.com/NYTimes/video-transcoding-api/provider" - "github.com/NYTimes/video-transcoding-api/swagger" + "github.com/video-dev/video-transcoding-api/provider" + "github.com/video-dev/video-transcoding-api/swagger" ) // response for the listProviders operation. Contains the list of providers diff --git a/service/provider_test.go b/service/provider_test.go index cb7cd83f..2681ea47 100644 --- a/service/provider_test.go +++ b/service/provider_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/config" "github.com/sirupsen/logrus" + "github.com/video-dev/video-transcoding-api/config" ) func TestListProviders(t *testing.T) { diff --git a/service/service.go b/service/service.go index fcc851f4..a3506829 100644 --- a/service/service.go +++ b/service/service.go @@ -1,4 +1,4 @@ -package service // import "github.com/NYTimes/video-transcoding-api/service" +package service // import "github.com/video-dev/video-transcoding-api/service" import ( "fmt" @@ -6,13 +6,13 @@ import ( "github.com/NYTimes/gizmo/server" "github.com/NYTimes/gziphandler" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/redis" - "github.com/NYTimes/video-transcoding-api/swagger" "github.com/fsouza/ctxlogger" "github.com/gorilla/handlers" "github.com/sirupsen/logrus" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/redis" + "github.com/video-dev/video-transcoding-api/swagger" ) // TranscodingService will implement server.JSONService and handle all requests diff --git a/service/swagger_test.go b/service/swagger_test.go index 4e8b96bb..1a20b515 100644 --- a/service/swagger_test.go +++ b/service/swagger_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/config" "github.com/sirupsen/logrus" + "github.com/video-dev/video-transcoding-api/config" ) func TestSwaggerManifest(t *testing.T) { diff --git a/service/transcode.go b/service/transcode.go index 7a4acdd8..01eab7b0 100644 --- a/service/transcode.go +++ b/service/transcode.go @@ -9,9 +9,9 @@ import ( "path/filepath" "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" - "github.com/NYTimes/video-transcoding-api/swagger" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" + "github.com/video-dev/video-transcoding-api/swagger" ) // swagger:route POST /jobs jobs newJob diff --git a/service/transcode_params.go b/service/transcode_params.go index 23ea755a..743f066a 100644 --- a/service/transcode_params.go +++ b/service/transcode_params.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/provider" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/provider" ) // NewTranscodeJobInputPayload makes up the parameters available for diff --git a/service/transcode_responses.go b/service/transcode_responses.go index 6f55a993..fea6f1e7 100644 --- a/service/transcode_responses.go +++ b/service/transcode_responses.go @@ -3,8 +3,8 @@ package service import ( "net/http" - "github.com/NYTimes/video-transcoding-api/provider" - "github.com/NYTimes/video-transcoding-api/swagger" + "github.com/video-dev/video-transcoding-api/provider" + "github.com/video-dev/video-transcoding-api/swagger" ) // PartialJob is the simple response given to an API diff --git a/service/transcode_test.go b/service/transcode_test.go index 37bfeea4..fd49e26f 100644 --- a/service/transcode_test.go +++ b/service/transcode_test.go @@ -10,11 +10,11 @@ import ( "testing" "github.com/NYTimes/gizmo/server" - "github.com/NYTimes/video-transcoding-api/config" - "github.com/NYTimes/video-transcoding-api/db" - "github.com/NYTimes/video-transcoding-api/db/dbtest" - "github.com/NYTimes/video-transcoding-api/provider" "github.com/sirupsen/logrus" + "github.com/video-dev/video-transcoding-api/config" + "github.com/video-dev/video-transcoding-api/db" + "github.com/video-dev/video-transcoding-api/db/dbtest" + "github.com/video-dev/video-transcoding-api/provider" ) func TestTranscode(t *testing.T) { diff --git a/swagger/handler.go b/swagger/handler.go index e1ebcf12..b492a4fe 100644 --- a/swagger/handler.go +++ b/swagger/handler.go @@ -1,4 +1,4 @@ -package swagger // import "github.com/NYTimes/video-transcoding-api/swagger" +package swagger // import "github.com/video-dev/video-transcoding-api/swagger" import ( "net/http"