v0.26.1 — show auto-generated values on deploy page
- Pre-generate domain + secret field values when deploy page loads, so user sees actual domain and masked passwords (with reveal button) before deploying. Same values submitted as hidden inputs → saved to app.yaml. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -114,12 +114,17 @@ func (m *Manager) DeployStack(req DeployRequest) (string, error) {
|
||||
value = m.cfg.Customer.Domain
|
||||
|
||||
case "secret":
|
||||
// Always auto-generate, user never sees these
|
||||
generated, err := generateValue(field.Generate)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("generating %s: %w", field.EnvVar, err)
|
||||
// Use pre-generated value if provided by the deploy page (same value the user saw),
|
||||
// otherwise fall back to generating a fresh one.
|
||||
if userVal, ok := req.Values[field.EnvVar]; ok && userVal != "" {
|
||||
value = userVal
|
||||
} else {
|
||||
generated, err := generateValue(field.Generate)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("generating %s: %w", field.EnvVar, err)
|
||||
}
|
||||
value = generated
|
||||
}
|
||||
value = generated
|
||||
|
||||
case "password":
|
||||
// Password fields MUST be filled by the user (via typing or Generálás button).
|
||||
@@ -366,6 +371,37 @@ func (m *Manager) LoadAppConfigByName(stackName string) *AppConfig {
|
||||
return LoadAppConfig(stackDir)
|
||||
}
|
||||
|
||||
// PreviewDeployValues generates the auto-field values that will be used at deploy time:
|
||||
// domain from controller config and freshly-generated secrets. These values are shown
|
||||
// on the deploy page so the user can see (and note down) their passwords before deploying.
|
||||
// Pass them back in DeployRequest.Values so the same values are saved to app.yaml.
|
||||
func (m *Manager) PreviewDeployValues(name string) (map[string]string, error) {
|
||||
stack, ok := m.GetStack(name)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("stack %q not found", name)
|
||||
}
|
||||
stackDir := filepath.Dir(stack.ComposePath)
|
||||
meta := LoadMetadata(stackDir)
|
||||
|
||||
result := make(map[string]string)
|
||||
for _, field := range meta.DeployFields {
|
||||
switch field.Type {
|
||||
case "domain":
|
||||
result[field.EnvVar] = m.cfg.Customer.Domain
|
||||
case "secret":
|
||||
if field.Generate == "" {
|
||||
continue
|
||||
}
|
||||
val, err := generateValue(field.Generate)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("generating preview for %s: %w", field.EnvVar, err)
|
||||
}
|
||||
result[field.EnvVar] = val
|
||||
}
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// --- App config persistence ---
|
||||
|
||||
func LoadAppConfig(stackDir string) *AppConfig {
|
||||
|
||||
@@ -254,7 +254,7 @@ func (s *Server) deployHandler(w http.ResponseWriter, r *http.Request, name stri
|
||||
data["AppPageURL"] = s.cfg.AppPageURL(meta.Slug)
|
||||
data["UserFields"] = meta.UserFacingFields()
|
||||
data["AutoFields"] = meta.AutoGeneratedFields()
|
||||
// Auto-generated field values for already-deployed apps
|
||||
// Auto-generated field values: existing values for deployed apps, pre-generated for new deploys
|
||||
autoFieldValues := make(map[string]string)
|
||||
if alreadyDeployed && appCfg != nil {
|
||||
for _, f := range meta.AutoGeneratedFields() {
|
||||
@@ -262,6 +262,12 @@ func (s *Server) deployHandler(w http.ResponseWriter, r *http.Request, name stri
|
||||
autoFieldValues[f.EnvVar] = val
|
||||
}
|
||||
}
|
||||
} else if !alreadyDeployed {
|
||||
// Pre-generate values so the user sees (and can note down) domain/passwords before deploying.
|
||||
// These same values are submitted back in the form and saved to app.yaml.
|
||||
if preview, err := s.stackMgr.PreviewDeployValues(name); err == nil {
|
||||
autoFieldValues = preview
|
||||
}
|
||||
}
|
||||
data["AutoFieldValues"] = autoFieldValues
|
||||
// Storage paths with free space info for deploy dropdown
|
||||
|
||||
@@ -230,14 +230,18 @@
|
||||
{{if .AutoFields}}
|
||||
<div class="form-section">
|
||||
<h4>Automatikusan generált értékek</h4>
|
||||
<p class="form-section-desc">Ezek az értékek automatikusan létrejönnek a telepítéskor.</p>
|
||||
{{if .AlreadyDeployed}}
|
||||
<p class="form-section-desc">Ezek az értékek automatikusan jöttek létre a telepítéskor.</p>
|
||||
{{else}}
|
||||
<p class="form-section-desc">Ezek az értékek a telepítéssel együtt mentésre kerülnek. Jegyezze fel a szükséges jelszavakat!</p>
|
||||
{{end}}
|
||||
{{$autoValues := .AutoFieldValues}}
|
||||
{{$isDeployed := .AlreadyDeployed}}
|
||||
{{range .AutoFields}}
|
||||
{{$val := index $autoValues .EnvVar}}
|
||||
<div class="form-group form-group-auto">
|
||||
<label>{{.Label}} <span class="auto-generated-badge">✓ Automatikusan generálva</span></label>
|
||||
{{if and $isDeployed $val}}
|
||||
{{if $val}}
|
||||
{{if eq .Type "secret"}}
|
||||
<div class="input-with-button">
|
||||
<input type="password" id="auto-field-{{.EnvVar}}" class="form-control" value="{{$val}}" readonly>
|
||||
@@ -246,6 +250,9 @@
|
||||
{{else}}
|
||||
<input type="text" id="auto-field-{{.EnvVar}}" class="form-control" value="{{$val}}" readonly>
|
||||
{{end}}
|
||||
{{if and (not $isDeployed) (eq .Type "secret")}}
|
||||
<input type="hidden" name="{{.EnvVar}}" value="{{$val}}">
|
||||
{{end}}
|
||||
{{end}}
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
Reference in New Issue
Block a user