feat: Passthrough for cache-{from,to} from integration tests to copa

Signed-off-by: Brian Goff <[email protected]>
project-copacetic · Aug 15, 2023 · 9a38109 · 9a38109
1 parent 8ebd10b
commit 9a38109
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -116,11 +116,13 @@ jobs:
           ./copa --version
       - name: Set up QEMU
         uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
+      - name: Setup gha cache vars
+        uses: crazy-max/ghaction-github-runtime@v2
       - name: Run functional test
         shell: bash
         run: |
           set -eu -o pipefail
           . .github/workflows/scripts/buildkitenvs/${{ matrix.buildkit_mode}}
-          go test -v ./integration --addr="${COPA_BUILDKIT_ADDR}" --copa="$(pwd)/copa"
+          go test -v ./integration --addr="${COPA_BUILDKIT_ADDR}" --copa="$(pwd)/copa" --cache-from=type=gha,scope=${{matrix.buildkit_mode}} --cache-to=type=gha,scope=${{ matrix.buildkit_mode }}
 
         
diff --git a/integration/main_test.go b/integration/main_test.go
@@ -9,11 +9,15 @@ import (
 var (
 	buildkitAddr string
 	copaPath     string
+	cacheFrom    string
+	cacheTo      string
 )
 
 func TestMain(m *testing.M) {
 	flag.StringVar(&buildkitAddr, "addr", "", "buildkit address to pass through to copa binary")
 	flag.StringVar(&copaPath, "copa", "./copa", "path to copa binary")
+	flag.StringVar(&cacheFrom, "cache-from", "", "pass through cache-from to copa binary")
+	flag.StringVar(&cacheTo, "cache-to", "", "pass through cache-to to copa binary")
 	flag.Parse()
 
 	if copaPath == "" {

diff --git a/integration/patch_test.go b/integration/patch_test.go
@@ -87,6 +87,18 @@ func patch(t *testing.T, ref, patchedTag, scan string) {
 		"-t="+patchedTag,
 		"-r="+scan,
 		"--timeout=20m",
+		func() string {
+			if cacheFrom == "" {
+				return ""
+			}
+			return "--cache-from=" + cacheFrom
+		}(),
+		func() string {
+			if cacheTo == "" {
+				return ""
+			}
+			return "--cache-to=" + cacheTo
+		}(),
 		addrFl,
 	)
 	out, err := cmd.CombinedOutput()

diff --git a/pkg/patch/cmd.go b/pkg/patch/cmd.go
@@ -40,8 +40,8 @@ func NewPatchCmd() *cobra.Command {
 	flags.StringVarP(&ua.WorkDir, "working-folder", "w", "", "Working folder, defaults to system temp folder")
 	flags.StringVarP(&ua.BuildkitAddr, "addr", "a", "", "Address of buildkitd service, defaults to local docker daemon with fallback to "+buildkit.DefaultAddr)
 	flags.DurationVar(&ua.Timeout, "timeout", 5*time.Minute, "Timeout for the operation, defaults to '5m'")
-	flags.StringSliceVar(&ua.CacheFrom, "cache-from", nil, "Cache import sources")
-	flags.StringSliceVar(&ua.CacheTo, "cache-to", nil, "Cache export destination")
+	flags.StringArrayVar(&ua.CacheFrom, "cache-from", []string{}, "Cache import sources")
+	flags.StringArrayVar(&ua.CacheTo, "cache-to", []string{}, "Cache export destination")
 
 	if err := patchCmd.MarkFlagRequired("image"); err != nil {
 		panic(err)