From 7b3db40be5e47cceff22c7f2e4208ce97ff9184e Mon Sep 17 00:00:00 2001 From: Yutong Sun Date: Wed, 7 Aug 2024 18:14:11 +0000 Subject: [PATCH 1/2] Fix lint warning for unexpected cfg - Another way to fix this is to specify mockall in the lints explicitly as unexpected cfg and treat it as warn instead of error. But we are using #[cfg(any(feature = "mockall", test))] in the rest of our code, so making this change for consistency. Signed-off-by: Yutong Sun --- apiserver/src/auth/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apiserver/src/auth/mod.rs b/apiserver/src/auth/mod.rs index 6d247890..eedcf0ad 100644 --- a/apiserver/src/auth/mod.rs +++ b/apiserver/src/auth/mod.rs @@ -6,5 +6,5 @@ pub use authorizor::{K8STokenAuthorizor, K8STokenReviewer, TokenAuthorizor}; pub use error::AuthorizationError; pub use middleware::TokenAuthMiddleware; -#[cfg(any(mockall, test))] +#[cfg(any(feature = "mockall", test))] pub use authorizor::mock; From f09027af5b8382e7b409cad8782fe44b80e2bc43 Mon Sep 17 00:00:00 2001 From: Yutong Sun Date: Wed, 7 Aug 2024 18:22:03 +0000 Subject: [PATCH 2/2] Fix clippy error for clippy::needless_borrows_for_generic_args Signed-off-by: Yutong Sun --- integ/src/nodegroup_provider.rs | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/integ/src/nodegroup_provider.rs b/integ/src/nodegroup_provider.rs index 1e6ee009..2a6a91af 100644 --- a/integ/src/nodegroup_provider.rs +++ b/integ/src/nodegroup_provider.rs @@ -96,7 +96,7 @@ pub async fn create_nodegroup( .launch_template( LaunchTemplateSpecification::builder() .id(&launch_template.launch_template_id) - .version(&launch_template.latest_version_number.to_string()) + .version(launch_template.latest_version_number.to_string()) .build(), ) .labels(LABEL_BRUPOP_INTERFACE_NAME, BRUPOP_INTERFACE_VERSION) @@ -257,61 +257,61 @@ async fn create_iam_instance_profile( let iam_instance_profile_name = format!("{}-{}", IAM_INSTANCE_PROFILE_NAME, nodegroup_name); let get_instance_profile_result = iam_client .get_instance_profile() - .instance_profile_name(&iam_instance_profile_name.clone()) + .instance_profile_name(iam_instance_profile_name.clone()) .send() .await; if instance_profile_exists(get_instance_profile_result) { - instance_profile_arn(iam_client, &iam_instance_profile_name.clone()).await + instance_profile_arn(iam_client, iam_instance_profile_name.as_str()).await } else { iam_client .create_role() - .role_name(&iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) .assume_role_policy_document(eks_role_policy_document(region)) .send() .await .context("Unable to create new role.")?; iam_client .attach_role_policy() - .role_name(&iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) .policy_arn(SSM_MANAGED_INSTANCE_CORE_ARN) .send() .await .context("Unable to attach AmazonSSM policy")?; iam_client .attach_role_policy() - .role_name(&iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) .policy_arn(EKS_WORKER_NODE_POLICY_ARN) .send() .await .context("Unable to attach AmazonEKSWorkerNode policy")?; iam_client .attach_role_policy() - .role_name(&iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) .policy_arn(EKS_CNI_ARN) .send() .await .context("Unable to attach AmazonEKS CNI policy")?; iam_client .attach_role_policy() - .role_name(&iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) .policy_arn(EC2_CONTAINER_REGISTRY_ARN) .send() .await .context("Unable to attach AmazonEC2ContainerRegistry policy")?; iam_client .create_instance_profile() - .instance_profile_name(&iam_instance_profile_name.clone()) + .instance_profile_name(iam_instance_profile_name.clone()) .send() .await .context("Unable to create instance profile")?; iam_client .add_role_to_instance_profile() - .instance_profile_name(&iam_instance_profile_name.clone()) - .role_name(&iam_instance_profile_name.clone()) + .instance_profile_name(iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) .send() .await .context("Unable to add role to instance profile")?; - instance_profile_arn(iam_client, &iam_instance_profile_name.clone()).await + instance_profile_arn(iam_client, iam_instance_profile_name.as_str()).await } } @@ -322,48 +322,48 @@ async fn delete_iam_instance_profile( let iam_instance_profile_name = format!("{}-{}", IAM_INSTANCE_PROFILE_NAME, nodegroup_name); iam_client .remove_role_from_instance_profile() - .role_name(&iam_instance_profile_name.clone()) - .instance_profile_name(&iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) + .instance_profile_name(iam_instance_profile_name.clone()) .send() .await .context("Unable to remove roles from instance profile.")?; iam_client .detach_role_policy() - .role_name(&iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) .policy_arn(SSM_MANAGED_INSTANCE_CORE_ARN) .send() .await .context("Unable to detach AmazonSSM policy")?; iam_client .detach_role_policy() - .role_name(&iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) .policy_arn(EKS_WORKER_NODE_POLICY_ARN) .send() .await .context("Unable to detach AmazonEKSWorkerNode policy")?; iam_client .detach_role_policy() - .role_name(&iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) .policy_arn(EKS_CNI_ARN) .send() .await .context("Unable to detach AmazonEKS CNI policy")?; iam_client .detach_role_policy() - .role_name(&iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) .policy_arn(EC2_CONTAINER_REGISTRY_ARN) .send() .await .context("Unable to detach AmazonEC2ContainerRegistry policy")?; iam_client .delete_instance_profile() - .instance_profile_name(&iam_instance_profile_name.clone()) + .instance_profile_name(iam_instance_profile_name.clone()) .send() .await .context("Unable to create instance profile")?; iam_client .delete_role() - .role_name(&iam_instance_profile_name.clone()) + .role_name(iam_instance_profile_name.clone()) .send() .await .context("Unable to delete role.")?;