Skip to content

Commit

Permalink
Fix yaml tag for dependency version
Browse files Browse the repository at this point in the history
There was a typo in the yaml tag for a dependency's version in
porter.yaml. It has always been version, and we intended to just move
reference and version underneath a new bundle field. It was accidentally
set to versions, but none of the other code, tests or examples were
updated to that value (yay!)

This reverts the yaml tag back to version (singular). I'm not bumping
the schema version since this actually matches what the schema has
always been, it's just fixing a bug where version completely didn't work
for a bit.

Signed-off-by: Carolyn Van Slyck <[email protected]>
  • Loading branch information
carolynvs committed Jul 8, 2022
1 parent 982a997 commit 73e514e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkg/manifest/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ type BundleCriteria struct {
// This includes considering prereleases to be invalid if the ranges does not include one.
// If you want to have it include pre-releases a simple solution is to include -0 in your range."
// https://github.com/Masterminds/semver/blob/master/README.md#checking-version-constraints
Version string `yaml:"versions,omitempty"`
Version string `yaml:"version,omitempty"`
}

func (d *RequiredDependency) Validate(cxt *portercontext.Context) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/porter/testdata/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"type": "string"
},
"version": {
"description": "Bundle version contstraint for version matching, see https://github.com/Masterminds/semver/blob/master/README.md#checking-version-constraints",
"description": "Bundle version constraint for version matching, see https://github.com/Masterminds/semver/blob/master/README.md#checking-version-constraints",
"type": "string"
}
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/schema/manifest.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
"type": "string"
},
"version": {
"description": "Bundle version contstraint for version matching, see https://github.com/Masterminds/semver/blob/master/README.md#checking-version-constraints",
"description": "Bundle version constraint for version matching, see https://github.com/Masterminds/semver/blob/master/README.md#checking-version-constraints",
"type": "string"
}
},
Expand Down

0 comments on commit 73e514e

Please sign in to comment.