Minor documentation fixes

Author: nfx

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 0.3.0
 
-* Added global timeout for resource provisioning, which defaults to 15 minutes.
+* Added configurable provisioning timeout for `databricks_mws_workspaces`, so that local DNS cache issues would be more tolerated.
 * Added [databricks_current_user] to simplify applying the same Terraform configuration by different users in the shared workspace for testing purposes. 
 * Added client-side rate limiting to release the pressure on backend APIs and prevent client blocking ([#465](https://github.com/databrickslabs/terraform-provider-databricks/pull/465))
 * Member usernames, group names and instance profile names in `databricks_group` data source are now sorted and providing consistent behavior between runs ([#449](https://github.com/databrickslabs/terraform-provider-databricks/issues/449))

CONTRIBUTING.md

@@ -21,12 +21,11 @@ We happily welcome contributions to databricks-terraform. We use GitHub Issues t
 
 The following command (tested on Ubuntu 20.04) will install `make`, `golang`, `git` with all of the dependent packages as well as Databricks Terrafrom provider from sources. Required version of GoLang is at least 1.13. Required version of terraform is at least 0.12. 
 
+On MacOS X, you can install GoLang through `brew install go`, on Debian-based Linux, you can install it by `sudo apt-get install golang -y`.
+
 ```bash
-sudo apt-get update
-sudo apt-get install make golang git -y
 git clone https://github.com/databrickslabs/terraform-provider-databricks.git
 cd terraform-provider-databricks
-make vendor
 make install
 ```
 
@@ -43,6 +42,8 @@ terraform {
 }
 ```
 
+Most likely, `terraform init -upgrade -verify-plugins=false -lock=false` would be a very great command to use.
+
 ## Developing provider
 
 After installing necessary software for building provider from sources, you should install `golangci-lint` and `gotestsum` in order to run `make test`.

common/http.go

@@ -435,7 +435,7 @@ func (c *DatabricksClient) genericQuery(ctx context.Context, method, requestURL
 	headers := ""
 	if c.DebugHeaders {
 		for k, v := range request.Header {
-			headers += fmt.Sprintf("\n * %s: %s", k, onlyNBytes(strings.Join(v, ""), 16))
+			headers += fmt.Sprintf("\n * %s: %s", k, onlyNBytes(strings.Join(v, ""), c.DebugTruncateBytes))
 		}
 		if len(headers) > 0 {
 			headers += "\n"

docs/guides/aws-workspace.md

@@ -2,12 +2,12 @@
 
 ## Provider initialization for E2 workspaces
 
-This guide assumes you have `username` and `password` for [https://accounts.cloud.databricks.com](https://accounts.cloud.databricks.com) and can find `account_id` in the top right corner of the page, once you're logged in. This guide is provided as is and assumes you'll use it as the basis for your setup.
+This guide assumes you have `databricks_account_username` and `databricks_account_password` for [https://accounts.cloud.databricks.com](https://accounts.cloud.databricks.com) and can find `databricks_account_id` in the top right corner of the page, once you're logged in. This guide is provided as is and assumes you'll use it as the basis for your setup.
 
 ```hcl
-variable "username" {}
-variable "password" {}
-variable "account_id" {}
+variable "databricks_account_username" {}
+variable "databricks_account_password" {}
+variable "databricks_account_id" {}
 
 variable "cidr_block" {
     default = "10.4.0.0/16"
@@ -27,7 +27,7 @@ locals {
   prefix = "databricks${random_string.naming.result}"
   tags = {
     Environment = "Demo"
-    Owner       = var.username
+    Owner       = var.databricks_account_username
   }
 }
 ```
@@ -52,8 +52,8 @@ provider "aws" {
 provider "databricks" {
   alias    = "mws"
   host     = "https://accounts.cloud.databricks.com"
-  username = var.username
-  password = var.password
+  databricks_account_username = var.databricks_account_username
+  databricks_account_password = var.databricks_account_password
 }
 ```
 
@@ -64,7 +64,7 @@ Cross-account IAM role is registered with [databricks_mws_credentials](../resour
 ```hcl
 
 data "databricks_aws_assume_role_policy" "this" {
-  external_id = var.account_id
+  external_id = var.databricks_account_id
 }
 
 resource "aws_iam_role" "cross_account_role" {
@@ -85,7 +85,7 @@ resource "aws_iam_role_policy" "this" {
 
 resource "databricks_mws_credentials" "this" {
   provider         = databricks.mws
-  account_id       = var.account_id
+  databricks_account_id       = var.databricks_account_id
   role_arn         = aws_iam_role.cross_account_role.arn
   credentials_name = "${local.prefix}-creds"
   depends_on       = [aws_iam_role_policy.this]
@@ -261,7 +261,7 @@ resource "aws_security_group" "this" {
 
 resource "databricks_mws_networks" "this" {
   provider           = databricks.mws
-  account_id         = var.account_id
+  databricks_account_id         = var.databricks_account_id
   network_name       = "${local.prefix}-network"
   subnet_ids         = [aws_subnet.private.id, aws_subnet.private_secondary.id]
   vpc_id             = aws_vpc.main.id
@@ -303,7 +303,7 @@ resource "aws_s3_bucket_policy" "root_bucket_policy" {
 
 resource "databricks_mws_storage_configurations" "this" {
   provider                   = databricks.mws
-  account_id                 = var.account_id
+  databricks_account_id                 = var.databricks_account_id
   bucket_name                = aws_s3_bucket.root_storage_bucket.bucket
   storage_configuration_name = "${local.prefix}-storage"
 }
@@ -316,7 +316,7 @@ Once you have [VPC](#vpc), [cross-account role](#cross-account-iam-role), and [r
 ```hcl
 resource "databricks_mws_workspaces" "this" {
   provider        = databricks.mws
-  account_id      = var.account_id
+  databricks_account_id      = var.databricks_account_id
   aws_region      = var.region
   workspace_name  = local.prefix
   deployment_name = local.prefix

scripts/azsp-integration/main.tf

@@ -92,6 +92,7 @@ output "test_key_vault_secret" {
 }
 
 output "test_key_vault_secret_value" {
+  sensitive = true
   value = module.this.test_key_vault_secret_value
 }