Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package terragrunt for openSUSE:Factory checked in at 2023-10-30 22:10:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/terragrunt (Old) and /work/SRC/openSUSE:Factory/.terragrunt.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "terragrunt" Mon Oct 30 22:10:48 2023 rev:78 rq:1121089 version:0.53.0 Changes: -------- --- /work/SRC/openSUSE:Factory/terragrunt/terragrunt.changes 2023-10-27 22:29:55.971342707 +0200 +++ /work/SRC/openSUSE:Factory/.terragrunt.new.17445/terragrunt.changes 2023-10-30 22:11:12.585156045 +0100 @@ -1,0 +2,6 @@ +Mon Oct 30 07:28:28 UTC 2023 - ka...@b1-systems.de + +- Update to version 0.53.0: + * Terraform 1.6 (#2754) + +------------------------------------------------------------------- Old: ---- terragrunt-0.52.7.obscpio New: ---- terragrunt-0.53.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ terragrunt.spec ++++++ --- /var/tmp/diff_new_pack.dmEUrA/_old 2023-10-30 22:11:13.789200465 +0100 +++ /var/tmp/diff_new_pack.dmEUrA/_new 2023-10-30 22:11:13.793200612 +0100 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: terragrunt -Version: 0.52.7 +Version: 0.53.0 Release: 0 Summary: Thin wrapper for Terraform for working with multiple Terraform modules License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.dmEUrA/_old 2023-10-30 22:11:13.829201940 +0100 +++ /var/tmp/diff_new_pack.dmEUrA/_new 2023-10-30 22:11:13.833202089 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/gruntwork-io/terragrunt</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.52.7</param> + <param name="revision">v0.53.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.dmEUrA/_old 2023-10-30 22:11:13.853202826 +0100 +++ /var/tmp/diff_new_pack.dmEUrA/_new 2023-10-30 22:11:13.857202974 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/gruntwork-io/terragrunt</param> - <param name="changesrevision">0764ce24d3f1520b039da1481f68598300fd5b59</param></service></servicedata> + <param name="changesrevision">dcbec9f11efae59038c4632116a13c89916dc15c</param></service></servicedata> (No newline at EOF) ++++++ terragrunt-0.52.7.obscpio -> terragrunt-0.53.0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/.circleci/config.yml new/terragrunt-0.53.0/.circleci/config.yml --- old/terragrunt-0.52.7/.circleci/config.yml 2023-10-26 20:05:46.000000000 +0200 +++ new/terragrunt-0.53.0/.circleci/config.yml 2023-10-27 18:05:16.000000000 +0200 @@ -130,6 +130,19 @@ - run: <<: *install_tflint + - run: + # Install Terraform 1.6 for integration tests + command: | + pushd . + cd /tmp + curl -L "https://releases.hashicorp.com/terraform/1.6.2/terraform_1.6.2_linux_amd64.zip" -o terraform.zip + unzip -o terraform.zip + sudo install -m 0755 terraform /usr/local/bin/terraform + rm -rf terraform + rm -rf terraform.zip + popd + terraform --version + # Make GCP Service Account creds available as a file - run: echo $GCLOUD_SERVICE_KEY > ${HOME}/gcloud-service-key.json - run: echo 'export GOOGLE_APPLICATION_CREDENTIALS=${HOME}/gcloud-service-key.json' >> $BASH_ENV diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/docs/_docs/01_getting-started/supported-versions.md new/terragrunt-0.53.0/docs/_docs/01_getting-started/supported-versions.md --- old/terragrunt-0.52.7/docs/_docs/01_getting-started/supported-versions.md 2023-10-26 20:05:46.000000000 +0200 +++ new/terragrunt-0.53.0/docs/_docs/01_getting-started/supported-versions.md 2023-10-27 18:05:16.000000000 +0200 @@ -3,7 +3,7 @@ title: Terraform and OpenTofu Version Compatibility Table category: getting-started excerpt: Learn which Terraform and OpenTofu versions are compatible with which versions of Terragrunt. -tags: ["install"] +tags: [ "install" ] order: 102 nav_title: Documentation nav_title_link: /docs/ @@ -23,6 +23,7 @@ | Terraform Version | Terragrunt Version | |-------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------| +| 1.6.x | >= [0.53.0](https://github.com/gruntwork-io/terragrunt/releases/tag/v0.53.0) | | 1.5.x | >= [0.48.0](https://github.com/gruntwork-io/terragrunt/releases/tag/v0.48.0) | | 1.4.x | >= [0.45.0](https://github.com/gruntwork-io/terragrunt/releases/tag/v0.45.0) | | 1.3.x | >= [0.40.0](https://github.com/gruntwork-io/terragrunt/releases/tag/v0.40.0) | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/fixture-download/custom-lock-file/.terraform.lock.hcl new/terragrunt-0.53.0/test/fixture-download/custom-lock-file/.terraform.lock.hcl --- old/terragrunt-0.52.7/test/fixture-download/custom-lock-file/.terraform.lock.hcl 2023-10-26 20:05:46.000000000 +0200 +++ new/terragrunt-0.53.0/test/fixture-download/custom-lock-file/.terraform.lock.hcl 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -# This file is maintained automatically by "tofu init". -# Manual edits may be lost in future updates. - -provider "registry.opentofu.org/hashicorp/aws" { - version = "5.19.0" - constraints = "5.19.0" - hashes = [ - "h1:xoQFH3TCqCvdaBuqxChcPaooKWOuz3mHI3VKdgxnxEk=", - "zh:0c1887bd8efd1da9458ad6d8c59f33de21041d06db3a1d3fa8eae53404051943", - "zh:1c3604f15481eff8ccbbeb31b47acf11454a391c1247c7b23d4e3636f1ce4547", - "zh:3363e23fe87cb7b0fbbb5e6fc4ef58d2aff05ef5fdf17605e5fbd7e4ee91a312", - "zh:3cba361ff181877cb261762a8225a42c5d1053503cb53796b6277bfedeb1baf9", - "zh:7a9d7dfaa5878ab51c45d8b5b6bec74a42e12d755753efaee6b2075875d3afd0", - "zh:b160fd637ebf3ffb8ee3f4f17e8d51f50e176e26f7889464fd019d20dd045159", - "zh:b32b9da9dba98e5be8b9b110c5306e99f49e6608eb434e93211db5bc3a78412e", - "zh:b5b60196dd0ce47111fbe2792670a0aca4d8814d15c291d23f1cb29224fbd9a7", - "zh:bd349062b14435a8d8924b37208e51caa197617b7a5f2c26e488007c7c6f3298", - "zh:f574b9f4652b3d4209fe41f360868e2a90aebebff5f9000f94c507b520490f74", - ] -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/fixture-download/custom-lock-file/terragrunt.hcl new/terragrunt-0.53.0/test/fixture-download/custom-lock-file/terragrunt.hcl --- old/terragrunt-0.52.7/test/fixture-download/custom-lock-file/terragrunt.hcl 2023-10-26 20:05:46.000000000 +0200 +++ new/terragrunt-0.53.0/test/fixture-download/custom-lock-file/terragrunt.hcl 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -inputs = { - name = "World" -} - -terraform { - source = "../custom-lock-file-module" -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/fixture-download/custom-lock-file-module/main.tf new/terragrunt-0.53.0/test/fixture-download/custom-lock-file-module/main.tf --- old/terragrunt-0.52.7/test/fixture-download/custom-lock-file-module/main.tf 2023-10-26 20:05:46.000000000 +0200 +++ new/terragrunt-0.53.0/test/fixture-download/custom-lock-file-module/main.tf 2023-10-27 18:05:16.000000000 +0200 @@ -8,7 +8,7 @@ required_providers { aws = { source = "hashicorp/aws" - version = "5.19.0" + version = "5.23.0" } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/fixture-download/custom-lock-file-terraform/.terraform.lock.hcl new/terragrunt-0.53.0/test/fixture-download/custom-lock-file-terraform/.terraform.lock.hcl --- old/terragrunt-0.52.7/test/fixture-download/custom-lock-file-terraform/.terraform.lock.hcl 1970-01-01 01:00:00.000000000 +0100 +++ new/terragrunt-0.53.0/test/fixture-download/custom-lock-file-terraform/.terraform.lock.hcl 2023-10-27 18:05:16.000000000 +0200 @@ -0,0 +1,25 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "5.23.0" + constraints = "5.23.0" + hashes = [ + "h1:AwjyBYctD8UKCXcm+kLJfRjYdUYzG0hetStKrw8UL9M=", + "zh:100966f25b1878b7c4ee250dcbaf09e5a2dad4bcebba2482d77c4cc4e48957da", + "zh:57ed5e66949568d25788ebcd170abf5961f81bb141f69d3acca9a7454994d0c5", + "zh:5acf55f8901d5443b6994463d7b2dcbb137a242486f47963e0f33c4cce30171a", + "zh:7036770df1223d15e0982be39bedf32b2e2cae1eabac717138cbc90bbf94e30e", + "zh:79f3f151984a97a7dee14e74ca9d9926b2add30982fe44a450645b89a6da6e00", + "zh:8a1b0bc5e237609fc1ad7af17e15a95f93a56c3403c0d022d94163ac1989507c", + "zh:94f3baf6a3ba728e31844d6786dae9aa505323389c6323e2eb820a3c81e82229", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:ac4059a4f45c77432897605efb3642451c125ddddabe14d36a4a85dad13ae6cb", + "zh:d2a8d1c9a9100ae3fec34f119d3a90faefb89bf93780fc6934898533c6900cba", + "zh:de647167adb585a54cfbfc4c5d204c5d0a444624d386a773eae75789aa75f363", + "zh:edb533b3df81f2d1ef7387380cab843877f3f3c756f7a87cbba1961b3f01e4a2", + "zh:f56491ecb31b1ebde35cbfe8261e3c82c983b3039837f8756834cf27018bd93a", + "zh:fba46b50c35e40ea27947f4305320aaa61cdc22812b138571841e9bf8c7f5db9", + "zh:fcb92b5c6fbb70ae9137291ffc8ef06c48daec9cf0fafb980d178fe925658160", + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/fixture-download/custom-lock-file-terraform/terragrunt.hcl new/terragrunt-0.53.0/test/fixture-download/custom-lock-file-terraform/terragrunt.hcl --- old/terragrunt-0.52.7/test/fixture-download/custom-lock-file-terraform/terragrunt.hcl 1970-01-01 01:00:00.000000000 +0100 +++ new/terragrunt-0.53.0/test/fixture-download/custom-lock-file-terraform/terragrunt.hcl 2023-10-27 18:05:16.000000000 +0200 @@ -0,0 +1,7 @@ +inputs = { + name = "World" +} + +terraform { + source = "../custom-lock-file-module" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/fixture-download/custom-lock-file-tofu/.terraform.lock.hcl new/terragrunt-0.53.0/test/fixture-download/custom-lock-file-tofu/.terraform.lock.hcl --- old/terragrunt-0.52.7/test/fixture-download/custom-lock-file-tofu/.terraform.lock.hcl 1970-01-01 01:00:00.000000000 +0100 +++ new/terragrunt-0.53.0/test/fixture-download/custom-lock-file-tofu/.terraform.lock.hcl 2023-10-27 18:05:16.000000000 +0200 @@ -0,0 +1,20 @@ +# This file is maintained automatically by "tofu init". +# Manual edits may be lost in future updates. + +provider "registry.opentofu.org/hashicorp/aws" { + version = "5.23.0" + constraints = "5.23.0" + hashes = [ + "h1:nrvJsxhay2nts34LIUgEtFEOe3ORnShNYyDzkybRj0E=", + "zh:1d529f875e2a5cbeb80b28c8e3ad41707ec329a7f790a7031868b88705df4965", + "zh:22f4b50cf437686cdab64d1d822d80518a846b80ab032b13e25ed5b128a74868", + "zh:25b23f38fd9bc0b07d1dad705d8afec0b1d4c6eab4bae7c707c8f7e4caed8856", + "zh:5a29c392a116ae44a1ab769efaa699bab5372f3605ec1f1f1749249526a21a76", + "zh:65a2177174f91c0382621a5e02fd5b077e9270895a20764bf5784f5d38d54f7b", + "zh:6b5b3bdb1134480c7a038287e5e3772298fcebc4cf7c5b0587c9ee61b15e4cb1", + "zh:7ec42646e253a29621283aeefd1ec6f1381d166ca6fb3cb7a35a18b05f6f09ef", + "zh:8950b9f706533ae017d6776db0ed7d165f8b90ffd1f5f79c91bc93d3a666b5e1", + "zh:bd92ded5eafdcc3bd423ca3477f4eec2737e7b6b2ccb68aedc38fd761de20ae8", + "zh:d00bd63e362a3ae90d2d9409d2f3adc0198b893637690d6640cc0bcb9b67a066", + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/fixture-download/custom-lock-file-tofu/terragrunt.hcl new/terragrunt-0.53.0/test/fixture-download/custom-lock-file-tofu/terragrunt.hcl --- old/terragrunt-0.52.7/test/fixture-download/custom-lock-file-tofu/terragrunt.hcl 1970-01-01 01:00:00.000000000 +0100 +++ new/terragrunt-0.53.0/test/fixture-download/custom-lock-file-tofu/terragrunt.hcl 2023-10-27 18:05:16.000000000 +0200 @@ -0,0 +1,7 @@ +inputs = { + name = "World" +} + +terraform { + source = "../custom-lock-file-module" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/fixture-tftest/main.tf new/terragrunt-0.53.0/test/fixture-tftest/main.tf --- old/terragrunt-0.52.7/test/fixture-tftest/main.tf 1970-01-01 01:00:00.000000000 +0100 +++ new/terragrunt-0.53.0/test/fixture-tftest/main.tf 2023-10-27 18:05:16.000000000 +0200 @@ -0,0 +1,15 @@ +provider "aws" { + region = "us-east-1" +} + +variable "bucket_prefix" { + type = string +} + +resource "aws_s3_bucket" "bucket" { + bucket = "${var.bucket_prefix}-bucket" +} + +output "bucket_name" { + value = aws_s3_bucket.bucket.bucket +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/fixture-tftest/terragrunt.hcl new/terragrunt-0.53.0/test/fixture-tftest/terragrunt.hcl --- old/terragrunt-0.52.7/test/fixture-tftest/terragrunt.hcl 1970-01-01 01:00:00.000000000 +0100 +++ new/terragrunt-0.53.0/test/fixture-tftest/terragrunt.hcl 2023-10-27 18:05:16.000000000 +0200 @@ -0,0 +1,3 @@ +inputs = { + bucket_prefix = "tg-test" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/fixture-tftest/validate_name.tftest.hcl new/terragrunt-0.53.0/test/fixture-tftest/validate_name.tftest.hcl --- old/terragrunt-0.52.7/test/fixture-tftest/validate_name.tftest.hcl 1970-01-01 01:00:00.000000000 +0100 +++ new/terragrunt-0.53.0/test/fixture-tftest/validate_name.tftest.hcl 2023-10-27 18:05:16.000000000 +0200 @@ -0,0 +1,7 @@ +run "valid_string_concat" { + command = plan + assert { + condition = aws_s3_bucket.bucket.bucket == "tg-test-bucket" + error_message = "S3 bucket name expected to be tg-test-bucket" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/integration_download_test.go new/terragrunt-0.53.0/test/integration_download_test.go --- old/terragrunt-0.52.7/test/integration_download_test.go 2023-10-26 20:05:46.000000000 +0200 +++ new/terragrunt-0.53.0/test/integration_download_test.go 2023-10-27 18:05:16.000000000 +0200 @@ -204,13 +204,15 @@ func TestCustomLockFile(t *testing.T) { t.Parallel() - cleanupTerraformFolder(t, testFixtureCustomLockFile) + path := fmt.Sprintf("%s-%s", testFixtureCustomLockFile, wrappedBinary()) - runTerragrunt(t, fmt.Sprintf("terragrunt apply -auto-approve --terragrunt-non-interactive --terragrunt-working-dir %s", testFixtureCustomLockFile)) + cleanupTerraformFolder(t, path) + + runTerragrunt(t, fmt.Sprintf("terragrunt apply -auto-approve --terragrunt-non-interactive --terragrunt-working-dir %s", path)) source := "../custom-lock-file-module" - downloadDir := util.JoinPath(testFixtureCustomLockFile, TERRAGRUNT_CACHE) - result, err := tfsource.NewSource(source, downloadDir, testFixtureCustomLockFile, util.CreateLogEntry("", util.GetDefaultLogLevel())) + downloadDir := util.JoinPath(path, TERRAGRUNT_CACHE) + result, err := tfsource.NewSource(source, downloadDir, path, util.CreateLogEntry("", util.GetDefaultLogLevel())) require.NoError(t, err) lockFilePath := util.JoinPath(result.WorkingDir, util.TerraformLockFile) @@ -222,7 +224,7 @@ // In our lock file, we intentionally have hashes for an older version of the AWS provider. If the lock file // copying works, then Terraform will stick with this older version. If there is a bug, Terraform will end up // installing a newer version (since the version is not pinned in the .tf code, only in the lock file). - assert.Contains(t, string(readFile), `version = "5.19.0"`) + assert.Contains(t, string(readFile), `version = "5.23.0"`) } func TestExcludeDirs(t *testing.T) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terragrunt-0.52.7/test/integration_test.go new/terragrunt-0.53.0/test/integration_test.go --- old/terragrunt-0.52.7/test/integration_test.go 2023-10-26 20:05:46.000000000 +0200 +++ new/terragrunt-0.53.0/test/integration_test.go 2023-10-27 18:05:16.000000000 +0200 @@ -174,6 +174,7 @@ TEST_FIXTURE_DISABLED_MODULE = "fixture-disabled/" TEST_FIXTURE_EMPTY_STATE = "fixture-empty-state/" TEST_FIXTURE_EXTERNAL_DEPENDENCY = "fixture-external-dependency/" + TEST_FIXTURE_TF_TEST = "fixture-tftest/" TERRAFORM_BINARY = "terraform" TOFU_BINARY = "tofu" TERRAFORM_FOLDER = ".terraform" @@ -6208,6 +6209,9 @@ cleanupTerraformFolder(t, tmpEnvPath) testPath := util.JoinPath(tmpEnvPath, TEST_FIXTURE_EXTERNAL_DEPENDENCY) + t.Cleanup(func() { + os.RemoveAll(filepath.ToSlash("/tmp/external-46521694")) + }) assert.NoError(t, os.Mkdir(filepath.ToSlash("/tmp/external-46521694"), 0755)) output, err := exec.Command("git", "init", tmpEnvPath).CombinedOutput() @@ -6241,6 +6245,21 @@ require.NotContains(t, captured, "/tmp/external1") } +func TestTerragruntInvokeTerraformTests(t *testing.T) { + t.Parallel() + + tmpEnvPath := copyEnvironment(t, TEST_FIXTURE_TF_TEST) + cleanupTerraformFolder(t, tmpEnvPath) + testPath := util.JoinPath(tmpEnvPath, TEST_FIXTURE_TF_TEST) + + stdout := bytes.Buffer{} + stderr := bytes.Buffer{} + + err := runTerragruntCommand(t, fmt.Sprintf("terragrunt test --terragrunt-non-interactive --terragrunt-working-dir %s", testPath), &stdout, &stderr) + require.NoError(t, err) + require.Contains(t, stdout.String(), "1 passed, 0 failed") +} + func validateOutput(t *testing.T, outputs map[string]TerraformOutput, key string, value interface{}) { t.Helper() output, hasPlatform := outputs[key] @@ -6252,7 +6271,11 @@ func wrappedBinary() string { value, found := os.LookupEnv("TERRAGRUNT_TFPATH") if !found { - return TERRAFORM_BINARY + // if env variable is not defined, try to check through executing command + if util.IsCommandExecutable(TERRAFORM_BINARY, "-version") { + return TERRAFORM_BINARY + } + return TOFU_BINARY } return value } ++++++ terragrunt.obsinfo ++++++ --- /var/tmp/diff_new_pack.dmEUrA/_old 2023-10-30 22:11:14.665232783 +0100 +++ /var/tmp/diff_new_pack.dmEUrA/_new 2023-10-30 22:11:14.665232783 +0100 @@ -1,5 +1,5 @@ name: terragrunt -version: 0.52.7 -mtime: 1698343546 -commit: 0764ce24d3f1520b039da1481f68598300fd5b59 +version: 0.53.0 +mtime: 1698422716 +commit: dcbec9f11efae59038c4632116a13c89916dc15c ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/terragrunt/vendor.tar.gz /work/SRC/openSUSE:Factory/.terragrunt.new.17445/vendor.tar.gz differ: char 5, line 1