feat(dp-token): fix tests' public keys names

Signed-off-by: nicoche <[email protected]>
kumahq · Oct 27, 2023 · aed9b21 · aed9b21
1 parent dc5a2dd
commit aed9b21
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/test/e2e_env/universal/auth/offline_auth.go b/test/e2e_env/universal/auth/offline_auth.go
@@ -57,7 +57,7 @@ dpServer:
               FvX0KmBtADEJ4n9Jo4ja3hDmp83Q4KjJq0xKbhh9Fp3AjwjDb0fVFwbt+8SdVgyV
               5PE+7HdigwlJ/cOVb9IY/UKVgCzlW5inCQIDAQAB
               -----END RSA PUBLIC KEY-----
-          - kid: static-nomesh-1
+          - kid: offline-auth-nomesh-1
             key: |
               -----BEGIN RSA PUBLIC KEY-----
               MIIBCgKCAQEAsGQSfwmBU/DMDLnKCbg7cKUrBEAxDinCPaQ5foF87H8aul4EAzym
@@ -91,7 +91,7 @@ dpServer:
 			"--group", "mesh-system:admin",
 			"--valid-for", "24h",
 			"--kid", "static-1",
-			"--signing-key-path", filepath.Join("..", "..", "keys", "sample-key-static-1.pem"),
+			"--signing-key-path", filepath.Join("..", "..", "keys", "samplekey.pem"),
 		)
 		Expect(err).ToNot(HaveOccurred())
 
@@ -115,7 +115,7 @@ dpServer:
 			"--mesh", meshes[0],
 			"--kid", "static-1",
 			"--valid-for", "24h",
-			"--signing-key-path", filepath.Join("..", "..", "keys", "sample-key-static-1.pem"),
+			"--signing-key-path", filepath.Join("..", "..", "keys", "samplekey.pem"),
 		)
 		Expect(err).ToNot(HaveOccurred())
 
@@ -134,9 +134,9 @@ dpServer:
 		// given
 		token, err := universal.GetKumactlOptions().RunKumactlAndGetOutput("generate", "dataplane-token",
 			"--mesh", meshes[1],
-			"--kid", "static-nomesh-1",
+			"--kid", "offline-auth-nomesh-1",
 			"--valid-for", "24h",
-			"--signing-key-path", filepath.Join("..", "..", "keys", "sample-key-static-nomesh-1.pem"),
+			"--signing-key-path", filepath.Join("..", "..", "keys", "samplekey-2.pem"),
 		)
 		Expect(err).ToNot(HaveOccurred())
 

diff --git a/test/keys/README.md b/test/keys/README.md
@@ -1,7 +1,7 @@
 Keys for tests generated by executing:
 
-kumactl generate signing-key --format=pem > sample-key-static-1.pem
-kumactl generate public-key --signing-key-path=sample-key-static-1.pem > sample-publickey-static-1.pem
+kumactl generate signing-key --format=pem > samplekey.pem
+kumactl generate public-key --signing-key-path=samplekey.pem > publickey.pem
 
-kumactl generate signing-key --format=pem > sample-key-static-nomesh-1.pem
-kumactl generate public-key --signing-key-path=sample-key-static-nomesh-1.pem > sample-publickey-static-nomesh-1.pem
+kumactl generate signing-key --format=pem > samplekey-2.pem
+kumactl generate public-key --signing-key-path=samplekey-2.pem > publickey-2.pem
diff --git a/...keys/sample-publickey-static-nomesh-1.pem → test/keys/publickey-2.pem b/...keys/sample-publickey-static-nomesh-1.pem → test/keys/publickey-2.pem
diff --git a/test/keys/sample-publickey-static-1.pem → test/keys/publickey.pem b/test/keys/sample-publickey-static-1.pem → test/keys/publickey.pem
diff --git a/test/keys/sample-key-static-nomesh-1.pem → test/keys/samplekey-2.pem b/test/keys/sample-key-static-nomesh-1.pem → test/keys/samplekey-2.pem
diff --git a/test/keys/sample-key-static-1.pem → test/keys/samplekey.pem b/test/keys/sample-key-static-1.pem → test/keys/samplekey.pem