Просмотр исходного кода

Changed err to nil when pushing same secret

William Young 3 лет назад
Родитель
Сommit
af04135568
2 измененных файлов с 5 добавлено и 4 удалено
  1. 1 1
      pkg/provider/vault/vault.go
  2. 4 3
      pkg/provider/vault/vault_test.go

+ 1 - 1
pkg/provider/vault/vault.go

@@ -377,7 +377,7 @@ func (v *client) SetSecret(ctx context.Context, value []byte, remoteRef esv1beta
 	pushSecretValue := fmt.Sprintf("%v", secretToPush)
 	pushSecretValue := fmt.Sprintf("%v", secretToPush)
 
 
 	if vaultSecretValue == pushSecretValue {
 	if vaultSecretValue == pushSecretValue {
-		return errors.New("cannot push - secret already exists")
+		return nil
 	}
 	}
 
 
 	// If error is nil this will error out
 	// If error is nil this will error out

+ 4 - 3
pkg/provider/vault/vault_test.go

@@ -1455,8 +1455,8 @@ func TestSetSecretUpdate(t *testing.T) {
 			Path: &path,
 			Path: &path,
 		},
 		},
 		logical: fake.Logical{
 		logical: fake.Logical{
-			WriteWithContextFn:        fake.NewWriteWithContextFn(secretData, fmt.Errorf("error")),
-			ReadWithDataWithContextFn: fake.NewReadWithContextFn(secretData, fmt.Errorf("error can't read data")),
+			WriteWithContextFn:        fake.NewWriteWithContextFn(secretData, nil),
+			ReadWithDataWithContextFn: fake.NewReadWithContextFn(secretData, nil),
 		},
 		},
 	}
 	}
 	ref := fakeRef{key: "I'm a key"}
 	ref := fakeRef{key: "I'm a key"}
@@ -1468,10 +1468,11 @@ func TestSetSecretUpdate(t *testing.T) {
 }
 }
 
 
 // Above test pushing same exact secret twice.
 // Above test pushing same exact secret twice.
+// It will also
 // Next test pushing a secret then pushing again with same key and different value
 // Next test pushing a secret then pushing again with same key and different value
 // Test if secret is managed by eso
 // Test if secret is managed by eso
 
 
-// // counterfeiter helper methods.
+// counterfeiter helper methods.
 // func newClient() *fakes.VaultClient {
 // func newClient() *fakes.VaultClient {
 // 	return new(fakes.VaultClient)
 // 	return new(fakes.VaultClient)
 // }
 // }