1Password/onepassword-operator
1
0
Fork 0
mirror of https://github.com/1Password/onepassword-operator.git synced 2025-10-22 07:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update errors text

Browse Source
This commit is contained in:
Volodymyr Zotov
2025-07-10 15:40:53 -05:00
parent 6ef0da2d17
commit dbd7408fac
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/onepassword/client/connect/connect.go
View File

@@ -32,7 +32,7 @@ func NewClient(config Config) *Connect {
func (c *Connect) GetItemByID(ctx context.Context, vaultID, itemID string) (*model.Item, error) { func (c *Connect) GetItemByID(ctx context.Context, vaultID, itemID string) (*model.Item, error) {
connectItem, err := c.client.GetItemByUUID(itemID, vaultID) connectItem, err := c.client.GetItemByUUID(itemID, vaultID)
if err != nil { 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 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 // Get all items in the vault with the specified title
connectItems, err := c.client.GetItemsByTitle(itemTitle, vaultID) connectItems, err := c.client.GetItemsByTitle(itemTitle, vaultID)
if err != nil { 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)) items := make([]model.Item, len(connectItems))
@@ -79,16 +79,16 @@ func (c *Connect) GetFileContent(ctx context.Context, vaultID, itemID, fileID st
continue 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) { func (c *Connect) GetVaultsByTitle(ctx context.Context, vaultQuery string) ([]model.Vault, error) {
connectVaults, err := c.client.GetVaultsByTitle(vaultQuery) connectVaults, err := c.client.GetVaultsByTitle(vaultQuery)
if err != nil { 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 var vaults []model.Vault

8
pkg/onepassword/client/sdk/sdk.go
View File

@@ -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) { func (s *SDK) GetItemByID(ctx context.Context, vaultID, itemID string) (*model.Item, error) {
sdkItem, err := s.client.Items().Get(ctx, vaultID, itemID) sdkItem, err := s.client.Items().Get(ctx, vaultID, itemID)
if err != nil { 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 var item model.Item
@@ -49,7 +49,7 @@ func (s *SDK) GetItemsByTitle(ctx context.Context, vaultID, itemTitle string) ([
// Get all items in the vault // Get all items in the vault
sdkItems, err := s.client.Items().List(ctx, vaultID) sdkItems, err := s.client.Items().List(ctx, vaultID)
if err != nil { 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 // Filter items by title
@@ -70,7 +70,7 @@ func (s *SDK) GetFileContent(ctx context.Context, vaultID, itemID, fileID string
ID: fileID, ID: fileID,
}) })
if err != nil { 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 return bytes, nil
@@ -80,7 +80,7 @@ func (s *SDK) GetVaultsByTitle(ctx context.Context, title string) ([]model.Vault
// List all vaults // List all vaults
sdkVaults, err := s.client.Vaults().List(ctx) sdkVaults, err := s.client.Vaults().List(ctx)
if err != nil { 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 // Filter vaults by title