make fixes

Author: trouze

modules/environments/main.tf

@@ -100,7 +100,6 @@ resource "dbtcloud_environment" "environments" {
   custom_branch              = try(each.value.env_data.custom_branch, null)
   deployment_type            = try(each.value.env_data.deployment_type, null)
   is_active                  = try(each.value.env_data.is_active, null)
-  target_name                = try(each.value.env_data.target_name, null)
   use_custom_branch          = try(each.value.env_data.custom_branch, null) != null
   primary_profile_id         = local.resolve_primary_profile_id[each.key]
   extended_attributes_id     = local.resolve_primary_profile_id[each.key] != null ? null : local.resolve_extended_attributes_id[each.key]
@@ -134,7 +133,6 @@ resource "dbtcloud_environment" "protected_environments" {
   custom_branch              = try(each.value.env_data.custom_branch, null)
   deployment_type            = try(each.value.env_data.deployment_type, null)
   is_active                  = try(each.value.env_data.is_active, null)
-  target_name                = try(each.value.env_data.target_name, null)
   use_custom_branch          = try(each.value.env_data.custom_branch, null) != null
   primary_profile_id         = local.resolve_primary_profile_id[each.key]
   extended_attributes_id     = local.resolve_primary_profile_id[each.key] != null ? null : local.resolve_extended_attributes_id[each.key]

modules/project/main.tf

@@ -36,9 +36,9 @@ locals {
 resource "dbtcloud_project" "projects" {
   for_each = local.unprotected_projects_map
 
-  name                    = "${var.target_name}${each.value.name}"
-  description             = try(each.value.description, null)
-  type                    = try(each.value.type, null)
+  name                     = "${var.target_name}${each.value.name}"
+  description              = try(each.value.description, null)
+  type                     = try(each.value.type, null)
   dbt_project_subdirectory = try(each.value.dbt_project_subdirectory, null)
 
   # Deferred until dbt-labs/dbtcloud supports resource_metadata on dbtcloud_project (v2 parity).
@@ -58,9 +58,9 @@ resource "dbtcloud_project" "projects" {
 resource "dbtcloud_project" "protected_projects" {
   for_each = local.protected_projects_map
 
-  name                    = "${var.target_name}${each.value.name}"
-  description             = try(each.value.description, null)
-  type                    = try(each.value.type, null)
+  name                     = "${var.target_name}${each.value.name}"
+  description              = try(each.value.description, null)
+  type                     = try(each.value.type, null)
   dbt_project_subdirectory = try(each.value.dbt_project_subdirectory, null)
 
   # Deferred until dbt-labs/dbtcloud supports resource_metadata on dbtcloud_project (v2 parity).

schemas/v1.json

@@ -413,6 +413,11 @@
           "description": "Key of a project profile to use as the environment's primary profile.",
           "default": null
         },
+        "is_active": {
+          "type": ["boolean", "null"],
+          "description": "Whether the environment is active.",
+          "default": true
+        },
         "deployment_type": {
           "type": ["string", "null"],
           "enum": ["production", "staging", "other", null],
@@ -709,6 +714,22 @@
           "minLength": 1,
           "maxLength": 128
         },
+        "description": {
+          "type": ["string", "null"],
+          "description": "Project description. Shown in dbt Explorer.",
+          "default": null
+        },
+        "type": {
+          "type": ["integer", "null"],
+          "description": "Project type: 0 = default, 1 = hybrid.",
+          "enum": [0, 1, null],
+          "default": null
+        },
+        "dbt_project_subdirectory": {
+          "type": ["string", "null"],
+          "description": "Subdirectory within the repository where the dbt project lives.",
+          "default": null
+        },
         "protected": {
           "type": ["boolean", "null"],
           "description": "If true, Terraform will prevent this resource from being destroyed (lifecycle.prevent_destroy = true)",