Merge pull request #22 from jumppad-labs/f-primatives-only

Ensure description and module properties are set during parse primative

parse_test.go

@@ -1134,4 +1134,21 @@ func TestParseParsesToResourceBase(t *testing.T) {
 	require.Equal(t, "consul", r.Metadata().Name)
 	require.Equal(t, "container", r.Metadata().Type)
 	require.Equal(t, "resource.network.onprem.meta.name", r.Metadata().Links[0])
+
+	r, err = c.FindResource("module.consul_2")
+	require.NoError(t, err)
+	require.NotNil(t, r)
+	require.Equal(t, "consul_2", r.Metadata().Name)
+	require.Equal(t, "module", r.Metadata().Type)
+
+	m1 := r.(*resources.Module)
+	require.Equal(t, "../single", m1.Source)
+	require.Equal(t, "latest", m1.Version)
+
+	r, err = c.FindResource("module.consul_2.output.container_name")
+	require.NoError(t, err)
+	require.NotNil(t, r)
+
+	o1 := r.(*resources.Output)
+	require.Equal(t, "This is the name of the container", o1.Description)
 }

parser.go

@@ -659,6 +659,9 @@ func (p *Parser) parseModule(ctx *hcl.EvalContext, c *Config, file string, b *hc
 		version = v.AsString()
 	}
 
+	rt.(*resources.Module).Source = src.AsString()
+	rt.(*resources.Module).Version = version
+
 	// src could be a registry url, github repository or a relative folder
 	// first check if it is a folder, we need to make it absolute relative to the current file
 	dir := path.Dir(file)
@@ -950,6 +953,16 @@ func (p *Parser) parseResource(ctx *hcl.EvalContext, c *Config, file string, b *
 		return &de
 	}
 
+	// if we have an output, get the description
+	// this is only needed when parsing primatives as
+	// this value is normally set during walk
+	if rt.Metadata().Type == resources.TypeOutput && b.Body.Attributes["description"] != nil {
+		desc, diags := b.Body.Attributes["description"].Expr.Value(ctx)
+		if !diags.HasErrors() {
+			rt.(*resources.Output).Description = desc.AsString()
+		}
+	}
+
 	// disabled is a property of the embedded type we need to add this manually
 	setDisabled(ctx, rt, b.Body, disabled)
 

test_fixtures/single/container.hcl

@@ -30,6 +30,7 @@ resource "container" "consul" {
 
 output "container_name" {
   value = resource.container.consul.meta.name
+  description = "This is the name of the container"
 }
 
 output "container_resources_cpu" {