add binary definition to build source #595
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
syamgk
added
do-not-merge/hold
syamgk
changed the title
syamgk
force-pushed
the
fix-buildConfig
branch
2 times, most recently
from
0ae8e1e to
000ea83
Compare
syamgk
removed
do-not-merge/hold
syamgk
force-pushed
the
fix-buildConfig
branch
2 times, most recently
from
29d737e to
7116042
Compare
kadel
requested changes
Jul 24, 2018
pkg/occlient/occlient.go
Outdated
| @@ -537,6 +537,10 @@ func (c *Client) NewAppS2I(name string, builderImage string, gitUrl string, labe | |||
| } | |||
|
|
|||
| // if gitUrl set change buildSource to git and use given repo | |||
| if gitUrl == "" { | |||
| return errors.Wrap(err, "unable to create buildSource with empty gitUrl") | |||
There was a problem hiding this comment.
ouch, nice catch
updated the PR
cdrage
suggested changes
Jul 26, 2018
pkg/occlient/occlient.go
Outdated
| @@ -507,7 +507,7 @@ func getAppRootVolumeName(dcName string) string { | |||
| } | |||
|
|
|||
| // NewAppS2I create new application using S2I | |||
| // gitUrl is the url of the git repo | |||
| // if gitUrl is "" then it throws error otherwise uses gitUrl as buildSource | |||
There was a problem hiding this comment.
You may as well move this comment, as you comment on this on line 540.
pkg/occlient/occlient.go
Outdated
| @@ -537,6 +537,10 @@ func (c *Client) NewAppS2I(name string, builderImage string, gitUrl string, labe | |||
| } | |||
|
|
|||
| // if gitUrl set change buildSource to git and use given repo | |||
There was a problem hiding this comment.
maybe change this comment in this PR.
if gitUrl is not set, error out.
syamgk
force-pushed
the
fix-buildConfig
branch
2 times, most recently
from
01992ba to
6a80a57
Compare
anmolbabu
approved these changes
Aug 6, 2018
mik-dass
added
the
needs-rebase
mik-dass
approved these changes
Aug 6, 2018
…empty giturl modified buildSource definition part to throw error in case of empty gitUrl in fun NewAppS2I fix issue redhat-developer#594
change wantErr to false in case of empty gitURL on TestNewAppS2I
syamgk
removed
the
needs-rebase
|
rebased |
kadel
approved these changes
Aug 7, 2018
|
it looks like @cdrage comments were addressed, and there are 2 LGTMs -> merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
add binary definition to build source
fix issue #594