Refactor generated code check

.github/actions/go_init/action.yml

@@ -15,35 +15,8 @@ runs:
         check-latest: true
         cache: ${{ inputs.cache }}
 
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        repository: overmindtech/aws-source
-        path: ./aws-source
-
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        repository: overmindtech/k8s-source
-        path: ./k8s-source
-
-    - name: Move sources in place
-      shell: bash
-      run: |
-        rm -rf ../aws-source
-        rm -rf ../k8s-source
-        mv -v aws-source ..
-        mv -v k8s-source ..
-
-    - name: Go Generate
+    - name: Get deps and refresh generated code
       shell: bash
       run: |
+        go get -v -t -d ./...
         go generate ./...
-        if [ -z "$(git status --porcelain)" ]; then
-          echo "No pending changes from 'go generate'"
-        else
-          echo "Pending changes from 'go generate' found, please run 'go generate ./...' and commit the changes"
-          git status
-          exit 1
-        fi
-        cat cmd/commit.txt

.github/workflows/e2e.yaml

@@ -44,7 +44,6 @@ jobs:
       - name: Build the binary
         run: |
           set -xe
-          go get -v -t -d ./...
           go build -o overmind main.go
 
       - name: Run E2E Tests
@@ -121,7 +120,6 @@ jobs:
       - name: Build the binary
         run: |
           set -xe
-          go get -v -t -d ./...
           go build -o overmind main.go
 
       - name: Run E2E Tests

.github/workflows/tests.yml

@@ -16,10 +16,6 @@ jobs:
       - name: Go Init
         uses: ./.github/actions/go_init
 
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
-
       - name: Go Test
         run: |
           go run main.go --version
@@ -38,6 +34,10 @@ jobs:
       - name: Go Init
         uses: ./.github/actions/go_init
 
+      - name: Check go generate output is clean
+        run: |
+          git diff --exit-code
+
       # get .golangci.yml from github.com/overmindtech/golangci-lint_config
       - name: Get .golangci.yml from github.com/overmindtech/golangci-lint_configs
         run: |
@@ -48,4 +48,3 @@ jobs:
         with:
           version: v1.60.1
           args: --timeout 3m
-          skip-pkg-cache: true # golangci-lint-action caching conflicts with the setup-go cache and `go get` above. See https://github.com/golangci/golangci-lint-action/issues/23

extractmaps.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"html/template"
 	"os"
+	"path/filepath"
 	"strings"
 )
 
@@ -17,7 +18,7 @@ type Args struct {
 }
 
 func main() {
-	fmt.Printf("Running %s go on %s\n", os.Args[0], os.Getenv("GOFILE"))
+	fmt.Printf("Running %s from %s\n", os.Args[0], os.Getenv("GOFILE"))
 
 	cwd, err := os.Getwd()
 	if err != nil {
@@ -35,9 +36,9 @@ func main() {
 	}
 
 	args := Args{
-		Source:       os.Args[1],
+		Source:       filepath.Base(os.Args[1]),
 		SourceMunged: strings.ReplaceAll(os.Args[1], "-", ""),
-		Data:         dataFromFiles(fmt.Sprintf("../sources/%v/docs-data", os.Args[1])),
+		Data:         dataFromFiles(fmt.Sprintf("%v/docs-data", os.Args[1])),
 	}
 
 	funcMap := template.FuncMap{

tfutils/types.go

@@ -4,8 +4,8 @@ import (
 	"github.com/overmindtech/sdp-go"
 )
 
-//go:generate go run ../extractmaps.go aws-source
-//go:generate go run ../extractmaps.go k8s-source
+//go:generate bash -c "go run ../extractmaps.go $(go list -m -f '{{.Dir}}' github.com/overmindtech/aws-source)"
+//go:generate bash -c "go run ../extractmaps.go $(go list -m -f '{{.Dir}}' github.com/overmindtech/k8s-source)"
 
 type TfMapData struct {
 	// The overmind type name