feat: add terraform prefix to paths

internal/apis/kfd/v1alpha2/eks/create/distribution.go

@@ -86,10 +86,10 @@ func NewDistribution(
 		tfRunner: terraform.NewRunner(
 			execx.NewStdExecutor(),
 			terraform.Paths{
-				Logs:      phaseOp.LogsPath,
-				Outputs:   phaseOp.OutputsPath,
+				Logs:      phaseOp.TerraformLogsPath,
+				Outputs:   phaseOp.TerraformOutputsPath,
 				WorkDir:   path.Join(phaseOp.Path, "terraform"),
-				Plan:      phaseOp.PlanPath,
+				Plan:      phaseOp.TerraformPlanPath,
 				Terraform: phaseOp.TerraformPath,
 			},
 		),
@@ -488,13 +488,13 @@ func (d *Distribution) createDummyOutput() error {
 		"velero_iam_role_arn":                   "arn:aws:iam::123456789012:role/dummy",
 	}
 
-	outputFilePath := path.Join(d.OutputsPath, "output.json")
+	outputFilePath := path.Join(d.TerraformOutputsPath, "output.json")
 
 	if _, err := os.Stat(outputFilePath); err == nil {
 		return nil
 	}
 
-	if err := os.MkdirAll(d.OutputsPath, iox.FullPermAccess); err != nil {
+	if err := os.MkdirAll(d.TerraformOutputsPath, iox.FullPermAccess); err != nil {
 		return fmt.Errorf("error while creating outputs folder: %w", err)
 	}
 

internal/apis/kfd/v1alpha2/eks/create/infrastructure.go

@@ -70,10 +70,10 @@ func NewInfrastructure(
 		tfRunner: terraform.NewRunner(
 			executor,
 			terraform.Paths{
-				Logs:      phase.LogsPath,
-				Outputs:   phase.OutputsPath,
+				Logs:      phase.TerraformLogsPath,
+				Outputs:   phase.TerraformOutputsPath,
 				WorkDir:   path.Join(phase.Path, "terraform"),
-				Plan:      phase.PlanPath,
+				Plan:      phase.TerraformPlanPath,
 				Terraform: phase.TerraformPath,
 			},
 		),

internal/apis/kfd/v1alpha2/eks/create/kubernetes.go

@@ -99,10 +99,10 @@ func NewKubernetes(
 		tfRunner: terraform.NewRunner(
 			execx.NewStdExecutor(),
 			terraform.Paths{
-				Logs:      phase.LogsPath,
-				Outputs:   phase.OutputsPath,
+				Logs:      phase.TerraformLogsPath,
+				Outputs:   phase.TerraformOutputsPath,
 				WorkDir:   path.Join(phase.Path, "terraform"),
-				Plan:      phase.PlanPath,
+				Plan:      phase.TerraformPlanPath,
 				Terraform: phase.TerraformPath,
 			},
 		),
@@ -220,7 +220,7 @@ func (k *Kubernetes) Exec() error {
 		return errWrongKubeconfig
 	}
 
-	p, err := kubex.CreateConfig([]byte(kubeString), k.SecretsPath)
+	p, err := kubex.CreateConfig([]byte(kubeString), k.TerraformSecretsPath)
 	if err != nil {
 		return fmt.Errorf("error creating kubeconfig: %w", err)
 	}

internal/apis/kfd/v1alpha2/eks/creator.go

@@ -123,7 +123,7 @@ func (v *ClusterCreator) Create(skipPhase string, timeout int) error {
 
 	vpnConnector, err := NewVpnConnector(
 		v.furyctlConf.Metadata.Name,
-		infra.SecretsPath,
+		infra.TerraformSecretsPath,
 		v.paths.BinPath,
 		v.kfdManifest.Tools.Common.Furyagent.Version,
 		v.vpnAutoConnect,
@@ -443,7 +443,7 @@ func (v *ClusterCreator) setupPhases() (*create.Infrastructure, *create.Kubernet
 	kube, err := create.NewKubernetes(
 		v.furyctlConf,
 		v.kfdManifest,
-		infra.OutputsPath,
+		infra.TerraformOutputsPath,
 		v.paths,
 		v.dryRun,
 	)
@@ -455,7 +455,7 @@ func (v *ClusterCreator) setupPhases() (*create.Infrastructure, *create.Kubernet
 		v.paths,
 		v.furyctlConf,
 		v.kfdManifest,
-		infra.OutputsPath,
+		infra.TerraformOutputsPath,
 		v.dryRun,
 		v.phase,
 		v.paths.Kubeconfig,

internal/apis/kfd/v1alpha2/eks/delete/distribution.go

@@ -58,10 +58,10 @@ func NewDistribution(
 		tfRunner: terraform.NewRunner(
 			execx.NewStdExecutor(),
 			terraform.Paths{
-				Logs:      phase.LogsPath,
-				Outputs:   phase.OutputsPath,
+				Logs:      phase.TerraformLogsPath,
+				Outputs:   phase.TerraformOutputsPath,
 				WorkDir:   path.Join(phase.Path, "terraform"),
-				Plan:      phase.PlanPath,
+				Plan:      phase.TerraformPlanPath,
 				Terraform: phase.TerraformPath,
 			},
 		),

internal/apis/kfd/v1alpha2/eks/delete/infrastructure.go

@@ -47,10 +47,10 @@ func NewInfrastructure(
 		tfRunner: terraform.NewRunner(
 			execx.NewStdExecutor(),
 			terraform.Paths{
-				Logs:      phase.LogsPath,
-				Outputs:   phase.OutputsPath,
+				Logs:      phase.TerraformLogsPath,
+				Outputs:   phase.TerraformOutputsPath,
 				WorkDir:   path.Join(phase.Path, "terraform"),
-				Plan:      phase.PlanPath,
+				Plan:      phase.TerraformPlanPath,
 				Terraform: phase.TerraformPath,
 			},
 		),

internal/apis/kfd/v1alpha2/eks/delete/kubernetes.go

@@ -66,10 +66,10 @@ func NewKubernetes(
 		tfRunner: terraform.NewRunner(
 			execx.NewStdExecutor(),
 			terraform.Paths{
-				Logs:      phase.LogsPath,
-				Outputs:   phase.OutputsPath,
+				Logs:      phase.TerraformLogsPath,
+				Outputs:   phase.TerraformOutputsPath,
 				WorkDir:   path.Join(phase.Path, "terraform"),
-				Plan:      phase.PlanPath,
+				Plan:      phase.TerraformPlanPath,
 				Terraform: phase.TerraformPath,
 			},
 		),

internal/apis/kfd/v1alpha2/eks/deleter.go

@@ -107,7 +107,7 @@ func (d *ClusterDeleter) Delete() error {
 
 	vpnConnector, err := NewVpnConnector(
 		d.furyctlConf.Metadata.Name,
-		infra.SecretsPath,
+		infra.TerraformSecretsPath,
 		d.paths.BinPath,
 		d.kfdManifest.Tools.Common.Furyagent.Version,
 		d.vpnAutoConnect,

internal/cluster/phase.go

@@ -45,16 +45,16 @@ func CheckPhase(phase string) error {
 }
 
 type OperationPhase struct {
-	Path          string
-	TerraformPath string
-	KustomizePath string
-	KubectlPath   string
-	YqPath        string
-	PlanPath      string
-	LogsPath      string
-	OutputsPath   string
-	SecretsPath   string
-	binPath       string
+	Path                 string
+	TerraformPath        string
+	KustomizePath        string
+	KubectlPath          string
+	YqPath               string
+	TerraformPlanPath    string
+	TerraformLogsPath    string
+	TerraformOutputsPath string
+	TerraformSecretsPath string
+	binPath              string
 }
 
 type OperationPhaseOption struct {
@@ -76,16 +76,16 @@ func NewOperationPhase(folder string, kfdTools config.KFDTools, binPath string)
 	secretsPath := path.Join(basePath, "terraform", "secrets")
 
 	return &OperationPhase{
-		Path:          basePath,
-		TerraformPath: terraformPath,
-		KustomizePath: kustomizePath,
-		KubectlPath:   kubectlPath,
-		PlanPath:      planPath,
-		LogsPath:      logsPath,
-		OutputsPath:   outputsPath,
-		SecretsPath:   secretsPath,
-		binPath:       binPath,
-		YqPath:        yqPath,
+		Path:                 basePath,
+		TerraformPath:        terraformPath,
+		KustomizePath:        kustomizePath,
+		KubectlPath:          kubectlPath,
+		TerraformPlanPath:    planPath,
+		TerraformLogsPath:    logsPath,
+		TerraformOutputsPath: outputsPath,
+		TerraformSecretsPath: secretsPath,
+		binPath:              binPath,
+		YqPath:               yqPath,
 	}, nil
 }
 
@@ -103,27 +103,27 @@ func (cp *OperationPhase) CreateFolder() error {
 }
 
 func (cp *OperationPhase) CreateFolderStructure() error {
-	if _, err := os.Stat(cp.PlanPath); os.IsNotExist(err) {
-		if err := os.Mkdir(cp.PlanPath, iox.FullPermAccess); err != nil {
-			return fmt.Errorf("error creating folder %s: %w", cp.PlanPath, err)
+	if _, err := os.Stat(cp.TerraformPlanPath); os.IsNotExist(err) {
+		if err := os.Mkdir(cp.TerraformPlanPath, iox.FullPermAccess); err != nil {
+			return fmt.Errorf("error creating folder %s: %w", cp.TerraformPlanPath, err)
 		}
 	}
 
-	if _, err := os.Stat(cp.LogsPath); os.IsNotExist(err) {
-		if err := os.Mkdir(cp.LogsPath, iox.FullPermAccess); err != nil {
-			return fmt.Errorf("error creating folder %s: %w", cp.LogsPath, err)
+	if _, err := os.Stat(cp.TerraformLogsPath); os.IsNotExist(err) {
+		if err := os.Mkdir(cp.TerraformLogsPath, iox.FullPermAccess); err != nil {
+			return fmt.Errorf("error creating folder %s: %w", cp.TerraformLogsPath, err)
 		}
 	}
 
-	if _, err := os.Stat(cp.SecretsPath); os.IsNotExist(err) {
-		if err := os.Mkdir(cp.SecretsPath, iox.FullPermAccess); err != nil {
-			return fmt.Errorf("error creating folder %s: %w", cp.SecretsPath, err)
+	if _, err := os.Stat(cp.TerraformSecretsPath); os.IsNotExist(err) {
+		if err := os.Mkdir(cp.TerraformSecretsPath, iox.FullPermAccess); err != nil {
+			return fmt.Errorf("error creating folder %s: %w", cp.TerraformSecretsPath, err)
 		}
 	}
 
-	if _, err := os.Stat(cp.OutputsPath); os.IsNotExist(err) {
-		if err := os.Mkdir(cp.OutputsPath, iox.FullPermAccess); err != nil {
-			return fmt.Errorf("error creating folder %s: %w", cp.OutputsPath, err)
+	if _, err := os.Stat(cp.TerraformOutputsPath); os.IsNotExist(err) {
+		if err := os.Mkdir(cp.TerraformOutputsPath, iox.FullPermAccess); err != nil {
+			return fmt.Errorf("error creating folder %s: %w", cp.TerraformOutputsPath, err)
 		}
 	}