-
Notifications
You must be signed in to change notification settings - Fork 244
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactors URL for localConfigProvider. The CLI layer code for url cre…
…ate and delete are refactored to use the new changes. It also moves the localConfigProvider to a new package. Signed-off-by: mik-dass <mrinald7@gmail.com>
- Loading branch information
Showing
30 changed files
with
2,139 additions
and
1,317 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
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
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
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,85 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/openshift/odo/pkg/localConfigProvider" | ||
| "github.com/openshift/odo/pkg/util" | ||
| ) | ||
|
|
||
| // GetPorts returns the ports, returns default if nil | ||
| func (lc *LocalConfig) GetPorts() []string { | ||
| if lc.componentSettings.Ports == nil { | ||
| return nil | ||
| } | ||
| return *lc.componentSettings.Ports | ||
| } | ||
|
|
||
| // CompleteURL completes the given URL with default values | ||
| func (lc *LocalConfig) CompleteURL(url *localConfigProvider.LocalURL) error { | ||
| var err error | ||
| url.Port, err = util.GetValidPortNumber(lc.GetName(), url.Port, lc.GetPorts()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // get the name | ||
| if len(url.Name) == 0 { | ||
| url.Name = util.GetURLName(lc.GetName(), url.Port) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // ValidateURL validates the given URL | ||
| func (lc *LocalConfig) ValidateURL(url localConfigProvider.LocalURL) error { | ||
| errorList := make([]string, 0) | ||
|
|
||
| for _, localURL := range lc.ListURLs() { | ||
| if url.Name == localURL.Name { | ||
| errorList = append(errorList, fmt.Sprintf("URL %s already exists in application: %s", url.Name, lc.GetApplication())) | ||
| } | ||
| } | ||
|
|
||
| if len(errorList) > 0 { | ||
| return fmt.Errorf(strings.Join(errorList, "\n")) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // GetURL gets the given url localConfig | ||
| func (lc *LocalConfig) GetURL(name string) *localConfigProvider.LocalURL { | ||
| for _, url := range lc.ListURLs() { | ||
| if name == url.Name { | ||
| return &url | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // CreateURL writes the given url to the localConfig | ||
| func (lci *LocalConfigInfo) CreateURL(url localConfigProvider.LocalURL) error { | ||
| return lci.SetConfiguration("url", localConfigProvider.LocalURL{Name: url.Name, Port: url.Port, Secure: url.Secure}) | ||
| } | ||
|
|
||
| // ListURLs returns the ConfigURL, returns default if nil | ||
| func (lc *LocalConfig) ListURLs() []localConfigProvider.LocalURL { | ||
| if lc.componentSettings.URL == nil { | ||
| return []localConfigProvider.LocalURL{} | ||
| } | ||
| return *lc.componentSettings.URL | ||
| } | ||
|
|
||
| // DeleteURL is used to delete config from local odo config | ||
| func (lci *LocalConfigInfo) DeleteURL(parameter string) error { | ||
| for i, url := range *lci.componentSettings.URL { | ||
| if url.Name == parameter { | ||
| s := *lci.componentSettings.URL | ||
| s = append(s[:i], s[i+1:]...) | ||
| lci.componentSettings.URL = &s | ||
| } | ||
| } | ||
| return lci.writeToFile() | ||
| } |
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
Oops, something went wrong.