Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add terraform prefix to paths #425

Merged
merged 1 commit into from
Sep 19, 2023
Merged

feat: add terraform prefix to paths #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions internal/apis/kfd/v1alpha2/eks/create/distribution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
),
Expand Down Expand Up @@ -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)
}

Expand Down
6 changes: 3 additions & 3 deletions internal/apis/kfd/v1alpha2/eks/create/infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,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,
},
),
Expand Down
8 changes: 4 additions & 4 deletions internal/apis/kfd/v1alpha2/eks/create/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
),
Expand Down Expand Up @@ -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)
}
Expand Down
6 changes: 3 additions & 3 deletions internal/apis/kfd/v1alpha2/eks/creator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
)
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions internal/apis/kfd/v1alpha2/eks/delete/distribution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
),
Expand Down
6 changes: 3 additions & 3 deletions internal/apis/kfd/v1alpha2/eks/delete/infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
),
Expand Down
6 changes: 3 additions & 3 deletions internal/apis/kfd/v1alpha2/eks/delete/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
),
Expand Down
2 changes: 1 addition & 1 deletion internal/apis/kfd/v1alpha2/eks/deleter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
64 changes: 32 additions & 32 deletions internal/cluster/phase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}

Expand All @@ -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)
}
}

Expand Down