Merge branch 'master' into dependabot/go_modules/github.com/NYTimes/g…

…izmo-1.2.17

.golangci.yaml

@@ -0,0 +1,16 @@
+run:
+  deadline: 5m
+
+linters:
+  enable-all: true
+  disable:
+    - dupl
+    - errcheck
+    - funlen
+    - gochecknoglobals
+    - gochecknoinits
+    - goconst
+    - gocritic
+    - gocyclo
+    - lll
+    - unparam

Makefile

@@ -6,24 +6,13 @@ LOG_LEVEL ?= debug
 all: test
 
 testdeps:
-	GO111MODULE=off go get github.com/golangci/golangci-lint/cmd/golangci-lint
+	cd /tmp && GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@latest
 	go mod download
 
 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) ./...

internal/provider/encodingcom/encodingcom.go

@@ -56,10 +56,12 @@ type encodingComProvider struct {
 func (e *encodingComProvider) Transcode(job *db.Job) (*provider.JobStatus, error) {
 	formats, err := e.presetsToFormats(job)
 	if err != nil {
+		//nolint:stylecheck
 		return nil, fmt.Errorf("Error converting presets to formats on Transcode operation: %s", err.Error())
 	}
 	resp, err := e.client.AddMedia([]string{e.sourceMedia(job.SourceMedia)}, formats, e.config.EncodingCom.Region)
 	if err != nil {
+		//nolint:stylecheck
 		return nil, fmt.Errorf("Error making AddMedia request for Transcode operation: %s", err.Error())
 	}
 	return &provider.JobStatus{
@@ -184,6 +186,7 @@ func (e *encodingComProvider) presetsToFormats(job *db.Job) ([]encodingcom.Forma
 		}
 		presetOutput, err := e.GetPreset(presetID)
 		if err != nil {
+			//nolint:stylecheck
 			return nil, fmt.Errorf("Error getting preset info: %s", err.Error())
 		}
 		presetStruct := presetOutput.(*encodingcom.Preset)