[DEPLOY]...

.jenkins/install.sh

@@ -35,3 +35,10 @@ fi
 # if [ ! -x "${WORKSPACE}/bin/zipit" ] ; then 
 #   go build -o "${WORKSPACE}/bin/zipit" .jenkins/zipit.go
 # fi
+
+# recompile terraform 'null' provider:
+if [ ! -x "${GOPATH}/bin/terraform-provider-null" ] ; then
+  git clone git@github.com:terraform-providers/terraform-provider-null "$GOPATH/src/github.com/terraform-providers/terraform-provider-null"
+  cd "$GOPATH/src/github.com/terraform-providers/terraform-provider-null"
+  go install
+fi 

.travis.yml

@@ -16,9 +16,11 @@ script:
   - go vet ./handler
   - go vet -tags=test ./handler
   - golint ./handler
-  # - staticcheck ./handler
+  - staticcheck ./handler
+  - staticcheck -tags=heroku ./handler
+  - staticcheck -tags=container ./handler
   # - staticcheck -tags=test ./handler
-  - gotest -v -tags test -cover -covermode=count -coverprofile coverage.out  ./...
+  - gotest -v -tags test -cover -covermode=count -coverprofile coverage.out ./...
 
 after_success:
   - $GOPATH/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken $COVERALLS_TOKEN

Jenkinsfile

@@ -47,7 +47,7 @@ pipeline {
         sh 'go vet ./handler'
         sh 'go vet -tags test ./handler'
         sh 'golint ./handler'
-        // sh 'staticcheck ./handler'
+        sh 'staticcheck ./handler'
         sh 'go build -o main ./handler/ && upx main && zip -0 main.zip main'
         archiveArtifacts artifacts: 'main.zip', fingerprint: true
       }
@@ -70,6 +70,8 @@ pipeline {
             sh '.jenkins/terraform.sh'
 	    dir("deployment") {
               sh "terraform init || true"
+	      // override the null provider
+	      sh "cp $GOPATH/bin/terraform-provider-null .terraform/plugins/*/terraform-provider-null_*"
               sh "terraform workspace new ${ENV} || terraform workspace select ${ENV}"
 	      sh "terraform plan"
 	      if (env.RECREATE == 'true' || COMMIT_MESSAGE.toUpperCase().contains("[RECREATE]")) {

deployment/services.tf

@@ -24,7 +24,3 @@ resource "null_resource" "orcidhub_webhook" {
     }
 	}
 }
-
-output "UPSTREAM_URL" {
-	value = "${local.UPSTREAM_URL}"
-}

handler/common.go

@@ -37,7 +37,6 @@ var (
 	taskRecordCountMutex sync.Mutex
 	taskRetentionMin     = defaultTaskRetentionMin
 	verbose              bool
-	wg                   sync.WaitGroup
 	env                  string
 	// for testing/mocking
 	logFatal func(args ...interface{})

handler/handler_internal_test.go

@@ -34,13 +34,6 @@ func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
 
-func getenv(key, defaultValue string) string {
-	if value := os.Getenv(key); value != "" {
-		return value
-	}
-	return defaultValue
-}
-
 func isValidUUID(u string) bool {
 	_, err := uuid.Parse(u)
 	return err == nil
@@ -378,7 +371,6 @@ func testProcessRegistration(t *testing.T) {
 	assert.NotNil(t, err)
 
 	// malformatted messages:
-	wg.Wait()
 	logFatal = func(args ...interface{}) {}
 	malformatResponse = true
 
@@ -387,7 +379,6 @@ func testProcessRegistration(t *testing.T) {
 	assert.Empty(t, output)
 	assert.NotNil(t, err)
 
-	wg.Wait()
 	malformatResponse = false
 	// logFatal = log.Fatal
 }
@@ -575,7 +566,7 @@ func testProcessEmpUpdate(t *testing.T) {
 	}).handle()
 	malformatResponse = false
 	logFatal = log.Fatal
-
+	assert.NotNil(t, err)
 }
 
 func testProcessMixed(t *testing.T) {

handler/main.go

@@ -35,8 +35,6 @@ func HandleRequest(ctx context.Context, e Event) (string, error) {
 
 	defer func() {
 		logger.Sync()
-		wg.Wait()
-		logger.Sync()
 	}()
 
 	return e.handle()

handler/mock_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"strings"
 	"testing"
 	"unicode"
@@ -24,6 +25,13 @@ func isValidID(uid string) bool {
 	return true
 }
 
+func getenv(key, defaultValue string) string {
+	if value := os.Getenv(key); value != "" {
+		return value
+	}
+	return defaultValue
+}
+
 func createMockHandler(t *testing.T) http.HandlerFunc {
 
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {