Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.

Commit c2b6b1e

Browse files
committed
Do not check for item existence if vault doesn't exist
1 parent 517ece6 commit c2b6b1e

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

internals/secrethub/migrate.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -497,20 +497,24 @@ func (cmd *MigrateApplyCommand) Run() error {
497497
i := 1
498498
for _, vault := range plan.vaults {
499499
fmt.Fprintf(cmd.io.Output(), "[%d/%d] Checking vault: %s\n", i, len(plan.vaults), vault.Name)
500-
exists, err := onepassword.ExistsVault(vault.Name)
500+
vaultExists, err := onepassword.ExistsVault(vault.Name)
501501
if err != nil {
502502
return fmt.Errorf("could not check vault existence: %s", err)
503503
}
504-
if !exists {
504+
if !vaultExists {
505505
changes = append(changes, vaultCreation{vault: vault.Name})
506506
}
507507

508508
for _, item := range vault.Items {
509-
exists, err := onepassword.ExistsItemInVault(vault.Name, item.Name)
510-
if err != nil {
511-
return err
509+
itemExists := false
510+
if vaultExists {
511+
itemExists, err = onepassword.ExistsItemInVault(vault.Name, item.Name)
512+
if err != nil {
513+
return err
514+
}
512515
}
513-
if !exists {
516+
517+
if !itemExists {
514518
template := onepassword.NewItemTemplate()
515519
for _, field := range item.Fields {
516520
value, err := client.Secrets().ReadString(strings.TrimPrefix(field.Reference, secretReferencePrefix))

0 commit comments

Comments
 (0)