Upgrade TF provider to 1.47.0 (#1476)

## Changes This includes a bugfix for provisioning jobs with `num_workers = 0`. Fixes #1472. ## Tests Manually tested this fixes the issue.
databricks · Jun 5, 2024 · 311dfa4 · 311dfa4
1 parent 41678fa
commit 311dfa4
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 98 deletions.
diff --git a/bundle/internal/tf/codegen/schema/version.go b/bundle/internal/tf/codegen/schema/version.go
@@ -1,3 +1,3 @@
 package schema
 
-const ProviderVersion = "1.46.0"
+const ProviderVersion = "1.47.0"
diff --git a/bundle/internal/tf/schema/data_source_aws_unity_catalog_assume_role_policy.go b/bundle/internal/tf/schema/data_source_aws_unity_catalog_assume_role_policy.go
@@ -0,0 +1,12 @@
+// Generated from Databricks Terraform provider schema. DO NOT EDIT.
+
+package schema
+
+type DataSourceAwsUnityCatalogAssumeRolePolicy struct {
+	AwsAccountId       string `json:"aws_account_id"`
+	ExternalId         string `json:"external_id"`
+	Id                 string `json:"id,omitempty"`
+	Json               string `json:"json,omitempty"`
+	RoleName           string `json:"role_name"`
+	UnityCatalogIamArn string `json:"unity_catalog_iam_arn,omitempty"`
+}
diff --git a/bundle/internal/tf/schema/data_sources.go b/bundle/internal/tf/schema/data_sources.go
@@ -3,105 +3,107 @@
 package schema
 
 type DataSources struct {
-	AwsAssumeRolePolicy   map[string]any `json:"databricks_aws_assume_role_policy,omitempty"`
-	AwsBucketPolicy       map[string]any `json:"databricks_aws_bucket_policy,omitempty"`
-	AwsCrossaccountPolicy map[string]any `json:"databricks_aws_crossaccount_policy,omitempty"`
-	AwsUnityCatalogPolicy map[string]any `json:"databricks_aws_unity_catalog_policy,omitempty"`
-	Catalog               map[string]any `json:"databricks_catalog,omitempty"`
-	Catalogs              map[string]any `json:"databricks_catalogs,omitempty"`
-	Cluster               map[string]any `json:"databricks_cluster,omitempty"`
-	ClusterPolicy         map[string]any `json:"databricks_cluster_policy,omitempty"`
-	Clusters              map[string]any `json:"databricks_clusters,omitempty"`
-	CurrentConfig         map[string]any `json:"databricks_current_config,omitempty"`
-	CurrentMetastore      map[string]any `json:"databricks_current_metastore,omitempty"`
-	CurrentUser           map[string]any `json:"databricks_current_user,omitempty"`
-	DbfsFile              map[string]any `json:"databricks_dbfs_file,omitempty"`
-	DbfsFilePaths         map[string]any `json:"databricks_dbfs_file_paths,omitempty"`
-	Directory             map[string]any `json:"databricks_directory,omitempty"`
-	ExternalLocation      map[string]any `json:"databricks_external_location,omitempty"`
-	ExternalLocations     map[string]any `json:"databricks_external_locations,omitempty"`
-	Group                 map[string]any `json:"databricks_group,omitempty"`
-	InstancePool          map[string]any `json:"databricks_instance_pool,omitempty"`
-	InstanceProfiles      map[string]any `json:"databricks_instance_profiles,omitempty"`
-	Job                   map[string]any `json:"databricks_job,omitempty"`
-	Jobs                  map[string]any `json:"databricks_jobs,omitempty"`
-	Metastore             map[string]any `json:"databricks_metastore,omitempty"`
-	Metastores            map[string]any `json:"databricks_metastores,omitempty"`
-	MlflowExperiment      map[string]any `json:"databricks_mlflow_experiment,omitempty"`
-	MlflowModel           map[string]any `json:"databricks_mlflow_model,omitempty"`
-	MwsCredentials        map[string]any `json:"databricks_mws_credentials,omitempty"`
-	MwsWorkspaces         map[string]any `json:"databricks_mws_workspaces,omitempty"`
-	NodeType              map[string]any `json:"databricks_node_type,omitempty"`
-	Notebook              map[string]any `json:"databricks_notebook,omitempty"`
-	NotebookPaths         map[string]any `json:"databricks_notebook_paths,omitempty"`
-	Pipelines             map[string]any `json:"databricks_pipelines,omitempty"`
-	Schemas               map[string]any `json:"databricks_schemas,omitempty"`
-	ServicePrincipal      map[string]any `json:"databricks_service_principal,omitempty"`
-	ServicePrincipals     map[string]any `json:"databricks_service_principals,omitempty"`
-	Share                 map[string]any `json:"databricks_share,omitempty"`
-	Shares                map[string]any `json:"databricks_shares,omitempty"`
-	SparkVersion          map[string]any `json:"databricks_spark_version,omitempty"`
-	SqlWarehouse          map[string]any `json:"databricks_sql_warehouse,omitempty"`
-	SqlWarehouses         map[string]any `json:"databricks_sql_warehouses,omitempty"`
-	StorageCredential     map[string]any `json:"databricks_storage_credential,omitempty"`
-	StorageCredentials    map[string]any `json:"databricks_storage_credentials,omitempty"`
-	Table                 map[string]any `json:"databricks_table,omitempty"`
-	Tables                map[string]any `json:"databricks_tables,omitempty"`
-	User                  map[string]any `json:"databricks_user,omitempty"`
-	Views                 map[string]any `json:"databricks_views,omitempty"`
-	Volumes               map[string]any `json:"databricks_volumes,omitempty"`
-	Zones                 map[string]any `json:"databricks_zones,omitempty"`
+	AwsAssumeRolePolicy             map[string]any `json:"databricks_aws_assume_role_policy,omitempty"`
+	AwsBucketPolicy                 map[string]any `json:"databricks_aws_bucket_policy,omitempty"`
+	AwsCrossaccountPolicy           map[string]any `json:"databricks_aws_crossaccount_policy,omitempty"`
+	AwsUnityCatalogAssumeRolePolicy map[string]any `json:"databricks_aws_unity_catalog_assume_role_policy,omitempty"`
+	AwsUnityCatalogPolicy           map[string]any `json:"databricks_aws_unity_catalog_policy,omitempty"`
+	Catalog                         map[string]any `json:"databricks_catalog,omitempty"`
+	Catalogs                        map[string]any `json:"databricks_catalogs,omitempty"`
+	Cluster                         map[string]any `json:"databricks_cluster,omitempty"`
+	ClusterPolicy                   map[string]any `json:"databricks_cluster_policy,omitempty"`
+	Clusters                        map[string]any `json:"databricks_clusters,omitempty"`
+	CurrentConfig                   map[string]any `json:"databricks_current_config,omitempty"`
+	CurrentMetastore                map[string]any `json:"databricks_current_metastore,omitempty"`
+	CurrentUser                     map[string]any `json:"databricks_current_user,omitempty"`
+	DbfsFile                        map[string]any `json:"databricks_dbfs_file,omitempty"`
+	DbfsFilePaths                   map[string]any `json:"databricks_dbfs_file_paths,omitempty"`
+	Directory                       map[string]any `json:"databricks_directory,omitempty"`
+	ExternalLocation                map[string]any `json:"databricks_external_location,omitempty"`
+	ExternalLocations               map[string]any `json:"databricks_external_locations,omitempty"`
+	Group                           map[string]any `json:"databricks_group,omitempty"`
+	InstancePool                    map[string]any `json:"databricks_instance_pool,omitempty"`
+	InstanceProfiles                map[string]any `json:"databricks_instance_profiles,omitempty"`
+	Job                             map[string]any `json:"databricks_job,omitempty"`
+	Jobs                            map[string]any `json:"databricks_jobs,omitempty"`
+	Metastore                       map[string]any `json:"databricks_metastore,omitempty"`
+	Metastores                      map[string]any `json:"databricks_metastores,omitempty"`
+	MlflowExperiment                map[string]any `json:"databricks_mlflow_experiment,omitempty"`
+	MlflowModel                     map[string]any `json:"databricks_mlflow_model,omitempty"`
+	MwsCredentials                  map[string]any `json:"databricks_mws_credentials,omitempty"`
+	MwsWorkspaces                   map[string]any `json:"databricks_mws_workspaces,omitempty"`
+	NodeType                        map[string]any `json:"databricks_node_type,omitempty"`
+	Notebook                        map[string]any `json:"databricks_notebook,omitempty"`
+	NotebookPaths                   map[string]any `json:"databricks_notebook_paths,omitempty"`
+	Pipelines                       map[string]any `json:"databricks_pipelines,omitempty"`
+	Schemas                         map[string]any `json:"databricks_schemas,omitempty"`
+	ServicePrincipal                map[string]any `json:"databricks_service_principal,omitempty"`
+	ServicePrincipals               map[string]any `json:"databricks_service_principals,omitempty"`
+	Share                           map[string]any `json:"databricks_share,omitempty"`
+	Shares                          map[string]any `json:"databricks_shares,omitempty"`
+	SparkVersion                    map[string]any `json:"databricks_spark_version,omitempty"`
+	SqlWarehouse                    map[string]any `json:"databricks_sql_warehouse,omitempty"`
+	SqlWarehouses                   map[string]any `json:"databricks_sql_warehouses,omitempty"`
+	StorageCredential               map[string]any `json:"databricks_storage_credential,omitempty"`
+	StorageCredentials              map[string]any `json:"databricks_storage_credentials,omitempty"`
+	Table                           map[string]any `json:"databricks_table,omitempty"`
+	Tables                          map[string]any `json:"databricks_tables,omitempty"`
+	User                            map[string]any `json:"databricks_user,omitempty"`
+	Views                           map[string]any `json:"databricks_views,omitempty"`
+	Volumes                         map[string]any `json:"databricks_volumes,omitempty"`
+	Zones                           map[string]any `json:"databricks_zones,omitempty"`
 }
 
 func NewDataSources() *DataSources {
 	return &DataSources{
-		AwsAssumeRolePolicy:   make(map[string]any),
-		AwsBucketPolicy:       make(map[string]any),
-		AwsCrossaccountPolicy: make(map[string]any),
-		AwsUnityCatalogPolicy: make(map[string]any),
-		Catalog:               make(map[string]any),
-		Catalogs:              make(map[string]any),
-		Cluster:               make(map[string]any),
-		ClusterPolicy:         make(map[string]any),
-		Clusters:              make(map[string]any),
-		CurrentConfig:         make(map[string]any),
-		CurrentMetastore:      make(map[string]any),
-		CurrentUser:           make(map[string]any),
-		DbfsFile:              make(map[string]any),
-		DbfsFilePaths:         make(map[string]any),
-		Directory:             make(map[string]any),
-		ExternalLocation:      make(map[string]any),
-		ExternalLocations:     make(map[string]any),
-		Group:                 make(map[string]any),
-		InstancePool:          make(map[string]any),
-		InstanceProfiles:      make(map[string]any),
-		Job:                   make(map[string]any),
-		Jobs:                  make(map[string]any),
-		Metastore:             make(map[string]any),
-		Metastores:            make(map[string]any),
-		MlflowExperiment:      make(map[string]any),
-		MlflowModel:           make(map[string]any),
-		MwsCredentials:        make(map[string]any),
-		MwsWorkspaces:         make(map[string]any),
-		NodeType:              make(map[string]any),
-		Notebook:              make(map[string]any),
-		NotebookPaths:         make(map[string]any),
-		Pipelines:             make(map[string]any),
-		Schemas:               make(map[string]any),
-		ServicePrincipal:      make(map[string]any),
-		ServicePrincipals:     make(map[string]any),
-		Share:                 make(map[string]any),
-		Shares:                make(map[string]any),
-		SparkVersion:          make(map[string]any),
-		SqlWarehouse:          make(map[string]any),
-		SqlWarehouses:         make(map[string]any),
-		StorageCredential:     make(map[string]any),
-		StorageCredentials:    make(map[string]any),
-		Table:                 make(map[string]any),
-		Tables:                make(map[string]any),
-		User:                  make(map[string]any),
-		Views:                 make(map[string]any),
-		Volumes:               make(map[string]any),
-		Zones:                 make(map[string]any),
+		AwsAssumeRolePolicy:             make(map[string]any),
+		AwsBucketPolicy:                 make(map[string]any),
+		AwsCrossaccountPolicy:           make(map[string]any),
+		AwsUnityCatalogAssumeRolePolicy: make(map[string]any),
+		AwsUnityCatalogPolicy:           make(map[string]any),
+		Catalog:                         make(map[string]any),
+		Catalogs:                        make(map[string]any),
+		Cluster:                         make(map[string]any),
+		ClusterPolicy:                   make(map[string]any),
+		Clusters:                        make(map[string]any),
+		CurrentConfig:                   make(map[string]any),
+		CurrentMetastore:                make(map[string]any),
+		CurrentUser:                     make(map[string]any),
+		DbfsFile:                        make(map[string]any),
+		DbfsFilePaths:                   make(map[string]any),
+		Directory:                       make(map[string]any),
+		ExternalLocation:                make(map[string]any),
+		ExternalLocations:               make(map[string]any),
+		Group:                           make(map[string]any),
+		InstancePool:                    make(map[string]any),
+		InstanceProfiles:                make(map[string]any),
+		Job:                             make(map[string]any),
+		Jobs:                            make(map[string]any),
+		Metastore:                       make(map[string]any),
+		Metastores:                      make(map[string]any),
+		MlflowExperiment:                make(map[string]any),
+		MlflowModel:                     make(map[string]any),
+		MwsCredentials:                  make(map[string]any),
+		MwsWorkspaces:                   make(map[string]any),
+		NodeType:                        make(map[string]any),
+		Notebook:                        make(map[string]any),
+		NotebookPaths:                   make(map[string]any),
+		Pipelines:                       make(map[string]any),
+		Schemas:                         make(map[string]any),
+		ServicePrincipal:                make(map[string]any),
+		ServicePrincipals:               make(map[string]any),
+		Share:                           make(map[string]any),
+		Shares:                          make(map[string]any),
+		SparkVersion:                    make(map[string]any),
+		SqlWarehouse:                    make(map[string]any),
+		SqlWarehouses:                   make(map[string]any),
+		StorageCredential:               make(map[string]any),
+		StorageCredentials:              make(map[string]any),
+		Table:                           make(map[string]any),
+		Tables:                          make(map[string]any),
+		User:                            make(map[string]any),
+		Views:                           make(map[string]any),
+		Volumes:                         make(map[string]any),
+		Zones:                           make(map[string]any),
 	}
 }
diff --git a/bundle/internal/tf/schema/resource_mws_workspaces.go b/bundle/internal/tf/schema/resource_mws_workspaces.go
@@ -43,6 +43,7 @@ type ResourceMwsWorkspaces struct {
 	CustomTags                          map[string]string                             `json:"custom_tags,omitempty"`
 	CustomerManagedKeyId                string                                        `json:"customer_managed_key_id,omitempty"`
 	DeploymentName                      string                                        `json:"deployment_name,omitempty"`
+	GcpWorkspaceSa                      string                                        `json:"gcp_workspace_sa,omitempty"`
 	Id                                  string                                        `json:"id,omitempty"`
 	IsNoPublicIpEnabled                 bool                                          `json:"is_no_public_ip_enabled,omitempty"`
 	Location                            string                                        `json:"location,omitempty"`

diff --git a/bundle/internal/tf/schema/resource_storage_credential.go b/bundle/internal/tf/schema/resource_storage_credential.go
@@ -41,6 +41,7 @@ type ResourceStorageCredential struct {
 	Owner                       string                                                `json:"owner,omitempty"`
 	ReadOnly                    bool                                                  `json:"read_only,omitempty"`
 	SkipValidation              bool                                                  `json:"skip_validation,omitempty"`
+	StorageCredentialId         string                                                `json:"storage_credential_id,omitempty"`
 	AwsIamRole                  *ResourceStorageCredentialAwsIamRole                  `json:"aws_iam_role,omitempty"`
 	AzureManagedIdentity        *ResourceStorageCredentialAzureManagedIdentity        `json:"azure_managed_identity,omitempty"`
 	AzureServicePrincipal       *ResourceStorageCredentialAzureServicePrincipal       `json:"azure_service_principal,omitempty"`

diff --git a/bundle/internal/tf/schema/resource_system_schema.go b/bundle/internal/tf/schema/resource_system_schema.go
@@ -3,6 +3,7 @@
 package schema
 
 type ResourceSystemSchema struct {
+	FullName    string `json:"full_name,omitempty"`
 	Id          string `json:"id,omitempty"`
 	MetastoreId string `json:"metastore_id,omitempty"`
 	Schema      string `json:"schema,omitempty"`

diff --git a/bundle/internal/tf/schema/root.go b/bundle/internal/tf/schema/root.go
@@ -21,7 +21,7 @@ type Root struct {
 
 const ProviderHost = "registry.terraform.io"
 const ProviderSource = "databricks/databricks"
-const ProviderVersion = "1.46.0"
+const ProviderVersion = "1.47.0"
 
 func NewRoot() *Root {
 	return &Root{