diff --git a/acceptance/bundle/state/state_present/output.txt b/acceptance/bundle/state/state_present/output.txt index dcd4c8a6a7..475720b87b 100644 --- a/acceptance/bundle/state/state_present/output.txt +++ b/acceptance/bundle/state/state_present/output.txt @@ -15,7 +15,7 @@ Updating deployment state... Deployment complete! >>> print_requests.py //api/2.1/unity-catalog/schemas -"databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" +"databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... @@ -24,7 +24,7 @@ Updating deployment state... Deployment complete! >>> print_requests.py --get //api/2.1/unity-catalog/schemas -"databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" +"databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" === Adding resources.json with lower serial does not change anything >>> DATABRICKS_BUNDLE_ENGINE=direct musterr [CLI] bundle plan diff --git a/acceptance/bundle/user_agent/output.txt b/acceptance/bundle/user_agent/output.txt index 30b72900f0..dc4b69fbb7 100644 --- a/acceptance/bundle/user_agent/output.txt +++ b/acceptance/bundle/user_agent/output.txt @@ -35,8 +35,8 @@ OK deploy.terraform /api/2.0/workspace-files/import-file/Workspace/Users/[USER OK deploy.terraform /api/2.0/workspace/delete engine/terraform OK deploy.terraform /api/2.0/workspace/delete engine/terraform OK deploy.terraform /api/2.0/workspace/mkdirs engine/terraform -MISS deploy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat' -MISS deploy.terraform /api/2.1/unity-catalog/schemas 'databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat' +MISS deploy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat' +MISS deploy.terraform /api/2.1/unity-catalog/schemas 'databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat' MISS destroy.direct /api/2.0/preview/scim/v2/Me 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] auth/pat' MISS destroy.direct /api/2.0/workspace-files/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/resources.json 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] auth/pat' MISS destroy.direct /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] auth/pat' @@ -59,8 +59,8 @@ OK destroy.terraform /api/2.0/workspace/get-status engine/terraform OK destroy.terraform /api/2.0/workspace/get-status engine/terraform OK destroy.terraform /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deploy.lock engine/terraform OK destroy.terraform /api/2.0/workspace/delete engine/terraform -MISS destroy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat' -MISS destroy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat' +MISS destroy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat' +MISS destroy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat' MISS plan.direct /api/2.0/preview/scim/v2/Me 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] auth/pat' MISS plan.direct /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] auth/pat' MISS plan.direct /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] auth/pat' @@ -82,7 +82,7 @@ MISS plan2.terraform /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks MISS plan2.terraform /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] auth/pat' OK plan2.terraform /api/2.0/workspace-files/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deployment.json engine/terraform OK plan2.terraform /api/2.0/workspace/get-status engine/terraform -MISS plan2.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat' +MISS plan2.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat' MISS run.direct /api/2.0/preview/scim/v2/Me 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_run cmd-exec-id/[UUID] auth/pat' MISS run.direct /api/2.0/workspace-files/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/resources.json 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_run cmd-exec-id/[UUID] auth/pat' MISS run.direct /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_run cmd-exec-id/[UUID] auth/pat' diff --git a/acceptance/bundle/user_agent/simple/out.requests.deploy.terraform.json b/acceptance/bundle/user_agent/simple/out.requests.deploy.terraform.json index 63b501da2d..17b0c24d60 100644 --- a/acceptance/bundle/user_agent/simple/out.requests.deploy.terraform.json +++ b/acceptance/bundle/user_agent/simple/out.requests.deploy.terraform.json @@ -296,7 +296,7 @@ { "headers": { "User-Agent": [ - "databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" + "databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" ] }, "method": "GET", @@ -305,7 +305,7 @@ { "headers": { "User-Agent": [ - "databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" + "databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" ] }, "method": "POST", diff --git a/acceptance/bundle/user_agent/simple/out.requests.destroy.terraform.json b/acceptance/bundle/user_agent/simple/out.requests.destroy.terraform.json index 243cc6984a..197d317145 100644 --- a/acceptance/bundle/user_agent/simple/out.requests.destroy.terraform.json +++ b/acceptance/bundle/user_agent/simple/out.requests.destroy.terraform.json @@ -127,7 +127,7 @@ { "headers": { "User-Agent": [ - "databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" + "databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" ] }, "method": "DELETE", @@ -139,7 +139,7 @@ { "headers": { "User-Agent": [ - "databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" + "databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" ] }, "method": "GET", diff --git a/acceptance/bundle/user_agent/simple/out.requests.plan2.terraform.json b/acceptance/bundle/user_agent/simple/out.requests.plan2.terraform.json index 22d685c0f6..64bbcd3f64 100644 --- a/acceptance/bundle/user_agent/simple/out.requests.plan2.terraform.json +++ b/acceptance/bundle/user_agent/simple/out.requests.plan2.terraform.json @@ -67,7 +67,7 @@ { "headers": { "User-Agent": [ - "databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" + "databricks-tf-provider/1.97.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" ] }, "method": "GET", diff --git a/bundle/internal/tf/codegen/schema/version.go b/bundle/internal/tf/codegen/schema/version.go index 6a719c4535..9b36443fc8 100644 --- 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.96.0" +const ProviderVersion = "1.97.0" diff --git a/bundle/internal/tf/schema/config.go b/bundle/internal/tf/schema/config.go index e94c65c83a..9efd81ceda 100644 --- a/bundle/internal/tf/schema/config.go +++ b/bundle/internal/tf/schema/config.go @@ -23,6 +23,7 @@ type Config struct { DatabricksIdTokenFilepath string `json:"databricks_id_token_filepath,omitempty"` DebugHeaders bool `json:"debug_headers,omitempty"` DebugTruncateBytes int `json:"debug_truncate_bytes,omitempty"` + ExperimentalIsUnifiedHost bool `json:"experimental_is_unified_host,omitempty"` GoogleCredentials string `json:"google_credentials,omitempty"` GoogleServiceAccount string `json:"google_service_account,omitempty"` Host string `json:"host,omitempty"` @@ -39,4 +40,5 @@ type Config struct { Token string `json:"token,omitempty"` Username string `json:"username,omitempty"` WarehouseId string `json:"warehouse_id,omitempty"` + WorkspaceId string `json:"workspace_id,omitempty"` } diff --git a/bundle/internal/tf/schema/data_source_notebook.go b/bundle/internal/tf/schema/data_source_notebook.go index bf97c19a84..d43338efde 100644 --- a/bundle/internal/tf/schema/data_source_notebook.go +++ b/bundle/internal/tf/schema/data_source_notebook.go @@ -2,13 +2,18 @@ package schema +type DataSourceNotebookProviderConfig struct { + WorkspaceId string `json:"workspace_id"` +} + type DataSourceNotebook struct { - Content string `json:"content,omitempty"` - Format string `json:"format"` - Id string `json:"id,omitempty"` - Language string `json:"language,omitempty"` - ObjectId int `json:"object_id,omitempty"` - ObjectType string `json:"object_type,omitempty"` - Path string `json:"path"` - WorkspacePath string `json:"workspace_path,omitempty"` + Content string `json:"content,omitempty"` + Format string `json:"format"` + Id string `json:"id,omitempty"` + Language string `json:"language,omitempty"` + ObjectId int `json:"object_id,omitempty"` + ObjectType string `json:"object_type,omitempty"` + Path string `json:"path"` + WorkspacePath string `json:"workspace_path,omitempty"` + ProviderConfig *DataSourceNotebookProviderConfig `json:"provider_config,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_mws_workspaces.go b/bundle/internal/tf/schema/resource_mws_workspaces.go index 18fd5be65f..a9ae9be8a8 100644 --- a/bundle/internal/tf/schema/resource_mws_workspaces.go +++ b/bundle/internal/tf/schema/resource_mws_workspaces.go @@ -51,6 +51,7 @@ type ResourceMwsWorkspaces struct { IsNoPublicIpEnabled bool `json:"is_no_public_ip_enabled,omitempty"` Location string `json:"location,omitempty"` ManagedServicesCustomerManagedKeyId string `json:"managed_services_customer_managed_key_id,omitempty"` + NetworkConnectivityConfigId string `json:"network_connectivity_config_id,omitempty"` NetworkId string `json:"network_id,omitempty"` PricingTier string `json:"pricing_tier,omitempty"` PrivateAccessSettingsId string `json:"private_access_settings_id,omitempty"` diff --git a/bundle/internal/tf/schema/resource_notebook.go b/bundle/internal/tf/schema/resource_notebook.go index 4e5d4cbc3c..d7470f0a6a 100644 --- a/bundle/internal/tf/schema/resource_notebook.go +++ b/bundle/internal/tf/schema/resource_notebook.go @@ -2,16 +2,21 @@ package schema +type ResourceNotebookProviderConfig struct { + WorkspaceId string `json:"workspace_id"` +} + type ResourceNotebook struct { - ContentBase64 string `json:"content_base64,omitempty"` - Format string `json:"format,omitempty"` - Id string `json:"id,omitempty"` - Language string `json:"language,omitempty"` - Md5 string `json:"md5,omitempty"` - ObjectId int `json:"object_id,omitempty"` - ObjectType string `json:"object_type,omitempty"` - Path string `json:"path"` - Source string `json:"source,omitempty"` - Url string `json:"url,omitempty"` - WorkspacePath string `json:"workspace_path,omitempty"` + ContentBase64 string `json:"content_base64,omitempty"` + Format string `json:"format,omitempty"` + Id string `json:"id,omitempty"` + Language string `json:"language,omitempty"` + Md5 string `json:"md5,omitempty"` + ObjectId int `json:"object_id,omitempty"` + ObjectType string `json:"object_type,omitempty"` + Path string `json:"path"` + Source string `json:"source,omitempty"` + Url string `json:"url,omitempty"` + WorkspacePath string `json:"workspace_path,omitempty"` + ProviderConfig *ResourceNotebookProviderConfig `json:"provider_config,omitempty"` } diff --git a/bundle/internal/tf/schema/resource_permission_assignment.go b/bundle/internal/tf/schema/resource_permission_assignment.go index 06bc362dab..beb9b16f74 100644 --- a/bundle/internal/tf/schema/resource_permission_assignment.go +++ b/bundle/internal/tf/schema/resource_permission_assignment.go @@ -2,12 +2,17 @@ package schema +type ResourcePermissionAssignmentProviderConfig struct { + WorkspaceId string `json:"workspace_id"` +} + type ResourcePermissionAssignment struct { - DisplayName string `json:"display_name,omitempty"` - GroupName string `json:"group_name,omitempty"` - Id string `json:"id,omitempty"` - Permissions []string `json:"permissions"` - PrincipalId int `json:"principal_id,omitempty"` - ServicePrincipalName string `json:"service_principal_name,omitempty"` - UserName string `json:"user_name,omitempty"` + DisplayName string `json:"display_name,omitempty"` + GroupName string `json:"group_name,omitempty"` + Id string `json:"id,omitempty"` + Permissions []string `json:"permissions"` + PrincipalId int `json:"principal_id,omitempty"` + ServicePrincipalName string `json:"service_principal_name,omitempty"` + UserName string `json:"user_name,omitempty"` + ProviderConfig *ResourcePermissionAssignmentProviderConfig `json:"provider_config,omitempty"` } diff --git a/bundle/internal/tf/schema/root.go b/bundle/internal/tf/schema/root.go index 4378d00fcc..776ad03192 100644 --- 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.96.0" +const ProviderVersion = "1.97.0" func NewRoot() *Root { return &Root{