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.

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

feat(*): enable parameters of type file in Porter manifest #579

Merged
merged 5 commits into from
Sep 18, 2019

Conversation

vdice
Copy link
Member

@vdice vdice commented Sep 4, 2019

Enables Porter manifest parameters of type file. Ref #480

TODO:

Note: validation broken pending #581

@vdice vdice changed the title WIP feat(*): enable parameters of type file in Porter manifest feat(*): enable parameters of type file in Porter manifest Sep 4, 2019
@carolynvs
Copy link
Member

@vdice We are finally off of that one custom branch of cnab-go! 🎉 I think you are all set to rebase your cnab-go branch off of v0.4.0-beta1 and then we can reference your branch here and merge.

pkg/cnab/provider/parameters.go Outdated Show resolved Hide resolved
pkg/config/manifest.go Outdated Show resolved Hide resolved
pkg/config/runtime-manifest.go Outdated Show resolved Hide resolved
pkg/config/runtime-manifest.go Outdated Show resolved Hide resolved
@vdice
Copy link
Member Author

vdice commented Sep 17, 2019

I think you are all set to rebase your cnab-go branch off of v0.4.0-beta1 and then we can reference your branch here and merge.

@carolynvs Oops, I rebased my cnab-go branch off of master as opposed to v0.4.0-beta1, but the only extra change appears to be:

--- a/vendor/github.com/deislabs/cnab-go/claim/claim.go
+++ b/vendor/github.com/deislabs/cnab-go/claim/claim.go
@@ -48,7 +48,7 @@ type Claim struct {
 }

 // ValidName is a regular expression that indicates whether a name is a valid claim name.
-var ValidName = regexp.MustCompile("^[a-zA-Z0-9_-]+$")
+var ValidName = regexp.MustCompile("^[a-zA-Z0-9._-]+$")

Still have the two comments/suggestions above to revisit...

@carolynvs
Copy link
Member

master is fine, we just needed to not move backwards is all 👍

Copy link
Member

@carolynvs carolynvs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one small thing to fix and then we are good to go!

pkg/config/manifest.go Outdated Show resolved Hide resolved
Copy link
Member

@carolynvs carolynvs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@vdice
Copy link
Member Author

vdice commented Sep 18, 2019

(last force-pushed commits represent rebase off master)

@vdice vdice merged commit 21bb79f into getporter:master Sep 18, 2019
@vdice vdice deleted the feat/file-param branch September 18, 2019 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants