Fixes for cognito output handling

internal/generate/terraform/generate.go

@@ -45,10 +45,10 @@ func GetOutputs(config *config.Commit0Config, pathPrefix string, outputs []strin
 
 	envars := util.MakeAwsEnvars(util.GetSecrets())
 
-	path := filepath.Join(pathPrefix, "terraform")
+	pathPrefix = filepath.Join(pathPrefix, "environments/staging")
 
 	for _, output := range outputs {
-		outputValue := util.ExecuteCommandOutput(exec.Command("terraform", "output", output), path, envars)
+		outputValue := util.ExecuteCommandOutput(exec.Command("terraform", "output", output), pathPrefix, envars)
 		outputsMap[output] = outputValue
 	}
 

internal/util/util.go

@@ -136,7 +136,7 @@ func ExecuteCommandOutput(cmd *exec.Cmd, pathPrefix string, envars []string) str
 
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		log.Fatalf("Executing terraform output failed: %v\n", err)
+		log.Fatalf("Executing command failed: (%v) %s\n", err, out)
 	}
 	return string(out)
 }

templates/terraform/environments/development/main.tf

@@ -38,3 +38,11 @@ module "development" {
   s3_hosting_bucket_name = "{{ .Config.Name }}-development"
 
 }
+
+output "cognito_client_id" {
+  value = module.staging.cognito.cognito_client_id
+}
+
+output "cognito_pool_id" {
+  value = module.staging.cognito.cognito_pool_id
+}

templates/terraform/environments/production/main.tf

@@ -38,3 +38,11 @@ module "production" {
   s3_hosting_bucket_name = "{{ .Config.Name }}-production"
 
 }
+
+output "cognito_client_id" {
+  value = module.staging.cognito.cognito_client_id
+}
+
+output "cognito_pool_id" {
+  value = module.staging.cognito.cognito_pool_id
+}

templates/terraform/environments/staging/main.tf

@@ -37,3 +37,11 @@ module "staging" {
   hostname = "{{ .Config.Frontend.Hostname }}"
   s3_hosting_bucket_name = "{{ .Config.Name }}-staging"
 }
+
+output "cognito_client_id" {
+  value = module.staging.cognito.cognito_client_id
+}
+
+output "cognito_pool_id" {
+  value = module.staging.cognito.cognito_pool_id
+}

templates/terraform/modules/cognito/main.tf

@@ -33,8 +33,8 @@ resource "aws_cognito_user_pool_client" "client" {
 }
 
 output "cognito_pool_id" {
-  value = "${aws_cognito_user_pool.users.id}"
+  value = aws_cognito_user_pool.users.id
 }
 output "cognito_client_id" {
-  value = "${aws_cognito_user_pool_client.client.id}"
+  value = aws_cognito_user_pool_client.client.id
 }

templates/terraform/modules/environment/main.tf

@@ -49,6 +49,10 @@ module "cognito" {
   user_pool   = var.user_pool
   hostname    = var.hostname
 }
+
+output "cognito" {
+  value       = module.cognito
+}
 # {{- end}}
 
 # {{ if .Config.Infrastructure.AWS.S3Hosting.Enabled }}