Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove schema override for variable default value #1536

Merged
merged 3 commits into from
Jul 10, 2024
Merged

Remove schema override for variable default value #1536

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93f46bc
Remove schema override for variable default value
shreyas-goenka Jun 27, 2024
4390b83
Merge remote-tracking branch 'origin' into fix/remove-var-default-ove…
shreyas-goenka Jul 5, 2024
e638f17
handle variable overrids
shreyas-goenka Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 3 additions & 51 deletions cmd/bundle/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,54 +11,6 @@ import (
"github.com/spf13/cobra"
)

func overrideVariables(s *jsonschema.Schema) error {
// Override schema for default values to allow for multiple primitive types.
// These are normalized to strings when converted to the typed representation.
err := s.SetByPath("variables.*.default", jsonschema.Schema{
AnyOf: []*jsonschema.Schema{
{
Type: jsonschema.StringType,
},
{
Type: jsonschema.BooleanType,
},
{
Type: jsonschema.NumberType,
},
{
Type: jsonschema.IntegerType,
},
},
})
if err != nil {
return err
}

// Override schema for variables in targets to allow just specifying the value
// along side overriding the variable definition if needed.
ns, err := s.GetByPath("variables.*")
if err != nil {
return err
}
return s.SetByPath("targets.*.variables.*", jsonschema.Schema{
AnyOf: []*jsonschema.Schema{
{
Type: jsonschema.StringType,
},
{
Type: jsonschema.BooleanType,
},
{
Type: jsonschema.NumberType,
},
{
Type: jsonschema.IntegerType,
},
&ns,
},
})
}

func newSchemaCommand() *cobra.Command {
cmd := &cobra.Command{
Use: "schema",
Expand All @@ -79,9 +31,9 @@ func newSchemaCommand() *cobra.Command {
return err
}

// Override schema for variables to take into account normalization of default
// variable values and variable overrides in a target.
err = overrideVariables(schema)
// Target variable value overrides can be primitives, maps or sequences.
// Set an empty schema for them.
err = schema.SetByPath("targets.*.variables.*", jsonschema.Schema{})
if err != nil {
return err
}
Expand Down
Loading