Merge pull request #212 from uselagoon/feature/211-routerPattern-proj…

…ect-update-support

Feature/211 router pattern project update support

cmd/project.go

@@ -360,6 +360,7 @@ func init() {
 	updateProjectCmd.Flags().StringVarP(&projectPatch.GitURL, "gitUrl", "g", "", "GitURL of the project")
 	updateProjectCmd.Flags().StringVarP(&projectPatch.PrivateKey, "privateKey", "I", "", "Private key to use for the project")
 	updateProjectCmd.Flags().StringVarP(&projectPatch.Subfolder, "subfolder", "s", "", "Set if the .lagoon.yml should be found in a subfolder useful if you have multiple Lagoon projects per Git Repository")
+	updateProjectCmd.Flags().StringVarP(&projectPatch.RouterPattern, "routerPattern", "Z", "", "Router pattern of the project, e.g. '${service}-${environment}-${project}.lagoon.example.com'")
 	updateProjectCmd.Flags().StringVarP(&projectPatch.ActiveSystemsTask, "activeSystemsTask", "T", "", "Which internal Lagoon System is responsible for tasks")
 	updateProjectCmd.Flags().StringVarP(&projectPatch.ActiveSystemsDeploy, "activeSystemsDeploy", "D", "", "Which internal Lagoon System is responsible for deploying ")
 	updateProjectCmd.Flags().StringVarP(&projectPatch.ActiveSystemsRemove, "activeSystemsRemove", "R", "", "Which internal Lagoon System is responsible for removing")
@@ -382,6 +383,7 @@ func init() {
 	addProjectCmd.Flags().StringVarP(&projectPatch.GitURL, "gitUrl", "g", "", "GitURL of the project")
 	addProjectCmd.Flags().StringVarP(&projectPatch.PrivateKey, "privateKey", "I", "", "Private key to use for the project")
 	addProjectCmd.Flags().StringVarP(&projectPatch.Subfolder, "subfolder", "s", "", "Set if the .lagoon.yml should be found in a subfolder useful if you have multiple Lagoon projects per Git Repository")
+	addProjectCmd.Flags().StringVarP(&projectPatch.RouterPattern, "routerPattern", "Z", "", "Router pattern of the project, e.g. '${service}-${environment}-${project}.lagoon.example.com'")
 	addProjectCmd.Flags().StringVarP(&projectPatch.ActiveSystemsTask, "activeSystemsTask", "T", "", "Which internal Lagoon System is responsible for tasks")
 	addProjectCmd.Flags().StringVarP(&projectPatch.ActiveSystemsDeploy, "activeSystemsDeploy", "D", "", "Which internal Lagoon System is responsible for deploying ")
 	addProjectCmd.Flags().StringVarP(&projectPatch.ActiveSystemsRemove, "activeSystemsRemove", "R", "", "Which internal Lagoon System is responsible for removing")

docs/commands/lagoon_add_project.md

@@ -29,6 +29,7 @@ lagoon add project [flags]
   -I, --privateKey string                     Private key to use for the project
   -E, --productionEnvironment string          Which environment(the name) should be marked as the production environment
   -m, --pullrequests string                   Which Pull Requests should be deployed
+  -Z, --routerPattern string                  Router pattern of the project, e.g. '${service}-${environment}-${project}.lagoon.example.com'
       --standbyProductionEnvironment string   Which environment(the name) should be marked as the standby production environment
   -C, --storageCalc int                       Should storage for this environment be calculated
   -s, --subfolder string                      Set if the .lagoon.yml should be found in a subfolder useful if you have multiple Lagoon projects per Git Repository

docs/commands/lagoon_update_project.md

@@ -30,6 +30,7 @@ lagoon update project [flags]
   -I, --privateKey string                     Private key to use for the project
   -E, --productionEnvironment string          Which environment(the name) should be marked as the production environment
   -m, --pullrequests string                   Which Pull Requests should be deployed
+  -Z, --routerPattern string                  Router pattern of the project, e.g. '${service}-${environment}-${project}.lagoon.example.com'
       --standbyProductionEnvironment string   Which environment(the name) should be marked as the standby production environment
   -C, --storageCalc int                       Should storage for this environment be calculated
   -s, --subfolder string                      Set if the .lagoon.yml should be found in a subfolder useful if you have multiple Lagoon projects per Git Repository

pkg/api/types.go

@@ -229,6 +229,7 @@ type Project struct {
 	GitURL                       string                `json:"gitUrl,omitempty"`
 	PrivateKey                   string                `json:"privateKey,omitempty"`
 	Subfolder                    string                `json:"subfolder,omitempty"`
+	RouterPattern                string                `json:"routerPattern,omitempty"`
 	ActiveSystemsTask            string                `json:"activeSystemsTask,omitempty"`
 	ActiveSystemsDeploy          string                `json:"activeSystemsDeploy,omitempty"`
 	ActiveSystemsRemove          string                `json:"activeSystemsRemove,omitempty"`
@@ -257,6 +258,7 @@ type ProjectPatch struct {
 	GitURL                       string `json:"gitUrl,omitempty"`
 	PrivateKey                   string `json:"privateKey,omitempty"`
 	Subfolder                    string `json:"subfolder,omitempty"`
+	RouterPattern                string `json:"routerPattern,omitempty"`
 	ActiveSystemsTask            string `json:"activeSystemsTask,omitempty"`
 	ActiveSystemsDeploy          string `json:"activeSystemsDeploy,omitempty"`
 	ActiveSystemsRemove          string `json:"activeSystemsRemove,omitempty"`

pkg/graphql/main.go

@@ -47,6 +47,7 @@ var ProjectByNameFragment = `fragment Project on Project {
 	name
 	gitUrl
 	subfolder
+	routerPattern
 	branches
 	pullrequests
 	productionEnvironment

pkg/lagoon/projects/main.go

@@ -138,7 +138,7 @@ func processProjectInfo(projectByName []byte) ([]byte, error) {
 	var data []output.Data
 	data = append(data, projectData)
 	dataMain := output.Table{
-		Header: []string{"ID", "ProjectName", "GitURL", "Branches", "PullRequests", "ProductionRoute", "DevEnvironments", "DevEnvLimit", "ProductionEnv", "AutoIdle"},
+		Header: []string{"ID", "ProjectName", "GitURL", "Branches", "PullRequests", "ProductionRoute", "DevEnvironments", "DevEnvLimit", "ProductionEnv", "RouterPattern", "AutoIdle"},
 		Data:   data,
 	}
 	return json.Marshal(dataMain)
@@ -166,6 +166,7 @@ func processProjectExtra(project api.Project) []string {
 		fmt.Sprintf("%v/%v", currentDevEnvironments, project.DevelopmentEnvironmentsLimit),
 		fmt.Sprintf("%v", project.DevelopmentEnvironmentsLimit),
 		fmt.Sprintf("%v", project.ProductionEnvironment),
+		fmt.Sprintf("%s", project.RouterPattern),
 		fmt.Sprintf("%v", *project.AutoIdle),
 	}
 	return data

pkg/lagoon/projects/main_test.go

@@ -80,8 +80,8 @@ func TestProjectInfo(t *testing.T) {
 		{"deployType":"branch","environmentType":"development","id":5,"name":"Development","openshiftProjectName":"high-cotton-development","route":"https://varnish-highcotton-org-development.us.amazee.io"},
 		{"deployType":"pullrequest","environmentType":"development","id":6,"name":"PR-175","openshiftProjectName":"high-cotton-pr-175","route":""},
 		{"deployType":"branch","environmentType":"development","id":10,"name":"high-cotton","openshiftProjectName":"high-cotton-high-cotton","route":null}],
-		"gitUrl":"test","id":18,"name":"high-cotton","productionEnvironment":"doopdd","pullrequests":"false","storageCalc":1,"subfolder":null}`
-	var projectInfoSuccess = `{"header":["ID","ProjectName","GitURL","Branches","PullRequests","ProductionRoute","DevEnvironments","DevEnvLimit","ProductionEnv","AutoIdle"],"data":[["18","high-cotton","test","false","false","http://highcotton.org","4/5","5","doopdd","1"]]}`
+		"gitUrl":"test","id":18,"name":"high-cotton","productionEnvironment":"doopdd","routerPattern":"${environment}-${project}.lagoon.example.com","pullrequests":"false","storageCalc":1,"subfolder":null}`
+	var projectInfoSuccess = `{"header":["ID","ProjectName","GitURL","Branches","PullRequests","ProductionRoute","DevEnvironments","DevEnvLimit","ProductionEnv","RouterPattern","AutoIdle"],"data":[["18","high-cotton","test","false","false","http://highcotton.org","4/5","5","doopdd","${environment}-${project}.lagoon.example.com","1"]]}`
 
 	returnResult, err := processProjectInfo([]byte(projectInfo))
 	if err != nil {
@@ -100,7 +100,7 @@ func TestProjectUpdate(t *testing.T) {
 		{"deployType":"branch","environmentType":"development","id":5,"name":"Development","openshiftProjectName":"high-cotton-development","route":"https://varnish-highcotton-org-development.us.amazee.io"},
 		{"deployType":"pullrequest","environmentType":"development","id":6,"name":"PR-175","openshiftProjectName":"high-cotton-pr-175","route":""},
 		{"deployType":"branch","environmentType":"development","id":10,"name":"high-cotton","openshiftProjectName":"high-cotton-high-cotton","route":null}],
-		"gitUrl":"test","id":18,"name":"high-cotton","productionEnvironment":"Master","pullrequests":"true","storageCalc":1,"subfolder":null}`
+		"gitUrl":"test","id":18,"name":"high-cotton","productionEnvironment":"Master","routerPattern":"${environment}-${project}.lagoon.example.com","pullrequests":"true","storageCalc":1,"subfolder":null}`
 
 	var jsonPatch = `{"branches":"false"}`
 	var updateProjectsSuccess = `{"id":18,"patch":{"branches":"false"}}`