Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Notable Changes

### Dependency updates
* Upgraded to TF provider 1.79.0 ([#2869](https://github.com/databricks/cli/pull/2869))

### CLI

Expand Down
2 changes: 1 addition & 1 deletion acceptance/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "1.75.0"
version = "1.79.0"
}
}

Expand Down
6 changes: 3 additions & 3 deletions acceptance/terraform/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
Initializing the backend...

Initializing provider plugins...
- Finding databricks/databricks versions matching "1.75.0"...
- Installing databricks/databricks v1.75.0...
- Installed databricks/databricks v1.75.0 (unauthenticated)
- Finding databricks/databricks versions matching "1.79.0"...
- Installing databricks/databricks v1.79.0...
- Installed databricks/databricks v1.79.0 (unauthenticated)

Terraform has created a lock file .terraform.lock.hcl to record the provider
selections it made above. Include this file in your version control repository
Expand Down
2 changes: 1 addition & 1 deletion bundle/internal/tf/codegen/schema/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package schema

const ProviderVersion = "1.75.0"
const ProviderVersion = "1.79.0"
3 changes: 3 additions & 0 deletions bundle/internal/tf/schema/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ type Config struct {
AccountId string `json:"account_id,omitempty"`
ActionsIdTokenRequestToken string `json:"actions_id_token_request_token,omitempty"`
ActionsIdTokenRequestUrl string `json:"actions_id_token_request_url,omitempty"`
Audience string `json:"audience,omitempty"`
AuthType string `json:"auth_type,omitempty"`
AzureClientId string `json:"azure_client_id,omitempty"`
AzureClientSecret string `json:"azure_client_secret,omitempty"`
Expand All @@ -19,13 +20,15 @@ type Config struct {
ClusterId string `json:"cluster_id,omitempty"`
ConfigFile string `json:"config_file,omitempty"`
DatabricksCliPath string `json:"databricks_cli_path,omitempty"`
DatabricksIdTokenFilepath string `json:"databricks_id_token_filepath,omitempty"`
DebugHeaders bool `json:"debug_headers,omitempty"`
DebugTruncateBytes int `json:"debug_truncate_bytes,omitempty"`
GoogleCredentials string `json:"google_credentials,omitempty"`
GoogleServiceAccount string `json:"google_service_account,omitempty"`
Host string `json:"host,omitempty"`
HttpTimeoutSeconds int `json:"http_timeout_seconds,omitempty"`
MetadataServiceUrl string `json:"metadata_service_url,omitempty"`
OidcTokenEnv string `json:"oidc_token_env,omitempty"`
Password string `json:"password,omitempty"`
Profile string `json:"profile,omitempty"`
RateLimit int `json:"rate_limit,omitempty"`
Expand Down
70 changes: 70 additions & 0 deletions bundle/internal/tf/schema/data_source_alert_v2.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
// Generated from Databricks Terraform provider schema. DO NOT EDIT.

package schema

type DataSourceAlertV2EvaluationNotificationSubscriptions struct {
DestinationId string `json:"destination_id,omitempty"`
UserEmail string `json:"user_email,omitempty"`
}

type DataSourceAlertV2EvaluationNotification struct {
NotifyOnOk bool `json:"notify_on_ok,omitempty"`
RetriggerSeconds int `json:"retrigger_seconds,omitempty"`
Subscriptions []DataSourceAlertV2EvaluationNotificationSubscriptions `json:"subscriptions,omitempty"`
}

type DataSourceAlertV2EvaluationSource struct {
Aggregation string `json:"aggregation,omitempty"`
Display string `json:"display,omitempty"`
Name string `json:"name,omitempty"`
}

type DataSourceAlertV2EvaluationThresholdColumn struct {
Aggregation string `json:"aggregation,omitempty"`
Display string `json:"display,omitempty"`
Name string `json:"name,omitempty"`
}

type DataSourceAlertV2EvaluationThresholdValue struct {
BoolValue bool `json:"bool_value,omitempty"`
DoubleValue int `json:"double_value,omitempty"`
StringValue string `json:"string_value,omitempty"`
}

type DataSourceAlertV2EvaluationThreshold struct {
Column *DataSourceAlertV2EvaluationThresholdColumn `json:"column,omitempty"`
Value *DataSourceAlertV2EvaluationThresholdValue `json:"value,omitempty"`
}

type DataSourceAlertV2Evaluation struct {
ComparisonOperator string `json:"comparison_operator,omitempty"`
EmptyResultState string `json:"empty_result_state,omitempty"`
LastEvaluatedAt string `json:"last_evaluated_at,omitempty"`
Notification *DataSourceAlertV2EvaluationNotification `json:"notification,omitempty"`
Source *DataSourceAlertV2EvaluationSource `json:"source,omitempty"`
State string `json:"state,omitempty"`
Threshold *DataSourceAlertV2EvaluationThreshold `json:"threshold,omitempty"`
}

type DataSourceAlertV2Schedule struct {
PauseStatus string `json:"pause_status,omitempty"`
QuartzCronSchedule string `json:"quartz_cron_schedule,omitempty"`
TimezoneId string `json:"timezone_id,omitempty"`
}

type DataSourceAlertV2 struct {
CreateTime string `json:"create_time,omitempty"`
CustomDescription string `json:"custom_description,omitempty"`
CustomSummary string `json:"custom_summary,omitempty"`
DisplayName string `json:"display_name,omitempty"`
Evaluation *DataSourceAlertV2Evaluation `json:"evaluation,omitempty"`
Id string `json:"id,omitempty"`
LifecycleState string `json:"lifecycle_state,omitempty"`
OwnerUserName string `json:"owner_user_name,omitempty"`
ParentPath string `json:"parent_path,omitempty"`
QueryText string `json:"query_text,omitempty"`
RunAsUserName string `json:"run_as_user_name,omitempty"`
Schedule *DataSourceAlertV2Schedule `json:"schedule,omitempty"`
UpdateTime string `json:"update_time,omitempty"`
WarehouseId string `json:"warehouse_id,omitempty"`
}
74 changes: 74 additions & 0 deletions bundle/internal/tf/schema/data_source_alerts_v2.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
// Generated from Databricks Terraform provider schema. DO NOT EDIT.

package schema

type DataSourceAlertsV2ResultsEvaluationNotificationSubscriptions struct {
DestinationId string `json:"destination_id,omitempty"`
UserEmail string `json:"user_email,omitempty"`
}

type DataSourceAlertsV2ResultsEvaluationNotification struct {
NotifyOnOk bool `json:"notify_on_ok,omitempty"`
RetriggerSeconds int `json:"retrigger_seconds,omitempty"`
Subscriptions []DataSourceAlertsV2ResultsEvaluationNotificationSubscriptions `json:"subscriptions,omitempty"`
}

type DataSourceAlertsV2ResultsEvaluationSource struct {
Aggregation string `json:"aggregation,omitempty"`
Display string `json:"display,omitempty"`
Name string `json:"name,omitempty"`
}

type DataSourceAlertsV2ResultsEvaluationThresholdColumn struct {
Aggregation string `json:"aggregation,omitempty"`
Display string `json:"display,omitempty"`
Name string `json:"name,omitempty"`
}

type DataSourceAlertsV2ResultsEvaluationThresholdValue struct {
BoolValue bool `json:"bool_value,omitempty"`
DoubleValue int `json:"double_value,omitempty"`
StringValue string `json:"string_value,omitempty"`
}

type DataSourceAlertsV2ResultsEvaluationThreshold struct {
Column *DataSourceAlertsV2ResultsEvaluationThresholdColumn `json:"column,omitempty"`
Value *DataSourceAlertsV2ResultsEvaluationThresholdValue `json:"value,omitempty"`
}

type DataSourceAlertsV2ResultsEvaluation struct {
ComparisonOperator string `json:"comparison_operator,omitempty"`
EmptyResultState string `json:"empty_result_state,omitempty"`
LastEvaluatedAt string `json:"last_evaluated_at,omitempty"`
Notification *DataSourceAlertsV2ResultsEvaluationNotification `json:"notification,omitempty"`
Source *DataSourceAlertsV2ResultsEvaluationSource `json:"source,omitempty"`
State string `json:"state,omitempty"`
Threshold *DataSourceAlertsV2ResultsEvaluationThreshold `json:"threshold,omitempty"`
}

type DataSourceAlertsV2ResultsSchedule struct {
PauseStatus string `json:"pause_status,omitempty"`
QuartzCronSchedule string `json:"quartz_cron_schedule,omitempty"`
TimezoneId string `json:"timezone_id,omitempty"`
}

type DataSourceAlertsV2Results struct {
CreateTime string `json:"create_time,omitempty"`
CustomDescription string `json:"custom_description,omitempty"`
CustomSummary string `json:"custom_summary,omitempty"`
DisplayName string `json:"display_name,omitempty"`
Evaluation *DataSourceAlertsV2ResultsEvaluation `json:"evaluation,omitempty"`
Id string `json:"id,omitempty"`
LifecycleState string `json:"lifecycle_state,omitempty"`
OwnerUserName string `json:"owner_user_name,omitempty"`
ParentPath string `json:"parent_path,omitempty"`
QueryText string `json:"query_text,omitempty"`
RunAsUserName string `json:"run_as_user_name,omitempty"`
Schedule *DataSourceAlertsV2ResultsSchedule `json:"schedule,omitempty"`
UpdateTime string `json:"update_time,omitempty"`
WarehouseId string `json:"warehouse_id,omitempty"`
}

type DataSourceAlertsV2 struct {
Results []DataSourceAlertsV2Results `json:"results,omitempty"`
}
14 changes: 7 additions & 7 deletions bundle/internal/tf/schema/data_source_budget_policies.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

package schema

type DataSourceBudgetPoliciesBudgetPoliciesCustomTags struct {
type DataSourceBudgetPoliciesPoliciesCustomTags struct {
Key string `json:"key"`
Value string `json:"value,omitempty"`
}

type DataSourceBudgetPoliciesBudgetPolicies struct {
BindingWorkspaceIds []int `json:"binding_workspace_ids,omitempty"`
CustomTags []DataSourceBudgetPoliciesBudgetPoliciesCustomTags `json:"custom_tags,omitempty"`
PolicyId string `json:"policy_id,omitempty"`
PolicyName string `json:"policy_name,omitempty"`
type DataSourceBudgetPoliciesPolicies struct {
BindingWorkspaceIds []int `json:"binding_workspace_ids,omitempty"`
CustomTags []DataSourceBudgetPoliciesPoliciesCustomTags `json:"custom_tags,omitempty"`
PolicyId string `json:"policy_id,omitempty"`
PolicyName string `json:"policy_name,omitempty"`
}

type DataSourceBudgetPolicies struct {
BudgetPolicies []DataSourceBudgetPoliciesBudgetPolicies `json:"budget_policies,omitempty"`
Policies []DataSourceBudgetPoliciesPolicies `json:"policies,omitempty"`
}
17 changes: 17 additions & 0 deletions bundle/internal/tf/schema/data_source_database_instance.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Generated from Databricks Terraform provider schema. DO NOT EDIT.

package schema

type DataSourceDatabaseInstance struct {
AdminPassword string `json:"admin_password,omitempty"`
AdminRolename string `json:"admin_rolename,omitempty"`
Capacity string `json:"capacity,omitempty"`
CreationTime string `json:"creation_time,omitempty"`
Creator string `json:"creator,omitempty"`
Name string `json:"name"`
PgVersion string `json:"pg_version,omitempty"`
ReadWriteDns string `json:"read_write_dns,omitempty"`
State string `json:"state,omitempty"`
Stopped bool `json:"stopped,omitempty"`
Uid string `json:"uid,omitempty"`
}
21 changes: 21 additions & 0 deletions bundle/internal/tf/schema/data_source_database_instances.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Generated from Databricks Terraform provider schema. DO NOT EDIT.

package schema

type DataSourceDatabaseInstancesDatabaseInstances struct {
AdminPassword string `json:"admin_password,omitempty"`
AdminRolename string `json:"admin_rolename,omitempty"`
Capacity string `json:"capacity,omitempty"`
CreationTime string `json:"creation_time,omitempty"`
Creator string `json:"creator,omitempty"`
Name string `json:"name"`
PgVersion string `json:"pg_version,omitempty"`
ReadWriteDns string `json:"read_write_dns,omitempty"`
State string `json:"state,omitempty"`
Stopped bool `json:"stopped,omitempty"`
Uid string `json:"uid,omitempty"`
}

type DataSourceDatabaseInstances struct {
DatabaseInstances []DataSourceDatabaseInstancesDatabaseInstances `json:"database_instances,omitempty"`
}
7 changes: 4 additions & 3 deletions bundle/internal/tf/schema/data_source_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ type DataSourceJobJobSettingsSettingsEmailNotifications struct {
}

type DataSourceJobJobSettingsSettingsEnvironmentSpec struct {
Client string `json:"client"`
Dependencies []string `json:"dependencies,omitempty"`
JarDependencies []string `json:"jar_dependencies,omitempty"`
Client string `json:"client"`
Dependencies []string `json:"dependencies,omitempty"`
EnvironmentVersion string `json:"environment_version,omitempty"`
JarDependencies []string `json:"jar_dependencies,omitempty"`
}

type DataSourceJobJobSettingsSettingsEnvironment struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@ type DataSourceMwsNetworkConnectivityConfigEgressConfigDefaultRules struct {
}

type DataSourceMwsNetworkConnectivityConfigEgressConfigTargetRulesAzurePrivateEndpointRules struct {
ConnectionState string `json:"connection_state,omitempty"`
CreationTime int `json:"creation_time,omitempty"`
Deactivated bool `json:"deactivated,omitempty"`
DeactivatedAt int `json:"deactivated_at,omitempty"`
EndpointName string `json:"endpoint_name,omitempty"`
GroupId string `json:"group_id,omitempty"`
NetworkConnectivityConfigId string `json:"network_connectivity_config_id,omitempty"`
ResourceId string `json:"resource_id,omitempty"`
RuleId string `json:"rule_id,omitempty"`
UpdatedTime int `json:"updated_time,omitempty"`
ConnectionState string `json:"connection_state,omitempty"`
CreationTime int `json:"creation_time,omitempty"`
Deactivated bool `json:"deactivated,omitempty"`
DeactivatedAt int `json:"deactivated_at,omitempty"`
DomainNames []string `json:"domain_names,omitempty"`
EndpointName string `json:"endpoint_name,omitempty"`
GroupId string `json:"group_id,omitempty"`
NetworkConnectivityConfigId string `json:"network_connectivity_config_id,omitempty"`
ResourceId string `json:"resource_id,omitempty"`
RuleId string `json:"rule_id,omitempty"`
UpdatedTime int `json:"updated_time,omitempty"`
}

type DataSourceMwsNetworkConnectivityConfigEgressConfigTargetRules struct {
Expand Down
8 changes: 8 additions & 0 deletions bundle/internal/tf/schema/data_sources.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
package schema

type DataSources struct {
AlertV2 map[string]any `json:"databricks_alert_v2,omitempty"`
AlertsV2 map[string]any `json:"databricks_alerts_v2,omitempty"`
App map[string]any `json:"databricks_app,omitempty"`
Apps map[string]any `json:"databricks_apps,omitempty"`
AwsAssumeRolePolicy map[string]any `json:"databricks_aws_assume_role_policy,omitempty"`
Expand All @@ -21,6 +23,8 @@ type DataSources struct {
CurrentMetastore map[string]any `json:"databricks_current_metastore,omitempty"`
CurrentUser map[string]any `json:"databricks_current_user,omitempty"`
Dashboards map[string]any `json:"databricks_dashboards,omitempty"`
DatabaseInstance map[string]any `json:"databricks_database_instance,omitempty"`
DatabaseInstances map[string]any `json:"databricks_database_instances,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"`
Expand Down Expand Up @@ -71,6 +75,8 @@ type DataSources struct {

func NewDataSources() *DataSources {
return &DataSources{
AlertV2: make(map[string]any),
AlertsV2: make(map[string]any),
App: make(map[string]any),
Apps: make(map[string]any),
AwsAssumeRolePolicy: make(map[string]any),
Expand All @@ -89,6 +95,8 @@ func NewDataSources() *DataSources {
CurrentMetastore: make(map[string]any),
CurrentUser: make(map[string]any),
Dashboards: make(map[string]any),
DatabaseInstance: make(map[string]any),
DatabaseInstances: make(map[string]any),
DbfsFile: make(map[string]any),
DbfsFilePaths: make(map[string]any),
Directory: make(map[string]any),
Expand Down
Loading
Loading