Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 214
Add support for conditional prompting in bundle init#971
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Changes from all commits
d042e572454bfb228554adc1d074b185f28bf7db07d691aa177bc75d88ba1dd31b55cb13986bf1fae05355b5e8b90c6851e681a91348d9ffFile filter
Filter by extension
Conversations
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -48,6 +48,7 @@ func TestSchemaLoadIntegers(t *testing.T) { | ||
| assert.NoError(t, err) | ||
| assert.Equal(t, int64(1), schema.Properties["abc"].Default) | ||
| assert.Equal(t, []any{int64(1), int64(2), int64(3)}, schema.Properties["abc"].Enum) | ||
| assert.Equal(t, int64(5), schema.Properties["def"].Const) | ||
| } | ||
| func TestSchemaLoadIntegersWithInvalidDefault(t *testing.T) { | ||
| @@ -60,6 +61,11 @@ func TestSchemaLoadIntegersWithInvalidEnums(t *testing.T) { | ||
| assert.EqualError(t, err, "failed to parse enum value 2.4 at index 1 for property abc: expected integer value, got: 2.4") | ||
| } | ||
| func TestSchemaLoadIntergersWithInvalidConst(t *testing.T) { | ||
| _, err := Load("./testdata/schema-load-int/schema-invalid-const.json") | ||
| assert.EqualError(t, err, "failed to parse const value for property def: expected integer value, got: 5.1") | ||
| } | ||
| func TestSchemaValidateDefaultType(t *testing.T) { | ||
| invalidSchema := &Schema{ | ||
| Properties: map[string]*Schema{ | ||
| @@ -250,3 +256,52 @@ func TestValidateSchemaMinimumCliVersion(t *testing.T) { | ||
| err = s.validateSchemaMinimumCliVersion("v0.0.0-dev")() | ||
| assert.NoError(t, err) | ||
| } | ||
| func TestValidateSchemaConstTypes(t *testing.T) { | ||
| s := &Schema{ | ||
| Properties: map[string]*Schema{ | ||
| "foo": { | ||
| Type: "string", | ||
| Const: "abc", | ||
Contributor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What are valid types for Const? Only strings and integers? ContributorAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Const can be any type, including null or objects according to the JSON schema spec: https://json-schema.org/draft/2020-12/json-schema-validation#name-const
| ||
| }, | ||
| }, | ||
| } | ||
| err := s.validate() | ||
| assert.NoError(t, err) | ||
| s = &Schema{ | ||
| Properties: map[string]*Schema{ | ||
| "foo": { | ||
| Type: "string", | ||
| Const: 123, | ||
| }, | ||
| }, | ||
| } | ||
| err = s.validate() | ||
| assert.EqualError(t, err, "type validation for const value of property foo failed: expected type string, but value is 123") | ||
| } | ||
| func TestValidateSchemaSkippedPropertiesHaveDefaults(t *testing.T) { | ||
| s := &Schema{ | ||
| Properties: map[string]*Schema{ | ||
| "foo": { | ||
| Type: "string", | ||
| Extension: Extension{SkipPromptIf: &Schema{}}, | ||
| }, | ||
| }, | ||
| } | ||
| err := s.validate() | ||
| assert.EqualError(t, err, "property \"foo\" has a skip_prompt_if clause but no default value") | ||
shreyas-goenka marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| s = &Schema{ | ||
| Properties: map[string]*Schema{ | ||
| "foo": { | ||
| Type: "string", | ||
| Default: "abc", | ||
| Extension: Extension{SkipPromptIf: &Schema{}}, | ||
| }, | ||
| }, | ||
| } | ||
| err = s.validate() | ||
| assert.NoError(t, err) | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "type": "object", | ||
| "properties": { | ||
| "def": { | ||
| "type": "integer", | ||
| "const": 5.1 | ||
| } | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -5,6 +5,10 @@ | ||
| "type": "integer", | ||
| "default": 1, | ||
| "enum": [1,2,3] | ||
| }, | ||
| "def": { | ||
| "type": "integer", | ||
| "const": 5 | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -105,20 +105,61 @@ func (c *config) assignDefaultValues(r *renderer) error { | ||
| return nil | ||
| } | ||
| func (c *config) skipPrompt(p jsonschema.Property, r *renderer) (bool, error) { | ||
| // Config already has a value assigned. We don't have to prompt for a user input. | ||
| if _, ok := c.values[p.Name]; ok { | ||
| return true, nil | ||
| } | ||
| if p.Schema.SkipPromptIf == nil { | ||
| return false, nil | ||
| } | ||
| // Check if conditions specified by template author for skipping the prompt | ||
| // are satisfied. If they are not, we have to prompt for a user input. | ||
| for name, property := range p.Schema.SkipPromptIf.Properties { | ||
shreyas-goenka marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| if v, ok := c.values[name]; ok && v == property.Const { | ||
| continue | ||
| } | ||
shreyas-goenka marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. shreyas-goenka marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| return false, nil | ||
| } | ||
| if p.Schema.Default == nil { | ||
| return false, fmt.Errorf("property %s has skip_prompt_if set but no default value", p.Name) | ||
| } | ||
| // Assign default value to property if we are skipping it. | ||
| if p.Schema.Type != jsonschema.StringType { | ||
| c.values[p.Name] = p.Schema.Default | ||
| return true, nil | ||
| } | ||
| // Execute the default value as a template and assign it to the property. | ||
| var err error | ||
| c.values[p.Name], err = r.executeTemplate(p.Schema.Default.(string)) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
| return true, nil | ||
| } | ||
| // Prompts user for values for properties that do not have a value set yet | ||
| func (c *config) promptForValues(r *renderer) error { | ||
| for _, p := range c.schema.OrderedProperties() { | ||
| name := p.Name | ||
| property := p.Schema | ||
| // Config already has a value assigned | ||
| if _, ok := c.values[name]; ok { | ||
| // Skip prompting if we can. | ||
| skip, err := c.skipPrompt(p, r) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if skip { | ||
| continue | ||
| } | ||
| // Compute default value to display by converting it to a string | ||
| var defaultVal string | ||
| var err error | ||
| if property.Default != nil { | ||
| defaultValRaw, err := property.DefaultString() | ||
| if err != nil { | ||
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.