* Adding explicit MPL license for sub-package. This directory and its subdirectories (packages) contain files licensed with the MPLv2 `LICENSE` file in this directory and are intentionally licensed separately from the BSL `LICENSE` file at the root of this repository. * Adding explicit MPL license for sub-package This directory and its subdirectories (packages) contain files licensed with the MPLv2 `LICENSE` file in this directory and are intentionally licensed separately from the BSL `LICENSE` file at the root of this repository. * Updating the license from MPL to Business Source License Going forward, this project will be licensed under the Business Source License v1.1. Please see our blog post for more details at https://hashi.co/bsl-blog, FAQ at www.hashicorp.com/licensing-faq, and details of the license at www.hashicorp.com/bsl. * Update copyright file headers to BUS-1.1 * Rerun make gen This will pick up the last of the license changes * Revert "Rerun make gen" This reverts commit dbe0968bffd92745d8663c6940debae098395a6b. * Remove copywrite from generation script The current version of copywrite is not sophisticated enough to only apply the copywrite changes to certain subdirectories, so to avoid accidentally relicensing our api and sdk modules, we will stop running the copywrite script until such time that it can do the right thing. * License protobuf API as MPL The protobuf API files are used to generate the SDK, since we want the SDK to be MPL, the protobuf files must also be MPL. This extends to all protobuf files whose sources end up in the SDK directory, including: - internal/proto/controller/api - internal/proto/controller/custom_options - internal/proto/plugin It also includes the generated service directory in internal/gen/controller/api/services, since they are generated from the protobuf sources used for the SDK. * Change website license file name This makes the naming scheme consistent with the rest of the repository. * Add note on licensing to README * Set copywrite license to BUSL * Revert "Add note on licensing to README" This reverts commit 4d865a91a7a4f11605f0dc4609355d7e3c3cfffe. --------- Co-authored-by: hashicorp-copywrite[bot] <110428419+hashicorp-copywrite[bot]@users.noreply.github.com> Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
104 lines
3.0 KiB
Go
104 lines
3.0 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package patchstruct
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"google.golang.org/protobuf/proto"
|
|
"google.golang.org/protobuf/types/known/structpb"
|
|
)
|
|
|
|
// PatchStruct updates the struct found in dst with the values found in src. The
|
|
// intent of this helper is to provide a fallback mechanism for subtype
|
|
// attributes when the actual schema of the subtype attributes are unknown. As
|
|
// such, it's preferred to use other methods (such as mask mapping) when an
|
|
// actual message for the subtype is known.
|
|
//
|
|
// The following rules apply:
|
|
//
|
|
// - The source (src) map is merged into the destination map (dst). If the
|
|
// source map is nil, the destination will be a valid, but empty, map.
|
|
//
|
|
// - Values are overwritten by the source map if they exist in both.
|
|
//
|
|
// - Values are deleted from the destination if they are set to null in the
|
|
// source.
|
|
//
|
|
// - Maps are recursively applied, meaning that a nested map at key "foo" in
|
|
// the destination would be patched with a map at key "foo" in the
|
|
// source.
|
|
//
|
|
// - A map in the destination is overwritten by a non-map in the source,
|
|
// and a non-map in the destination is overwritten by a map in the
|
|
// source.
|
|
//
|
|
// PatchStruct returns the updated map as a copy, dst and src are not altered.
|
|
func PatchStruct(dst, src *structpb.Struct) *structpb.Struct {
|
|
if src == nil {
|
|
ret, _ := structpb.NewStruct(nil)
|
|
return ret
|
|
}
|
|
result, err := structpb.NewStruct(patchM(dst.AsMap(), src.AsMap()))
|
|
if err != nil {
|
|
// Should never error as values are source from structpb values
|
|
panic(err)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// PatchBytes follows the same rules as above with PatchStruct, but instead of
|
|
// patching structpb.Structs, it patches the protobuf encoding. An error is
|
|
// returned if there are issues working with the data. If src is nil or empty,
|
|
// the result is a marshaled, empty struct.
|
|
func PatchBytes(dst, src []byte) ([]byte, error) {
|
|
srcpb, dstpb := new(structpb.Struct), new(structpb.Struct)
|
|
if len(src) != 0 {
|
|
if err := proto.Unmarshal(dst, dstpb); err != nil {
|
|
return nil, fmt.Errorf("error reading destination data: %w", err)
|
|
}
|
|
if err := proto.Unmarshal(src, srcpb); err != nil {
|
|
return nil, fmt.Errorf("error reading source data: %w", err)
|
|
}
|
|
dstpb = PatchStruct(dstpb, srcpb)
|
|
} else {
|
|
dstpb, _ = structpb.NewStruct(nil)
|
|
}
|
|
|
|
result, err := proto.Marshal(dstpb)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error writing result data: %w", err)
|
|
}
|
|
|
|
return result, nil
|
|
}
|
|
|
|
func patchM(dst, src map[string]any) map[string]any {
|
|
for k, v := range src {
|
|
switch x := v.(type) {
|
|
case map[string]any:
|
|
if y, ok := dst[k].(map[string]any); ok {
|
|
// If the value in dst a map, continue to patch
|
|
dst[k] = patchM(y, x)
|
|
} else {
|
|
// Overwrite after stripping out keys to nil values
|
|
newX := patchM(make(map[string]any), x)
|
|
dst[k] = newX
|
|
}
|
|
|
|
default:
|
|
if v == nil {
|
|
// explicit null values delete values at that key in dst
|
|
delete(dst, k)
|
|
} else {
|
|
// Anything else gets overwritten
|
|
dst[k] = v
|
|
}
|
|
}
|
|
}
|
|
|
|
return dst
|
|
}
|