Fix: tf apply fails when switching from v1.2.4 to v1.2.5 (#509)

* extracting bluprintId from lastDeployment * fix tests * formatting * checking for environment.BlueprintId also
env0 · Sep 29, 2022 · 3c3799e · 3c3799e
1 parent b08125a
commit 3c3799e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/env0/resource_environment.go b/env0/resource_environment.go
@@ -241,10 +241,16 @@ func setEnvironmentSchema(d *schema.ResourceData, environment client.Environment
 			d.Set("template_id", environment.LatestDeploymentLog.BlueprintId)
 			d.Set("revision", environment.LatestDeploymentLog.BlueprintRevision)
 		}
-	} else if environment.BlueprintId != "" {
+	} else if environment.BlueprintId != "" || environment.LatestDeploymentLog.BlueprintId != "" {
 		settings := d.Get("without_template_settings").([]interface{})
 		elem := settings[0].(map[string]interface{})
-		elem["id"] = environment.BlueprintId
+
+		if environment.BlueprintId != "" {
+			elem["id"] = environment.BlueprintId
+		} else {
+			elem["id"] = environment.LatestDeploymentLog.BlueprintId
+		}
+
 		d.Set("without_template_settings", settings)
 	}
 

diff --git a/env0/resource_environment_test.go b/env0/resource_environment_test.go
@@ -1191,6 +1191,9 @@ func TestUnitEnvironmentWithoutTemplateResource(t *testing.T) {
 		WorkspaceName:              "workspace-name",
 		TerragruntWorkingDirectory: "/terragrunt/directory/",
 		VcsCommandsAlias:           "alias",
+		LatestDeploymentLog: client.DeploymentLog{
+			BlueprintId: "id-template-0",
+		},
 	}
 
 	environmentWithBluePrint := environment