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
111 lines
3.1 KiB
Go
111 lines
3.1 KiB
Go
package testing
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/1Password/connect-sdk-go/onepassword"
|
|
"github.com/1Password/onepassword-operator/pkg/onepassword/model"
|
|
sdk "github.com/1password/onepassword-sdk-go"
|
|
)
|
|
|
|
func CreateConnectItem() *onepassword.Item {
|
|
return &onepassword.Item{
|
|
ID: "test-id",
|
|
Vault: onepassword.ItemVault{ID: "test-vault-id"},
|
|
Version: 1,
|
|
Tags: []string{"tag1", "tag2"},
|
|
Fields: []*onepassword.ItemField{
|
|
{Label: "label1", Value: "value1"},
|
|
{Label: "label2", Value: "value2"},
|
|
},
|
|
Files: []*onepassword.File{
|
|
{ID: "file-id-1", Name: "file1.txt", Size: 1234},
|
|
{ID: "file-id-2", Name: "file2.txt", Size: 1234},
|
|
},
|
|
}
|
|
}
|
|
|
|
func CreateSDKItem() *sdk.Item {
|
|
return &sdk.Item{
|
|
ID: "test-id",
|
|
VaultID: "test-vault-id",
|
|
Version: 1,
|
|
Tags: []string{"tag1", "tag2"},
|
|
Fields: []sdk.ItemField{
|
|
{Title: "label1", Value: "value1"},
|
|
{Title: "label2", Value: "value2"},
|
|
},
|
|
Files: []sdk.ItemFile{
|
|
{Attributes: sdk.FileAttributes{ID: "file-id-1", Name: "file1.txt", Size: 1234}},
|
|
{Attributes: sdk.FileAttributes{ID: "file-id-2", Name: "file2.txt", Size: 1234}},
|
|
},
|
|
CreatedAt: time.Now(),
|
|
}
|
|
}
|
|
|
|
func CreateSDKItemOverview() *sdk.ItemOverview {
|
|
return &sdk.ItemOverview{
|
|
ID: "test-id",
|
|
Title: "item-title",
|
|
VaultID: "test-vault-id",
|
|
Tags: []string{"tag1", "tag2"},
|
|
CreatedAt: time.Now(),
|
|
}
|
|
}
|
|
|
|
func CheckConnectItemMapping(t *testing.T, expected *onepassword.Item, actual *model.Item) {
|
|
t.Helper()
|
|
|
|
require.Equal(t, expected.ID, actual.ID)
|
|
require.Equal(t, expected.Vault.ID, actual.VaultID)
|
|
require.Equal(t, expected.Version, actual.Version)
|
|
require.ElementsMatch(t, expected.Tags, actual.Tags)
|
|
|
|
for i, field := range expected.Fields {
|
|
require.Equal(t, field.Label, actual.Fields[i].Label)
|
|
require.Equal(t, field.Value, actual.Fields[i].Value)
|
|
}
|
|
|
|
for i, file := range expected.Files {
|
|
require.Equal(t, file.ID, actual.Files[i].ID)
|
|
require.Equal(t, file.Name, actual.Files[i].Name)
|
|
require.Equal(t, file.Size, actual.Files[i].Size)
|
|
}
|
|
|
|
require.Equal(t, expected.CreatedAt, actual.CreatedAt)
|
|
}
|
|
|
|
func CheckSDKItemMapping(t *testing.T, expected *sdk.Item, actual *model.Item) {
|
|
t.Helper()
|
|
|
|
require.Equal(t, expected.ID, actual.ID)
|
|
require.Equal(t, expected.VaultID, actual.VaultID)
|
|
require.Equal(t, int(expected.Version), actual.Version)
|
|
require.ElementsMatch(t, expected.Tags, actual.Tags)
|
|
|
|
for i, field := range expected.Fields {
|
|
require.Equal(t, field.Title, actual.Fields[i].Label)
|
|
require.Equal(t, field.Value, actual.Fields[i].Value)
|
|
}
|
|
|
|
for i, file := range expected.Files {
|
|
require.Equal(t, file.Attributes.ID, actual.Files[i].ID)
|
|
require.Equal(t, file.Attributes.Name, actual.Files[i].Name)
|
|
require.Equal(t, int(file.Attributes.Size), actual.Files[i].Size)
|
|
}
|
|
|
|
require.Equal(t, expected.CreatedAt, actual.CreatedAt)
|
|
}
|
|
|
|
func CheckSDKItemOverviewMapping(t *testing.T, expected *sdk.ItemOverview, actual *model.Item) {
|
|
t.Helper()
|
|
|
|
require.Equal(t, expected.ID, actual.ID)
|
|
require.Equal(t, expected.VaultID, actual.VaultID)
|
|
require.ElementsMatch(t, expected.Tags, actual.Tags)
|
|
require.Equal(t, expected.CreatedAt, actual.CreatedAt)
|
|
}
|