jsonconfig: add implicitly created provider configs

hashicorp · Feb 18, 2022 · 3c32f7a · 3c32f7a
1 parent 0ce0404
commit 3c32f7a
Show file tree

Hide file tree

Showing 12 changed files with 88 additions and 24 deletions.
diff --git a/internal/command/jsonconfig/config.go b/internal/command/jsonconfig/config.go
@@ -239,27 +239,29 @@ func marshalProviderConfigs(
 		m[key] = p
 	}
 
-	// In child modules, providers defined in the parent module can be implicitly used.
-	// Such providers could have no requirements and configuration blocks defined.
-	if c.Parent != nil {
-		for req := range reqs {
-			// Implicit inheritance only applies to the default provider,
-			// so the provider name must be same as the provider type.
-			key := opaqueProviderKey(req.Type, c.Path.String())
-			if _, exists := m[key]; exists {
-				continue
-			}
+	// Providers could be implicitly created or inherited from the parent module
+	// when no requirements and configuration block defined.
+	for req := range reqs {
+		// Only default providers could implicitly exist,
+		// so the provider name must be same as the provider type.
+		key := opaqueProviderKey(req.Type, c.Path.String())
+		if _, exists := m[key]; exists {
+			continue
+		}
 
-			parentKey := opaqueProviderKey(req.Type, c.Parent.Path.String())
-			p := providerConfig{
-				Name:          req.Type,
-				FullName:      req.String(),
-				ModuleAddress: c.Path.String(),
-				parentKey:     findSourceProviderKey(parentKey, req.String(), m),
-			}
+		p := providerConfig{
+			Name:          req.Type,
+			FullName:      req.String(),
+			ModuleAddress: c.Path.String(),
+		}
 
-			m[key] = p
+		// In child modules, providers defined in the parent module can be implicitly used.
+		if c.Parent != nil {
+			parentKey := opaqueProviderKey(req.Type, c.Parent.Path.String())
+			p.parentKey = findSourceProviderKey(parentKey, p.FullName, m)
 		}
+
+		m[key] = p
 	}
 
 	// Must also visit our child modules, recursively.

diff --git a/internal/command/testdata/show-json/basic-delete/output.json b/internal/command/testdata/show-json/basic-delete/output.json
@@ -130,6 +130,12 @@
         }
     },
     "configuration": {
+        "provider_config": {
+            "test": {
+                "name": "test",
+                "full_name": "registry.terraform.io/hashicorp/test"
+            }
+        },
         "root_module": {
             "outputs": {
                 "test": {

diff --git a/internal/command/testdata/show-json/basic-update/output.json b/internal/command/testdata/show-json/basic-update/output.json
@@ -96,6 +96,12 @@
         }
     },
     "configuration": {
+        "provider_config": {
+            "test": {
+                "name": "test",
+                "full_name": "registry.terraform.io/hashicorp/test"
+            }
+        },
         "root_module": {
             "outputs": {
                 "test": {

diff --git a/internal/command/testdata/show-json/drift/output.json b/internal/command/testdata/show-json/drift/output.json
@@ -141,6 +141,12 @@
         }
     },
     "configuration": {
+        "provider_config": {
+            "test": {
+                "name": "test",
+                "full_name": "registry.terraform.io/hashicorp/test"
+            }
+        },
         "root_module": {
             "resources": [
                 {

diff --git a/internal/command/testdata/show-json/module-depends-on/output.json b/internal/command/testdata/show-json/module-depends-on/output.json
@@ -43,6 +43,12 @@
         }
     ],
     "configuration": {
+        "provider_config": {
+            "test": {
+                "name": "test",
+                "full_name": "registry.terraform.io/hashicorp/test"
+            }
+        },
         "root_module": {
             "resources": [
                 {

diff --git a/internal/command/testdata/show-json/modules/output.json b/internal/command/testdata/show-json/modules/output.json
@@ -293,6 +293,11 @@
                 "module_address": "module.module_test_foo",
                 "name": "test",
                 "full_name": "registry.terraform.io/hashicorp/test"
+            },
+            "module.module_test_bar:test": {
+                "module_address": "module.module_test_bar",
+                "name": "test",
+                "full_name": "registry.terraform.io/hashicorp/test"
             }
         }
     }

diff --git a/internal/command/testdata/show-json/moved-drift/output.json b/internal/command/testdata/show-json/moved-drift/output.json
@@ -143,6 +143,12 @@
         }
     },
     "configuration": {
+        "provider_config": {
+            "test": {
+                "name": "test",
+                "full_name": "registry.terraform.io/hashicorp/test"
+            }
+        },
         "root_module": {
             "resources": [
                 {

diff --git a/internal/command/testdata/show-json/moved/output.json b/internal/command/testdata/show-json/moved/output.json
@@ -68,6 +68,12 @@
         }
     },
     "configuration": {
+        "provider_config": {
+            "test": {
+                "name": "test",
+                "full_name": "registry.terraform.io/hashicorp/test"
+            }
+        },
         "root_module": {
             "resources": [
                 {

diff --git a/internal/command/testdata/show-json/multi-resource-update/output.json b/internal/command/testdata/show-json/multi-resource-update/output.json
@@ -137,6 +137,12 @@
         }
     },
     "configuration": {
+        "provider_config": {
+            "test": {
+                "name": "test",
+                "full_name": "registry.terraform.io/hashicorp/test"
+            }
+        },
         "root_module": {
             "outputs": {
                 "test": {

diff --git a/internal/command/testdata/show-json/nested-modules/output.json b/internal/command/testdata/show-json/nested-modules/output.json
@@ -37,9 +37,7 @@
       "name": "test",
       "provider_name": "registry.terraform.io/hashicorp/test",
       "change": {
-        "actions": [
-          "create"
-        ],
+        "actions": ["create"],
         "before": null,
         "after": {
           "ami": "bar-var"
@@ -53,6 +51,13 @@
     }
   ],
   "configuration": {
+    "provider_config": {
+      "module.my_module.module.more:test": {
+        "module_address": "module.my_module.module.more",
+        "name": "test",
+        "full_name": "registry.terraform.io/hashicorp/test"
+      }
+    },
     "root_module": {
       "module_calls": {
         "my_module": {
@@ -71,9 +76,7 @@
                       "provider_config_key": "module.my_module.module.more:test",
                       "expressions": {
                         "ami": {
-                          "references": [
-                            "var.test_var"
-                          ]
+                          "references": ["var.test_var"]
                         }
                       },
                       "schema_version": 0

diff --git a/internal/command/testdata/show-json/requires-replace/output.json b/internal/command/testdata/show-json/requires-replace/output.json
@@ -70,6 +70,12 @@
         }
     },
     "configuration": {
+        "provider_config": {
+            "test": {
+                "name": "test",
+                "full_name": "registry.terraform.io/hashicorp/test"
+            }
+        },
         "root_module": {
             "resources": [
                 {

diff --git a/internal/command/testdata/show-json/sensitive-values/output.json b/internal/command/testdata/show-json/sensitive-values/output.json
@@ -81,6 +81,12 @@
         }
     },
     "configuration": {
+        "provider_config": {
+            "test": {
+                "name": "test",
+                "full_name": "registry.terraform.io/hashicorp/test"
+            }
+        },
         "root_module": {
             "outputs": {
                 "test": {