Maidn/maidn-cli
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: use absolute Terraform plan path

Browse source
This commit is contained in:
eding 2026-07-26 21:02:24 +02:00
parent 189c79fad0
commit 7ed39b254e
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
internal/bootstrap/bootstrap.go
View file

@ -564,7 +564,10 @@ func (r Runner) reconcileTerraform(terraformDir string) error {
return err return err
} }
} }
planPath := filepath.Join(terraformDir, r.Config.ClusterID+".tfplan") planPath, err := terraformPlanPath(terraformDir, r.Config.ClusterID)
if err != nil {
return err
}
defer os.Remove(planPath) defer os.Remove(planPath)
if err := utils.RunCommandInDirEnv(terraformDir, environment, "terraform", "plan", "-input=false", "-out="+planPath); err != nil { if err := utils.RunCommandInDirEnv(terraformDir, environment, "terraform", "plan", "-input=false", "-out="+planPath); err != nil {
return err return err
@ -572,6 +575,10 @@ func (r Runner) reconcileTerraform(terraformDir string) error {
return utils.RunCommandInDirEnv(terraformDir, environment, "terraform", "apply", "-input=false", "-auto-approve", planPath) return utils.RunCommandInDirEnv(terraformDir, environment, "terraform", "apply", "-input=false", "-auto-approve", planPath)
} }
func terraformPlanPath(terraformDir, clusterID string) (string, error) {
return filepath.Abs(filepath.Join(terraformDir, clusterID+".tfplan"))
}
func installSOPSKey(dir string, cfg config.Config) error { func installSOPSKey(dir string, cfg config.Config) error {
if _, err := os.Stat(cfg.SOPS.AgeKeyPath); err != nil { if _, err := os.Stat(cfg.SOPS.AgeKeyPath); err != nil {
return fmt.Errorf("read SOPS age identity: %w", err) return fmt.Errorf("read SOPS age identity: %w", err)

7
internal/bootstrap/bootstrap_test.go
View file

@ -159,3 +159,10 @@ func TestRenderTerraformTFVarsIsStableAndRedactsToken(t *testing.T) {
t.Fatalf("Terraform rendering is not deterministic or redacted: %s", first) t.Fatalf("Terraform rendering is not deterministic or redacted: %s", first)
} }
} }
func TestTerraformPlanPathIsAbsolute(t *testing.T) {
path, err := terraformPlanPath(filepath.Join("maidn-workspace", "terraform"), "cluster")
if err != nil || !filepath.IsAbs(path) {
t.Fatalf("Terraform plan path is not absolute: %q, %v", path, err)
}
}