dev_admin_creds

Author: epompeii

tasks/test_api/src/parser/oci.rs

@@ -58,13 +58,26 @@ pub struct TaskOci {
 }
 
 impl TaskOci {
-    /// Create a `TaskOci` configured for smoke tests with the given API URL
+    /// Create a `TaskOci` configured for smoke tests with the given API URL and default credentials
     pub fn for_test(api_url: &str, admin: bool) -> Self {
         let (username, password) = if admin {
-            (TEST_ADMIN_USERNAME, TEST_ADMIN_API_TOKEN)
+            (
+                TEST_ADMIN_USERNAME.to_owned(),
+                TEST_ADMIN_API_TOKEN.to_owned(),
+            )
         } else {
-            (TEST_USERNAME, TEST_API_TOKEN)
+            (TEST_USERNAME.to_owned(), TEST_API_TOKEN.to_owned())
         };
+        Self::for_test_with_credentials(api_url, admin, username, password)
+    }
+
+    /// Create a `TaskOci` configured for smoke tests with custom credentials
+    pub fn for_test_with_credentials(
+        api_url: &str,
+        admin: bool,
+        username: String,
+        password: String,
+    ) -> Self {
         Self {
             api_url: api_url.to_owned(),
             namespace: "namespace".to_owned(),
@@ -75,8 +88,8 @@ impl TaskOci {
             output_dir: "./oci-conformance-results".to_owned(),
             spec_dir: "./distribution-spec".to_owned(),
             admin,
-            username: username.to_owned(),
-            password: password.to_owned(),
+            username,
+            password,
         }
     }
 }

tasks/test_api/src/task/test/smoke_test.rs

@@ -13,7 +13,10 @@ use bencher_json::{
 
 use crate::{
     API_VERSION,
-    parser::{TaskExamples, TaskOci, TaskSeedTest, TaskSmokeTest, TaskTestEnvironment},
+    parser::{
+        TEST_ADMIN_USERNAME, TaskExamples, TaskOci, TaskSeedTest, TaskSmokeTest,
+        TaskTestEnvironment,
+    },
     task::{
         oci::Oci,
         test::{examples::Examples, seed_test::SeedTest},
@@ -196,14 +199,19 @@ fn test(api_url: &Url, mock_setup: MockSetup) -> anyhow::Result<()> {
         MockSetup::BencherCloud { admin_token, token } => {
             let task = TaskSeedTest {
                 url: Some(api_url.clone()),
-                admin_token: Some(admin_token),
+                admin_token: Some(admin_token.clone()),
                 token: Some(token),
                 is_bencher_cloud: true,
             };
             SeedTest::try_from(task)?.exec()?;
 
-            // Run OCI conformance tests
-            let oci = Oci::try_from(TaskOci::for_test(api_url.as_ref(), true))?;
+            // Run OCI conformance tests with Bencher Cloud dev credentials
+            let oci = Oci::try_from(TaskOci::for_test_with_credentials(
+                api_url.as_ref(),
+                false,
+                TEST_ADMIN_USERNAME.to_owned(),
+                admin_token.to_string(),
+            ))?;
             oci.exec()?;
 
             Ok(())