Print relative variable names for dep variables

hashicorp · Oct 24, 2023 · 1880bdf · 1880bdf
1 parent db9f7f8
commit 1880bdf
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/sdk/pack/variables/variables.go b/sdk/pack/variables/variables.go
@@ -78,7 +78,13 @@ func (v *Variable) Equal(ivp *Variable) bool {
 
 func (v *Variable) AsOverrideString(pID pack.ID) string {
 	var out strings.Builder
-	out.WriteString(fmt.Sprintf(`# variable "%s"`, v.Name))
+
+	fqvn := strings.Join([]string{pID.String(), v.Name.String()}, ".")
+	b := strings.Split(fqvn, ".")
+	b = b[1:]
+	rvn := strings.Join(b, ".")
+
+	out.WriteString(fmt.Sprintf(`# variable "%s"`, rvn))
 	out.WriteByte('\n')
 	if v.hasDescription {
 		tmp := "description: " + v.Description
@@ -100,9 +106,9 @@ func (v *Variable) AsOverrideString(pID pack.ID) string {
 	}
 
 	if v.Value.Equals(v.Default).True() {
-		out.WriteString(fmt.Sprintf("#\n# %s=%s\n\n", v.Name, printDefault(v.Default)))
+		out.WriteString(fmt.Sprintf("#\n# %s=%s\n\n", rvn, printDefault(v.Default)))
 	} else {
-		out.WriteString(fmt.Sprintf("#\n%s=%s\n\n", v.Name, printDefault(v.Value)))
+		out.WriteString(fmt.Sprintf("#\n%s=%s\n\n", rvn, printDefault(v.Value)))
 	}
 
 	out.WriteString("\n")