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-04-06 15:56:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/terragrunt (Old)
and /work/SRC/openSUSE:Factory/.terragrunt.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "terragrunt"
Thu Apr 6 15:56:17 2023 rev:36 rq:1077620 version:0.45.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/terragrunt/terragrunt.changes 2023-04-04
21:26:33.751285050 +0200
+++ /work/SRC/openSUSE:Factory/.terragrunt.new.19717/terragrunt.changes
2023-04-06 15:56:18.836421916 +0200
@@ -1,0 +2,6 @@
+Thu Apr 06 03:25:11 UTC 2023 - ka...@b1-systems.de
+
+- Update to version 0.45.2:
+ * #2515 Add option to disable module output (#2516)
+
+-------------------------------------------------------------------
Old:
----
terragrunt-0.45.1.obscpio
New:
----
terragrunt-0.45.2.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ terragrunt.spec ++++++
--- /var/tmp/diff_new_pack.0gNFiS/_old 2023-04-06 15:56:19.652426524 +0200
+++ /var/tmp/diff_new_pack.0gNFiS/_new 2023-04-06 15:56:19.656426547 +0200
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: terragrunt
-Version: 0.45.1
+Version: 0.45.2
Release: 0
Summary: Thin wrapper for Terraform for working with multiple Terraform
modules
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.0gNFiS/_old 2023-04-06 15:56:19.692426750 +0200
+++ /var/tmp/diff_new_pack.0gNFiS/_new 2023-04-06 15:56:19.696426773 +0200
@@ -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.45.1</param>
+ <param name="revision">v0.45.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.0gNFiS/_old 2023-04-06 15:56:19.716426886 +0200
+++ /var/tmp/diff_new_pack.0gNFiS/_new 2023-04-06 15:56:19.724426931 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/gruntwork-io/terragrunt</param>
- <param
name="changesrevision">6d48a853858c1feb3c67a45dc50fc71ec4713e1a</param></service></servicedata>
+ <param
name="changesrevision">cff4cbae12e6ba4018a01f167831b9fc35ababbb</param></service></servicedata>
(No newline at EOF)
++++++ terragrunt-0.45.1.obscpio -> terragrunt-0.45.2.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terragrunt-0.45.1/config/dependency.go
new/terragrunt-0.45.2/config/dependency.go
--- old/terragrunt-0.45.1/config/dependency.go 2023-04-03 23:28:47.000000000
+0200
+++ new/terragrunt-0.45.2/config/dependency.go 2023-04-05 20:59:02.000000000
+0200
@@ -476,6 +476,7 @@
// Clone terragrunt options and update context for dependency block so that
the outputs can be read correctly
func cloneTerragruntOptionsForDependencyOutput(terragruntOptions
*options.TerragruntOptions, targetConfig string) (*options.TerragruntOptions,
error) {
targetOptions := cloneTerragruntOptionsForDependency(terragruntOptions,
targetConfig)
+ targetOptions.IncludeModulePrefix = false
targetOptions.TerraformCommand = "output"
targetOptions.TerraformCliArgs = []string{"output", "-json"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terragrunt-0.45.1/shell/run_shell_cmd.go
new/terragrunt-0.45.2/shell/run_shell_cmd.go
--- old/terragrunt-0.45.1/shell/run_shell_cmd.go 2023-04-03
23:28:47.000000000 +0200
+++ new/terragrunt-0.45.2/shell/run_shell_cmd.go 2023-04-05
20:59:02.000000000 +0200
@@ -73,7 +73,10 @@
var errWriter = terragruntOptions.ErrWriter
var outWriter = terragruntOptions.Writer
- var prefix = terragruntOptions.OutputPrefix
+ var prefix = ""
+ if terragruntOptions.IncludeModulePrefix {
+ prefix = terragruntOptions.OutputPrefix
+ }
// Terragrunt can run some commands (such as terraform remote config)
before running the actual terraform
// command requested by the user. The output of these other commands
should not end up on stdout as this
// breaks scripts relying on terraform's output.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terragrunt-0.45.1/shell/run_shell_cmd_output_test.go
new/terragrunt-0.45.2/shell/run_shell_cmd_output_test.go
--- old/terragrunt-0.45.1/shell/run_shell_cmd_output_test.go 2023-04-03
23:28:47.000000000 +0200
+++ new/terragrunt-0.45.2/shell/run_shell_cmd_output_test.go 2023-04-05
20:59:02.000000000 +0200
@@ -45,6 +45,7 @@
prefixedOutput = append(prefixedOutput, prefix+line)
}
testCommandOutput(t, func(terragruntOptions *options.TerragruntOptions)
{
+ terragruntOptions.IncludeModulePrefix = true
terragruntOptions.OutputPrefix = prefix
}, assertOutputs(t,
prefixedOutput,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terragrunt-0.45.1/test/integration_test.go
new/terragrunt-0.45.2/test/integration_test.go
--- old/terragrunt-0.45.1/test/integration_test.go 2023-04-03
23:28:47.000000000 +0200
+++ new/terragrunt-0.45.2/test/integration_test.go 2023-04-05
20:59:02.000000000 +0200
@@ -88,6 +88,7 @@
TEST_FIXTURE_HOOKS_INIT_ONCE_NO_SOURCE_WITH_BACKEND =
"fixture-hooks/init-once/no-source-with-backend"
TEST_FIXTURE_HOOKS_INIT_ONCE_WITH_SOURCE_NO_BACKEND =
"fixture-hooks/init-once/with-source-no-backend"
TEST_FIXTURE_HOOKS_INIT_ONCE_WITH_SOURCE_WITH_BACKEND =
"fixture-hooks/init-once/with-source-with-backend"
+ TEST_FIXTURE_HOOKS_WORKING_DIR =
"fixture-hooks/working_dir"
TEST_FIXTURE_FAILED_TERRAFORM =
"fixture-failure"
TEST_FIXTURE_EXIT_CODE =
"fixture-exit-code"
TEST_FIXTURE_AUTO_RETRY_RERUN =
"fixture-auto-retry/re-run"
@@ -5227,6 +5228,51 @@
require.NoError(t, err)
}
+func TestRenderJsonMetadataDepenencyModulePrefix(t *testing.T) {
+ t.Parallel()
+
+ tmpEnvPath := copyEnvironment(t, TEST_FIXTURE_RENDER_JSON_METADATA)
+ cleanupTerraformFolder(t, tmpEnvPath)
+ tmpDir := util.JoinPath(tmpEnvPath, TEST_FIXTURE_RENDER_JSON_METADATA,
"dependency", "app")
+
+ runTerragrunt(t, fmt.Sprintf("terragrunt run-all render-json
--terragrunt-include-module-prefix --with-metadata --terragrunt-non-interactive
--terragrunt-log-level debug --terragrunt-working-dir %s", tmpDir))
+}
+
+func TestTerragruntValidateModulePrefix(t *testing.T) {
+ t.Parallel()
+
+ fixturePath := TEST_FIXTURE_INCLUDE_PARENT
+ cleanupTerraformFolder(t, fixturePath)
+ tmpEnvPath := copyEnvironment(t, fixturePath)
+ rootPath := util.JoinPath(tmpEnvPath, fixturePath)
+
+ runTerragrunt(t, fmt.Sprintf("terragrunt run-all validate
--terragrunt-include-module-prefix --terragrunt-non-interactive
--terragrunt-working-dir %s", rootPath))
+}
+
+func TestDependencyOutputModulePrefix(t *testing.T) {
+ t.Parallel()
+
+ cleanupTerraformFolder(t, TEST_FIXTURE_GET_OUTPUT)
+ tmpEnvPath := copyEnvironment(t, TEST_FIXTURE_GET_OUTPUT)
+ rootPath := util.JoinPath(tmpEnvPath, TEST_FIXTURE_GET_OUTPUT,
"integration")
+
+ runTerragrunt(t, fmt.Sprintf("terragrunt apply-all
--terragrunt-include-module-prefix --terragrunt-non-interactive
--terragrunt-working-dir %s", rootPath))
+
+ // verify expected output 42
+ stdout := bytes.Buffer{}
+ stderr := bytes.Buffer{}
+
+ app3Path := util.JoinPath(rootPath, "app3")
+ require.NoError(
+ t,
+ runTerragruntCommand(t, fmt.Sprintf("terragrunt output
-no-color -json --terragrunt-include-module-prefix
--terragrunt-non-interactive --terragrunt-working-dir %s", app3Path), &stdout,
&stderr),
+ )
+
+ outputs := map[string]TerraformOutput{}
+ require.NoError(t, json.Unmarshal([]byte(stdout.String()), &outputs))
+ assert.Equal(t, int(outputs["z"].Value.(float64)), 42)
+}
+
func validateBoolOutput(t *testing.T, outputs map[string]TerraformOutput, key
string, value bool) {
t.Helper()
output, hasPlatform := outputs[key]
++++++ terragrunt.obsinfo ++++++
--- /var/tmp/diff_new_pack.0gNFiS/_old 2023-04-06 15:56:20.440430975 +0200
+++ /var/tmp/diff_new_pack.0gNFiS/_new 2023-04-06 15:56:20.444430997 +0200
@@ -1,5 +1,5 @@
name: terragrunt
-version: 0.45.1
-mtime: 1680557327
-commit: 6d48a853858c1feb3c67a45dc50fc71ec4713e1a
+version: 0.45.2
+mtime: 1680721142
+commit: cff4cbae12e6ba4018a01f167831b9fc35ababbb
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/terragrunt/vendor.tar.gz
/work/SRC/openSUSE:Factory/.terragrunt.new.19717/vendor.tar.gz differ: char 5,
line 1
