Switches to use terraform core's stack schema for config parsing, adds support for providers (#139)

Author: nicsnet

main.go

@@ -13,7 +13,7 @@ import (
 )
 
 var showJSON = flag.Bool("json", false, "produce JSON-formatted output")
-var parseStack = flag.Bool("stack", false, "parse as Terraform stack instead of module")
+var parseStack = flag.Bool("stack", false, "parse a Terraform stack")
 
 func main() {
 	flag.Parse()

tfconfig/load_hcl.go

@@ -87,7 +87,7 @@ func LoadStack(dir string) (*Stack, Diagnostics) {
 
 func loadStackFromFile(file *hcl.File, stack *Stack) hcl.Diagnostics {
 	var diags hcl.Diagnostics
-	content, _, contentDiags := file.Body.PartialContent(rootSchema)
+	content, _, contentDiags := file.Body.PartialContent(stackSchema)
 	diags = append(diags, contentDiags...)
 
 	for _, block := range content.Blocks {
@@ -243,9 +243,31 @@ func loadStackFromFile(file *hcl.File, stack *Stack) hcl.Diagnostics {
 				}
 			}
 
+		case "provider":
+			if len(block.Labels) < 2 {
+				diags = append(diags, &hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  "Invalid provider block",
+					Detail:   "Provider blocks in stacks must have both a provider name and configuration name",
+					Subject:  &block.DefRange,
+				})
+				continue
+			}
+
+			_, _, contentDiags := block.Body.PartialContent(providerConfigSchema)
+			diags = append(diags, contentDiags...)
+
+			providerName := block.Labels[0]
+			_ = block.Labels[1] // configName - not used for metadata extraction
+
+			// For stack providers, we primarily care about tracking that they exist
+			// The actual provider configuration is handled differently in stacks
+			if _, exists := stack.RequiredProviders[providerName]; !exists {
+				stack.RequiredProviders[providerName] = &ProviderRequirement{}
+			}
+
 		default:
-			// For now, we only handle variable blocks in stacks
-			// Other block types will be ignored
+			// Other block types will be ignored for stacks
 		}
 	}
 

tfconfig/load_test.go

@@ -81,3 +81,34 @@ func TestLoadStack(t *testing.T) {
 		return stack
 	})
 }
+
+func TestProviderLabels(t *testing.T) {
+	// Test that provider blocks with two labels are correctly parsed
+	stack, diags := LoadStack("testdata-stack/provider-labels")
+
+	if diags.HasErrors() {
+		t.Fatalf("unexpected errors: %v", diags)
+	}
+
+	expectedProviders := map[string]bool{
+		"aws":    true,
+		"random": true,
+		"null":   true,
+	}
+
+	if len(stack.RequiredProviders) != len(expectedProviders) {
+		t.Errorf("expected %d required providers, got %d", len(expectedProviders), len(stack.RequiredProviders))
+	}
+
+	for providerName := range expectedProviders {
+		if _, exists := stack.RequiredProviders[providerName]; !exists {
+			t.Errorf("expected provider %q to be in required_providers", providerName)
+		}
+	}
+
+	if awsProvider, exists := stack.RequiredProviders["aws"]; exists {
+		if awsProvider.Source != "hashicorp/aws" {
+			t.Errorf("expected aws provider source to be 'hashicorp/aws', got %q", awsProvider.Source)
+		}
+	}
+}

tfconfig/schema.go

@@ -132,3 +132,44 @@ var componentSchema = &hcl.BodySchema{
 		},
 	},
 }
+
+// stackSchema defines the schema for Terraform Stacks files based on Terraform core's rootConfigSchema
+// https://github.com/hashicorp/terraform/blob/8b65426ecfac58a6937c1c26297c8e6a0db57a35/internal/stacks/stackconfig/file.go
+var stackSchema = &hcl.BodySchema{
+	Attributes: []hcl.AttributeSchema{
+		{
+			Name: "language",
+		},
+	},
+	Blocks: []hcl.BlockHeaderSchema{
+		{
+			Type:       "stack",
+			LabelNames: []string{"name"},
+		},
+		{
+			Type:       "component",
+			LabelNames: []string{"name"},
+		},
+		{
+			Type:       "variable",
+			LabelNames: []string{"name"},
+		},
+		{
+			Type: "locals",
+		},
+		{
+			Type:       "output",
+			LabelNames: []string{"name"},
+		},
+		{
+			Type:       "provider",
+			LabelNames: []string{"type", "name"},
+		},
+		{
+			Type: "required_providers",
+		},
+		{
+			Type: "removed",
+		},
+	},
+}

tfconfig/testdata-stack/provider-labels/provider-labels.out.json

@@ -0,0 +1,47 @@
+{
+  "path": "testdata-stack/provider-labels",
+  "variables": {
+    "test_var": {
+      "name": "test_var",
+      "type": "string",
+      "description": "Test variable for provider labels test",
+      "default": "test",
+      "required": false,
+      "pos": {
+        "filename": "testdata-stack/provider-labels/providers.tfstack.hcl",
+        "line": 42
+      }
+    }
+  },
+  "outputs": {
+    "test_output": {
+      "name": "test_output",
+      "description": "Test output for provider labels test",
+      "pos": {
+        "filename": "testdata-stack/provider-labels/providers.tfstack.hcl",
+        "line": 48
+      }
+    }
+  },
+  "required_providers": {
+    "aws": {
+      "source": "hashicorp/aws"
+    },
+    "null": {
+      "source": "hashicorp/null"
+    },
+    "random": {
+      "source": "hashicorp/random"
+    }
+  },
+  "components": {
+    "test_component": {
+      "name": "test_component",
+      "source": "./test-module",
+      "pos": {
+        "filename": "testdata-stack/provider-labels/providers.tfstack.hcl",
+        "line": 53
+      }
+    }
+  }
+}

tfconfig/testdata-stack/provider-labels/providers.tfstack.hcl

@@ -0,0 +1,55 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+# Test file for provider blocks with different label configurations
+
+required_providers {
+  aws = {
+    source  = "hashicorp/aws"
+    version = "~> 5.0"
+  }
+
+  random = {
+    source  = "hashicorp/random"
+    version = "~> 3.0"
+  }
+
+  null = {
+    source = "hashicorp/null"
+  }
+}
+
+# Terraform Stacks provider with two labels (type + name)
+provider "aws" "main" {
+  config {
+    region = "us-east-1"
+  }
+}
+
+# Another two-label provider configuration
+provider "aws" "secondary" {
+  config {
+    region = "us-west-2"
+  }
+}
+
+# Two-label provider with for_each
+provider "random" "default" {}
+
+# Two-label provider with minimal config
+provider "null" "test" {}
+
+variable "test_var" {
+  type        = string
+  description = "Test variable for provider labels test"
+  default     = "test"
+}
+
+output "test_output" {
+  description = "Test output for provider labels test"
+  value       = var.test_var
+}
+
+component "test_component" {
+  source = "./test-module"
+}