Skip to content

Commit ac06f8d

Browse files
Add more logs and fix params order
1 parent 72511ed commit ac06f8d

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

pkg/onepassword/client/client.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package client
22

33
import (
44
"errors"
5+
"fmt"
56
"os"
67

78
"github.com/1Password/onepassword-operator/pkg/onepassword/client/connect"
@@ -28,6 +29,7 @@ func NewClient(integrationVersion string) (Client, error) {
2829
}
2930

3031
if serviceAccountToken != "" {
32+
fmt.Printf("Using Service Account Token")
3133
return sdk.NewClient(sdk.Config{
3234
ServiceAccountToken: serviceAccountToken,
3335
IntegrationName: "1password-operator",
@@ -36,6 +38,7 @@ func NewClient(integrationVersion string) (Client, error) {
3638
}
3739

3840
if connectHost != "" && connectToken != "" {
41+
fmt.Printf("Using Connect")
3942
return connect.NewClient(connect.Config{
4043
ConnectHost: connectHost,
4144
ConnectToken: connectToken,

pkg/onepassword/items.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ func GetOnePasswordItemByPath(opClient opclient.Client, path string) (*model.Ite
1919
}
2020
vaultID, err := getVaultID(opClient, vaultIdentifier)
2121
if err != nil {
22-
return nil, err
22+
return nil, fmt.Errorf("failed to 'getVaultID' for vaultIdentifier='%s': %w", vaultIdentifier, err)
2323
}
2424

2525
itemID, err := getItemID(opClient, vaultID, itemIdentifier)
2626
if err != nil {
27-
return nil, err
27+
return nil, fmt.Errorf("faild to 'getItemID' for vaultID='%s' and itemIdentifier='%s': %w", vaultID, itemIdentifier, err)
2828
}
2929

30-
item, err := opClient.GetItemByID(itemID, vaultID)
30+
item, err := opClient.GetItemByID(vaultID, itemID)
3131
if err != nil {
32-
return nil, err
32+
return nil, fmt.Errorf("faield to 'GetItemByID' for vaultID='%s' and itemID='%s': %w", vaultID, itemID, err)
3333
}
3434

3535
for _, file := range item.Files {
@@ -77,7 +77,7 @@ func getVaultID(client opclient.Client, vaultIdentifier string) (string, error)
7777

7878
func getItemID(client opclient.Client, vaultId, itemIdentifier string) (string, error) {
7979
if !IsValidClientUUID(itemIdentifier) {
80-
items, err := client.GetItemsByTitle(itemIdentifier, vaultId)
80+
items, err := client.GetItemsByTitle(vaultId, itemIdentifier)
8181
if err != nil {
8282
return "", err
8383
}

0 commit comments

Comments
 (0)