Repository restructuring

.gitignore

@@ -39,7 +39,7 @@ _testmain.go
 
 # For any releases made locally
 /target/
-worker_type_definitions
+aws-provisioner-v1-worker-type-definitions
 
 # Files created by generic-worker
 generic-worker.config

.taskcluster.yml

@@ -86,10 +86,10 @@ tasks:
         - 'git clean -fdx'
         - 'git checkout -B tmp -t "X%TASK_ID%"'
         - go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
-        - cd gw-codegen
+        - cd cmd\gw-codegen
         - go get -v -u
-        - cd ..
-        - go generate
+        - cd ..\..
+        - go generate ./...
         - |
           :: this counts the number of lines returned by git status
           :: dump temp file a directory higher, otherwise git status reports the tmp1.txt file!
@@ -105,9 +105,9 @@ tasks:
         - set CGO_ENABLED=1
         - set GORACE=history_size=7
         - C:\generic-worker\generic-worker-test-creds.cmd
-        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v -race ./...'
+        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v -race ./...'
         - set GW_TESTS_RUN_AS_TASK_USER=true
-        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v -race'
+        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v -race github.com/taskcluster/generic-worker/cmd/generic-worker'
         - ineffassign .
       artifacts:
         - name: public/build/generic-worker-windows-amd64.exe
@@ -168,17 +168,17 @@ tasks:
         - 'git clean -fdx'
         - 'git checkout -B tmp -t "X%TASK_ID%"'
         - go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
-        - cd gw-codegen
+        - cd cmd\gw-codegen
         - go get -v -u
-        - cd ..
-        - go generate
+        - cd ..\..
+        - go generate ./...
         - set revision={{ event.head.sha }}
         - go get -ldflags "-X main.revision=%revision%" -v -u -t ./...
         - set GORACE=history_size=7
         - C:\generic-worker\generic-worker-test-creds.cmd
-        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v ./...'
+        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v ./...'
         - set GW_TESTS_RUN_AS_TASK_USER=true
-        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v'
+        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v github.com/taskcluster/generic-worker/cmd/generic-worker'
         - ineffassign .
       artifacts:
         - name: public/build/generic-worker-windows-386.exe
@@ -239,10 +239,10 @@ tasks:
         - 'git clean -fdx'
         - 'git checkout -B tmp -t "X%TASK_ID%"'
         - go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
-        - cd gw-codegen
+        - cd cmd\gw-codegen
         - go get -v -u
-        - cd ..
-        - go generate
+        - cd ..\..
+        - go generate ./...
         - |
           :: this counts the number of lines returned by git status
           :: dump temp file a directory higher, otherwise git status reports the tmp1.txt file!
@@ -258,9 +258,9 @@ tasks:
         - set CGO_ENABLED=1
         - set GORACE=history_size=7
         - C:\generic-worker\generic-worker-test-creds.cmd
-        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v -race ./...'
+        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v -race ./...'
         - set GW_TESTS_RUN_AS_TASK_USER=true
-        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v -race'
+        - 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v -race github.com/taskcluster/generic-worker/cmd/generic-worker'
         - ineffassign .
       artifacts:
         - name: public/build/generic-worker-windows-amd64.exe
@@ -310,12 +310,12 @@ tasks:
             export CGO_ENABLED=0
             export GOROOT="$(pwd)/go1.10.3/go"
             export GOPATH="$(pwd)/gopath1.10.3"
-            export PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}"
+            export PATH="$(go env GOPATH)/bin:${GOROOT}/bin:${PATH}"
             go version
             go env
             source "${GW_CREDS_BOOTSTRAP}"
-            mkdir -p "${GOPATH}/src/github.com/taskcluster"
-            cd "${GOPATH}/src/github.com/taskcluster"
+            mkdir -p "$(go env GOPATH)/src/github.com/taskcluster"
+            cd "$(go env GOPATH)/src/github.com/taskcluster"
             if [ ! -d generic-worker/.git ]; then rm -rf generic-worker; git clone '{{ event.head.repo.url }}' 'generic-worker'; fi
             cd 'generic-worker'
             git fetch '{{ event.head.repo.url }}' "+{{ event.head.ref }}:refs/heads/X${TASK_ID}"
@@ -324,14 +324,14 @@ tasks:
             git clean -fdx
             git checkout -B tmp -t "X${TASK_ID}"
             go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
-            cd gw-codegen
+            cd cmd/gw-codegen
             go get -v -u
-            cd ..
-            go generate
+            cd ../..
+            go generate ./...
             go get -ldflags "-X main.revision=$(git rev-parse HEAD)" -v -u -t ./...
             # output of wc command can contain spaces on darwin, so no quotes around expression
             test $(git status --porcelain | wc -l) == 0
-            GORACE=history_size=7 CGO_ENABLED=1 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=$(git rev-parse HEAD)" -race -v ./...
+            GORACE=history_size=7 CGO_ENABLED=1 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=$(git rev-parse HEAD)" -race -v ./...
             ineffassign .
       artifacts:
         - name: public/build/generic-worker-darwin-amd64
@@ -382,13 +382,13 @@ tasks:
   #           export CGO_ENABLED=0
   #           export GOROOT="$(pwd)/go1.10.3/go"
   #           export GOPATH="$(pwd)/gopath1.10.3"
-  #           export PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}"
+  #           export PATH="$(go env GOPATH)/bin:${GOROOT}/bin:${PATH}"
   #           export CGO_ENABLED=0
   #           go version
   #           go env
   #           source "${GW_CREDS_BOOTSTRAP}"
-  #           mkdir -p "${GOPATH}/src/github.com/taskcluster"
-  #           cd "${GOPATH}/src/github.com/taskcluster"
+  #           mkdir -p "$(go env GOPATH)/src/github.com/taskcluster"
+  #           cd "$(go env GOPATH)/src/github.com/taskcluster"
   #           if [ ! -d generic-worker/.git ]; then rm -rf generic-worker; git clone '{{ event.head.repo.url }}' 'generic-worker'; fi
   #           cd 'generic-worker'
   #           git fetch '{{ event.head.repo.url }}' "+{{ event.head.ref }}:refs/heads/X${TASK_ID}"
@@ -397,13 +397,13 @@ tasks:
   #           git clean -fdx
   #           git checkout -B tmp -t "X${TASK_ID}"
   #           go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
-  #           cd gw-codegen
+  #           cd cmd/gw-codegen
   #           go get -v -u
-  #           cd ..
-  #           go generate
+  #           cd ../..
+  #           go generate ./...
   #           go get -ldflags "-X main.revision=$(git rev-parse HEAD)" -v -u -t ./...
   #           test "$(git status --porcelain | wc -l)" == 0
-  #           GORACE=history_size=7 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=$(git rev-parse HEAD)" -v ./...
+  #           GORACE=history_size=7 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=$(git rev-parse HEAD)" -v ./...
   #           ineffassign .
   #     artifacts:
   #       - name: public/build/generic-worker-linux-armv6l
@@ -454,8 +454,8 @@ tasks:
           go env
           curl -s http://taskcluster/secrets/v1/secret/repo:github.com/taskcluster/generic-worker | sed -n 's/.*"b64_encoded_credentials_script": "\(.*\)".*/\1/p' | base64 -d > ~/env_private.sh
           source ~/env_private.sh
-          mkdir -p "${GOPATH}/src/github.com/taskcluster"
-          cd "${GOPATH}/src/github.com/taskcluster"
+          mkdir -p "$(go env GOPATH)/src/github.com/taskcluster"
+          cd "$(go env GOPATH)/src/github.com/taskcluster"
           if [ ! -d generic-worker/.git ]; then rm -rf generic-worker; git clone '{{ event.head.repo.url }}' 'generic-worker'; fi
           cd 'generic-worker'
           git fetch '{{ event.head.repo.url }}' "+{{ event.head.ref }}:refs/heads/X${TASK_ID}"
@@ -464,14 +464,14 @@ tasks:
           git clean -fdx
           git checkout -B tmp -t "X${TASK_ID}"
           go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
-          cd gw-codegen
+          cd cmd/gw-codegen
           go get -v -u
-          cd ..
-          go generate
+          cd ../..
+          go generate ./...
           go get -ldflags "-X main.revision=$(git rev-parse HEAD)" -v -u -t ./...
           test "$(git status --porcelain | wc -l)" == 0
-          GORACE=history_size=7 CGO_ENABLED=1 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=$(git rev-parse HEAD)" -v -race ./...
-          "${GOPATH}/bin/ineffassign" .
+          GORACE=history_size=7 CGO_ENABLED=1 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=$(git rev-parse HEAD)" -v -race ./...
+          "$(go env GOPATH)/bin/ineffassign" .
       artifacts:
         public/build/generic-worker-linux-amd64:
           path: "/go/bin/generic-worker"

.travis.yml

@@ -6,7 +6,7 @@ env:
   - "CGO_ENABLED=0 GIMME_OS=linux GIMME_ARCH=386"
   - "CGO_ENABLED=0 GIMME_OS=linux GIMME_ARCH=amd64"
   - "CGO_ENABLED=0 GIMME_OS=linux GIMME_ARCH=arm"
-  # currently broken
+  # currently broken due to upstream issue
   # - "CGO_ENABLED=0 GIMME_OS=linux GIMME_ARCH=arm64"
   - "CGO_ENABLED=0 GIMME_OS=darwin GIMME_ARCH=amd64"
   - "CGO_ENABLED=0 GIMME_OS=windows GIMME_ARCH=amd64"
@@ -16,16 +16,16 @@ install:
   - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || go get github.com/mattn/goveralls github.com/taskcluster/taskcluster-proxy github.com/taskcluster/livelog github.com/gordonklaus/ineffassign"
 
 script:
-  - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || go get ./gw-codegen"
-  - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || go generate"
+  - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || go get ./cmd/gw-codegen"
+  - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || go generate ./..."
   - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || git status"
   - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || test $(git status --porcelain | wc -l) == 0"
   - "go get -ldflags \"-X main.revision=$(git rev-parse HEAD)\" -v -t ./..."
-  - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || GORACE=history_size=7 travis_wait 30 ./gotestcover.sh coverage.report"
-  - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || ${GOPATH}/bin/ineffassign ."
+  - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || GORACE=history_size=7 travis_wait 30 scripts/gotestcover.sh coverage.report"
+  - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || $(go env GOPATH)/bin/ineffassign ."
 
 after_script:
-  - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || ${GOPATH}/bin/goveralls -coverprofile=coverage.report -service=travis-ci"
+  - "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || $(go env GOPATH)/bin/goveralls -coverprofile=coverage.report -service=travis-ci"
 
 before_deploy:
   - "source .travis_rename_releases.sh"