From ac06f8db137f547249c8bacfda4cf83aa987a533 Mon Sep 17 00:00:00 2001 From: Volodymyr Zotov Date: Fri, 6 Jun 2025 16:12:25 -0500 Subject: [PATCH] Add more logs and fix params order --- pkg/onepassword/client/client.go | 3 +++ pkg/onepassword/items.go | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/onepassword/client/client.go b/pkg/onepassword/client/client.go index 1b0cd74..7147381 100644 --- a/pkg/onepassword/client/client.go +++ b/pkg/onepassword/client/client.go @@ -2,6 +2,7 @@ package client import ( "errors" + "fmt" "os" "github.com/1Password/onepassword-operator/pkg/onepassword/client/connect" @@ -28,6 +29,7 @@ func NewClient(integrationVersion string) (Client, error) { } if serviceAccountToken != "" { + fmt.Printf("Using Service Account Token") return sdk.NewClient(sdk.Config{ ServiceAccountToken: serviceAccountToken, IntegrationName: "1password-operator", @@ -36,6 +38,7 @@ func NewClient(integrationVersion string) (Client, error) { } if connectHost != "" && connectToken != "" { + fmt.Printf("Using Connect") return connect.NewClient(connect.Config{ ConnectHost: connectHost, ConnectToken: connectToken, diff --git a/pkg/onepassword/items.go b/pkg/onepassword/items.go index 1ed0934..eb121a3 100644 --- a/pkg/onepassword/items.go +++ b/pkg/onepassword/items.go @@ -19,17 +19,17 @@ func GetOnePasswordItemByPath(opClient opclient.Client, path string) (*model.Ite } vaultID, err := getVaultID(opClient, vaultIdentifier) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to 'getVaultID' for vaultIdentifier='%s': %w", vaultIdentifier, err) } itemID, err := getItemID(opClient, vaultID, itemIdentifier) if err != nil { - return nil, err + return nil, fmt.Errorf("faild to 'getItemID' for vaultID='%s' and itemIdentifier='%s': %w", vaultID, itemIdentifier, err) } - item, err := opClient.GetItemByID(itemID, vaultID) + item, err := opClient.GetItemByID(vaultID, itemID) if err != nil { - return nil, err + return nil, fmt.Errorf("faield to 'GetItemByID' for vaultID='%s' and itemID='%s': %w", vaultID, itemID, err) } for _, file := range item.Files { @@ -77,7 +77,7 @@ func getVaultID(client opclient.Client, vaultIdentifier string) (string, error) func getItemID(client opclient.Client, vaultId, itemIdentifier string) (string, error) { if !IsValidClientUUID(itemIdentifier) { - items, err := client.GetItemsByTitle(itemIdentifier, vaultId) + items, err := client.GetItemsByTitle(vaultId, itemIdentifier) if err != nil { return "", err }