From cc3c51a14ed5b2c381f11ec0c51f4e635bd5bbec Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priya@chainguard.dev>
Date: Wed, 7 Sep 2022 11:48:01 -0700
Subject: [PATCH] Skip harness tests if rekor-cli is incompatible with
 rekor-server version

Signed-off-by: Priya Wadhwa <priya@chainguard.dev>
---
 tests/harness_test.go  | 30 ++++++++++++++++++++++++++----
 tests/rekor-harness.sh |  8 ++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/tests/harness_test.go b/tests/harness_test.go
index 4379c0fba..a6ac1a7b2 100644
--- a/tests/harness_test.go
+++ b/tests/harness_test.go
@@ -77,9 +77,12 @@ func TestHarnessAddEntry(t *testing.T) {
 	uuid := getUUIDFromUploadOutput(t, out)
 	logIndex := getLogIndexFromUploadOutput(t, out)
 
-	// Now we should be able to verify it.
-	out = runCli(t, "verify", "--type=hashedrekord", "--pki-format=x509", "--artifact-hash", dataSHA, "--signature", sigPath, "--public-key", pubPath)
-	outputContains(t, out, "Inclusion Proof:")
+	if !rekorCLIIncompatible() {
+		// Now we should be able to verify it.
+		out = runCli(t, "verify", "--type=hashedrekord", "--pki-format=x509", "--artifact-hash", dataSHA, "--signature", sigPath, "--public-key", pubPath)
+		outputContains(t, out, "Inclusion Proof:")
+	}
+
 	saveEntry(t, logIndex, StoredEntry{UUID: uuid})
 }
 
@@ -155,7 +158,7 @@ func TestHarnessAddIntoto(t *testing.T) {
 	uuid := getUUIDFromUploadOutput(t, out)
 	logIndex := getLogIndexFromUploadOutput(t, out)
 
-	out = runCli(t, "get", "--uuid", uuid, "--format=json")
+	out = runCli(t, "get", "--log-index", fmt.Sprintf("%d", logIndex), "--format=json")
 	g := getOut{}
 	if err := json.Unmarshal([]byte(out), &g); err != nil {
 		t.Fatal(err)
@@ -265,11 +268,16 @@ func TestHarnessGetAllEntriesLogIndex(t *testing.T) {
 }
 
 func TestHarnessGetAllEntriesUUID(t *testing.T) {
+	if rekorCLIIncompatible() {
+		t.Skipf("Skipping getting entries by UUID, old rekor-cli version %s is incompatible with server version %s", os.Getenv("CLI_VERSION"), os.Getenv("SERVER_VERSION"))
+	}
+
 	treeSize := activeTreeSize(t)
 	if treeSize == 0 {
 		t.Fatal("There are 0 entries in the log, there should be at least 2")
 	}
 	_, entries := getEntries(t)
+
 	for _, e := range entries {
 		outUUID := runCli(t, "get", "--uuid", e.UUID, "--format", "json")
 		outEntryID := runCli(t, "get", "--uuid", entryID(t, e.UUID), "--format", "json")
@@ -294,6 +302,9 @@ func TestHarnessGetAllEntriesUUID(t *testing.T) {
 }
 
 func entryID(t *testing.T, uuid string) string {
+	if sharding.ValidateEntryID(uuid) == nil {
+		return uuid
+	}
 	treeID, err := strconv.Atoi(os.Getenv("TREE_ID"))
 	if err != nil {
 		t.Fatal(err)
@@ -317,3 +328,14 @@ func activeTreeSize(t *testing.T) int {
 	}
 	return s.ActiveTreeSize
 }
+
+// Check if we have a new server version and an old CLI version
+// since the new server returns an EntryID but the old CLI version expects a UUID
+func rekorCLIIncompatible() bool {
+	if sv := os.Getenv("SERVER_VERSION"); sv != "v0.10.0" && sv != "v0.11.0" {
+		if cv := os.Getenv("CLI_VERSION"); cv == "v0.10.0" || cv == "v0.11.0" {
+			return true
+		}
+	}
+	return false
+}
diff --git a/tests/rekor-harness.sh b/tests/rekor-harness.sh
index 8d1952dfd..ba1f5662d 100755
--- a/tests/rekor-harness.sh
+++ b/tests/rekor-harness.sh
@@ -75,7 +75,7 @@ function run_tests () {
     trap "rm -rf $REKORTMPDIR" EXIT
 
     go clean -testcache
-    if ! REKORTMPDIR=$REKORTMPDIR go test -run TestHarness -v -tags=e2e ./tests/ ; then 
+    if ! REKORTMPDIR=$REKORTMPDIR SERVER_VERSION=$1 CLI_VERSION=$2 go test -run TestHarness -v -tags=e2e ./tests/ ; then 
         docker-compose logs --no-color > /tmp/docker-compose.log
         exit 1
     fi
@@ -112,17 +112,17 @@ do
         echo "Running tests with server version $server_version and CLI version $cli_version"
 
         build_cli $cli_version
-        run_tests
+        run_tests $server_version $cli_version
 
         echo "Tests passed successfully."
         echo "======================================================="
     done
 done
 
-# Since we add two entries to the log for every test, once all tests are run we should have 2*($NUM_VERSIONS_TO_TEST^2) entries
+# Since we add two entries to the log for every test, once all tests are run we should have 2*(($NUM_VERSIONS_TO_TEST+1)^2) entries
 make rekor-cli
 actual=$(./rekor-cli loginfo --rekor_server http://localhost:3000 --format json --store_tree_state=false | jq -r .ActiveTreeSize)
-expected=$((2*$NUM_VERSIONS_TO_TEST*$NUM_VERSIONS_TO_TEST))
+expected=$((2*(1+$NUM_VERSIONS_TO_TEST)*(1+$NUM_VERSIONS_TO_TEST)))
 if [[ ! "$expected" == "$actual" ]]; then
     echo "ERROR: Log had $actual entries instead of expected $expected"
     exit 1