feat(cdsctl,api): allow to push a template from url #3810
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
…ow to push a template from url
richardlt
requested review from
bnjjj,
fsamin,
sguiheux and
yesnault
as code owners
yesnault
approved these changes
Jan 3, 2019
bnjjj
approved these changes
Jan 4, 2019
fsamin
requested changes
Jan 4, 2019
cli/cdsctl/environment_group.go
Outdated
| @@ -63,8 +62,7 @@ func environmentGroupImportRun(v cli.Values) error { | |||
| format = "json" | |||
| } | |||
|
|
|||
| isURL, _ := regexp.MatchString(`http[s]?:\/\/(.*)`, v["path"]) | |||
| if isURL { | |||
| if exportentities.IsURL(v["path"]) { | |||
cli/cdsctl/environment_group.go
Outdated
| @@ -63,8 +62,7 @@ func environmentGroupImportRun(v cli.Values) error { | |||
| format = "json" | |||
| } | |||
|
|
|||
| isURL, _ := regexp.MatchString(`http[s]?:\/\/(.*)`, v["path"]) | |||
| if isURL { | |||
| if exportentities.IsURL(v["path"]) { | |||
| var err error | |||
| reader, _, err = exportentities.OpenURL(v["path"], format) | |||
cli/cdsctl/pipeline.go
Outdated
| @@ -130,8 +129,7 @@ func pipelineImportRun(v cli.Values) error { | |||
| format = "json" | |||
| } | |||
|
|
|||
| isURL, _ := regexp.MatchString(`http[s]?:\/\/(.*)`, v["path"]) | |||
| if isURL { | |||
| if exportentities.IsURL(v["path"]) { | |||
cli/cdsctl/pipeline_group.go
Outdated
| @@ -64,8 +63,7 @@ func pipelineGroupImportRun(v cli.Values) error { | |||
| format = "json" | |||
| } | |||
|
|
|||
| isURL, _ := regexp.MatchString(`http[s]?:\/\/(.*)`, v["path"]) | |||
| if isURL { | |||
| if exportentities.IsURL(v["path"]) { | |||
cli/cdsctl/project_group.go
Outdated
| @@ -62,8 +61,7 @@ func projectGroupImportRun(v cli.Values) error { | |||
| format = "json" | |||
| } | |||
|
|
|||
| isURL, _ := regexp.MatchString(`http[s]?:\/\/(.*)`, v["path"]) | |||
| if isURL { | |||
| if exportentities.IsURL(v["path"]) { | |||
cli/cdsctl/template.go
Outdated
| } | ||
| buf := new(bytes.Buffer) | ||
| if _, err := buf.ReadFrom(contentFile); err != nil { | ||
| return fmt.Errorf("Cannot read from given remote file: %v", err) |
There was a problem hiding this comment.
Error strings should not start with a capital letter because they'll often be prefixed before printing:
cli/cdsctl/template.go
Outdated
| } | ||
| var t exportentities.Template | ||
| if err := yaml.Unmarshal(buf.Bytes(), &t); err != nil { | ||
| return fmt.Errorf("Cannot unmarshal given remote yaml file: %v", err) |
There was a problem hiding this comment.
Error strings should not start with a capital letter because they'll often be prefixed before printing:
cli/cdsctl/template.go
Outdated
| for _, file := range files { | ||
| fi, err := os.Lstat(file) | ||
| if err != nil { | ||
| fmt.Printf("Skipping file %s: %v\n", file, err) |
There was a problem hiding this comment.
Error strings should not start with a capital letter because they'll often be prefixed before printing:
fsamin
approved these changes
Jan 4, 2019
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.
@ovh/cds