Merge pull request #225 from dbt-labs/release-0.2.16

Release 0.2.16

Author: b-per

CHANGELOG.md

@@ -2,7 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
-## [Unreleased](https://github.com/dbt-labs/terraform-provider-dbtcloud/compare/v0.2.15...HEAD)
+## [Unreleased](https://github.com/dbt-labs/terraform-provider-dbtcloud/compare/v0.2.16...HEAD)
+
+## [0.2.16](https://github.com/dbt-labs/terraform-provider-dbtcloud/compare/v0.2.15...v0.2.16)
+
+## Changes
+
+- #99 - add the resource `environment_variable_job_override` to allow environment variable override in jobs
+- Update the go version and packages versions
+
+## Fixes
+
+- #221 - removing the value for an env var scope was not removing it in dbt Cloud
+- add better messages and error handling for jobs
 
 ## [0.2.15](https://github.com/dbt-labs/terraform-provider-dbtcloud/compare/v0.2.14...v0.2.15)
 

Makefile

@@ -32,3 +32,6 @@ deps:
 release:
 	git tag "v$(VERSION)"
 	git push origin "v$(VERSION)"
+
+d2doc:
+	d2 terraform_resources.d2 terraform_resources.png -l elk

docs/data-sources/azure_dev_ops_project.md

@@ -34,5 +34,3 @@ data "dbtcloud_azure_dev_ops_project" "my_ado_project" {
 
 - `id` (String) The internal Azure Dev Ops ID of the ADO Project
 - `url` (String) The URL of the ADO project
-
-

docs/data-sources/azure_dev_ops_repository.md

@@ -39,5 +39,3 @@ data "dbtcloud_azure_dev_ops_repository" "my_ado_repository" {
 - `id` (String) The internal Azure Dev Ops ID of the ADO Repository
 - `remote_url` (String) The HTTP URL of the ADO repository used to connect to dbt Cloud
 - `web_url` (String) The URL of the ADO repository accessible in the browser
-
-

docs/data-sources/bigquery_connection.md

@@ -45,5 +45,3 @@ description: |-
 - `timeout_seconds` (Number) Timeout in seconds for queries
 - `token_uri` (String) Token URI for the Service Account
 - `type` (String) The type of connection
-
-

docs/data-sources/bigquery_credential.md

@@ -26,5 +26,3 @@ description: |-
 - `id` (String) The ID of this resource.
 - `is_active` (Boolean) Whether the BigQuery credential is active
 - `num_threads` (Number) Number of threads to use
-
-

docs/data-sources/connection.md

@@ -33,5 +33,3 @@ description: |-
 - `role` (String) Role name for the connection
 - `type` (String) Connection type
 - `warehouse` (String) Warehouse name for the connection
-
-

docs/data-sources/databricks_credential.md

@@ -28,5 +28,3 @@ description: |-
 - `num_threads` (Number) Number of threads to use
 - `schema` (String) The schema where to create models
 - `target_name` (String) Target name
-
-

docs/data-sources/environment.md

@@ -32,5 +32,3 @@ description: |-
 - `name` (String) Environment name
 - `type` (String) The type of environment (must be either development or deployment)
 - `use_custom_branch` (Boolean) Whether to use a custom git branch in this environment
-
-

docs/data-sources/environment_variable.md

@@ -24,5 +24,3 @@ description: |-
 
 - `environment_values` (Map of String) Map containing the environment variables
 - `id` (String) The ID of this resource.
-
-

docs/data-sources/extended_attributes.md

@@ -32,5 +32,3 @@ data "dbtcloud_extended_attributes" "my_extended_attributes" {
 - `extended_attributes` (String) A JSON string listing the extended attributes mapping
 - `id` (String) The ID of this resource.
 - `state` (Number) The state of the extended attributes (1 = active, 2 = inactive)
-
-

docs/data-sources/group.md

@@ -26,5 +26,3 @@ description: |-
 - `is_active` (Boolean) Whether the group is active
 - `name` (String) Group name
 - `sso_mapping_groups` (List of String) SSO mapping group names for this group
-
-

docs/data-sources/group_users.md

@@ -37,5 +37,3 @@ Read-Only:
 
 - `email` (String)
 - `id` (Number)
-
-

docs/data-sources/job.md

@@ -32,5 +32,3 @@ description: |-
 - `timeout_seconds` (Number) Number of seconds before the job times out
 - `triggers` (Map of Boolean) Flags for which types of triggers to use, keys of github_webhook, git_provider_webhook, schedule, custom_branch_only
 - `triggers_on_draft_pr` (Boolean) Whether the CI job should be automatically triggered on draft PRs
-
-

docs/data-sources/notification.md

@@ -34,5 +34,3 @@ data "dbtcloud_notification" "my_notification" {
 - `on_failure` (Set of Number) List of job IDs to trigger the webhook on failure
 - `on_success` (Set of Number) List of job IDs to trigger the webhook on success
 - `user_id` (Number) Internal dbt Cloud User ID. Must be the user_id for an existing user even if the notification is an external one
-
-

docs/data-sources/postgres_credential.md

@@ -27,5 +27,3 @@ description: |-
 - `is_active` (Boolean) Whether the Postgres credential is active
 - `num_threads` (Number) Number of threads to use
 - `username` (String) Username for Postgres
-
-

docs/data-sources/privatelink_endpoint.md

@@ -45,5 +45,3 @@ data "dbtcloud_privatelink_endpoint" "test_with_name_and_url" {
 - `id` (String) The internal ID of the PrivateLink Endpoint
 - `state` (Number) PrivatelinkEndpoint state should be 1 = active, as 2 = deleted
 - `type` (String) Type of the PrivateLink Endpoint
-
-

docs/data-sources/project.md

@@ -44,5 +44,3 @@ data "dbtcloud_project" "test_project" {
 - `id` (String) The ID of this resource.
 - `repository_id` (Number) ID of the repository associated with the project
 - `state` (Number) Project state should be 1 = active, as 2 = deleted
-
-

docs/data-sources/repository.md

@@ -34,5 +34,3 @@ description: |-
 - `is_active` (Boolean) Whether the repository is active
 - `remote_url` (String) Connection name
 - `repository_credentials_id` (Number) Credentials ID for the repository (From the repository side not the dbt Cloud ID)
-
-

docs/data-sources/service_token.md

@@ -34,5 +34,3 @@ Read-Only:
 - `all_projects` (Boolean)
 - `permission_set` (String)
 - `project_id` (Number)
-
-

docs/data-sources/snowflake_credential.md

@@ -28,5 +28,3 @@ description: |-
 - `num_threads` (Number) Number of threads to use
 - `schema` (String) Default schema name
 - `user` (String) Username for Snowflake
-
-

docs/data-sources/user.md

@@ -28,5 +28,3 @@ data "dbtcloud_user" "my_user" {
 ### Read-Only
 
 - `id` (Number) ID of the user
-
-

docs/data-sources/user_groups.md

@@ -29,5 +29,3 @@ data "dbtcloud_user_groups" "my_user_groups" {
 
 - `group_ids` (Set of Number) IDs of the groups assigned to the user
 - `id` (String) The ID of this resource.
-
-

docs/data-sources/webhook.md

@@ -30,5 +30,3 @@ description: |-
 - `id` (String) The ID of this resource.
 - `job_ids` (List of Number) List of job IDs to trigger the webhook
 - `name` (String) Webhooks Name
-
-

docs/resources/environment.md

@@ -35,13 +35,13 @@ resource "dbtcloud_environment" "prod_environment" {
   credential_id   = dbtcloud_snowflake_credential.prod_credential.credential_id
   deployment_type = "production"
 }
-  
+
 // Creating a development environment
 resource "dbtcloud_environment" "dev_environment" {
-  dbt_version     = "1.6.0-latest"
-  name            = "Dev"
-  project_id      = dbtcloud_project.dbt_project.id
-  type            = "development"
+  dbt_version = "1.6.0-latest"
+  name        = "Dev"
+  project_id  = dbtcloud_project.dbt_project.id
+  type        = "development"
 }
 ```
 

docs/resources/environment_variable.md

@@ -24,7 +24,7 @@ resource "dbtcloud_environment_variable" "dbt_my_env_var" {
     "project" : "my_project_level_value",
     "Dev" : "my_env_level_value",
     "CI" : "my_ci_override_value",
-    "Prod" "my_prod_override_value"
+    "Prod" : "my_prod_override_value"
   }
   depends_on = [
     dbtcloud_project.dbt_project,

docs/resources/environment_variable_job_override.md

@@ -0,0 +1,47 @@
+---
+page_title: "dbtcloud_environment_variable_job_override Resource - dbtcloud"
+subcategory: ""
+description: |-
+  
+---
+
+# dbtcloud_environment_variable_job_override (Resource)
+
+
+
+
+## Example Usage
+
+```terraform
+resource "dbtcloud_environment_variable_job_override" "my_env_var_job_override" {
+  name              = dbtcloud_environment_variable.dbt_my_env_var.name
+  project_id        = dbtcloud_project.dbt_project.id
+  job_definition_id = dbtcloud_job.daily_job.id
+  raw_value         = "my_override_value"
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `job_definition_id` (Number) The job ID for which the environment variable is being overridden
+- `name` (String) The environment variable name to override
+- `project_id` (Number) The project ID for which the environment variable is being overridden
+- `raw_value` (String) The value for the override of the environment variable
+
+### Read-Only
+
+- `environment_variable_job_override_id` (Number) The ID of the environment variable job override
+- `id` (String) The ID of this resource.
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+# Import using a project ID, a job ID and the environment variable override ID
+terraform import dbtcloud_environment_variable_job_override.test_environment_variable_job_override "project_id:job_id:environment_variable_override_id"
+terraform import dbtcloud_environment_variable_job_override.test_environment_variable_job_override 12345:678:123456
+```

docs/resources/extended_attributes.md

@@ -29,7 +29,7 @@ resource "dbtcloud_extended_attributes" "my_attributes" {
   project_id = var.dbt_project.id
 }
 
-resource dbtcloud_environment issue_depl {
+resource "dbtcloud_environment" "issue_depl" {
   dbt_version            = "1.6.0-latest"
   name                   = "My environment"
   project_id             = var.dbt_project.id

docs/resources/job.md

@@ -41,8 +41,8 @@ resource "dbtcloud_job" "daily_job" {
     "schedule" : true
   }
   # this is the default that gets set up when modifying jobs in the UI
-  schedule_days = [0, 1, 2, 3, 4, 5, 6]
-  schedule_type = "days_of_week"
+  schedule_days  = [0, 1, 2, 3, 4, 5, 6]
+  schedule_type  = "days_of_week"
   schedule_hours = [0]
 }
 

docs/resources/license_map.md

@@ -15,19 +15,19 @@ description: |-
 ```terraform
 # Developer license group mapping
 resource "dbtcloud_license_map" "dev_license_map" {
-  license_type = "developer"
+  license_type               = "developer"
   sso_license_mapping_groups = ["DEV-SSO-GROUP"]
 }
 
 # Read-only license mapping
 resource "dbtcloud_license_map" "read_only_license_map" {
-  license_type = "read_only"
+  license_type               = "read_only"
   sso_license_mapping_groups = ["READ-ONLY-SSO-GROUP"]
 }
 
 # IT license mapping
 resource "dbtcloud_license_map" "it_license_map" {
-  license_type = "it"
+  license_type               = "it"
   sso_license_mapping_groups = ["IT-SSO-GROUP"]
 }
 ```

docs/resources/user_groups.md

@@ -25,21 +25,21 @@ If you would like a different behavior, please open an issue on GitHub. To remov
 ```terraform
 // we can assign groups to users
 resource "dbtcloud_user_groups" "my_user_groups" {
-  user_id     = dbtcloud_user.my_user.id
-  group_ids   = [
+  user_id = dbtcloud_user.my_user.id
+  group_ids = [
     // the group_id can be written directly
     1234,
     // or we can refer to a group created by Terraform
     dbtcloud_group.my_group.id,
     // or we can use  a local variable (see the guide on how to use the HTTP provider)
     local.my_group_id,
-    ]
+  ]
 }
 
 // as Delete is not handled currently, by design, removing all groups from a user can be done with
 resource "dbtcloud_user_groups" "my_other_user_groups" {
-  user_id     = 123456
-  group_ids   = []
+  user_id   = 123456
+  group_ids = []
 }
 ```
 

examples/resources/dbtcloud_environment/resource.tf

@@ -20,11 +20,11 @@ resource "dbtcloud_environment" "prod_environment" {
   credential_id   = dbtcloud_snowflake_credential.prod_credential.credential_id
   deployment_type = "production"
 }
-  
+
 // Creating a development environment
 resource "dbtcloud_environment" "dev_environment" {
-  dbt_version     = "1.6.0-latest"
-  name            = "Dev"
-  project_id      = dbtcloud_project.dbt_project.id
-  type            = "development"
+  dbt_version = "1.6.0-latest"
+  name        = "Dev"
+  project_id  = dbtcloud_project.dbt_project.id
+  type        = "development"
 }

examples/resources/dbtcloud_environment_variable/resource.tf

@@ -9,7 +9,7 @@ resource "dbtcloud_environment_variable" "dbt_my_env_var" {
     "project" : "my_project_level_value",
     "Dev" : "my_env_level_value",
     "CI" : "my_ci_override_value",
-    "Prod" "my_prod_override_value"
+    "Prod" : "my_prod_override_value"
   }
   depends_on = [
     dbtcloud_project.dbt_project,

examples/resources/dbtcloud_environment_variable_job_override/import.sh

@@ -0,0 +1,3 @@
+# Import using a project ID, a job ID and the environment variable override ID
+terraform import dbtcloud_environment_variable_job_override.test_environment_variable_job_override "project_id:job_id:environment_variable_override_id"
+terraform import dbtcloud_environment_variable_job_override.test_environment_variable_job_override 12345:678:123456

examples/resources/dbtcloud_environment_variable_job_override/resource.tf

@@ -0,0 +1,6 @@
+resource "dbtcloud_environment_variable_job_override" "my_env_var_job_override" {
+  name              = dbtcloud_environment_variable.dbt_my_env_var.name
+  project_id        = dbtcloud_project.dbt_project.id
+  job_definition_id = dbtcloud_job.daily_job.id
+  raw_value         = "my_override_value"
+}

examples/resources/dbtcloud_extended_attributes/resource.tf

@@ -14,7 +14,7 @@ resource "dbtcloud_extended_attributes" "my_attributes" {
   project_id = var.dbt_project.id
 }
 
-resource dbtcloud_environment issue_depl {
+resource "dbtcloud_environment" "issue_depl" {
   dbt_version            = "1.6.0-latest"
   name                   = "My environment"
   project_id             = var.dbt_project.id

examples/resources/dbtcloud_job/resource.tf

@@ -23,8 +23,8 @@ resource "dbtcloud_job" "daily_job" {
     "schedule" : true
   }
   # this is the default that gets set up when modifying jobs in the UI
-  schedule_days = [0, 1, 2, 3, 4, 5, 6]
-  schedule_type = "days_of_week"
+  schedule_days  = [0, 1, 2, 3, 4, 5, 6]
+  schedule_type  = "days_of_week"
   schedule_hours = [0]
 }
 

examples/resources/dbtcloud_license_map/resource.tf

@@ -1,17 +1,17 @@
 # Developer license group mapping
 resource "dbtcloud_license_map" "dev_license_map" {
-  license_type = "developer"
+  license_type               = "developer"
   sso_license_mapping_groups = ["DEV-SSO-GROUP"]
 }
 
 # Read-only license mapping
 resource "dbtcloud_license_map" "read_only_license_map" {
-  license_type = "read_only"
+  license_type               = "read_only"
   sso_license_mapping_groups = ["READ-ONLY-SSO-GROUP"]
 }
 
 # IT license mapping
 resource "dbtcloud_license_map" "it_license_map" {
-  license_type = "it"
+  license_type               = "it"
   sso_license_mapping_groups = ["IT-SSO-GROUP"]
 }