diff --git a/pkg/config/hclconf/dsl_types.go b/pkg/config/hclconf/dsl_types.go index cea2e83..f50f006 100644 --- 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 index 8f64068..d989f1c 100644 --- 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 },