diff --git a/.github/actions/equivalence-test/action.yml b/.github/actions/equivalence-test/action.yml index bcde18329e..127af9ce80 100644 --- a/.github/actions/equivalence-test/action.yml +++ b/.github/actions/equivalence-test/action.yml @@ -70,6 +70,7 @@ runs: shell: bash run: | gh pr create \ + --draft \ --base ${{ inputs.current-branch }} \ --head ${{ inputs.new-branch }} \ --title "Update equivalence test golden files" \ diff --git a/.github/workflows/equivalence-test-diff.yml b/.github/workflows/equivalence-test-diff.yml index fed8b5bf3f..f5cdf3f6d5 100644 --- a/.github/workflows/equivalence-test-diff.yml +++ b/.github/workflows/equivalence-test-diff.yml @@ -3,6 +3,7 @@ name: equivalence-test-diff on: pull_request: types: + - opened - synchronize - ready_for_review - reopened diff --git a/.github/workflows/equivalence-test-update.yml b/.github/workflows/equivalence-test-update.yml index 9cd1e5d6bb..b194cd3437 100644 --- a/.github/workflows/equivalence-test-update.yml +++ b/.github/workflows/equivalence-test-update.yml @@ -66,4 +66,4 @@ jobs: current-branch: ${{ github.event.pull_request.base.ref }} new-branch: equivalence-testing/${{ github.event.pull_request.head.ref }} reviewers: ${{ github.event.pull_request.merged_by.login }} - message: "Update equivalence test golden files after ${{ github.event.pull_request.url }}." + message: "Update equivalence test golden files after ${{ github.event.pull_request.html_url }}." diff --git a/testing/equivalence-tests/tests/null_provider_basic/spec.json b/testing/equivalence-tests/tests/null_provider_basic/spec.json deleted file mode 100644 index d32d9a3b25..0000000000 --- a/testing/equivalence-tests/tests/null_provider_basic/spec.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "description": "tests creating a simple resource created by the null provider", - "include_files": [], - "ignore_fields": { - "apply.json": [ - "2.@message", - "2.hook.id_value" - ], - "state.json": [ - "values.root_module.resources.*.values.id" - ] - } -} diff --git a/testing/equivalence-tests/tests/null_provider_update/.terraform.lock.hcl b/testing/equivalence-tests/tests/null_provider_update/.terraform.lock.hcl new file mode 100644 index 0000000000..6ed19d1db2 --- /dev/null +++ b/testing/equivalence-tests/tests/null_provider_update/.terraform.lock.hcl @@ -0,0 +1,22 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/null" { + version = "3.1.1" + constraints = "3.1.1" + hashes = [ + "h1:YvH6gTaQzGdNv+SKTZujU1O0bO+Pw6vJHOPhqgN8XNs=", + "zh:063466f41f1d9fd0dd93722840c1314f046d8760b1812fa67c34de0afcba5597", + "zh:08c058e367de6debdad35fc24d97131c7cf75103baec8279aba3506a08b53faf", + "zh:73ce6dff935150d6ddc6ac4a10071e02647d10175c173cfe5dca81f3d13d8afe", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:8fdd792a626413502e68c195f2097352bdc6a0df694f7df350ed784741eb587e", + "zh:976bbaf268cb497400fd5b3c774d218f3933271864345f18deebe4dcbfcd6afa", + "zh:b21b78ca581f98f4cdb7a366b03ae9db23a73dfa7df12c533d7c19b68e9e72e5", + "zh:b7fc0c1615dbdb1d6fd4abb9c7dc7da286631f7ca2299fb9cd4664258ccfbff4", + "zh:d1efc942b2c44345e0c29bc976594cb7278c38cfb8897b344669eafbc3cddf46", + "zh:e356c245b3cd9d4789bab010893566acace682d7db877e52d40fc4ca34a50924", + "zh:ea98802ba92fcfa8cf12cbce2e9e7ebe999afbf8ed47fa45fc847a098d89468b", + "zh:eff8872458806499889f6927b5d954560f3d74bf20b6043409edf94d26cd906f", + ] +} diff --git a/testing/equivalence-tests/tests/null_provider_basic/main.tf b/testing/equivalence-tests/tests/null_provider_update/main.tf similarity index 100% rename from testing/equivalence-tests/tests/null_provider_basic/main.tf rename to testing/equivalence-tests/tests/null_provider_update/main.tf diff --git a/testing/equivalence-tests/tests/null_provider_update/spec.json b/testing/equivalence-tests/tests/null_provider_update/spec.json new file mode 100644 index 0000000000..fcd4cd67bc --- /dev/null +++ b/testing/equivalence-tests/tests/null_provider_update/spec.json @@ -0,0 +1,5 @@ +{ + "description": "tests creating a simple resource created by the null provider", + "include_files": [], + "ignore_fields": {} +} diff --git a/testing/equivalence-tests/tests/null_provider_update/terraform.tfstate b/testing/equivalence-tests/tests/null_provider_update/terraform.tfstate new file mode 100644 index 0000000000..c3b48aedfa --- /dev/null +++ b/testing/equivalence-tests/tests/null_provider_update/terraform.tfstate @@ -0,0 +1,27 @@ +{ + "version": 4, + "terraform_version": "1.10.0", + "serial": 1, + "lineage": "afca9e36-5040-2a11-9225-a64c8caa4605", + "outputs": {}, + "resources": [ + { + "mode": "managed", + "type": "null_resource", + "name": "null_resource", + "provider": "provider[\"registry.terraform.io/hashicorp/null\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "id": "3637779521417605172", + "triggers": null + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + } + ] + } + ], + "check_results": null +}