workspace new (#80)

* fixed default workspace case

Author: Spartakovic

pkg/terraform/tf.go

@@ -68,12 +68,20 @@ func (terraform Terraform) Apply() (string, string, error) {
 		println("terraform init failed.")
 		return stdout.GetString(), "", fmt.Errorf("terraform init failed. %s", err)
 	}
-
-	err = tf.WorkspaceSelect(context.Background(), terraform.Workspace)
+	currentWorkspace, err := tf.WorkspaceShow(context.Background())
 
 	if err != nil {
-		log.Printf("terraform workspace select failed. workspace: %v. dir: %v", terraform.Workspace, terraform.WorkingDir)
-		return stdout.GetString(), "", fmt.Errorf("terraform select failed. %s", err)
+		log.Printf("terraform workspace show failed. workspace: %v . dir: %v", terraform.Workspace, terraform.WorkingDir)
+		return stdout.GetString(), "", fmt.Errorf("terraform show failed. %s", err)
+	}
+
+	if currentWorkspace != terraform.Workspace {
+		err = tf.WorkspaceNew(context.Background(), terraform.Workspace)
+
+		if err != nil {
+			log.Printf("terraform workspace new failed. workspace: %v . dir: %v", terraform.Workspace, terraform.WorkingDir)
+			return stdout.GetString(), "", fmt.Errorf("terraform select failed. %s", err)
+		}
 	}
 
 	err = tf.Apply(context.Background())
@@ -123,12 +131,22 @@ func (terraform Terraform) Plan() (bool, string, string, error) {
 		println("terraform init failed.")
 		return false, stdout.GetString(), stderr.GetString(), fmt.Errorf("terraform init failed. %s", err)
 	}
-	err = tf.WorkspaceSelect(context.Background(), terraform.Workspace)
+	currentWorkspace, err := tf.WorkspaceShow(context.Background())
 
 	if err != nil {
-		log.Printf("terraform workspace select failed. workspace: %v. dir: %v", terraform.Workspace, terraform.WorkingDir)
-		return false, stdout.GetString(), stderr.GetString(), fmt.Errorf("terraform select failed. %s", err)
+		log.Printf("terraform workspace show failed. workspace: %v . dir: %v", terraform.Workspace, terraform.WorkingDir)
+		return false, stdout.GetString(), "", fmt.Errorf("terraform show failed. %s", err)
 	}
+
+	if currentWorkspace != terraform.Workspace {
+		err = tf.WorkspaceNew(context.Background(), terraform.Workspace)
+
+		if err != nil {
+			log.Printf("terraform workspace new failed. workspace: %v . dir: %v", terraform.Workspace, terraform.WorkingDir)
+			return false, stdout.GetString(), "", fmt.Errorf("terraform select failed. %s", err)
+		}
+	}
+
 	isNonEmptyPlan, err := tf.Plan(context.Background())
 	if err != nil {
 		println("terraform plan failed. dir: " + terraform.WorkingDir)

pkg/terraform/tf_test.go

@@ -18,7 +18,7 @@ func TestExecuteTerraformPlan(t *testing.T) {
 
 	CreateValidTerraformTestFile(dir)
 
-	tf := Terraform{WorkingDir: dir, Workspace: "default"}
+	tf := Terraform{WorkingDir: dir, Workspace: "dev"}
 	_, _, _, err := tf.Plan()
 	assert.NoError(t, err)
 }
@@ -34,6 +34,22 @@ func TestExecuteTerraformApply(t *testing.T) {
 
 	CreateValidTerraformTestFile(dir)
 
+	tf := Terraform{WorkingDir: dir, Workspace: "dev"}
+	_, _, err := tf.Apply()
+	assert.NoError(t, err)
+}
+
+func TestExecuteTerraformApplyDefaultWorkspace(t *testing.T) {
+	dir := CreateTestTerraformProject()
+	defer func(name string) {
+		err := os.RemoveAll(name)
+		if err != nil {
+			log.Fatal(err)
+		}
+	}(dir)
+
+	CreateValidTerraformTestFile(dir)
+
 	tf := Terraform{WorkingDir: dir, Workspace: "default"}
 	_, _, err := tf.Apply()
 	assert.NoError(t, err)

pkg/terraform/utils.go

@@ -6,7 +6,7 @@ import (
 )
 
 func CreateTestTerraformProject() string {
-	file, err := os.MkdirTemp("", "digger-test")
+	file, err := os.MkdirTemp("", "digger-test-*")
 	if err != nil {
 		log.Fatal(err)
 	}