Resolve BuildKit version from go.mod if not provided

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

Author: crazy-max

hack/_util

@@ -1,23 +1,13 @@
 #!/usr/bin/env bash
 
+: "${BUILDKIT_VERSION=}"
+: "${CACHE_FROM=}"
+: "${CACHE_TO=}"
+
 dockerCmd() {
   (set -x ; docker "$@")
 }
 
-: ${CACHE_FROM=}
-: ${CACHE_TO=}
-
-buildkitPkg=github.com/moby/buildkit
-# FIXME: Doesn't seem to be possible to use a ref from a pseudo-ver in go.mod as build context so we need to use a hardcoded one for now.
-buildkitVersion=ffe2301031c8f8bfb8d5fc5034e5e509c5624913
-# Returns buildkit ref from go.mod (can be v0.9.3 or ffe2301031c8 for pseudo-ver)
-#buildkitVersion=$(go list -mod=readonly -u -m -f '{{.Version}}' $buildkitPkg)
-#if [[ "${buildkitVersion}" == *-*-* ]]; then
-#  # if a pseudo-version, figure out just the SHA
-#  buildkitVersion=$(echo "${buildkitVersion}" | awk -F"-" '{print $NF}' | awk 'BEGIN{FIELDWIDTHS="7"} {print $1}')
-#fi
-buildkitRef="https://${buildkitPkg}.git#${buildkitVersion}"
-
 cacheFromFlag=""
 cacheToFlag=""
 if [ -n "$CACHE_FROM" ]; then
@@ -26,3 +16,16 @@ fi
 if [ -n "$CACHE_TO" ]; then
   cacheToFlag="--cache-to=$CACHE_TO"
 fi
+
+if [ -z "$BUILDKIT_VERSION" ]; then
+  # resolve BuildKit version from go.mod if not provided
+  BUILDKIT_VERSION=$(go list -mod=readonly -u -m -f '{{.Version}}' github.com/moby/buildkit)
+  if [[ "${BUILDKIT_VERSION}" == *-*-* ]]; then
+    # if pseudo-version, figure out just the uncommon sha (https://github.com/golang/go/issues/34745)
+    BUILDKIT_VERSION=$(echo "${BUILDKIT_VERSION}" | awk -F"-" '{print $NF}' | awk 'BEGIN{FIELDWIDTHS="7"} {print $1}')
+    # use github api to return full sha to be able to use it as ref for git remote context
+    BUILDKIT_VERSION=$(curl -s "https://api.github.com/repos/moby/buildkit/commits/${BUILDKIT_VERSION}" | jq -r .sha)
+  fi
+fi
+
+buildkitRef="https://github.com/moby/buildkit.git#${BUILDKIT_VERSION}"

hack/buildkit-it-base

@@ -2,16 +2,16 @@
 
 OUTPUT=$1
 
-. $(dirname $0)/_util
+. _util
 set -eu -o pipefail
 
 outputFlag="--output=$OUTPUT"
 if [ -z "$OUTPUT" ]; then
   outputFlag="--output=type=cacheonly"
 fi
 
-# build buildkit integration test base from buildkit ref
+# build buildkit "integration tests base" from buildkit ref
 # https://github.com/moby/buildkit/blob/ffe2301031c8f8bfb8d5fc5034e5e509c5624913/Dockerfile#L228
 dockerCmd buildx build $cacheFromFlag $cacheToFlag $outputFlag \
   --target "integration-tests-base" \
-  $buildkitRef
+  "$buildkitRef"

hack/test

@@ -1,16 +1,16 @@
 #!/usr/bin/env bash
 
-. $(dirname $0)/_util
+. _util
 set -eu -o pipefail
 
-: ${CHANNEL=mainline}
+: "${CHANNEL=mainline}"
 
-: ${TEST_INTEGRATION=}
-: ${TEST_DOCKERFILE=}
-: ${TEST_DOCKERD=}
-: ${TEST_DOCKERD_BINARY=$(which dockerd)}
-: ${TEST_COVERAGE=}
-: ${TEST_KEEP_CACHE=}
+: "${TEST_INTEGRATION=}"
+: "${TEST_DOCKERFILE=}"
+: "${TEST_DOCKERD=}"
+: "${TEST_DOCKERD_BINARY=$(which dockerd)}"
+: "${TEST_COVERAGE=}"
+: "${TEST_KEEP_CACHE=}"
 
 if [ "$TEST_DOCKERD" == "1" ] && ! file $TEST_DOCKERD_BINARY | grep "statically linked" >/dev/null; then
   echo "dockerd binary needs to be statically linked"