test: add bindle keyring & secret keys

Signed-off-by: Frank Yang <[email protected]>

Author: FrankYang0529

Makefile

@@ -30,8 +30,8 @@ test-integration:
 
 .PHONY: test-e2e
 test-e2e:
-	RUST_LOG=$(LOG_LEVEL) cargo test --test integration --features e2e-tests --no-fail-fast  -- integration_tests::test_dependencies --nocapture 
-	RUST_LOG=$(LOG_LEVEL) cargo test --test integration --features e2e-tests --no-fail-fast -- --skip integration_tests::test_dependencies --nocapture --include-ignored
+	RUST_LOG=$(LOG_LEVEL) cargo test --test integration --features e2e-tests --no-fail-fast -- integration_tests::e2e_tests::test_dependencies --nocapture 
+	RUST_LOG=$(LOG_LEVEL) cargo test --test integration --features e2e-tests --no-fail-fast -- --skip integration_tests::e2e_tests::test_dependencies --nocapture --include-ignored
 
 .PHONY: test-sdk-go
 test-sdk-go:

tests/http/keyring.toml

@@ -0,0 +1,7 @@
+version = "1.0"
+
+[[key]]
+label = "Test<[email protected]>"
+roles = ["creator"]
+key = "HfXxdRvgUWEE0f36EIa8+njPJVoMvmF6/gO/T19aV90="
+labelSignature = "En2GtxiLbzAIoFu2zQ5HWXwck5lONq/ALYGt8RQYUDNpStk23JcaN/Gx9zh9oEJGnVeDwHLNj9/Cql6j23O1Cw=="

tests/http/secret_keys.toml

@@ -0,0 +1,6 @@
+version = "1.0"
+
+[[key]]
+label = "Test<[email protected]>"
+keypair = "O6QdMC7mvxepvqDIXtj9b66ooMf4Mlz4Mmz65Em2Q8Ed9fF1G+BRYQTR/foQhrz6eM8lWgy+YXr+A79PX1pX3Q=="
+roles = ["creator"]

tests/integration.rs

@@ -46,6 +46,9 @@ mod integration_tests {
         const BINDLE_SERVER_BASIC_AUTH_HTPASSWD_FILE: &str = "tests/http/htpasswd";
         const BINDLE_SERVER_BASIC_AUTH_USER: &str = "bindle-user";
         const BINDLE_SERVER_BASIC_AUTH_PASSWORD: &str = "topsecret";
+        const BINDLE_SECRET_FILE: &str = "tests/http/secret_keys.toml";
+        const BINDLE_KEYRING_FILE: &str = "tests/http/keyring.toml";
+        const BINDLE_LABEL: &str = "\"Test<[email protected]>\"";
 
         const HIPPO_BASIC_AUTH_USER: &str = "hippo-user";
         const HIPPO_BASIC_AUTH_PASSWORD: &str = "topsecret";
@@ -85,6 +88,12 @@ mod integration_tests {
                     ),
                     "--bindle-server",
                     &b.url,
+                    "--bindle-secret-file",
+                    BINDLE_SECRET_FILE,
+                    "--bindle-keyring-file",
+                    BINDLE_KEYRING_FILE,
+                    "--bindle-label",
+                    BINDLE_LABEL,
                 ],
                 None,
             )?;
@@ -125,6 +134,12 @@ mod integration_tests {
                     BINDLE_SERVER_BASIC_AUTH_USER,
                     "--bindle-password",
                     BINDLE_SERVER_BASIC_AUTH_PASSWORD,
+                    "--bindle-secret-file",
+                    BINDLE_SECRET_FILE,
+                    "--bindle-keyring-file",
+                    BINDLE_KEYRING_FILE,
+                    "--bindle-label",
+                    BINDLE_LABEL,
                 ],
                 None,
             )?;
@@ -161,6 +176,12 @@ mod integration_tests {
                     ),
                     "--bindle-server",
                     &b.url,
+                    "--bindle-secret-file",
+                    BINDLE_SECRET_FILE,
+                    "--bindle-keyring-file",
+                    BINDLE_KEYRING_FILE,
+                    "--bindle-label",
+                    BINDLE_LABEL,
                 ],
                 None,
             )?;
@@ -205,6 +226,12 @@ mod integration_tests {
                     ),
                     "--bindle-server",
                     &b.url,
+                    "--bindle-secret-file",
+                    BINDLE_SECRET_FILE,
+                    "--bindle-keyring-file",
+                    BINDLE_KEYRING_FILE,
+                    "--bindle-label",
+                    BINDLE_LABEL,
                 ],
                 None,
             )?;
@@ -259,6 +286,12 @@ mod integration_tests {
                     ),
                     "--bindle-server",
                     &b.url,
+                    "--bindle-secret-file",
+                    BINDLE_SECRET_FILE,
+                    "--bindle-keyring-file",
+                    BINDLE_KEYRING_FILE,
+                    "--bindle-label",
+                    BINDLE_LABEL,
                 ],
                 None,
             )?;
@@ -311,6 +344,12 @@ mod integration_tests {
                     HIPPO_BASIC_AUTH_USER,
                     "--hippo-password",
                     HIPPO_BASIC_AUTH_PASSWORD,
+                    "--bindle-secret-file",
+                    BINDLE_SECRET_FILE,
+                    "--bindle-keyring-file",
+                    BINDLE_KEYRING_FILE,
+                    "--bindle-label",
+                    BINDLE_LABEL,
                 ],
                 None,
             )?;
@@ -389,6 +428,8 @@ mod integration_tests {
                                 server_cache.path().to_string_lossy().to_string().as_str(),
                                 "-i",
                                 address.as_str(),
+                                "--keyring",
+                                BINDLE_KEYRING_FILE,
                             ],
                             auth_args.as_slice(),
                         ]