Merge pull request #181 from dflook/diff

dflook · web-flow · commit 80692d2a7b78 · 2022-05-02T14:15:11.000+01:00
Clarify diff when aborting apply because of changed plan
diff --git a/image/entrypoints/apply.sh b/image/entrypoints/apply.sh
@@ -126,6 +126,9 @@ else
         echo "The plan on the PR must be up to date. Alternatively, set the auto_approve input to 'true' to apply outdated plans"
         update_status ":x: Plan not applied in $(job_markdown_ref) (Plan has changed)"
 
+        echo "Performing diff between the pull request plan and the plan generated at execution time ..."
+        echo "> are lines from the plan in the pull request"
+        echo "< are lines from the plan generated at execution"
         echo "Plan changes:"
         debug_log diff "$STEP_TMP_DIR/plan.txt" "$STEP_TMP_DIR/approved-plan.txt"
         diff "$STEP_TMP_DIR/plan.txt" "$STEP_TMP_DIR/approved-plan.txt" || true
diff --git a/tests/infra/http-auth.py b/tests/infra/http-auth.py
@@ -27,7 +27,7 @@ def lambda_handler(event, context):
 
     return {
         'statusCode': 200,
-        'body': '<html><head><meta name="terraform-get" content="git::https://github.com/dflook/terraform-github-actions.git//tests/registry/test-module" />',
+        'body': '<html><head><meta name="terraform-get" content="git::https://github.com/dflook/terraform-github-actions.git//tests/workflows/test-http/test-module" />',
         'headers': {
             'content-type': 'text/html'
         }
diff --git a/tests/workflows/test-http/main.tf b/tests/workflows/test-http/main.tf
@@ -1,5 +1,5 @@
 module "git_https_source" {
-  source = "git::https://github.com/dflook/terraform-github-actions-dev.git//tests/registry/test-module"
+  source = "git::https://github.com/dflook/terraform-github-actions-dev.git//tests/workflows/test-http/test-module"
 }
 
 output "git_https" {
diff --git a/tests/workflows/test-http/test-module/README.md b/tests/workflows/test-http/test-module/README.md
@@ -0,0 +1 @@
+This module is hosted in a git repo
diff --git a/tests/workflows/test-http/test-module/main.tf b/tests/workflows/test-http/test-module/main.tf
@@ -0,0 +1,3 @@
+output "my-output" {
+  value = "hello"
+}
diff --git a/tests/workflows/test-ssh/main.tf b/tests/workflows/test-ssh/main.tf
@@ -1,5 +1,5 @@
 module "hello" {
-  source = "git::ssh://git@github.com/dflook/terraform-github-actions//tests/registry/test-module"
+  source = "git::ssh://git@github.com/dflook/terraform-github-actions//tests/workflows/test-ssh/test-module"
 }
 
 output "word" {
diff --git a/tests/workflows/test-ssh/test-module/README.md b/tests/workflows/test-ssh/test-module/README.md
@@ -0,0 +1 @@
+This module is a module stored in a git repo
diff --git a/tests/workflows/test-ssh/test-module/main.tf b/tests/workflows/test-ssh/test-module/main.tf
@@ -0,0 +1,3 @@
+output "my-output" {
+  value = "hello"
+}

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ def lambda_handler(event, context):`
`27`	`27`
`28`	`28`	`return {`
`29`	`29`	`'statusCode': 200,`
`30`		`- 'body': '<html><head><meta name="terraform-get" content="git::https://github.com/dflook/terraform-github-actions.git//tests/registry/test-module" />',`
	`30`	`+ 'body': '<html><head><meta name="terraform-get" content="git::https://github.com/dflook/terraform-github-actions.git//tests/workflows/test-http/test-module" />',`
`31`	`31`	`'headers': {`
`32`	`32`	`'content-type': 'text/html'`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`module "git_https_source" {`
`2`		`- source = "git::https://github.com/dflook/terraform-github-actions-dev.git//tests/registry/test-module"`
	`2`	`+ source = "git::https://github.com/dflook/terraform-github-actions-dev.git//tests/workflows/test-http/test-module"`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`output "git_https" {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+output "my-output" {`
	`2`	`+ value = "hello"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`module "hello" {`
`2`		`- source = "git::ssh://git@github.com/dflook/terraform-github-actions//tests/registry/test-module"`
	`2`	`+ source = "git::ssh://git@github.com/dflook/terraform-github-actions//tests/workflows/test-ssh/test-module"`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`output "word" {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+This module is a module stored in a git repo`