fix gitcredential pagination bug, add initial_manage_principal to sco…

…pe params
mach-kernel · Jul 16, 2024 · 794bdd8 · 794bdd8
1 parent 0907816
commit 794bdd8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/databricks-kube/src/crds/databricks_secret_scope.rs b/databricks-kube/src/crds/databricks_secret_scope.rs
@@ -26,6 +26,7 @@ use crate::{error::DatabricksKubeError, traits::remote_api_resource::RemoteAPIRe
 )]
 pub struct DatabricksSecretScopeSpec {
     pub scope: WorkspaceSecretScope,
+    pub initial_manage_principal: Option<String>,
 }
 
 // API -> CRD
@@ -39,7 +40,7 @@ impl From<WorkspaceSecretScope> for DatabricksSecretScope {
                 .as_secs()
         ));
 
-        Self::new(&k8s_name, DatabricksSecretScopeSpec { scope })
+        Self::new(&k8s_name, DatabricksSecretScopeSpec { scope, initial_manage_principal: None })
     }
 }
 
@@ -99,6 +100,7 @@ impl RemoteAPIResource<WorkspaceSecretScope> for DatabricksSecretScope {
             // Endpoint has no response value
             secret_api::create_scope(&config, Some(WorkspaceCreateScope {
                 scope: scope.name.unwrap(),
+                initial_manage_principal: self.spec().initial_manage_principal.clone(),
                 ..Default::default()
             })).await?;
 

diff --git a/databricks-kube/src/crds/git_credential.rs b/databricks-kube/src/crds/git_credential.rs
@@ -81,7 +81,7 @@ impl RemoteAPIResource<APICredential> for GitCredential {
         try_stream! {
             let config = APICredential::get_rest_config(context.clone()).await.unwrap();
 
-            while let GetCredentialsResponse {
+            if let GetCredentialsResponse {
                 credentials,
                 ..
             } = default_api::get_git_credential_list(&config).await? {