Fix output values with null

goruha · goruha · commit 656f6a64d5d2 · 2024-03-25T12:05:56.000+01:00
Signed-off-by: Igor Rodionov &lt;goruha@gmail.com&gt;
diff --git a/format/generator_test.go b/format/generator_test.go
@@ -191,7 +191,7 @@ func TestGeneratorFuncModule(t *testing.T) {
 		assert.Equal(expected, generator.module.Header)
 		assert.Equal("", generator.module.Footer)
 		assert.Equal(7, len(generator.module.Inputs))
-		assert.Equal(3, len(generator.module.Outputs))
+		assert.Equal(4, len(generator.module.Outputs))
 	})
 }
 
diff --git a/terraform/load.go b/terraform/load.go
@@ -294,11 +294,15 @@ func loadOutputs(tfmodule *tfconfig.Module, config *print.Config) ([]*Output, er
 		}
 
 		if config.OutputValues.Enabled {
-			output.Sensitive = values[output.Name].Sensitive
-			if values[output.Name].Sensitive {
-				output.Value = types.ValueOf(`<sensitive>`)
+			if value, ok := values[output.Name]; ok {
+				output.Sensitive = value.Sensitive
+				output.Value = types.ValueOf(value.Value)
 			} else {
-				output.Value = types.ValueOf(values[output.Name].Value)
+				output.Value = types.ValueOf("null")
+			}
+
+			if output.Sensitive {
+				output.Value = types.ValueOf(`<sensitive>`)
 			}
 		}
 		outputs = append(outputs, output)
diff --git a/terraform/load_test.go b/terraform/load_test.go
@@ -589,7 +589,7 @@ func TestLoadOutputs(t *testing.T) {
 			name: "load module outputs from path",
 			path: "full-example",
 			expected: expected{
-				outputs: 3,
+				outputs: 4,
 			},
 		},
 		{
@@ -665,7 +665,7 @@ func TestLoadOutputsValues(t *testing.T) {
 			path:       "full-example",
 			outputPath: "output-values.json",
 			expected: expected{
-				outputs: 3,
+				outputs: 4,
 			},
 			wantErr: false,
 		},
@@ -896,7 +896,7 @@ func TestSortItems(t *testing.T) {
 				inputs:    []string{"D", "B", "E", "A", "C", "F", "G"},
 				required:  []string{"A", "F"},
 				optional:  []string{"D", "B", "E", "C", "G"},
-				outputs:   []string{"C", "A", "B"},
+				outputs:   []string{"C", "A", "B", "D"},
 				providers: []string{"tls", "aws", "null"},
 			},
 		},
@@ -909,7 +909,7 @@ func TestSortItems(t *testing.T) {
 				inputs:    []string{"D", "B", "E", "A", "C", "F", "G"},
 				required:  []string{"A", "F"},
 				optional:  []string{"D", "B", "E", "C", "G"},
-				outputs:   []string{"C", "A", "B"},
+				outputs:   []string{"C", "A", "B", "D"},
 				providers: []string{"tls", "aws", "null"},
 			},
 		},
@@ -922,7 +922,7 @@ func TestSortItems(t *testing.T) {
 				inputs:    []string{"D", "B", "E", "A", "C", "F", "G"},
 				required:  []string{"A", "F"},
 				optional:  []string{"D", "B", "E", "C", "G"},
-				outputs:   []string{"C", "A", "B"},
+				outputs:   []string{"C", "A", "B", "D"},
 				providers: []string{"tls", "aws", "null"},
 			},
 		},
@@ -935,7 +935,7 @@ func TestSortItems(t *testing.T) {
 				inputs:    []string{"A", "B", "C", "D", "E", "F", "G"},
 				required:  []string{"A", "F"},
 				optional:  []string{"B", "C", "D", "E", "G"},
-				outputs:   []string{"A", "B", "C"},
+				outputs:   []string{"A", "B", "C", "D"},
 				providers: []string{"aws", "null", "tls"},
 			},
 		},
@@ -948,7 +948,7 @@ func TestSortItems(t *testing.T) {
 				inputs:    []string{"A", "F", "B", "C", "D", "E", "G"},
 				required:  []string{"A", "F"},
 				optional:  []string{"B", "C", "D", "E", "G"},
-				outputs:   []string{"A", "B", "C"},
+				outputs:   []string{"A", "B", "C", "D"},
 				providers: []string{"aws", "null", "tls"},
 			},
 		},
@@ -961,7 +961,7 @@ func TestSortItems(t *testing.T) {
 				inputs:    []string{"A", "F", "G", "B", "C", "D", "E"},
 				required:  []string{"A", "F"},
 				optional:  []string{"G", "B", "C", "D", "E"},
-				outputs:   []string{"A", "B", "C"},
+				outputs:   []string{"A", "B", "C", "D"},
 				providers: []string{"aws", "null", "tls"},
 			},
 		},
diff --git a/terraform/testdata/full-example/outputs.tf b/terraform/testdata/full-example/outputs.tf
@@ -12,3 +12,8 @@ output "A" {
 output "B" {
   value = "b"
 }
+
+// D null result
+output "D" {
+  value = null
+}

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ func TestGeneratorFuncModule(t *testing.T) {`
`191`	`191`	`assert.Equal(expected, generator.module.Header)`
`192`	`192`	`assert.Equal("", generator.module.Footer)`
`193`	`193`	`assert.Equal(7, len(generator.module.Inputs))`
`194`		`- assert.Equal(3, len(generator.module.Outputs))`
	`194`	`+ assert.Equal(4, len(generator.module.Outputs))`
`195`	`195`	`})`
`196`	`196`	`}`
`197`	`197`
Original file line number	Diff line number	Diff line change
`@@ -294,11 +294,15 @@ func loadOutputs(tfmodule tfconfig.Module, config print.Config) ([]*Output, er`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`if config.OutputValues.Enabled {`
`297`		`- output.Sensitive = values[output.Name].Sensitive`
`298`		`- if values[output.Name].Sensitive {`
`299`		- output.Value = types.ValueOf(`<sensitive>`)
	`297`	`+ if value, ok := values[output.Name]; ok {`
	`298`	`+ output.Sensitive = value.Sensitive`
	`299`	`+ output.Value = types.ValueOf(value.Value)`
`300`	`300`	`} else {`
`301`		`- output.Value = types.ValueOf(values[output.Name].Value)`
	`301`	`+ output.Value = types.ValueOf("null")`
	`302`	`+ }`
	`303`	`+`
	`304`	`+ if output.Sensitive {`
	`305`	+ output.Value = types.ValueOf(`<sensitive>`)
`302`	`306`	`}`
`303`	`307`	`}`
`304`	`308`	`outputs = append(outputs, output)`
Original file line number	Diff line number	Diff line change
`@@ -12,3 +12,8 @@ output "A" {`
`12`	`12`	`output "B" {`
`13`	`13`	`value = "b"`
`14`	`14`	`}`
	`15`	`+`
	`16`	`+// D null result`
	`17`	`+output "D" {`
	`18`	`+ value = null`
	`19`	`+}`