tests: Update tests for new securesystemslib

jku · jku · commit 72832488887d · 2024-12-04T15:28:49.000+02:00
envvar signer no longer exists, use private key in file
diff --git a/signer/tuf_on_ci_sign/delegate.py b/signer/tuf_on_ci_sign/delegate.py
@@ -260,7 +260,7 @@ def _collect_online_key(user_config: User) -> Key:
         if choice == 0:
             # This could be generic support, but for now it's a hidden test key.
             # key value 1d9a024348e413892aeeb8cc8449309c152f48177200ee61a02ae56f450c6480
-            uri = "envvar:LOCAL_TESTING_KEY"
+            uri = f"file2:{os.getenv('TUF_ON_CI_TEST_KEY')}"
             pub_key = "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
             return SSlibKey(
                 "fa47289",
diff --git a/tests/e2e.sh b/tests/e2e.sh
@@ -16,7 +16,6 @@
 # Python dependencies
 # * signer: pip install ./signer/
 # * repo: pip install ./repo/
-# * pynacl: pip install pynacl  # for the testing ed25519 key
 #
 #
 # Set DEBUG_TESTS=1 for more visibility. This will leave the temp directories in place.
@@ -519,7 +518,7 @@ repo_online_sign()
 
     cd $REPO_GIT
 
-    if LOCAL_TESTING_KEY=$ONLINE_KEY tuf-on-ci-online-sign --push >> $REPO_DIR/out 2>&1; then
+    if tuf-on-ci-online-sign --push >> $REPO_DIR/out 2>&1; then
         echo "generated=true" >> $REPO_DIR/out
     else
         echo "generated=false" >> $REPO_DIR/out
@@ -917,7 +916,9 @@ export TZ="UTC"
 WORK_DIR=$(mktemp -d)
 SCRIPT_DIR=$(dirname $(readlink -f "$0"))
 
-ONLINE_KEY="1d9a024348e413892aeeb8cc8449309c152f48177200ee61a02ae56f450c6480"
+# setup online signing workaround with file based key
+export TUF_ON_CI_TEST_KEY=online-test-key
+export CRYPTO_SIGNER_PATH_PREFIX=$SCRIPT_DIR
 
 # Run tests
 test_basic
diff --git a/tests/expected/basic/metadata/1.root.json b/tests/expected/basic/metadata/1.root.json
@@ -24,7 +24,7 @@
      "public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
     },
     "scheme": "ed25519",
-    "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"
+    "x-tuf-on-ci-online-uri": "file2:online-test-key"
    }
   },
   "roles": {
diff --git a/tests/expected/delegated/metadata/1.root.json b/tests/expected/delegated/metadata/1.root.json
@@ -24,7 +24,7 @@
      "public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
     },
     "scheme": "ed25519",
-    "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"
+    "x-tuf-on-ci-online-uri": "file2:online-test-key"
    }
   },
   "roles": {
diff --git a/tests/expected/multi-user-signing/metadata/1.root.json b/tests/expected/multi-user-signing/metadata/1.root.json
@@ -32,7 +32,7 @@
      "public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
     },
     "scheme": "ed25519",
-    "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"
+    "x-tuf-on-ci-online-uri": "file2:online-test-key"
    }
   },
   "roles": {
diff --git a/tests/expected/multi-user-signing/metadata/2.root.json b/tests/expected/multi-user-signing/metadata/2.root.json
@@ -32,7 +32,7 @@
      "public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
     },
     "scheme": "ed25519",
-    "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"
+    "x-tuf-on-ci-online-uri": "file2:online-test-key"
    }
   },
   "roles": {
diff --git a/tests/expected/online-version-bump/metadata/1.root.json b/tests/expected/online-version-bump/metadata/1.root.json
@@ -24,7 +24,7 @@
      "public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
     },
     "scheme": "ed25519",
-    "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"
+    "x-tuf-on-ci-online-uri": "file2:online-test-key"
    }
   },
   "roles": {
diff --git a/tests/expected/root-key-rotation/metadata/1.root.json b/tests/expected/root-key-rotation/metadata/1.root.json
@@ -24,7 +24,7 @@
      "public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
     },
     "scheme": "ed25519",
-    "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"
+    "x-tuf-on-ci-online-uri": "file2:online-test-key"
    }
   },
   "roles": {
diff --git a/tests/expected/root-key-rotation/metadata/2.root.json b/tests/expected/root-key-rotation/metadata/2.root.json
@@ -36,7 +36,7 @@
      "public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
     },
     "scheme": "ed25519",
-    "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"
+    "x-tuf-on-ci-online-uri": "file2:online-test-key"
    }
   },
   "roles": {
diff --git a/tests/expected/signing-event-creation/metadata/1.root.json b/tests/expected/signing-event-creation/metadata/1.root.json
@@ -24,7 +24,7 @@
      "public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
     },
     "scheme": "ed25519",
-    "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"
+    "x-tuf-on-ci-online-uri": "file2:online-test-key"
    }
   },
   "roles": {
diff --git a/tests/expected/signing-event-creation/metadata/2.root.json b/tests/expected/signing-event-creation/metadata/2.root.json
@@ -24,7 +24,7 @@
      "public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
     },
     "scheme": "ed25519",
-    "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"
+    "x-tuf-on-ci-online-uri": "file2:online-test-key"
    }
   },
   "roles": {
diff --git a/tests/expected/target-file-changes/metadata/1.root.json b/tests/expected/target-file-changes/metadata/1.root.json
@@ -32,7 +32,7 @@
      "public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
     },
     "scheme": "ed25519",
-    "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"
+    "x-tuf-on-ci-online-uri": "file2:online-test-key"
    }
   },
   "roles": {
diff --git a/tests/expected/target-files-in-delegated-roles/metadata/1.root.json b/tests/expected/target-files-in-delegated-roles/metadata/1.root.json
@@ -24,7 +24,7 @@
      "public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"
     },
     "scheme": "ed25519",
-    "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"
+    "x-tuf-on-ci-online-uri": "file2:online-test-key"
    }
   },
   "roles": {
diff --git a/tests/online-test-key b/tests/online-test-key
@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEIB2aAkNI5BOJKu64zIRJMJwVL0gXcgDuYaAq5W9FDGSA
+-----END PRIVATE KEY-----
diff --git a/tox.ini b/tox.ini
@@ -50,7 +50,6 @@ deps =
     -c action-constraints.txt
     -e repo
     -e signer
-    pynacl
 
 changedir = tests
 commands =

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"`
`25`	`25`	`},`
`26`	`26`	`"scheme": "ed25519",`
`27`		`- "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"`
	`27`	`+ "x-tuf-on-ci-online-uri": "file2:online-test-key"`
`28`	`28`	`}`
`29`	`29`	`},`
`30`	`30`	`"roles": {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`"public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"`
`33`	`33`	`},`
`34`	`34`	`"scheme": "ed25519",`
`35`		`- "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"`
	`35`	`+ "x-tuf-on-ci-online-uri": "file2:online-test-key"`
`36`	`36`	`}`
`37`	`37`	`},`
`38`	`38`	`"roles": {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`"public": "fa472895c9756c2b9bcd1440bf867d0fa5c4edee79e9792fa9822be3dd6fcbb3"`
`37`	`37`	`},`
`38`	`38`	`"scheme": "ed25519",`
`39`		`- "x-tuf-on-ci-online-uri": "envvar:LOCAL_TESTING_KEY"`
	`39`	`+ "x-tuf-on-ci-online-uri": "file2:online-test-key"`
`40`	`40`	`}`
`41`	`41`	`},`
`42`	`42`	`"roles": {`