2023-12-22 13:20:45 +00:00
|
|
|
package dyn
|
2023-10-20 12:56:59 +00:00
|
|
|
|
2023-10-24 11:12:36 +00:00
|
|
|
import (
|
|
|
|
"fmt"
|
2024-07-16 11:27:27 +00:00
|
|
|
"slices"
|
2023-10-24 11:12:36 +00:00
|
|
|
)
|
2023-10-20 12:56:59 +00:00
|
|
|
|
|
|
|
type Value struct {
|
|
|
|
v any
|
2023-10-24 11:12:36 +00:00
|
|
|
|
|
|
|
k Kind
|
2024-07-16 11:27:27 +00:00
|
|
|
|
|
|
|
// List of locations this value is defined at. The first location in the slice
|
|
|
|
// is the location returned by the `.Location()` method and is typically used
|
|
|
|
// for reporting errors and warnings associated with the value.
|
|
|
|
l []Location
|
2023-10-20 12:56:59 +00:00
|
|
|
|
|
|
|
// Whether or not this value is an anchor.
|
|
|
|
// If this node doesn't map to a type, we don't need to warn about it.
|
|
|
|
anchor bool
|
|
|
|
}
|
|
|
|
|
2024-01-05 13:02:04 +00:00
|
|
|
// InvalidValue is equal to the zero-value of Value.
|
|
|
|
var InvalidValue = Value{
|
|
|
|
k: KindInvalid,
|
|
|
|
}
|
|
|
|
|
|
|
|
// NilValue is a convenient constant for a nil value.
|
2023-10-24 11:12:36 +00:00
|
|
|
var NilValue = Value{
|
|
|
|
k: KindNil,
|
|
|
|
}
|
|
|
|
|
|
|
|
// V constructs a new Value with the given value.
|
|
|
|
func V(v any) Value {
|
2024-07-16 11:27:27 +00:00
|
|
|
return NewValue(v, []Location{})
|
2023-10-24 11:12:36 +00:00
|
|
|
}
|
2023-10-20 12:56:59 +00:00
|
|
|
|
|
|
|
// NewValue constructs a new Value with the given value and location.
|
2024-07-16 11:27:27 +00:00
|
|
|
func NewValue(v any, loc []Location) Value {
|
2024-03-25 11:01:09 +00:00
|
|
|
switch vin := v.(type) {
|
|
|
|
case map[string]Value:
|
|
|
|
v = newMappingFromGoMap(vin)
|
|
|
|
}
|
|
|
|
|
2023-10-20 12:56:59 +00:00
|
|
|
return Value{
|
|
|
|
v: v,
|
2023-10-24 11:12:36 +00:00
|
|
|
k: kindOf(v),
|
2024-07-16 11:27:27 +00:00
|
|
|
|
|
|
|
// create a copy of the locations, so that mutations to the original slice
|
|
|
|
// don't affect new value.
|
|
|
|
l: slices.Clone(loc),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// WithLocations returns a new Value with its location set to the given value.
|
|
|
|
func (v Value) WithLocations(loc []Location) Value {
|
|
|
|
return Value{
|
|
|
|
v: v.v,
|
|
|
|
k: v.k,
|
|
|
|
|
|
|
|
// create a copy of the locations, so that mutations to the original slice
|
|
|
|
// don't affect new value.
|
|
|
|
l: slices.Clone(loc),
|
2023-10-20 12:56:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-07-16 11:27:27 +00:00
|
|
|
func (v Value) AppendLocationsFromValue(w Value) Value {
|
Use dynamic configuration model in bundles (#1098)
## Changes
This is a fundamental change to how we load and process bundle
configuration. We now depend on the configuration being represented as a
`dyn.Value`. This representation is functionally equivalent to Go's
`any` (it is variadic) and allows us to capture metadata associated with
a value, such as where it was defined (e.g. file, line, and column). It
also allows us to represent Go's zero values properly (e.g. empty
string, integer equal to 0, or boolean false).
Using this representation allows us to let the configuration model
deviate from the typed structure we have been relying on so far
(`config.Root`). We need to deviate from these types when using
variables for fields that are not a string themselves. For example,
using `${var.num_workers}` for an integer `workers` field was impossible
until now (though not implemented in this change).
The loader for a `dyn.Value` includes functionality to capture any and
all type mismatches between the user-defined configuration and the
expected types. These mismatches can be surfaced as validation errors in
future PRs.
Given that many mutators expect the typed struct to be the source of
truth, this change converts between the dynamic representation and the
typed representation on mutator entry and exit. Existing mutators can
continue to modify the typed representation and these modifications are
reflected in the dynamic representation (see `MarkMutatorEntry` and
`MarkMutatorExit` in `bundle/config/root.go`).
Required changes included in this change:
* The existing interpolation package is removed in favor of
`libs/dyn/dynvar`.
* Functionality to merge job clusters, job tasks, and pipeline clusters
are now all broken out into their own mutators.
To be implemented later:
* Allow variable references for non-string types.
* Surface diagnostics about the configuration provided by the user in
the validation output.
* Some mutators use a resource's configuration file path to resolve
related relative paths. These depend on `bundle/config/paths.Path` being
set and populated through `ConfigureConfigFilePath`. Instead, they
should interact with the dynamically typed configuration directly. Doing
this also unlocks being able to differentiate different base paths used
within a job (e.g. a task override with a relative path defined in a
directory other than the base job).
## Tests
* Existing unit tests pass (some have been modified to accommodate)
* Integration tests pass
2024-02-16 19:41:58 +00:00
|
|
|
return Value{
|
|
|
|
v: v.v,
|
|
|
|
k: v.k,
|
2024-07-16 11:27:27 +00:00
|
|
|
l: append(v.l, w.l...),
|
Use dynamic configuration model in bundles (#1098)
## Changes
This is a fundamental change to how we load and process bundle
configuration. We now depend on the configuration being represented as a
`dyn.Value`. This representation is functionally equivalent to Go's
`any` (it is variadic) and allows us to capture metadata associated with
a value, such as where it was defined (e.g. file, line, and column). It
also allows us to represent Go's zero values properly (e.g. empty
string, integer equal to 0, or boolean false).
Using this representation allows us to let the configuration model
deviate from the typed structure we have been relying on so far
(`config.Root`). We need to deviate from these types when using
variables for fields that are not a string themselves. For example,
using `${var.num_workers}` for an integer `workers` field was impossible
until now (though not implemented in this change).
The loader for a `dyn.Value` includes functionality to capture any and
all type mismatches between the user-defined configuration and the
expected types. These mismatches can be surfaced as validation errors in
future PRs.
Given that many mutators expect the typed struct to be the source of
truth, this change converts between the dynamic representation and the
typed representation on mutator entry and exit. Existing mutators can
continue to modify the typed representation and these modifications are
reflected in the dynamic representation (see `MarkMutatorEntry` and
`MarkMutatorExit` in `bundle/config/root.go`).
Required changes included in this change:
* The existing interpolation package is removed in favor of
`libs/dyn/dynvar`.
* Functionality to merge job clusters, job tasks, and pipeline clusters
are now all broken out into their own mutators.
To be implemented later:
* Allow variable references for non-string types.
* Surface diagnostics about the configuration provided by the user in
the validation output.
* Some mutators use a resource's configuration file path to resolve
related relative paths. These depend on `bundle/config/paths.Path` being
set and populated through `ConfigureConfigFilePath`. Instead, they
should interact with the dynamically typed configuration directly. Doing
this also unlocks being able to differentiate different base paths used
within a job (e.g. a task override with a relative path defined in a
directory other than the base job).
## Tests
* Existing unit tests pass (some have been modified to accommodate)
* Integration tests pass
2024-02-16 19:41:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-10-24 11:12:36 +00:00
|
|
|
func (v Value) Kind() Kind {
|
|
|
|
return v.k
|
|
|
|
}
|
|
|
|
|
2024-01-17 14:26:33 +00:00
|
|
|
func (v Value) Value() any {
|
|
|
|
return v.v
|
|
|
|
}
|
|
|
|
|
2024-07-16 11:27:27 +00:00
|
|
|
func (v Value) Locations() []Location {
|
2023-10-20 12:56:59 +00:00
|
|
|
return v.l
|
|
|
|
}
|
|
|
|
|
2024-07-16 11:27:27 +00:00
|
|
|
func (v Value) Location() Location {
|
|
|
|
if len(v.l) == 0 {
|
|
|
|
return Location{}
|
|
|
|
}
|
|
|
|
|
|
|
|
return v.l[0]
|
|
|
|
}
|
|
|
|
|
2023-11-24 13:21:47 +00:00
|
|
|
func (v Value) IsValid() bool {
|
|
|
|
return v.k != KindInvalid
|
|
|
|
}
|
|
|
|
|
2023-10-20 12:56:59 +00:00
|
|
|
func (v Value) AsAny() any {
|
2023-10-24 11:12:36 +00:00
|
|
|
switch v.k {
|
|
|
|
case KindInvalid:
|
|
|
|
panic("invoked AsAny on invalid value")
|
|
|
|
case KindMap:
|
2024-03-25 11:01:09 +00:00
|
|
|
m := v.v.(Mapping)
|
|
|
|
out := make(map[string]any, m.Len())
|
|
|
|
for _, pair := range m.pairs {
|
|
|
|
pk := pair.Key
|
|
|
|
pv := pair.Value
|
|
|
|
out[pk.MustString()] = pv.AsAny()
|
2023-10-20 12:56:59 +00:00
|
|
|
}
|
2024-03-25 11:01:09 +00:00
|
|
|
return out
|
2023-10-24 11:12:36 +00:00
|
|
|
case KindSequence:
|
|
|
|
vv := v.v.([]Value)
|
2023-10-20 12:56:59 +00:00
|
|
|
a := make([]any, len(vv))
|
|
|
|
for i, v := range vv {
|
|
|
|
a[i] = v.AsAny()
|
|
|
|
}
|
|
|
|
return a
|
2023-10-24 11:12:36 +00:00
|
|
|
case KindNil:
|
|
|
|
return v.v
|
|
|
|
case KindString:
|
|
|
|
return v.v
|
|
|
|
case KindBool:
|
|
|
|
return v.v
|
|
|
|
case KindInt:
|
|
|
|
return v.v
|
|
|
|
case KindFloat:
|
|
|
|
return v.v
|
|
|
|
case KindTime:
|
2024-08-29 13:02:34 +00:00
|
|
|
t := v.v.(Time)
|
|
|
|
return t.Time()
|
2023-10-20 12:56:59 +00:00
|
|
|
default:
|
|
|
|
// Panic because we only want to deal with known types.
|
2023-10-24 11:12:36 +00:00
|
|
|
panic(fmt.Sprintf("invalid kind: %d", v.k))
|
2023-10-20 12:56:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (v Value) Get(key string) Value {
|
|
|
|
m, ok := v.AsMap()
|
|
|
|
if !ok {
|
2024-06-19 15:24:57 +00:00
|
|
|
return InvalidValue
|
2023-10-20 12:56:59 +00:00
|
|
|
}
|
|
|
|
|
2024-03-25 11:01:09 +00:00
|
|
|
vv, ok := m.GetByString(key)
|
2023-10-20 12:56:59 +00:00
|
|
|
if !ok {
|
2024-06-19 15:24:57 +00:00
|
|
|
return InvalidValue
|
2023-10-20 12:56:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return vv
|
|
|
|
}
|
|
|
|
|
|
|
|
func (v Value) Index(i int) Value {
|
|
|
|
s, ok := v.v.([]Value)
|
|
|
|
if !ok {
|
2024-06-19 15:24:57 +00:00
|
|
|
return InvalidValue
|
2023-10-20 12:56:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if i < 0 || i >= len(s) {
|
2024-06-19 15:24:57 +00:00
|
|
|
return InvalidValue
|
2023-10-20 12:56:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return s[i]
|
|
|
|
}
|
|
|
|
|
|
|
|
func (v Value) MarkAnchor() Value {
|
|
|
|
return Value{
|
|
|
|
v: v.v,
|
2023-10-24 11:12:36 +00:00
|
|
|
k: v.k,
|
2023-10-20 12:56:59 +00:00
|
|
|
l: v.l,
|
|
|
|
|
|
|
|
anchor: true,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (v Value) IsAnchor() bool {
|
|
|
|
return v.anchor
|
|
|
|
}
|
Add functionality to visit values in `dyn.Value` tree (#1142)
## Changes
This change adds the following functions:
* `dyn.Get(value, "foo.bar") -> (dyn.Value, error)`
* `dyn.Set(value, "foo.bar", newValue) -> (dyn.Value, error)`
* `dyn.Map(value, "foo.bar", func) -> (dyn.Value, error)`
And equivalent functions that take a previously constructed `dyn.Path`:
* `dyn.GetByPath(value, dyn.Path) -> (dyn.Value, error)`
* `dyn.SetByPath(value, dyn.Path, newValue) -> (dyn.Value, error)`
* `dyn.MapByPath(value, dyn.Path, func) -> (dyn.Value, error)`
Changes made by the "set" and "map" functions are never reflected in the
input argument; they return new `dyn.Value` instances for all nodes in
the path leading up to the changed value.
## Tests
New unit tests cover all critical paths.
2024-01-24 18:38:46 +00:00
|
|
|
|
|
|
|
// eq is an internal only method that compares two values.
|
|
|
|
// It is used to determine if a value has changed during a visit.
|
|
|
|
// We need a custom implementation because maps and slices
|
|
|
|
// cannot be compared with the regular == operator.
|
|
|
|
func (v Value) eq(w Value) bool {
|
2024-07-16 11:27:27 +00:00
|
|
|
if v.k != w.k {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
if !slices.Equal(v.l, w.l) {
|
Add functionality to visit values in `dyn.Value` tree (#1142)
## Changes
This change adds the following functions:
* `dyn.Get(value, "foo.bar") -> (dyn.Value, error)`
* `dyn.Set(value, "foo.bar", newValue) -> (dyn.Value, error)`
* `dyn.Map(value, "foo.bar", func) -> (dyn.Value, error)`
And equivalent functions that take a previously constructed `dyn.Path`:
* `dyn.GetByPath(value, dyn.Path) -> (dyn.Value, error)`
* `dyn.SetByPath(value, dyn.Path, newValue) -> (dyn.Value, error)`
* `dyn.MapByPath(value, dyn.Path, func) -> (dyn.Value, error)`
Changes made by the "set" and "map" functions are never reflected in the
input argument; they return new `dyn.Value` instances for all nodes in
the path leading up to the changed value.
## Tests
New unit tests cover all critical paths.
2024-01-24 18:38:46 +00:00
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
switch v.k {
|
|
|
|
case KindMap:
|
|
|
|
// Compare pointers to the underlying map.
|
|
|
|
// This is safe because we don't allow maps to be mutated.
|
|
|
|
return &v.v == &w.v
|
|
|
|
case KindSequence:
|
|
|
|
vs := v.v.([]Value)
|
|
|
|
ws := w.v.([]Value)
|
2024-02-05 16:54:41 +00:00
|
|
|
lv := len(vs)
|
|
|
|
lw := len(ws)
|
|
|
|
// If both slices are empty, they are equal.
|
|
|
|
if lv == 0 && lw == 0 {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
// If they have different lengths, they are not equal.
|
|
|
|
if lv != lw {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
// They are both non-empty and have the same length.
|
|
|
|
// Compare pointers to the underlying slice.
|
|
|
|
// This is safe because we don't allow slices to be mutated.
|
|
|
|
return &vs[0] == &ws[0]
|
Add functionality to visit values in `dyn.Value` tree (#1142)
## Changes
This change adds the following functions:
* `dyn.Get(value, "foo.bar") -> (dyn.Value, error)`
* `dyn.Set(value, "foo.bar", newValue) -> (dyn.Value, error)`
* `dyn.Map(value, "foo.bar", func) -> (dyn.Value, error)`
And equivalent functions that take a previously constructed `dyn.Path`:
* `dyn.GetByPath(value, dyn.Path) -> (dyn.Value, error)`
* `dyn.SetByPath(value, dyn.Path, newValue) -> (dyn.Value, error)`
* `dyn.MapByPath(value, dyn.Path, func) -> (dyn.Value, error)`
Changes made by the "set" and "map" functions are never reflected in the
input argument; they return new `dyn.Value` instances for all nodes in
the path leading up to the changed value.
## Tests
New unit tests cover all critical paths.
2024-01-24 18:38:46 +00:00
|
|
|
default:
|
|
|
|
return v.v == w.v
|
|
|
|
}
|
|
|
|
}
|