Merge branch 'main' into migrate-snowflake-sign-25

Author: adrianburusdbt

docs/data-sources/databricks_credential.md

@@ -3,12 +3,12 @@
 page_title: "dbtcloud_databricks_credential Data Source - dbtcloud"
 subcategory: ""
 description: |-
-  
+  Databricks credential data source
 ---
 
 # dbtcloud_databricks_credential (Data Source)
 
-
+Databricks credential data source
 
 
 
@@ -24,7 +24,7 @@ description: |-
 
 - `adapter_id` (Number) Databricks adapter ID for the credential
 - `catalog` (String) The catalog where to create models
-- `id` (String) The ID of this resource.
-- `num_threads` (Number) Number of threads to use
+- `id` (String) The ID of this resource. Contains the project ID and the credential ID.
+- `num_threads` (Number) The number of threads to use
 - `schema` (String) The schema where to create models
 - `target_name` (String) Target name

docs/data-sources/repository.md

@@ -3,12 +3,12 @@
 page_title: "dbtcloud_repository Data Source - dbtcloud"
 subcategory: ""
 description: |-
-  
+  Retrieve data for a single repository
 ---
 
 # dbtcloud_repository (Data Source)
 
-
+Retrieve data for a single repository
 
 
 
@@ -26,11 +26,15 @@ description: |-
 
 ### Read-Only
 
+- `azure_active_directory_project_id` (String) The Azure Dev Ops project ID
+- `azure_active_directory_repository_id` (String) The Azure Dev Ops repository ID
+- `azure_bypass_webhook_registration_failure` (Boolean) If set to False (the default), the connection will fail if the service user doesn't have access to set webhooks
 - `deploy_key` (String) Public key generated by dbt when using `deploy_key` clone strategy
 - `git_clone_strategy` (String) Git clone strategy for the repository
 - `github_installation_id` (Number) Identifier for the GitHub installation
 - `gitlab_project_id` (Number) Identifier for the Gitlab project
-- `id` (String) The ID of this resource.
+- `id` (String) The ID of this resource
 - `is_active` (Boolean) Whether the repository is active
-- `remote_url` (String) Connection name
+- `pull_request_url_template` (String) The pull request URL template to be used when opening a pull request from within dbt Cloud's IDE
+- `remote_url` (String) Git URL for the repository or \<Group>/\<Project> for Gitlab
 - `repository_credentials_id` (Number) Credentials ID for the repository (From the repository side not the dbt Cloud ID)

docs/resources/databricks_credential.md

@@ -2,13 +2,13 @@
 page_title: "dbtcloud_databricks_credential Resource - dbtcloud"
 subcategory: ""
 description: |-
-  
+  Databricks credential resource
 ---
 
 # dbtcloud_databricks_credential (Resource)
 
 
-
+Databricks credential resource
 
 ## Example Usage
 
@@ -54,14 +54,14 @@ resource "dbtcloud_databricks_credential" "my_spark_cred" {
 
 ### Optional
 
-- `adapter_id` (Number) Databricks adapter ID for the credential (do not fill in when using global connections, only to be used for connections created with the legacy connection resource `dbtcloud_connection`)
+- `adapter_id` (Number) Databricks adapter ID for the credential (do not fill in when using global connections, only to be used for connections created with the legacy connection resource `dbtcloud_connection')
 - `catalog` (String) The catalog where to create models (only for the databricks adapter)
 - `target_name` (String, Deprecated) Target name
 
 ### Read-Only
 
 - `credential_id` (Number) The system Databricks credential ID
-- `id` (String) The ID of this resource.
+- `id` (String) The ID of this resource. Contains the project ID and the credential ID.
 
 ## Import
 

docs/resources/repository.md

@@ -2,7 +2,7 @@
 page_title: "dbtcloud_repository Resource - dbtcloud"
 subcategory: ""
 description: |-
-  
+  Manages a dbt Cloud repository.
 ---
 
 # dbtcloud_repository (Resource)
@@ -106,14 +106,14 @@ resource "dbtcloud_repository" "ado_repo" {
 - `fetch_deploy_key` (Boolean, Deprecated) Whether we should return the public deploy key - (for the `deploy_key` strategy)
 - `git_clone_strategy` (String) Git clone strategy for the repository. Can be `deploy_key` (default) for cloning via SSH Deploy Key, `github_app` for GitHub native integration, `deploy_token` for the GitLab native integration and `azure_active_directory_app` for ADO native integration
 - `github_installation_id` (Number) Identifier for the GitHub App - (for GitHub native integration only)
-- `gitlab_project_id` (Number) Identifier for the Gitlab project -  (for GitLab native integration only)
+- `gitlab_project_id` (Number) Identifier for the Gitlab project - (for GitLab native integration only)
 - `is_active` (Boolean) Whether the repository is active
-- `pull_request_url_template` (String) URL template for creating a pull request. If it is not set, the default template will create a PR from the current branch to the branch configured in the Development environment.
+- `pull_request_url_template` (String) The pull request URL template to be used when opening a pull request from within dbt Cloud's IDE
 
 ### Read-Only
 
 - `deploy_key` (String) Public key generated by dbt when using `deploy_key` clone strategy
-- `id` (String) The ID of this resource.
+- `id` (String) The ID of this resource
 - `repository_credentials_id` (Number) Credentials ID for the repository (From the repository side not the dbt Cloud ID)
 - `repository_id` (Number) Repository Identifier
 

pkg/framework/objects/bigquery_credential/resource_acceptance_test.go

@@ -6,45 +6,59 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/dbt-labs/terraform-provider-dbtcloud/pkg/framework/acctest_config"
 	"github.com/dbt-labs/terraform-provider-dbtcloud/pkg/framework/acctest_helper"
 	"github.com/dbt-labs/terraform-provider-dbtcloud/pkg/helper"
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 )
 
-func TestAccDbtCloudBigQueryCredentialResource(t *testing.T) {
+var projectName = strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
+var dataset = strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
+
+var createCredentialTestStep = resource.TestStep{
+	Config: testAccDbtCloudBigQueryCredentialResourceBasicConfig(projectName, dataset),
+	Check: resource.ComposeTestCheckFunc(
+		testAccCheckDbtCloudBigQueryCredentialExists(
+			"dbtcloud_bigquery_credential.test_credential",
+		),
+		resource.TestCheckResourceAttr(
+			"dbtcloud_bigquery_credential.test_credential",
+			"dataset",
+			dataset,
+		),
+	),
+}
 
-	projectName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
-	dataset := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
+func TestAccDbtCloudBigQueryCredentialResource(t *testing.T) {
+	var importStateTestStep = resource.TestStep{
+		ResourceName:            "dbtcloud_bigquery_credential.test_credential",
+		ImportState:             true,
+		ImportStateVerify:       true,
+		ImportStateVerifyIgnore: []string{"password"},
+	}
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest_helper.TestAccPreCheck(t) },
 		ProtoV6ProviderFactories: acctest_helper.TestAccProtoV6ProviderFactories,
 		CheckDestroy:             testAccCheckDbtCloudBigQueryCredentialDestroy,
 		Steps: []resource.TestStep{
-			{
-				Config: testAccDbtCloudBigQueryCredentialResourceBasicConfig(projectName, dataset),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckDbtCloudBigQueryCredentialExists(
-						"dbtcloud_bigquery_credential.test_credential",
-					),
-					resource.TestCheckResourceAttr(
-						"dbtcloud_bigquery_credential.test_credential",
-						"dataset",
-						dataset,
-					),
-				),
-			},
+			createCredentialTestStep,
 			// RENAME
 			// MODIFY
-			// IMPORT
-			{
-				ResourceName:            "dbtcloud_bigquery_credential.test_credential",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"password"},
-			},
+			importStateTestStep,
+		},
+	})
+}
+
+func TestConfDbtCloudBigQueryCredentialResource(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { acctest_helper.TestAccPreCheck(t) },
+		CheckDestroy: testAccCheckDbtCloudBigQueryCredentialDestroy,
+		Steps: []resource.TestStep{
+			acctest_helper.MakeExternalProviderTestStep(createCredentialTestStep, acctest_config.LAST_VERSION_BEFORE_FRAMEWORK_MIGRATION),
+			acctest_helper.MakeCurrentProviderNoOpTestStep(createCredentialTestStep),
 		},
 	})
 }

pkg/framework/objects/databricks_credential/data_source.go

@@ -0,0 +1,83 @@
+package databricks_credential
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/dbt-labs/terraform-provider-dbtcloud/pkg/dbt_cloud"
+	"github.com/hashicorp/terraform-plugin-framework/datasource"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+var (
+	_ datasource.DataSource              = &databricksCredentialDataSource{}
+	_ datasource.DataSourceWithConfigure = &databricksCredentialDataSource{}
+)
+
+func DatabricksCredentialDataSource() datasource.DataSource {
+	return &databricksCredentialDataSource{}
+}
+
+type databricksCredentialDataSource struct {
+	client *dbt_cloud.Client
+}
+
+func (d *databricksCredentialDataSource) Configure(ctx context.Context, req datasource.ConfigureRequest, resp *datasource.ConfigureResponse) {
+	if req.ProviderData == nil {
+		return
+	}
+
+	client, ok := req.ProviderData.(*dbt_cloud.Client)
+	if !ok {
+		resp.Diagnostics.AddError(
+			"Unexpected Data Source Configure Type",
+			fmt.Sprintf(
+				"Expected *dbt_cloud.Client, got: %T. Please report this issue to the provider developers.",
+				req.ProviderData,
+			),
+		)
+		return
+	}
+
+	d.client = client
+}
+
+func (d *databricksCredentialDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
+	resp.TypeName = req.ProviderTypeName + "_databricks_credential"
+}
+
+func (d *databricksCredentialDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
+	var state DatabricksCredentialDataSourceModel
+	diags := req.Config.Get(ctx, &state)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+	
+	projectID := int(state.ProjectID.ValueInt64())
+	credentialID := int(state.CredentialID.ValueInt64())
+
+	credential, err := d.client.GetDatabricksCredential(projectID, credentialID)
+	if err != nil {
+		resp.Diagnostics.AddError("Error reading Databricks credential", "Could not read Databricks credential ID "+state.ID.ValueString()+": "+err.Error())
+		return
+	}
+
+	state.ID = types.StringValue(fmt.Sprintf("%d%s%d", credential.Project_Id, dbt_cloud.ID_DELIMITER, *credential.ID))
+	state.NumThreads = types.Int64Value(int64(credential.Threads))
+	state.ProjectID = types.Int64Value(int64(credential.Project_Id))
+	state.AdapterID = types.Int64Value(int64(credential.Adapter_Id))
+	state.TargetName = types.StringValue(credential.Target_Name)
+	state.Schema = types.StringValue(credential.UnencryptedCredentialDetails.Schema)
+	state.Catalog = types.StringValue(credential.UnencryptedCredentialDetails.Catalog)
+
+	diags = resp.State.Set(ctx, &state)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+}
+
+func (d *databricksCredentialDataSource) Schema(ctx context.Context, req datasource.SchemaRequest, resp *datasource.SchemaResponse) {
+	resp.Schema = dataSourceSchema
+}

…databricks_credential_acceptance_test.go …redential/data_source_acceptance_test.gopkg/sdkv2/data_sources/databricks_credential_acceptance_test.go renamed to pkg/framework/objects/databricks_credential/data_source_acceptance_test.go pkg/sdkv2/data_sources/databricks_credential_acceptance_test.go renamed to pkg/framework/objects/databricks_credential/data_source_acceptance_test.go

@@ -1,4 +1,4 @@
-package data_sources_test
+package databricks_credential_test
 
 import (
 	"fmt"

pkg/framework/objects/databricks_credential/model.go

@@ -0,0 +1,28 @@
+package databricks_credential
+
+import (
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+type DatabricksCredentialDataSourceModel struct {
+	ID           types.String `tfsdk:"id"`
+	CredentialID types.Int64  `tfsdk:"credential_id"`
+	ProjectID    types.Int64  `tfsdk:"project_id"`
+	AdapterID    types.Int64  `tfsdk:"adapter_id"`
+	TargetName   types.String `tfsdk:"target_name"`
+	NumThreads   types.Int64  `tfsdk:"num_threads"`
+	Catalog      types.String `tfsdk:"catalog"`
+	Schema       types.String `tfsdk:"schema"`
+}
+
+type DatabricksCredentialResourceModel struct {
+	ID           types.String `tfsdk:"id"`
+	CredentialID types.Int64  `tfsdk:"credential_id"`
+	ProjectID    types.Int64  `tfsdk:"project_id"`
+	AdapterID    types.Int64  `tfsdk:"adapter_id"`
+	TargetName   types.String `tfsdk:"target_name"`
+	Token        types.String `tfsdk:"token"`
+	Catalog      types.String `tfsdk:"catalog"`
+	Schema       types.String `tfsdk:"schema"`
+	AdapterType  types.String `tfsdk:"adapter_type"`
+}