Fix more Custom Resource updaters (#528)

* Custom::ECRRepository update does not error * fix more custom updates * gofmt * return the actual outputs for repo * get physical resource id from the right place
convox · Apr 8, 2016 · a501c0f · a501c0f
1 parent 3d09654
commit a501c0f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/api/cmd/formation/handler/ecr.go b/api/cmd/formation/handler/ecr.go
@@ -51,7 +51,12 @@ func ECRRepositoryCreate(req Request) (string, map[string]string, error) {
 }
 
 func ECRRepositoryUpdate(req Request) (string, map[string]string, error) {
-	return req.PhysicalResourceId, nil, fmt.Errorf("could not update")
+	outputs := map[string]string{
+		"RegistryId":     strings.Split(req.PhysicalResourceId, ":")[4],
+		"RepositoryName": strings.Split(req.PhysicalResourceId, "/")[1],
+	}
+
+	return req.PhysicalResourceId, outputs, nil
 }
 
 func ECRRepositoryDelete(req Request) (string, map[string]string, error) {

diff --git a/api/cmd/formation/handler/ecs.go b/api/cmd/formation/handler/ecs.go
@@ -89,7 +89,7 @@ func ECSClusterCreate(req Request) (string, map[string]string, error) {
 }
 
 func ECSClusterUpdate(req Request) (string, map[string]string, error) {
-	return req.PhysicalResourceId, nil, fmt.Errorf("could not update")
+	return req.PhysicalResourceId, nil, nil
 }
 
 func ECSClusterDelete(req Request) (string, map[string]string, error) {
@@ -425,15 +425,15 @@ func ECSTaskDefinitionCreate(req Request) (string, map[string]string, error) {
 		// a single string (shell form) - ["sh", "-c", command]
 		// an array of strings (exec form) - ["cmd1", "cmd2"]
 		switch commands := task["Command"].(type) {
-			case string:
-				if commands != "" {
-					r.ContainerDefinitions[i].Command = []*string{aws.String("sh"), aws.String("-c"), aws.String(commands)}
-				}
-			case []interface{}:
-				r.ContainerDefinitions[i].Command = make([]*string, len(commands))
-				for j, command := range commands {
-					r.ContainerDefinitions[i].Command[j] = aws.String(command.(string))
-				}
+		case string:
+			if commands != "" {
+				r.ContainerDefinitions[i].Command = []*string{aws.String("sh"), aws.String("-c"), aws.String(commands)}
+			}
+		case []interface{}:
+			r.ContainerDefinitions[i].Command = make([]*string, len(commands))
+			for j, command := range commands {
+				r.ContainerDefinitions[i].Command[j] = aws.String(command.(string))
+			}
 		}
 
 		// set Task environment from CF Tasks[].Environment key/values

diff --git a/api/cmd/formation/handler/kms.go b/api/cmd/formation/handler/kms.go
@@ -43,7 +43,7 @@ func KMSKeyCreate(req Request) (string, map[string]string, error) {
 }
 
 func KMSKeyUpdate(req Request) (string, map[string]string, error) {
-	return req.PhysicalResourceId, nil, fmt.Errorf("could not update")
+	return req.PhysicalResourceId, nil, nil
 }
 
 func KMSKeyDelete(req Request) (string, map[string]string, error) {