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

Rename vaultIdentifier and itemIdentifier for more clarity

Browse Source
This commit is contained in:
Volodymyr Zotov
2025-06-17 11:16:57 -05:00
parent 458ed24ca3
commit ac646ec56c
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/onepassword/items.go
View File

@@ -13,18 +13,18 @@ import (
var logger = logf.Log.WithName("retrieve_item") var logger = logf.Log.WithName("retrieve_item")
func GetOnePasswordItemByPath(opClient opclient.Client, path string) (*model.Item, error) { func GetOnePasswordItemByPath(opClient opclient.Client, path string) (*model.Item, error) {
vaultIdentifier, itemIdentifier, err := ParseVaultAndItemFromPath(path) vaultNameOrID, itemNameOrID, err := ParseVaultAndItemFromPath(path)
if err != nil { if err != nil {
return nil, err return nil, err
} }
vaultID, err := getVaultID(opClient, vaultIdentifier) vaultID, err := getVaultID(opClient, vaultNameOrID)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to 'getVaultID' for vaultIdentifier='%s': %w", vaultIdentifier, err) return nil, fmt.Errorf("failed to 'getVaultID' for vaultNameOrID='%s': %w", vaultNameOrID, err)
} }
itemID, err := getItemID(opClient, vaultID, itemIdentifier) itemID, err := getItemID(opClient, vaultID, itemNameOrID)
if err != nil { if err != nil {
return nil, fmt.Errorf("faild to 'getItemID' for vaultID='%s' and itemIdentifier='%s': %w", vaultID, itemIdentifier, err) return nil, fmt.Errorf("faild to 'getItemID' for vaultID='%s' and itemNameOrID='%s': %w", vaultID, itemNameOrID, err)
} }
item, err := opClient.GetItemByID(vaultID, itemID) item, err := opClient.GetItemByID(vaultID, itemID)
@@ -50,15 +50,15 @@ func ParseVaultAndItemFromPath(path string) (string, string, error) {
return "", "", fmt.Errorf("%q is not an acceptable path for One Password item. Must be of the format: `vaults/{vault_id}/items/{item_id}`", path) return "", "", fmt.Errorf("%q is not an acceptable path for One Password item. Must be of the format: `vaults/{vault_id}/items/{item_id}`", path)
} }
func getVaultID(client opclient.Client, vaultIdentifier string) (string, error) { func getVaultID(client opclient.Client, vaultNameOrID string) (string, error) {
if !IsValidClientUUID(vaultIdentifier) { if !IsValidClientUUID(vaultNameOrID) {
vaults, err := client.GetVaultsByTitle(vaultIdentifier) vaults, err := client.GetVaultsByTitle(vaultNameOrID)
if err != nil { if err != nil {
return "", err return "", err
} }
if len(vaults) == 0 { if len(vaults) == 0 {
return "", fmt.Errorf("No vaults found with identifier %q", vaultIdentifier) return "", fmt.Errorf("No vaults found with identifier %q", vaultNameOrID)
} }
oldestVault := vaults[0] oldestVault := vaults[0]
@@ -68,22 +68,22 @@ func getVaultID(client opclient.Client, vaultIdentifier string) (string, error)
oldestVault = returnedVault oldestVault = returnedVault
} }
} }
logger.Info(fmt.Sprintf("%v 1Password vaults found with the title %q. Will use vault %q as it is the oldest.", len(vaults), vaultIdentifier, oldestVault.ID)) logger.Info(fmt.Sprintf("%v 1Password vaults found with the title %q. Will use vault %q as it is the oldest.", len(vaults), vaultNameOrID, oldestVault.ID))
} }
vaultIdentifier = oldestVault.ID vaultNameOrID = oldestVault.ID
} }
return vaultIdentifier, nil return vaultNameOrID, nil
} }
func getItemID(client opclient.Client, vaultId, itemIdentifier string) (string, error) { func getItemID(client opclient.Client, vaultId, itemNameOrID string) (string, error) {
if !IsValidClientUUID(itemIdentifier) { if !IsValidClientUUID(itemNameOrID) {
items, err := client.GetItemsByTitle(vaultId, itemIdentifier) items, err := client.GetItemsByTitle(vaultId, itemNameOrID)
if err != nil { if err != nil {
return "", err return "", err
} }
if len(items) == 0 { if len(items) == 0 {
return "", fmt.Errorf("No items found with identifier %q", itemIdentifier) return "", fmt.Errorf("No items found with identifier %q", itemNameOrID)
} }
oldestItem := items[0] oldestItem := items[0]
@@ -93,9 +93,9 @@ func getItemID(client opclient.Client, vaultId, itemIdentifier string) (string,
oldestItem = returnedItem oldestItem = returnedItem
} }
} }
logger.Info(fmt.Sprintf("%v 1Password items found with the title %q. Will use item %q as it is the oldest.", len(items), itemIdentifier, oldestItem.ID)) logger.Info(fmt.Sprintf("%v 1Password items found with the title %q. Will use item %q as it is the oldest.", len(items), itemNameOrID, oldestItem.ID))
} }
itemIdentifier = oldestItem.ID itemNameOrID = oldestItem.ID
} }
return itemIdentifier, nil return itemNameOrID, nil
} }