Merge pull request #23 from andrke/add_app-domain_feature

Add --app-domain feature
entigolabs · Dec 2, 2021 · 403bbb7 · 403bbb7
2 parents 371ea6c + 3f873d5
commit 403bbb7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/internal/app/gitops/cli/flags.go b/internal/app/gitops/cli/flags.go
@@ -54,6 +54,7 @@ func copyAndDeleteSpecificFlags(baseFlags []cli.Flag) []cli.Flag {
 	baseFlags = append(baseFlags, &appBranchFlag)
 	baseFlags = append(baseFlags, &appPrefixArgoFlag)
 	baseFlags = append(baseFlags, &appPrefixYamlFlag)
+    baseFlags = append(baseFlags, &appDomainFlag)
 	return baseFlags
 }
 
@@ -170,6 +171,14 @@ var appBranchFlag = cli.StringFlag{
 	Required:    true,
 }
 
+var appDomainFlag = cli.StringFlag{
+	Name:        "app-domain",
+	EnvVars:     []string{"APP_DOMAIN"},
+	DefaultText: "localhost",
+	Usage:       "application domain",
+	Destination: &flags.App.Domain,
+}
+
 var appPrefixArgoFlag = cli.StringFlag{
 	Name:        "app-prefix-argo",
 	EnvVars:     []string{"APP_PREFIX_ARGO"},

diff --git a/internal/app/gitops/commands/copy/copy.go b/internal/app/gitops/commands/copy/copy.go
@@ -66,7 +66,7 @@ func copyMasterToNewBranch(flags *common.Flags) {
 func installViaFile(flags *common.Flags) {
 	installer := configInstaller.Installer{Command: common.CopyCmd, DeploymentStrategy: common.UnspecifiedStrategy}
 	installTxt := string(common.GetFileInput(installFile))
-	installTxtVars := *initInstallTxtVariables(flags.App.Branch, flags.App.Name)
+	installTxtVars := *initInstallTxtVariables(flags.App.Branch, flags.App.Name, flags.App.Domain)
 	installTxt = installTxtVars.specifyInstallVariables(installTxt)
 	input := composeInstallInput(installTxt)
 	installer.Install(input)

diff --git a/internal/app/gitops/commands/copy/install_txt_variables.go b/internal/app/gitops/commands/copy/install_txt_variables.go
@@ -11,12 +11,12 @@ type installTxtVariables struct {
 	featureUrl string
 }
 
-func initInstallTxtVariables(appBranch string, appName string) *installTxtVariables {
+func initInstallTxtVariables(appBranch string, appName string, appDomain string) *installTxtVariables {
 	featureUrl := ""
 	if appBranch == "master" {
 		featureUrl = appName
 	} else {
-		featureUrl = fmt.Sprintf("%s-%s.fleetcomplete.dev", appName, appBranch)
+		featureUrl = fmt.Sprintf("%s-%s.%s", appName, appBranch, appDomain)
 	}
 	return &installTxtVariables{appBranch: appBranch, appName: appName, featureUrl: featureUrl}
 }

diff --git a/internal/app/gitops/common/flags.go b/internal/app/gitops/common/flags.go
@@ -35,6 +35,7 @@ type AppFlags struct {
 	Branch     string
 	PrefixArgo string
 	PrefixYaml string
+    Domain     string
 }
 
 type ArgoCDFlags struct {