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

Write bundle.json to cnab/ #373

Merged
merged 1 commit into from May 31, 2019

Conversation

carolynvs
Copy link
Member

As part of #320, during porter build bundle.json is written to cnab/ now, and the cnab actions and publish look for it in cnab/.

@carolynvs carolynvs marked this pull request as ready for review May 31, 2019 18:49
@jeremyrickard
Copy link
Contributor

This LGTM. I don't see the publish update in here, should I take care of that in the PR I'm working on right now?

@carolynvs
Copy link
Member Author

I don't think anything explicit needs to happen for publish. In Validate it's only looking for porter.yaml. In Publish it is calling p.buildBuildle which I fixed in this PR to output to cnab/.

Let me know if there's another spot!

Copy link
Contributor

@jeremyrickard jeremyrickard left a comment

Choose a reason for hiding this comment

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

I don't think anything explicit needs to happen for publish. In Validate it's only looking for porter.yaml. In Publish it is calling p.buildBuildle which I fixed in this PR to output to cnab/.

Let me know if there's another spot!

Oh you're right. I forgot what code I wrote yesterday :)

@@ -122,42 +120,29 @@ func (o *sharedOptions) validateBundlePath() error {

// defaultBundleFile defaults the bundle file to the bundle in the current directory
// when none is set.
func (o *sharedOptions) defaultBundleFile() error {
func (o *sharedOptions) defaultBundleFile(cxt *context.Context) error {
if o.File != "" {
Copy link
Contributor

Choose a reason for hiding this comment

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

should we actually validate that this file exists? i wondered that before when I was looking at this.

Copy link
Member Author

Choose a reason for hiding this comment

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

In this PR I was just preserving the original logic. I'm not sure why I didn't validate if the file exists before. Possibly because I didn't have the context? We could do it now pretty easily.

@jeremyrickard jeremyrickard merged commit 2e3950a into getporter:master May 31, 2019
@carolynvs carolynvs deleted the move-bundlejson branch June 5, 2019 18:12
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.

None yet

3 participants