Merge pull request #193 from dflook/only_moved

Fix compacting plans with only moved resources

Author: dflook

.github/workflows/test-apply.yaml

@@ -122,7 +122,8 @@ jobs:
             exit 1
           fi
 
-          if [[ $(jq -r .format_version "${{ steps.apply.outputs.json_plan_path }}") != "1.0" ]]; then
+          cat "${{ steps.apply.outputs.json_plan_path }}"
+          if [[ $(jq -r .format_version "${{ steps.apply.outputs.json_plan_path }}") != "1.1" ]]; then
             echo "::error:: json_plan_path not set correctly"
             exit 1
           fi
@@ -226,7 +227,7 @@ jobs:
             exit 1
           fi
 
-          if [[ $(jq -r .format_version "${{ steps.second-apply.outputs.json_plan_path }}") != "1.0" ]]; then
+          if [[ $(jq -r .format_version "${{ steps.second-apply.outputs.json_plan_path }}") != "1.1" ]]; then
             echo "::error:: json_plan_path not set correctly"
             exit 1
           fi
@@ -623,7 +624,8 @@ jobs:
             exit 1
           fi
 
-          if [[ $(jq -r .format_version "${{ steps.apply.outputs.json_plan_path }}") != "1.0" ]]; then
+          cat "${{ steps.apply.outputs.json_plan_path }}"
+          if [[ $(jq -r .format_version "${{ steps.apply.outputs.json_plan_path }}") != "1.1" ]]; then
             echo "::error:: json_plan_path not set correctly"
             exit 1
           fi

.github/workflows/test-plan.yaml

@@ -29,7 +29,7 @@ jobs:
           fi
 
           cat '${{ steps.plan.outputs.json_plan_path }}'
-          if [[ $(jq -r .format_version "${{ steps.plan.outputs.json_plan_path }}") != "1.0" ]]; then
+          if [[ $(jq -r .format_version "${{ steps.plan.outputs.json_plan_path }}") != "1.1" ]]; then
             echo "::error:: json_plan_path not set correctly"
             exit 1
           fi
@@ -69,7 +69,7 @@ jobs:
       - name: Verify outputs
         run: |
           cat '${{ steps.plan.outputs.json_plan_path }}'
-          if [[ $(jq -r .format_version "${{ steps.plan.outputs.json_plan_path }}") != "1.0" ]]; then
+          if [[ $(jq -r .format_version "${{ steps.plan.outputs.json_plan_path }}") != "1.1" ]]; then
             echo "::error:: json_plan_path not set correctly"
             exit 1
           fi

.github/workflows/test-version.yaml

@@ -398,7 +398,7 @@ jobs:
 
       - name: Check the version
         run: |
-          if [[ "${{ steps.terraform-version.outputs.terraform }}" != *"1.1"* ]]; then
+          if [[ "${{ steps.terraform-version.outputs.terraform }}" != *"1.2"* ]]; then
             echo "::error:: Latest version was not used"
             exit 1
           fi

image/tools/compact_plan.py

@@ -14,7 +14,8 @@ def compact_plan(input):
             line.startswith('An execution plan has been generated and is shown below') or
             line.startswith('No changes') or
             line.startswith('Error') or
-            line.startswith('Changes to Outputs:')
+            line.startswith('Changes to Outputs:') or
+            line.startswith('Terraform will perform the following actions:')
         ):
             plan = True
 

tests/test_compact_plan.py

@@ -510,6 +510,37 @@ def test_plan_refresh_changes_15():
     output = '\n'.join(compact_plan(input.splitlines()))
     assert output == expected_output
 
+def test_plan_refresh_changes_16():
+    input = """
+random_string.my_string: Refreshing state... [id=Iyh3jLKc]
+
+Terraform will perform the following actions:
+
+  # random_string.your_string has moved to random_string.my_string
+    resource "random_string" "my_string" {
+        id          = "Iyh3jLKc"
+        length      = 8
+        # (8 unchanged attributes hidden)
+    }
+
+Plan: 0 to add, 0 to change, 0 to destroy.
+        """
+
+    expected_output = """Terraform will perform the following actions:
+
+  # random_string.your_string has moved to random_string.my_string
+    resource "random_string" "my_string" {
+        id          = "Iyh3jLKc"
+        length      = 8
+        # (8 unchanged attributes hidden)
+    }
+
+Plan: 0 to add, 0 to change, 0 to destroy.
+        """
+
+    output = '\n'.join(compact_plan(input.splitlines()))
+    assert output == expected_output
+
 def test_error_11():
     input = """
 Error: random_string.my_string: length: cannot parse '' as int: strconv.ParseInt: parsing "ten": invalid syntax