mirror of
https://github.com/1Password/onepassword-operator.git
synced 2025-10-21 15:08:06 +00:00

* Add missing improvements from Operator SDK 1.34.1 These were not mentioned in the upgrade documentation for version 1.34.x (https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.34.0/), but I've found them by compating the release with the previous one (https://github.com/operator-framework/operator-sdk/compare/v1.33.0...v1.34.1). * Upgrade to Operator SDK 1.36.0 Source of upgrade steps: https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.36.0/ Key differences: - Go packages `k8s.io/*` are already at a version higher than the one in the upgrade. - `ENVTEST_K8S_VERSION` is at a version higher than the one in the upgrade - We didn't have the golangci-lint make command before, thus we only needed to add things. * Upgrade to Operator SDK 1.38.0 Source of upgrade steps: https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.38.0/ * Upgrade to Operator SDK 1.39.0 Source of upgrade steps: https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.39.0/ * Upgrade to Operator SDK 1.40.0 Source of upgrade steps: https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.40.0/ I didn't do the "Add app.kubernetes.io/name label to your manifests" since it seems that we have it already, and it's customized. * Address lint errors * Update golangci-lint version used to support Go 1.24 * Improve workflows - Make workflow targets more specific. - Make build workflow only build (i.e. remove test part of it). - Rearrange steps and improve naming for build workflow. * Add back deleted test Initially the test has been removed due to lint saying that it was duplicate code, but it falsely errored since the values are different. * Improve code and add missing upgrade pieces * Upgrade to Operator SDK 1.41.1 Source of upgrade steps: https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.41.0/ Upgrading to 1.41.1 from 1.40.0 doesn't have any migration steps. Key elements: - Upgrade to golangci-lint v2 - Made the manifests using the updated controller tools * Address linter errors golanci-lint v2 seems to be more robust than the previous one, which is beneficial. Thus, we address the linter errors thrown by v2 and improve our code even further. * Add Makefile improvements These were brought in by comparing the Makefile of a freshly created operator using the latest operator-sdk with ours. * Add missing default kustomization for 1.40.0 upgrade * Bring default kustomization to latest version This is done by putting the file's content from a newly-generated operator. * Switch metrics-bind-address default value back to 8080 This ensures that the upgrade is backwards-compatible. * Add webhook-related scaffolding This enables us to easily add support for webhooks by running `operator-sdk create webhook` whenever we want to add them. * Fix typo
105 lines
3.0 KiB
Go
105 lines
3.0 KiB
Go
package connect
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/1Password/connect-sdk-go/connect"
|
|
"github.com/1Password/connect-sdk-go/onepassword"
|
|
"github.com/1Password/onepassword-operator/pkg/onepassword/model"
|
|
)
|
|
|
|
// Config holds the configuration for the Connect client.
|
|
type Config struct {
|
|
ConnectHost string
|
|
ConnectToken string
|
|
}
|
|
|
|
// Connect is a client for interacting with 1Password using the Connect API.
|
|
type Connect struct {
|
|
client connect.Client
|
|
}
|
|
|
|
// NewClient creates a new Connect client using provided configuration.
|
|
func NewClient(config Config) *Connect {
|
|
return &Connect{
|
|
client: connect.NewClient(config.ConnectHost, config.ConnectToken),
|
|
}
|
|
}
|
|
|
|
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("failed to GetItemByID using 1Password Connect: %w", err)
|
|
}
|
|
|
|
var item model.Item
|
|
item.FromConnectItem(connectItem)
|
|
return &item, nil
|
|
}
|
|
|
|
func (c *Connect) GetItemsByTitle(ctx context.Context, vaultID, itemTitle string) ([]model.Item, error) {
|
|
// Get all items in the vault with the specified title
|
|
connectItems, err := c.client.GetItemsByTitle(itemTitle, vaultID)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to GetItemsByTitle using 1Password Connect: %w", err)
|
|
}
|
|
|
|
items := make([]model.Item, len(connectItems))
|
|
for i, connectItem := range connectItems {
|
|
var item model.Item
|
|
item.FromConnectItem(&connectItem)
|
|
items[i] = item
|
|
}
|
|
|
|
return items, nil
|
|
}
|
|
|
|
// GetFileContent retrieves the content of a file from a 1Password item.
|
|
// As the Connect has a delay when synchronizing files and returns a 500 error in this case,
|
|
// this function implements a retry mechanism.
|
|
func (c *Connect) GetFileContent(ctx context.Context, vaultID, itemID, fileID string) ([]byte, error) {
|
|
const maxRetries = 5
|
|
const delay = 1 * time.Second
|
|
|
|
var lastErr error
|
|
for i := 0; i < maxRetries; i++ {
|
|
bytes, err := c.client.GetFileContent(&onepassword.File{
|
|
ContentPath: fmt.Sprintf("/v1/vaults/%s/items/%s/files/%s/content", vaultID, itemID, fileID),
|
|
})
|
|
if err == nil {
|
|
return bytes, nil
|
|
}
|
|
|
|
var connectErr *onepassword.Error
|
|
if errors.As(err, &connectErr) && connectErr.StatusCode == 500 {
|
|
lastErr = err
|
|
time.Sleep(delay)
|
|
continue
|
|
}
|
|
|
|
return nil, fmt.Errorf("failed to GetFileContent using 1Password Connect: %w", err)
|
|
}
|
|
|
|
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("failed to GetVaultsByTitle using 1Password Connect: %w", err)
|
|
}
|
|
|
|
var vaults []model.Vault
|
|
for _, connectVault := range connectVaults {
|
|
if vaultQuery == connectVault.Name {
|
|
var vault model.Vault
|
|
vault.FromConnectVault(&connectVault)
|
|
vaults = append(vaults, vault)
|
|
}
|
|
}
|
|
return vaults, nil
|
|
}
|