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

* Move controller package inside internal directory Based on the go/v4 project structure, the following changed: - Pakcage `controllers` is now named `controller` - Package `controller` now lives inside new `internal` directory * Move main.go in cmd directory Based on the new go/v4 project structure, `main.go` now lives in the `cmd` directory. * Change package import in main.go * Update go mod dependencies Update the dependencies based on the versions obtained by creating a new operator project using `kubebuilder init --domain onepassword.com --plugins=go/v4`. This is based on the migration steps provided to go from go/v3 to go/v4 (https://book.kubebuilder.io/migration/migration_guide_gov3_to_gov4) * Update vendor * Adjust code for breaking changes from pkg update sigs.k8s.io/controller-runtime package had breaking changes from v0.14.5 to v0.16.3. This commit brings the changes needed to achieve the same things using the new functionality avaialble. * Adjust paths to connect yaml files Since `main.go` is now in `cmd` directory, the paths to the files for deploying Connect have to be adjusted based on the new location `main.go` is executed from. * Update files based on new structure and scaffolding These changes are made based on the new project structure and scaffolding obtained when using the new go/v4 project structure. These were done based on the migration steps mentioned when migrating to go/v4 (https://book.kubebuilder.io/migration/migration_guide_gov3_to_gov4). * Update config files These updates are made based on the Kustomize v4 syntax. This is part of the upgrate to go/v4 (https://book.kubebuilder.io/migration/migration_guide_gov3_to_gov4) * Update dependencies and GO version * Update vendor * Update Kubernetes tools versions * Update operator version in Makefile Now the version in the Makefile matches the version of the operator * Update Operator SDK version in version.go * Adjust generated deepcopy It seems that the +build tag is no longer needed based on the latest generated scaffolding, therefore it's removed. * Update copyright year * Bring back missing changes from migration Some customization in Makefile was lost during the migration process. Specifically, the namespace customization for `make deploy` command. Also, we push changes to kustomization.yaml for making the deploy process smoother. * Add RBAC perms for coordination.k8s.io It seems that with the latest changes to Kubernetes and Kustomize, we need to add additional RBAC to the service account used so that it can properly access the `leases` resource. * Optimize Dockerfile Dockerfile had a step for caching dependencies (go mod download). However, this is already done by the vendor directory, which we include. Therefore, this step can be removed to make the image build time faster.
247 lines
5.9 KiB
Go
247 lines
5.9 KiB
Go
package jsonpatch
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"reflect"
|
|
"strings"
|
|
)
|
|
|
|
var errBadJSONDoc = fmt.Errorf("invalid JSON Document")
|
|
|
|
type JsonPatchOperation = Operation
|
|
|
|
type Operation struct {
|
|
Operation string `json:"op"`
|
|
Path string `json:"path"`
|
|
Value interface{} `json:"value,omitempty"`
|
|
}
|
|
|
|
func (j *Operation) Json() string {
|
|
b, _ := json.Marshal(j)
|
|
return string(b)
|
|
}
|
|
|
|
func (j *Operation) MarshalJSON() ([]byte, error) {
|
|
// Ensure for add and replace we emit `value: null`
|
|
if j.Value == nil && (j.Operation == "replace" || j.Operation == "add") {
|
|
return json.Marshal(struct {
|
|
Operation string `json:"op"`
|
|
Path string `json:"path"`
|
|
Value interface{} `json:"value"`
|
|
}{
|
|
Operation: j.Operation,
|
|
Path: j.Path,
|
|
})
|
|
}
|
|
// otherwise just marshal normally. We cannot literally do json.Marshal(j) as it would be recursively
|
|
// calling this function.
|
|
return json.Marshal(struct {
|
|
Operation string `json:"op"`
|
|
Path string `json:"path"`
|
|
Value interface{} `json:"value,omitempty"`
|
|
}{
|
|
Operation: j.Operation,
|
|
Path: j.Path,
|
|
Value: j.Value,
|
|
})
|
|
}
|
|
|
|
type ByPath []Operation
|
|
|
|
func (a ByPath) Len() int { return len(a) }
|
|
func (a ByPath) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
|
func (a ByPath) Less(i, j int) bool { return a[i].Path < a[j].Path }
|
|
|
|
func NewOperation(op, path string, value interface{}) Operation {
|
|
return Operation{Operation: op, Path: path, Value: value}
|
|
}
|
|
|
|
// CreatePatch creates a patch as specified in http://jsonpatch.com/
|
|
//
|
|
// 'a' is original, 'b' is the modified document. Both are to be given as json encoded content.
|
|
// The function will return an array of JsonPatchOperations
|
|
//
|
|
// An error will be returned if any of the two documents are invalid.
|
|
func CreatePatch(a, b []byte) ([]Operation, error) {
|
|
if bytes.Equal(a, b) {
|
|
return []Operation{}, nil
|
|
}
|
|
var aI interface{}
|
|
var bI interface{}
|
|
err := json.Unmarshal(a, &aI)
|
|
if err != nil {
|
|
return nil, errBadJSONDoc
|
|
}
|
|
err = json.Unmarshal(b, &bI)
|
|
if err != nil {
|
|
return nil, errBadJSONDoc
|
|
}
|
|
return handleValues(aI, bI, "", []Operation{})
|
|
}
|
|
|
|
// Returns true if the values matches (must be json types)
|
|
// The types of the values must match, otherwise it will always return false
|
|
// If two map[string]interface{} are given, all elements must match.
|
|
func matchesValue(av, bv interface{}) bool {
|
|
if reflect.TypeOf(av) != reflect.TypeOf(bv) {
|
|
return false
|
|
}
|
|
switch at := av.(type) {
|
|
case string:
|
|
bt, ok := bv.(string)
|
|
if ok && bt == at {
|
|
return true
|
|
}
|
|
case float64:
|
|
bt, ok := bv.(float64)
|
|
if ok && bt == at {
|
|
return true
|
|
}
|
|
case bool:
|
|
bt, ok := bv.(bool)
|
|
if ok && bt == at {
|
|
return true
|
|
}
|
|
case map[string]interface{}:
|
|
bt, ok := bv.(map[string]interface{})
|
|
if !ok {
|
|
return false
|
|
}
|
|
for key := range at {
|
|
if !matchesValue(at[key], bt[key]) {
|
|
return false
|
|
}
|
|
}
|
|
for key := range bt {
|
|
if !matchesValue(at[key], bt[key]) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
case []interface{}:
|
|
bt, ok := bv.([]interface{})
|
|
if !ok {
|
|
return false
|
|
}
|
|
if len(bt) != len(at) {
|
|
return false
|
|
}
|
|
for key := range at {
|
|
if !matchesValue(at[key], bt[key]) {
|
|
return false
|
|
}
|
|
}
|
|
for key := range bt {
|
|
if !matchesValue(at[key], bt[key]) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
// From http://tools.ietf.org/html/rfc6901#section-4 :
|
|
//
|
|
// Evaluation of each reference token begins by decoding any escaped
|
|
// character sequence. This is performed by first transforming any
|
|
// occurrence of the sequence '~1' to '/', and then transforming any
|
|
// occurrence of the sequence '~0' to '~'.
|
|
// TODO decode support:
|
|
// var rfc6901Decoder = strings.NewReplacer("~1", "/", "~0", "~")
|
|
|
|
var rfc6901Encoder = strings.NewReplacer("~", "~0", "/", "~1")
|
|
|
|
func makePath(path string, newPart interface{}) string {
|
|
key := rfc6901Encoder.Replace(fmt.Sprintf("%v", newPart))
|
|
if path == "" {
|
|
return "/" + key
|
|
}
|
|
return path + "/" + key
|
|
}
|
|
|
|
// diff returns the (recursive) difference between a and b as an array of JsonPatchOperations.
|
|
func diff(a, b map[string]interface{}, path string, patch []Operation) ([]Operation, error) {
|
|
for key, bv := range b {
|
|
p := makePath(path, key)
|
|
av, ok := a[key]
|
|
// value was added
|
|
if !ok {
|
|
patch = append(patch, NewOperation("add", p, bv))
|
|
continue
|
|
}
|
|
// Types are the same, compare values
|
|
var err error
|
|
patch, err = handleValues(av, bv, p, patch)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
// Now add all deleted values as nil
|
|
for key := range a {
|
|
_, found := b[key]
|
|
if !found {
|
|
p := makePath(path, key)
|
|
|
|
patch = append(patch, NewOperation("remove", p, nil))
|
|
}
|
|
}
|
|
return patch, nil
|
|
}
|
|
|
|
func handleValues(av, bv interface{}, p string, patch []Operation) ([]Operation, error) {
|
|
{
|
|
at := reflect.TypeOf(av)
|
|
bt := reflect.TypeOf(bv)
|
|
if at == nil && bt == nil {
|
|
// do nothing
|
|
return patch, nil
|
|
} else if at != bt {
|
|
// If types have changed, replace completely (preserves null in destination)
|
|
return append(patch, NewOperation("replace", p, bv)), nil
|
|
}
|
|
}
|
|
|
|
var err error
|
|
switch at := av.(type) {
|
|
case map[string]interface{}:
|
|
bt := bv.(map[string]interface{})
|
|
patch, err = diff(at, bt, p, patch)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
case string, float64, bool:
|
|
if !matchesValue(av, bv) {
|
|
patch = append(patch, NewOperation("replace", p, bv))
|
|
}
|
|
case []interface{}:
|
|
bt := bv.([]interface{})
|
|
n := min(len(at), len(bt))
|
|
for i := len(at) - 1; i >= n; i-- {
|
|
patch = append(patch, NewOperation("remove", makePath(p, i), nil))
|
|
}
|
|
for i := n; i < len(bt); i++ {
|
|
patch = append(patch, NewOperation("add", makePath(p, i), bt[i]))
|
|
}
|
|
for i := 0; i < n; i++ {
|
|
var err error
|
|
patch, err = handleValues(at[i], bt[i], makePath(p, i), patch)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
default:
|
|
panic(fmt.Sprintf("Unknown type:%T ", av))
|
|
}
|
|
return patch, nil
|
|
}
|
|
|
|
func min(x int, y int) int {
|
|
if y < x {
|
|
return y
|
|
}
|
|
return x
|
|
}
|