Merge pull request #242 from dbt-labs/release-0.2.22

Author: b-per

CHANGELOG.md

@@ -2,7 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
-## [Unreleased](https://github.com/dbt-labs/terraform-provider-dbtcloud/compare/v0.2.21...HEAD)
+## [Unreleased](https://github.com/dbt-labs/terraform-provider-dbtcloud/compare/v0.2.22...HEAD)
+
+## [0.2.22](https://github.com/dbt-labs/terraform-provider-dbtcloud/compare/v0.2.21...v0.2.22)
+
+## Changes
+
+- [#240](https://github.com/dbt-labs/terraform-provider-dbtcloud/issues/240) Add notice of deprecation for `triggers.custom_branch_only` for jobs and update logic to make it work even though people have it to true or false in their config. We might raise an error if the field is still there in the future.
+- Update diff calculation for Extended Attributes, allowing strings which are not set with `jsonencode()`
+- [#241](https://github.com/dbt-labs/terraform-provider-dbtcloud/issues/241) Force recreation of env vars when values change to work with the recent changes in the dbt Cloud API
+
+## Documentation
+
+- Add list of permission names and permission codes in the docs of the `service_token` and `group`
+- Add info in `dbtcloud_repository` about the need to also create a `dbtcloud_project_repository`
 
 ## [0.2.21](https://github.com/dbt-labs/terraform-provider-dbtcloud/compare/v0.2.20...v0.2.21)
 

docs/resources/group.md

@@ -7,7 +7,34 @@ description: |-
 
 # dbtcloud_group (Resource)
 
-*Note*: Groups currently do not support updates, as per both the API and the UI.
+The mapping of permission names [from the docs](https://docs.getdbt.com/docs/cloud/manage-access/enterprise-permissions) to the permissions to set in Terraform is the following:
+
+|Permission name......... | Permission code|
+|-- | --|
+|Account Admin | account_admin|
+|Account Viewer | account_viewer|
+|Admin | admin|
+|Analyst | analyst|
+|Billing Admin | billing_admin|
+|Database Admin | database_admin|
+|Developer | developer|
+|Git Admin | git_admin|
+|Job Admin | job_admin|
+|Job Runner | job_runner|
+|Job Viewer | job_viewer|
+|Member | member|
+|Metadata Only | metadata_only|
+|Owner | owner|
+|Project Creator | project_creator|
+|Read-Only | readonly|
+|Security Admin | security_admin|
+|Semantic Layer Only | semantic_layer_only|
+|Stakeholder | stakeholder|
+|Team Admin | team_admin|
+|Webhooks Only | webhooks_only|
+
+
+
 
 ## Example Usage
 

docs/resources/job.md

@@ -13,11 +13,6 @@ description: |-
 Those improvements include modifications to deferral which was historically set at the job level and will now be set at the environment level. 
 Deferral can still be set to "self" by setting `self_deferring` to `true` but with the new approach, deferral to other runs need to be done with `deferring_environment_id` instead of `deferring_job_id`.
 
-~> As of beginning of February 2024, job chaining with `job_completion_trigger_condition` is in private beta and not available to all users.
-<br/>
-<br/>
-This notice will be removed once the feature is generally available.
-
 
 ## Example Usage
 
@@ -41,7 +36,6 @@ resource "dbtcloud_job" "daily_job" {
   run_generate_sources = true
   target_name          = "default"
   triggers = {
-    "custom_branch_only" : false,
     "github_webhook" : false,
     "git_provider_webhook" : false,
     "schedule" : true
@@ -67,7 +61,6 @@ resource "dbtcloud_job" "ci_job" {
   project_id               = dbtcloud_project.dbt_project.id
   run_generate_sources     = false
   triggers = {
-    "custom_branch_only" : true,
     "github_webhook" : true,
     "git_provider_webhook" : true,
     "schedule" : false
@@ -91,7 +84,6 @@ resource "dbtcloud_job" "downstream_job" {
   project_id               = dbtcloud_project.dbt_project2.id
   run_generate_sources     = true
   triggers = {
-    "custom_branch_only" : false,
     "github_webhook" : false,
     "git_provider_webhook" : false,
     "schedule" : false
@@ -115,7 +107,7 @@ resource "dbtcloud_job" "downstream_job" {
 - `execute_steps` (List of String) List of commands to execute for the job
 - `name` (String) Job name
 - `project_id` (Number) Project ID to create the job in
-- `triggers` (Map of Boolean) Flags for which types of triggers to use, the values are `github_webhook`, `git_provider_webhook`, `schedule` and `custom_branch_only`. <br>`custom_branch_only` is only relevant for CI jobs triggered automatically on PR creation to only trigger a job on a PR to the custom branch of the environment. To create a job in a 'deactivated' state, set all to `false`.
+- `triggers` (Map of Boolean) Flags for which types of triggers to use, the values are `github_webhook`, `git_provider_webhook`, and `schedule`. <br>`custom_branch_only` used to be allowed but has been deprecated from the API. The jobs will use the custom branch of the environment. Please remove the `custom_branch_only` from your config. <br>To create a job in a 'deactivated' state, set all to `false`.
 
 ### Optional
 

docs/resources/project_repository.md

@@ -2,13 +2,13 @@
 page_title: "dbtcloud_project_repository Resource - dbtcloud"
 subcategory: ""
 description: |-
-  
+  This resource allows you to link a dbt Cloud project to a git repository.
 ---
 
 # dbtcloud_project_repository (Resource)
 
 
-
+This resource allows you to link a dbt Cloud project to a git repository.
 
 ## Example Usage
 

docs/resources/repository.md

@@ -7,8 +7,10 @@ description: |-
 
 # dbtcloud_repository (Resource)
 
-*Note*: Some upstream resources can be slow to create, so if creating a project at
-the same time as the repository, it's recommended to use the `depends_on` meta argument.
+This resource allows you to manage connections to git repositories in dbt Cloud.
+
+By itself, this resource won't show you the repository in the dbt Cloud UI. 
+You will need to also set up a [`dbtcloud_project_repository` resource](https://registry.terraform.io/providers/dbt-labs/dbtcloud/latest/docs/resources/project_repository) as well to link your dbt Cloud project and the git repository.
 
 In order to find the `github_installation_id`, you can log in to dbt Cloud, replace `<dbt_cloud_url>` by your dbt Cloud
 URL and run the following commands in the Google Chrome console:

docs/resources/service_token.md

@@ -7,6 +7,32 @@ description: |-
 
 # dbtcloud_service_token (Resource)
 
+The mapping of permission names [from the docs](https://docs.getdbt.com/docs/cloud/manage-access/enterprise-permissions) to the permissions to set in Terraform is the following:
+
+|Permission name......... | Permission code|
+|-- | --|
+|Account Admin | account_admin|
+|Account Viewer | account_viewer|
+|Admin | admin|
+|Analyst | analyst|
+|Billing Admin | billing_admin|
+|Database Admin | database_admin|
+|Developer | developer|
+|Git Admin | git_admin|
+|Job Admin | job_admin|
+|Job Runner | job_runner|
+|Job Viewer | job_viewer|
+|Member | member|
+|Metadata Only | metadata_only|
+|Owner | owner|
+|Project Creator | project_creator|
+|Read-Only | readonly|
+|Security Admin | security_admin|
+|Semantic Layer Only | semantic_layer_only|
+|Stakeholder | stakeholder|
+|Team Admin | team_admin|
+|Webhooks Only | webhooks_only|
+
 
 
 
@@ -29,9 +55,6 @@ resource "dbtcloud_service_token" "test_service_token" {
     project_id     = dbtcloud_project.dbt_project.id
   }
 }
-
-// permission_set accepts one of the following values:
-// "account_admin","admin","database_admin","git_admin","team_admin","job_admin","job_viewer","analyst","developer","stakeholder","readonly","project_creator","account_viewer","metadata_only"
 ```
 
 <!-- schema generated by tfplugindocs -->

examples/resources/dbtcloud_job/resource.tf

@@ -17,7 +17,6 @@ resource "dbtcloud_job" "daily_job" {
   run_generate_sources = true
   target_name          = "default"
   triggers = {
-    "custom_branch_only" : false,
     "github_webhook" : false,
     "git_provider_webhook" : false,
     "schedule" : true
@@ -43,7 +42,6 @@ resource "dbtcloud_job" "ci_job" {
   project_id               = dbtcloud_project.dbt_project.id
   run_generate_sources     = false
   triggers = {
-    "custom_branch_only" : true,
     "github_webhook" : true,
     "git_provider_webhook" : true,
     "schedule" : false
@@ -67,7 +65,6 @@ resource "dbtcloud_job" "downstream_job" {
   project_id               = dbtcloud_project.dbt_project2.id
   run_generate_sources     = true
   triggers = {
-    "custom_branch_only" : false,
     "github_webhook" : false,
     "git_provider_webhook" : false,
     "schedule" : false

examples/resources/dbtcloud_service_token/resource.tf

@@ -14,6 +14,3 @@ resource "dbtcloud_service_token" "test_service_token" {
     project_id     = dbtcloud_project.dbt_project.id
   }
 }
-
-// permission_set accepts one of the following values:
-// "account_admin","admin","database_admin","git_admin","team_admin","job_admin","job_viewer","analyst","developer","stakeholder","readonly","project_creator","account_viewer","metadata_only"

pkg/data_sources/job_acceptance_test.go

@@ -60,7 +60,6 @@ func jobs(jobName string) string {
             "dbt run"
         ]
         triggers = {
-          "custom_branch_only" : false,
           "github_webhook" : false,
           "schedule" : false,
           "git_provider_webhook": false

pkg/data_sources/notification_acceptance_test.go

@@ -15,9 +15,20 @@ func TestAccDbtCloudNotificationDataSource(t *testing.T) {
 	config := notification(randomProjectName)
 
 	check := resource.ComposeTestCheckFunc(
-		resource.TestCheckResourceAttr("data.dbtcloud_notification.test_notification_external", "notification_type", "4"),
-		resource.TestCheckResourceAttrSet("data.dbtcloud_notification.test_notification_external", "on_failure.0"),
-		resource.TestCheckResourceAttr("data.dbtcloud_notification.test_notification_external", "external_email", "[email protected]"),
+		resource.TestCheckResourceAttr(
+			"data.dbtcloud_notification.test_notification_external",
+			"notification_type",
+			"4",
+		),
+		resource.TestCheckResourceAttrSet(
+			"data.dbtcloud_notification.test_notification_external",
+			"on_failure.0",
+		),
+		resource.TestCheckResourceAttr(
+			"data.dbtcloud_notification.test_notification_external",
+			"external_email",
+			"[email protected]",
+		),
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -55,7 +66,6 @@ func notification(projectName string) string {
 			"github_webhook" : false,
 			"git_provider_webhook" : false,
 			"schedule" : false,
-			"custom_branch_only" : false,
 		}
 	}