Adding generated code for templated repo name

christopherhein · christopherhein · commit 5d4c87ea8524 · 2018-08-25T11:20:55.000-07:00
Signed-off-by: Christopher Hein &lt;me@christopherhein.com&gt;
diff --git a/pkg/apis/operator.aws/v1alpha1/ecrrepository.go b/pkg/apis/operator.aws/v1alpha1/ecrrepository.go
@@ -28,6 +28,8 @@ type ECRRepositorySpec struct {
 // ECRRepositoryOutput defines the output resource for ECRRepository
 type ECRRepositoryOutput struct {
   RepositoryName string `json:"repositoryName"`
+  RepositoryARN string `json:"repositoryARN"`
+  RepositoryURL string `json:"repositoryURL"`
 }
 
 // ECRRepositoryStatus holds the status of the Cloudformation template
diff --git a/pkg/operator/ecrrepository/controller.go b/pkg/operator/ecrrepository/controller.go
@@ -172,6 +172,9 @@ func updateStatus(config *config.Config, name string, namespace string, stackID
 				logger.WithError(err).Error("error getting outputs")
 			}
 			resourceCopy.Output.RepositoryName = outputs["RepositoryName"]
+			resourceCopy.Output.RepositoryARN = outputs["RepositoryARN"]
+			repositoryURL, _ := helpers.Templatize("{{.Config.AccountID}}.dkr.ecr.{{.Config.Region}}.amazonaws.com/{{.Obj.Name}}", helpers.Data{Obj: resourceCopy, Config: config})
+			resourceCopy.Output.RepositoryURL = repositoryURL
 		}
 
 		_, err = clientSet.ECRRepositories(namespace).Update(resourceCopy)

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ type ECRRepositorySpec struct {`
`28`	`28`	`// ECRRepositoryOutput defines the output resource for ECRRepository`
`29`	`29`	`type ECRRepositoryOutput struct {`
`30`	`30`	RepositoryName string `json:"repositoryName"`
	`31`	+ RepositoryARN string `json:"repositoryARN"`
	`32`	+ RepositoryURL string `json:"repositoryURL"`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`// ECRRepositoryStatus holds the status of the Cloudformation template`
Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,9 @@ func updateStatus(config *config.Config, name string, namespace string, stackID`
`172`	`172`	`logger.WithError(err).Error("error getting outputs")`
`173`	`173`	`}`
`174`	`174`	`resourceCopy.Output.RepositoryName = outputs["RepositoryName"]`
	`175`	`+ resourceCopy.Output.RepositoryARN = outputs["RepositoryARN"]`
	`176`	`+ repositoryURL, _ := helpers.Templatize("{{.Config.AccountID}}.dkr.ecr.{{.Config.Region}}.amazonaws.com/{{.Obj.Name}}", helpers.Data{Obj: resourceCopy, Config: config})`
	`177`	`+ resourceCopy.Output.RepositoryURL = repositoryURL`
`175`	`178`	`}`
`176`	`179`
`177`	`180`	`_, err = clientSet.ECRRepositories(namespace).Update(resourceCopy)`