From dbd7408fac9d33d38f95d63d337cc774a042a4db Mon Sep 17 00:00:00 2001 From: Volodymyr Zotov Date: Thu, 10 Jul 2025 15:40:53 -0500 Subject: [PATCH] Update errors text --- pkg/onepassword/client/connect/connect.go | 10 +++++----- pkg/onepassword/client/sdk/sdk.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/onepassword/client/connect/connect.go b/pkg/onepassword/client/connect/connect.go index fc967a5..0c77a3d 100644 --- a/pkg/onepassword/client/connect/connect.go +++ b/pkg/onepassword/client/connect/connect.go @@ -32,7 +32,7 @@ func NewClient(config Config) *Connect { func (c *Connect) GetItemByID(ctx context.Context, vaultID, itemID string) (*model.Item, error) { connectItem, err := c.client.GetItemByUUID(itemID, vaultID) if err != nil { - return nil, fmt.Errorf("GetItemByID 1Password Connect error: %w", err) + return nil, fmt.Errorf("failed to GetItemByID using 1Password Connect: %w", err) } var item model.Item @@ -44,7 +44,7 @@ func (c *Connect) GetItemsByTitle(ctx context.Context, vaultID, itemTitle string // Get all items in the vault with the specified title connectItems, err := c.client.GetItemsByTitle(itemTitle, vaultID) if err != nil { - return nil, fmt.Errorf("GetItemsByTitle 1Password Connect error: %w", err) + return nil, fmt.Errorf("failed to GetItemsByTitle using 1Password Connect: %w", err) } items := make([]model.Item, len(connectItems)) @@ -79,16 +79,16 @@ func (c *Connect) GetFileContent(ctx context.Context, vaultID, itemID, fileID st continue } - return nil, fmt.Errorf("GetFileContent 1Password Connect error: %w", err) + return nil, fmt.Errorf("failed to GetFileContent using 1Password Connect: %w", err) } - return nil, fmt.Errorf("GetFileContent failed after retries: %w", lastErr) + return nil, fmt.Errorf("failed to GetFileContent using 1Password Connect after %d retries: %w", maxRetries, lastErr) } func (c *Connect) GetVaultsByTitle(ctx context.Context, vaultQuery string) ([]model.Vault, error) { connectVaults, err := c.client.GetVaultsByTitle(vaultQuery) if err != nil { - return nil, fmt.Errorf("GetVaultsByTitle 1Password Connect error: %w", err) + return nil, fmt.Errorf("failed to GetVaultsByTitle using 1Password Connect: %w", err) } var vaults []model.Vault diff --git a/pkg/onepassword/client/sdk/sdk.go b/pkg/onepassword/client/sdk/sdk.go index 6c90700..997f67c 100644 --- a/pkg/onepassword/client/sdk/sdk.go +++ b/pkg/onepassword/client/sdk/sdk.go @@ -37,7 +37,7 @@ func NewClient(ctx context.Context, config Config) (*SDK, error) { func (s *SDK) GetItemByID(ctx context.Context, vaultID, itemID string) (*model.Item, error) { sdkItem, err := s.client.Items().Get(ctx, vaultID, itemID) if err != nil { - return nil, fmt.Errorf("1Password sdk error: %w", err) + return nil, fmt.Errorf("failed to GetItemsByTitle using 1Password SDK: %w", err) } var item model.Item @@ -49,7 +49,7 @@ func (s *SDK) GetItemsByTitle(ctx context.Context, vaultID, itemTitle string) ([ // Get all items in the vault sdkItems, err := s.client.Items().List(ctx, vaultID) if err != nil { - return nil, fmt.Errorf("1Password sdk error: %w", err) + return nil, fmt.Errorf("failed to GetItemsByTitle using 1Password SDK: %w", err) } // Filter items by title @@ -70,7 +70,7 @@ func (s *SDK) GetFileContent(ctx context.Context, vaultID, itemID, fileID string ID: fileID, }) if err != nil { - return nil, fmt.Errorf("1Password sdk error: %w", err) + return nil, fmt.Errorf("failed to GetFileContent using 1Password SDK: %w", err) } return bytes, nil @@ -80,7 +80,7 @@ func (s *SDK) GetVaultsByTitle(ctx context.Context, title string) ([]model.Vault // List all vaults sdkVaults, err := s.client.Vaults().List(ctx) if err != nil { - return nil, fmt.Errorf("1Password sdk error: %w", err) + return nil, fmt.Errorf("failed to GetVaultsByTitle using 1Password SDK: %w", err) } // Filter vaults by title