Make dependency source sources optional

variantdev · Jan 17, 2020 · 1757af4 · 1757af4
1 parent cb3fd18
commit 1757af4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/pkg/config/hclconf/dsl_types.go b/pkg/config/hclconf/dsl_types.go
@@ -42,13 +42,13 @@ type GitTags struct {
 }
 
 type GitHubTags struct {
-	Host   string `hcl:"host,attr"`
-	Source string `hcl:"source,attr"`
+	Host   *string `hcl:"host,attr"`
+	Source string  `hcl:"source,attr"`
 }
 
 type GitHubReleases struct {
-	Host   string `hcl:"host,attr"`
-	Source string `hcl:"source,attr"`
+	Host   *string `hcl:"host,attr"`
+	Source string  `hcl:"source,attr"`
 }
 
 type DockerImageTags struct {

diff --git a/pkg/variantmod/load_hcl.go b/pkg/variantmod/load_hcl.go
@@ -60,8 +60,12 @@ func appToModule(app *hclconf.App) (*confapi.Module, error) {
 			if err := gohcl.DecodeBody(d.BodyForType, &hcl.EvalContext{}, &e); err != nil {
 				return nil, err
 			}
+			var host string
+			if e.Host != nil {
+				host = *e.Host
+			}
 			provider.GitHubTags = confapi.GitHubTags{
-				Host:   e.Host,
+				Host:   host,
 				Source: func(_ map[string]interface{}) (string, error) {
 					return e.Source, nil
 				},
@@ -71,8 +75,12 @@ func appToModule(app *hclconf.App) (*confapi.Module, error) {
 			if err := gohcl.DecodeBody(d.BodyForType, &hcl.EvalContext{}, &e); err != nil {
 				return nil, err
 			}
+			var host string
+			if e.Host != nil {
+				host = *e.Host
+			}
 			provider.GitHubReleases = confapi.GitHubReleases{
-				Host:   e.Host,
+				Host:   host,
 				Source: func(_ map[string]interface{}) (string, error) {
 					return e.Source, nil
 				},