address clippy and yamllint feedback

stackabletech · Aug 6, 2024 · f6b5dcb · f6b5dcb
1 parent 5a6ad47
commit f6b5dcb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/rust/operator-binary/src/config.rs b/rust/operator-binary/src/config.rs
@@ -607,7 +607,7 @@ pub fn build_nifi_properties(
         let scopes = provider.scopes.join(",");
         properties.insert(
             "nifi.security.user.oidc.additional.scopes".to_string(),
-            format!("{scopes}").to_string(),
+            scopes.to_string(),
         );
 
         properties.insert(

diff --git a/rust/operator-binary/src/security/authentication.rs b/rust/operator-binary/src/security/authentication.rs
@@ -94,8 +94,8 @@ impl NifiAuthenticationConfig {
                 "#});
             }
             Self::Ldap { provider } => {
-                login_identity_provider_xml.push_str(&get_ldap_login_identity_provider(&provider)?);
-                authorizers_xml.push_str(&get_ldap_authorizer(&provider)?);
+                login_identity_provider_xml.push_str(&get_ldap_login_identity_provider(provider)?);
+                authorizers_xml.push_str(&get_ldap_authorizer(provider)?);
             }
         }
 

diff --git a/rust/operator-binary/src/security/oidc.rs b/rust/operator-binary/src/security/oidc.rs
@@ -51,13 +51,13 @@ pub(crate) async fn check_or_generate_oidc_admin_password(
                 .into_keys()
                 .collect::<HashSet<_>>();
             if keys.contains(STACKABLE_OIDC_ADMIN_PASSWORD_KEY) {
-                return Ok(false);
+                Ok(false)
             } else {
                 return OidcAdminPasswordKeyMissingSnafu {
                     name: build_oidc_admin_password_secret_name(nifi),
                     namespace,
                 }
-                .fail()?;
+                .fail();
             }
         }
         None => {

diff --git a/tests/templates/kuttl/oidc/12-assert.yaml b/tests/templates/kuttl/oidc/12-assert.yaml
@@ -16,4 +16,4 @@ kind: Job
 metadata:
   name: test-nifi-create-reporting-task-1-27-0
 status:
-  succeeded: 1
+  succeeded: 1