installer: separate suffix and prefix generation.
Reuse suffix for app dir name.
diff --git a/core/installer/welcome/welcome.go b/core/installer/welcome/welcome.go
index d34580f..ac13f06 100644
--- a/core/installer/welcome/welcome.go
+++ b/core/installer/welcome/welcome.go
@@ -95,7 +95,8 @@
if err != nil {
return err
}
- nsGen := installer.NewPrefixGenerator(config.Values.Id + "-")
+ nsGen := installer.NewPrefixGenerator(config.Values.NamespacePrefix)
+ suffixGen := installer.NewEmptySuffixGenerator()
appManager, err := installer.NewAppManager(s.repo, s.nsCreator)
if err != nil {
return err
@@ -106,7 +107,7 @@
if err != nil {
return err
}
- if err := appManager.Install(*app, nsGen, map[string]any{
+ if err := appManager.Install(*app, nsGen, suffixGen, map[string]any{
"GandiAPIToken": req.GandiAPIToken,
}); err != nil {
return err
@@ -117,7 +118,7 @@
if err != nil {
return err
}
- if err := appManager.Install(*app, nsGen, map[string]any{
+ if err := appManager.Install(*app, nsGen, suffixGen, map[string]any{
"Username": req.Username,
"IPSubnet": "10.1.0.0/24", // TODO(giolekva): this should be taken from the config generated during new env creation
}); err != nil {