From e276ca1148e1cdebd154c957930ba64ced7fa51f Mon Sep 17 00:00:00 2001 From: Eddy Filip Date: Tue, 13 Sep 2022 15:57:53 +0300 Subject: [PATCH] Clean test code --- .../kubernetes_secrets_builder_test.go | 14 +++++--------- pkg/onepassword/containers_test.go | 4 ++-- pkg/onepassword/deployments_test.go | 12 ++++++------ pkg/onepassword/items.go | 1 + pkg/onepassword/secret_update_handler_test.go | 6 +++--- pkg/onepassword/volumes_test.go | 8 ++++---- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/pkg/kubernetessecrets/kubernetes_secrets_builder_test.go b/pkg/kubernetessecrets/kubernetes_secrets_builder_test.go index b24f26a..7ffc3f0 100644 --- a/pkg/kubernetessecrets/kubernetes_secrets_builder_test.go +++ b/pkg/kubernetessecrets/kubernetes_secrets_builder_test.go @@ -7,20 +7,16 @@ import ( "testing" "github.com/1Password/connect-sdk-go/onepassword" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" kubeValidate "k8s.io/apimachinery/pkg/util/validation" - "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client/fake" ) const restartDeploymentAnnotation = "false" -type k8s struct { - clientset kubernetes.Interface -} - func TestCreateKubernetesSecretFromOnePasswordItem(t *testing.T) { secretName := "test-secret-name" namespace := "test" @@ -31,7 +27,7 @@ func TestCreateKubernetesSecretFromOnePasswordItem(t *testing.T) { item.Vault.ID = "hfnjvi6aymbsnfc2xeeoheizda" item.ID = "h46bb3jddvay7nxopfhvlwg35q" - kubeClient := fake.NewFakeClient() + kubeClient := fake.NewClientBuilder().Build() secretLabels := map[string]string{} secretType := "" @@ -59,7 +55,7 @@ func TestKubernetesSecretFromOnePasswordItemOwnerReferences(t *testing.T) { item.Vault.ID = "hfnjvi6aymbsnfc2xeeoheizda" item.ID = "h46bb3jddvay7nxopfhvlwg35q" - kubeClient := fake.NewFakeClient() + kubeClient := fake.NewClientBuilder().Build() secretLabels := map[string]string{} secretType := "" @@ -104,7 +100,7 @@ func TestUpdateKubernetesSecretFromOnePasswordItem(t *testing.T) { item.Vault.ID = "hfnjvi6aymbsnfc2xeeoheizda" item.ID = "h46bb3jddvay7nxopfhvlwg35q" - kubeClient := fake.NewFakeClient() + kubeClient := fake.NewClientBuilder().Build() secretLabels := map[string]string{} secretType := "" @@ -219,7 +215,7 @@ func TestCreateKubernetesTLSSecretFromOnePasswordItem(t *testing.T) { item.Vault.ID = "hfnjvi6aymbsnfc2xeeoheizda" item.ID = "h46bb3jddvay7nxopfhvlwg35q" - kubeClient := fake.NewFakeClient() + kubeClient := fake.NewClientBuilder().Build() secretLabels := map[string]string{} secretType := "kubernetes.io/tls" diff --git a/pkg/onepassword/containers_test.go b/pkg/onepassword/containers_test.go index c6540f9..fd909d5 100644 --- a/pkg/onepassword/containers_test.go +++ b/pkg/onepassword/containers_test.go @@ -9,8 +9,8 @@ import ( func TestAreContainersUsingSecretsFromEnv(t *testing.T) { secretNamesToSearch := map[string]*corev1.Secret{ - "onepassword-database-secret": &corev1.Secret{}, - "onepassword-api-key": &corev1.Secret{}, + "onepassword-database-secret": {}, + "onepassword-api-key": {}, } containerSecretNames := []string{ diff --git a/pkg/onepassword/deployments_test.go b/pkg/onepassword/deployments_test.go index 45761fc..d2879a5 100644 --- a/pkg/onepassword/deployments_test.go +++ b/pkg/onepassword/deployments_test.go @@ -9,8 +9,8 @@ import ( func TestIsDeploymentUsingSecretsUsingVolumes(t *testing.T) { secretNamesToSearch := map[string]*corev1.Secret{ - "onepassword-database-secret": &corev1.Secret{}, - "onepassword-api-key": &corev1.Secret{}, + "onepassword-database-secret": {}, + "onepassword-api-key": {}, } volumeSecretNames := []string{ @@ -28,8 +28,8 @@ func TestIsDeploymentUsingSecretsUsingVolumes(t *testing.T) { func TestIsDeploymentUsingSecretsUsingContainers(t *testing.T) { secretNamesToSearch := map[string]*corev1.Secret{ - "onepassword-database-secret": &corev1.Secret{}, - "onepassword-api-key": &corev1.Secret{}, + "onepassword-database-secret": {}, + "onepassword-api-key": {}, } containerSecretNames := []string{ @@ -47,8 +47,8 @@ func TestIsDeploymentUsingSecretsUsingContainers(t *testing.T) { func TestIsDeploymentNotUSingSecrets(t *testing.T) { secretNamesToSearch := map[string]*corev1.Secret{ - "onepassword-database-secret": &corev1.Secret{}, - "onepassword-api-key": &corev1.Secret{}, + "onepassword-database-secret": {}, + "onepassword-api-key": {}, } deployment := &appsv1.Deployment{} diff --git a/pkg/onepassword/items.go b/pkg/onepassword/items.go index c022f5d..f608013 100644 --- a/pkg/onepassword/items.go +++ b/pkg/onepassword/items.go @@ -6,6 +6,7 @@ import ( "github.com/1Password/connect-sdk-go/connect" "github.com/1Password/connect-sdk-go/onepassword" + logf "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/pkg/onepassword/secret_update_handler_test.go b/pkg/onepassword/secret_update_handler_test.go index 717d032..68a06a3 100644 --- a/pkg/onepassword/secret_update_handler_test.go +++ b/pkg/onepassword/secret_update_handler_test.go @@ -800,10 +800,10 @@ func TestUpdateSecretHandler(t *testing.T) { } // Create a fake client to mock API calls. - cl := fake.NewFakeClientWithScheme(s, objs...) + cl := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).Build() opConnectClient := &mocks.TestClient{} - mocks.GetGetItemFunc = func(uuid string, vaultUUID string) (*onepassword.Item, error) { + mocks.DoGetItemFunc = func(uuid string, vaultUUID string) (*onepassword.Item, error) { item := onepassword.Item{} item.Fields = generateFields(testData.opItem["username"], testData.opItem["password"]) @@ -871,7 +871,7 @@ func TestIsUpdatedSecret(t *testing.T) { secretName := "test-secret" updatedSecrets := map[string]*corev1.Secret{ - "some_secret": &corev1.Secret{}, + "some_secret": {}, } assert.False(t, isUpdatedSecret(secretName, updatedSecrets)) diff --git a/pkg/onepassword/volumes_test.go b/pkg/onepassword/volumes_test.go index 00d109c..c00372d 100644 --- a/pkg/onepassword/volumes_test.go +++ b/pkg/onepassword/volumes_test.go @@ -8,8 +8,8 @@ import ( func TestAreVolmesUsingSecrets(t *testing.T) { secretNamesToSearch := map[string]*corev1.Secret{ - "onepassword-database-secret": &corev1.Secret{}, - "onepassword-api-key": &corev1.Secret{}, + "onepassword-database-secret": {}, + "onepassword-api-key": {}, } volumeSecretNames := []string{ @@ -27,8 +27,8 @@ func TestAreVolmesUsingSecrets(t *testing.T) { func TestAreVolumesNotUsingSecrets(t *testing.T) { secretNamesToSearch := map[string]*corev1.Secret{ - "onepassword-database-secret": &corev1.Secret{}, - "onepassword-api-key": &corev1.Secret{}, + "onepassword-database-secret": {}, + "onepassword-api-key": {}, } volumeSecretNames := []string{