From 71695cd4150e5d9c6f6f50cd788f643c107ce42b Mon Sep 17 00:00:00 2001 From: Bill Monkman Date: Wed, 3 Jun 2020 11:28:20 -0700 Subject: [PATCH] Moved zero module yaml file name to constant --- internal/config/globalconfig/global_config.go | 2 +- internal/constants/constants.go | 13 +++++++------ internal/module/module.go | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/internal/config/globalconfig/global_config.go b/internal/config/globalconfig/global_config.go index 5a4ae5e6a..7371d81af 100644 --- a/internal/config/globalconfig/global_config.go +++ b/internal/config/globalconfig/global_config.go @@ -71,7 +71,7 @@ func getCredentialsPath() string { rootDir := path.Join(usr.HomeDir, constants.ZeroHomeDirectory) os.MkdirAll(rootDir, os.ModePerm) - filePath := path.Join(rootDir, constants.UserCredentials) + filePath := path.Join(rootDir, constants.UserCredentialsYml) return filePath } diff --git a/internal/constants/constants.go b/internal/constants/constants.go index 1f5a00901..907ad9f60 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -1,10 +1,11 @@ package constants const ( - TemplatesDir = "tmp/templates" - ZeroProjectYml = "zero-project.yml" - ZeroHomeDirectory = ".zero" - UserCredentials = "credentials.yml" - IgnoredPaths = "(?i)zero.module.yml|.git/" - TemplateExtn = ".tmpl" + TemplatesDir = "tmp/templates" + ZeroProjectYml = "zero-project.yml" + ZeroModuleYml = "zero-module.yml" + UserCredentialsYml = "credentials.yml" + ZeroHomeDirectory = ".zero" + IgnoredPaths = "(?i)zero.module.yml|.git/" + TemplateExtn = ".tmpl" ) diff --git a/internal/module/module.go b/internal/module/module.go index d465e913f..4babb1810 100644 --- a/internal/module/module.go +++ b/internal/module/module.go @@ -49,7 +49,7 @@ func NewTemplateModule(moduleCfg config.ModuleInstance) (*TemplateModule, error) } } - configPath := path.Join(sourcePath, "zero-module.yml") + configPath := path.Join(sourcePath, constants.ZeroModuleYml) moduleConfig := moduleconfig.LoadModuleConfig(configPath) templateModule.Config = *moduleConfig