move ta-generator to task-generator directory

- ta-generator and task-generator are currently on the same directory level - move ta-generator so it's a subdirectory of the task-generator leading to a better file organization in the repository - update .gitignore so it ignores vendor directories and diff files used in trusted-artifacts task generation testing
konflux-ci · Sep 18, 2024 · a3c7f58 · a3c7f58
1 parent e23faa2
commit a3c7f58
Show file tree

Hide file tree

Showing 31 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/checkton.yaml b/.github/workflows/checkton.yaml
@@ -21,7 +21,7 @@ jobs:
           # Set to false when re-enabling SARIF uploads
           fail-on-findings: true
           find-copies-harder: true
-          exclude-regex: ^ta-generator
+          exclude-regex: ^task-generator
 
       # Currently, code scanning alerts annoyingly stay open even if you fix them.
       # Don't upload SARIF until https://github.com/orgs/community/discussions/132787 is resolved.

diff --git a/.github/workflows/go-ci.yaml b/.github/workflows/go-ci.yaml
@@ -9,8 +9,8 @@ jobs:
     strategy:
       matrix:
         path:
-          - task-generator
-          - ta-generator
+          - task-generator/remote
+          - task-generator/trusted-artifacts
     steps:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
       - uses: actions/setup-go@b26d40294f8ad76fcc90b915dac85892322fe62d
@@ -28,8 +28,8 @@ jobs:
     strategy:
       matrix:
         path:
-          - task-generator
-          - ta-generator
+          - task-generator/remote
+          - task-generator/trusted-artifacts
     steps:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
       - name: Install Go
@@ -69,8 +69,8 @@ jobs:
     strategy:
       matrix:
         path:
-          - task-generator
-          - ta-generator
+          - task-generator/remote
+          - task-generator/trusted-artifacts
     steps:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
       - uses: actions/setup-go@b26d40294f8ad76fcc90b915dac85892322fe62d

diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,12 @@ bundle_values.env
 *~
 *.swp
 .checkton.sarif
+**/vendor
+
+# expected and got files generated in trusted-artifacts tests when mismatch occurs
+task-generator/trusted-artifacts/golden/**/expected
+task-generator/trusted-artifacts/golden/**/got
+# Generated binaries
+task-generator/trusted-artifacts/trusted-artifacts
+task-generator/remote/remote
+
diff --git a/hack/generate-ta-tasks.sh b/hack/generate-ta-tasks.sh
@@ -16,7 +16,7 @@ ROOT_DIR="$(git rev-parse --show-toplevel)"
 TASK_DIR="$(realpath "${ROOT_DIR}/task")"
 
 tashbin="$(mktemp --dry-run)"
-GOTOOLCHAIN=auto GOSUMDB=sum.golang.org go build -C "${ROOT_DIR}/ta-generator/" -o "${tashbin}"
+GOTOOLCHAIN=auto GOSUMDB=sum.golang.org go build -C "${ROOT_DIR}/task-generator/trusted-artifacts" -o "${tashbin}"
 trap 'rm "${tashbin}"' EXIT
 tash() {
   "${tashbin}" "$@"

diff --git a/task-generator/go.mod → task-generator/remote/go.mod b/task-generator/go.mod → task-generator/remote/go.mod
@@ -1,4 +1,4 @@
-module github.com/konflux-ci/build-definitions/task-generator
+module github.com/konflux-ci/build-definitions/task-generator/remote
 
 go 1.22.0
 

diff --git a/task-generator/go.sum → task-generator/remote/go.sum b/task-generator/go.sum → task-generator/remote/go.sum
diff --git a/ta-generator/README.md → task-generator/trusted-artifacts/README.md b/ta-generator/README.md → task-generator/trusted-artifacts/README.md
diff --git a/ta-generator/expect.go → task-generator/trusted-artifacts/expect.go b/ta-generator/expect.go → task-generator/trusted-artifacts/expect.go
diff --git a/ta-generator/go.mod → task-generator/trusted-artifacts/go.mod b/ta-generator/go.mod → task-generator/trusted-artifacts/go.mod
@@ -1,4 +1,4 @@
-module github.com/konflux-ci/build-definitions/ta-generator
+module github.com/konflux-ci/build-definitions/task-generator/trusted-artifacts
 
 go 1.22.3
 

diff --git a/ta-generator/go.sum → task-generator/trusted-artifacts/go.sum b/ta-generator/go.sum → task-generator/trusted-artifacts/go.sum
diff --git a/ta-generator/golden/buildah/base.yaml → ...rusted-artifacts/golden/buildah/base.yaml b/ta-generator/golden/buildah/base.yaml → ...rusted-artifacts/golden/buildah/base.yaml
diff --git a/ta-generator/golden/buildah/recipe.yaml → ...sted-artifacts/golden/buildah/recipe.yaml b/ta-generator/golden/buildah/recipe.yaml → ...sted-artifacts/golden/buildah/recipe.yaml
diff --git a/ta-generator/golden/buildah/ta.yaml → .../trusted-artifacts/golden/buildah/ta.yaml b/ta-generator/golden/buildah/ta.yaml → .../trusted-artifacts/golden/buildah/ta.yaml
diff --git a/ta-generator/golden/git-clone/base.yaml → ...sted-artifacts/golden/git-clone/base.yaml b/ta-generator/golden/git-clone/base.yaml → ...sted-artifacts/golden/git-clone/base.yaml
diff --git a/ta-generator/golden/git-clone/recipe.yaml → ...ed-artifacts/golden/git-clone/recipe.yaml b/ta-generator/golden/git-clone/recipe.yaml → ...ed-artifacts/golden/git-clone/recipe.yaml
diff --git a/ta-generator/golden/git-clone/ta.yaml → ...rusted-artifacts/golden/git-clone/ta.yaml b/ta-generator/golden/git-clone/ta.yaml → ...rusted-artifacts/golden/git-clone/ta.yaml
diff --git a/...or/golden/prefetch-dependencies/base.yaml → ...ts/golden/prefetch-dependencies/base.yaml b/...or/golden/prefetch-dependencies/base.yaml → ...ts/golden/prefetch-dependencies/base.yaml
diff --git a/.../golden/prefetch-dependencies/recipe.yaml → .../golden/prefetch-dependencies/recipe.yaml b/.../golden/prefetch-dependencies/recipe.yaml → .../golden/prefetch-dependencies/recipe.yaml
diff --git a/...ator/golden/prefetch-dependencies/ta.yaml → ...acts/golden/prefetch-dependencies/ta.yaml b/...ator/golden/prefetch-dependencies/ta.yaml → ...acts/golden/prefetch-dependencies/ta.yaml
diff --git a/...enerator/golden/sast-snyk-check/base.yaml → ...rtifacts/golden/sast-snyk-check/base.yaml b/...enerator/golden/sast-snyk-check/base.yaml → ...rtifacts/golden/sast-snyk-check/base.yaml
diff --git a/...erator/golden/sast-snyk-check/recipe.yaml → ...ifacts/golden/sast-snyk-check/recipe.yaml b/...erator/golden/sast-snyk-check/recipe.yaml → ...ifacts/golden/sast-snyk-check/recipe.yaml
diff --git a/ta-generator/golden/sast-snyk-check/ta.yaml → ...-artifacts/golden/sast-snyk-check/ta.yaml b/ta-generator/golden/sast-snyk-check/ta.yaml → ...-artifacts/golden/sast-snyk-check/ta.yaml
diff --git a/ta-generator/golden/source-build/base.yaml → ...d-artifacts/golden/source-build/base.yaml b/ta-generator/golden/source-build/base.yaml → ...d-artifacts/golden/source-build/base.yaml
diff --git a/ta-generator/golden/source-build/recipe.yaml → ...artifacts/golden/source-build/recipe.yaml b/ta-generator/golden/source-build/recipe.yaml → ...artifacts/golden/source-build/recipe.yaml
diff --git a/ta-generator/golden/source-build/ta.yaml → ...ted-artifacts/golden/source-build/ta.yaml b/ta-generator/golden/source-build/ta.yaml → ...ted-artifacts/golden/source-build/ta.yaml
diff --git a/ta-generator/main.go → task-generator/trusted-artifacts/main.go b/ta-generator/main.go → task-generator/trusted-artifacts/main.go
diff --git a/ta-generator/main_test.go → ...-generator/trusted-artifacts/main_test.go b/ta-generator/main_test.go → ...-generator/trusted-artifacts/main_test.go
diff --git a/ta-generator/recipe.go → task-generator/trusted-artifacts/recipe.go b/ta-generator/recipe.go → task-generator/trusted-artifacts/recipe.go
diff --git a/ta-generator/shell.go → task-generator/trusted-artifacts/shell.go b/ta-generator/shell.go → task-generator/trusted-artifacts/shell.go
diff --git a/ta-generator/ta.go → task-generator/trusted-artifacts/ta.go b/ta-generator/ta.go → task-generator/trusted-artifacts/ta.go
diff --git a/ta-generator/tekton.go → task-generator/trusted-artifacts/tekton.go b/ta-generator/tekton.go → task-generator/trusted-artifacts/tekton.go