-
Notifications
You must be signed in to change notification settings - Fork 695
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added method for validating Config object - should fix #144.
Reviewed and removed unnecessary fields from Config, which was also renamed from Request (fixed #100).
- Loading branch information
Showing
23 changed files
with
492 additions
and
455 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| // Main STI command. Parses command line arguments, creates request, | ||
| // and launches the proper request handler. | ||
| // Main STI command. Parses command line arguments, builds config object, | ||
| // and launches the proper handler. | ||
|
|
||
| package main |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| package describe | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| "strings" | ||
| "text/tabwriter" | ||
|
|
||
| "github.com/openshift/source-to-image/pkg/api" | ||
| ) | ||
|
|
||
| // Config returns the Config object in nice readable, tabbed format. | ||
| func DescribeConfig(config *api.Config) string { | ||
| out, err := tabbedString(func(out io.Writer) error { | ||
| fmt.Fprintf(out, "Builder Image:\t%s\n", config.BuilderImage) | ||
| fmt.Fprintf(out, "Source:\t%s\n", config.Source) | ||
| if len(config.Ref) > 0 { | ||
| fmt.Fprintf(out, "Source Ref:\t%s\n", config.Ref) | ||
| } | ||
| if len(config.ContextDir) > 0 { | ||
| fmt.Fprintf(out, "Context Directory:\t%s\n", config.ContextDir) | ||
| } | ||
| fmt.Fprintf(out, "Output Image Tag:\t%s\n", config.Tag) | ||
| printEnv(out, config.Environment) | ||
| if len(config.EnvironmentFile) > 0 { | ||
| fmt.Fprintf(out, "Environment File:\t%s\n", config.EnvironmentFile) | ||
| } | ||
| fmt.Fprintf(out, "Incremental Build:\t%s\n", printBool(config.Incremental)) | ||
| fmt.Fprintf(out, "Remove Old Build:\t%s\n", printBool(config.RemovePreviousImage)) | ||
| fmt.Fprintf(out, "Force Pull:\t%s\n", printBool(config.ForcePull)) | ||
| fmt.Fprintf(out, "Quiet:\t%s\n", printBool(config.Quiet)) | ||
| // fmt.Fprintf(out, "Layered Build:\t%s\n", printBool(config.LayeredBuild)) | ||
| if len(config.Location) > 0 { | ||
| fmt.Fprintf(out, "Artifacts Location:\t%s\n", config.Location) | ||
| } | ||
| if len(config.CallbackURL) > 0 { | ||
| fmt.Fprintf(out, "Callback URL:\t%s\n", config.CallbackURL) | ||
| } | ||
| if len(config.ScriptsURL) > 0 { | ||
| fmt.Fprintf(out, "STI Scripts URL:\t%s\n", config.ScriptsURL) | ||
| } | ||
| if len(config.WorkingDir) > 0 { | ||
| fmt.Fprintf(out, "Workdir:\t%s\n", config.WorkingDir) | ||
| } | ||
| fmt.Fprintf(out, "Docker Endpoint:\t%s\n", config.DockerConfig.Endpoint) | ||
|
|
||
| if _, err := os.Open(config.DockerCfgPath); err == nil { | ||
| fmt.Fprintf(out, "Docker Pull Config:\t%s\n", config.DockerCfgPath) | ||
| fmt.Fprintf(out, "Docker Pull User:\t%s\n", config.PullAuthentication.Username) | ||
| } | ||
| return nil | ||
| }) | ||
| if err != nil { | ||
| fmt.Printf("ERROR: %v", err) | ||
| } | ||
| return out | ||
| } | ||
|
|
||
| func printEnv(out io.Writer, env map[string]string) { | ||
| if len(env) == 0 { | ||
| return | ||
| } | ||
| result := []string{} | ||
| for k, v := range env { | ||
| result = append(result, fmt.Sprintf("%s=%s", k, v)) | ||
| } | ||
| fmt.Fprintf(out, "Environment:\t%s\n", strings.Join(result, ",")) | ||
| } | ||
|
|
||
| func printBool(b bool) string { | ||
| if b { | ||
| return "\033[1menabled\033[0m" | ||
| } | ||
| return "disabled" | ||
| } | ||
|
|
||
| func tabbedString(f func(io.Writer) error) (string, error) { | ||
| out := new(tabwriter.Writer) | ||
| buf := &bytes.Buffer{} | ||
| out.Init(buf, 0, 8, 1, '\t', 0) | ||
|
|
||
| err := f(out) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| out.Flush() | ||
| str := string(buf.String()) | ||
| return str, nil | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| // Provides types used for processing sti requests. | ||
| // Provides types used for processing sti builds. | ||
| package api |
Oops, something went wrong.