steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix-jobs-command

This commit is contained in:
Andrew Nester 2023-06-21 09:14:23 +02:00 committed by GitHub
parent 724cd8237f ddeb7487b3
commit 072cf53452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bundle/internal/tf/schema/data_source_cluster_policy.go
View File

@ -3,8 +3,12 @@
package schema package schema
type DataSourceClusterPolicy struct { type DataSourceClusterPolicy struct {
Definition string `json:"definition,omitempty"` Definition string `json:"definition,omitempty"`
Id string `json:"id,omitempty"` Description string `json:"description,omitempty"`
MaxClustersPerUser int `json:"max_clusters_per_user,omitempty"` Id string `json:"id,omitempty"`
Name string `json:"name,omitempty"` IsDefault bool `json:"is_default,omitempty"`
MaxClustersPerUser int `json:"max_clusters_per_user,omitempty"`
Name string `json:"name,omitempty"`
PolicyFamilyDefinitionOverrides string `json:"policy_family_definition_overrides,omitempty"`
PolicyFamilyId string `json:"policy_family_id,omitempty"`
} }

7
bundle/internal/tf/schema/data_source_job.go
View File

@ -388,6 +388,11 @@ type DataSourceJobJobSettingsSettingsPythonWheelTask struct {
type DataSourceJobJobSettingsSettingsQueue struct { type DataSourceJobJobSettingsSettingsQueue struct {
} }
type DataSourceJobJobSettingsSettingsRunAs struct {
ServicePrincipalName string `json:"service_principal_name,omitempty"`
UserName string `json:"user_name,omitempty"`
}
type DataSourceJobJobSettingsSettingsSchedule struct { type DataSourceJobJobSettingsSettingsSchedule struct {
PauseStatus string `json:"pause_status,omitempty"` PauseStatus string `json:"pause_status,omitempty"`
QuartzCronExpression string `json:"quartz_cron_expression"` QuartzCronExpression string `json:"quartz_cron_expression"`
@ -740,6 +745,7 @@ type DataSourceJobJobSettingsSettings struct {
PipelineTask *DataSourceJobJobSettingsSettingsPipelineTask `json:"pipeline_task,omitempty"` PipelineTask *DataSourceJobJobSettingsSettingsPipelineTask `json:"pipeline_task,omitempty"`
PythonWheelTask *DataSourceJobJobSettingsSettingsPythonWheelTask `json:"python_wheel_task,omitempty"` PythonWheelTask *DataSourceJobJobSettingsSettingsPythonWheelTask `json:"python_wheel_task,omitempty"`
Queue *DataSourceJobJobSettingsSettingsQueue `json:"queue,omitempty"` Queue *DataSourceJobJobSettingsSettingsQueue `json:"queue,omitempty"`
RunAs *DataSourceJobJobSettingsSettingsRunAs `json:"run_as,omitempty"`
Schedule *DataSourceJobJobSettingsSettingsSchedule `json:"schedule,omitempty"` Schedule *DataSourceJobJobSettingsSettingsSchedule `json:"schedule,omitempty"`
SparkJarTask *DataSourceJobJobSettingsSettingsSparkJarTask `json:"spark_jar_task,omitempty"` SparkJarTask *DataSourceJobJobSettingsSettingsSparkJarTask `json:"spark_jar_task,omitempty"`
SparkPythonTask *DataSourceJobJobSettingsSettingsSparkPythonTask `json:"spark_python_task,omitempty"` SparkPythonTask *DataSourceJobJobSettingsSettingsSparkPythonTask `json:"spark_python_task,omitempty"`
@ -753,6 +759,7 @@ type DataSourceJobJobSettings struct {
CreatedTime int `json:"created_time,omitempty"` CreatedTime int `json:"created_time,omitempty"`
CreatorUserName string `json:"creator_user_name,omitempty"` CreatorUserName string `json:"creator_user_name,omitempty"`
JobId int `json:"job_id,omitempty"` JobId int `json:"job_id,omitempty"`
RunAsUserName string `json:"run_as_user_name,omitempty"`
Settings *DataSourceJobJobSettingsSettings `json:"settings,omitempty"` Settings *DataSourceJobJobSettingsSettings `json:"settings,omitempty"`
} }

21
bundle/internal/tf/schema/resource_catalog.go
View File

@ -3,14 +3,15 @@
package schema package schema
type ResourceCatalog struct { type ResourceCatalog struct {
Comment string `json:"comment,omitempty"` Comment string `json:"comment,omitempty"`
ForceDestroy bool `json:"force_destroy,omitempty"` ForceDestroy bool `json:"force_destroy,omitempty"`
Id string `json:"id,omitempty"` Id string `json:"id,omitempty"`
MetastoreId string `json:"metastore_id,omitempty"` IsolationMode string `json:"isolation_mode,omitempty"`
Name string `json:"name"` MetastoreId string `json:"metastore_id,omitempty"`
Owner string `json:"owner,omitempty"` Name string `json:"name"`
Properties map[string]string `json:"properties,omitempty"` Owner string `json:"owner,omitempty"`
ProviderName string `json:"provider_name,omitempty"` Properties map[string]string `json:"properties,omitempty"`
ShareName string `json:"share_name,omitempty"` ProviderName string `json:"provider_name,omitempty"`
StorageRoot string `json:"storage_root,omitempty"` ShareName string `json:"share_name,omitempty"`
StorageRoot string `json:"storage_root,omitempty"`
} }

2
bundle/internal/tf/schema/resource_external_location.go
View File

@ -5,10 +5,12 @@ package schema
type ResourceExternalLocation struct { type ResourceExternalLocation struct {
Comment string `json:"comment,omitempty"` Comment string `json:"comment,omitempty"`
CredentialName string `json:"credential_name"` CredentialName string `json:"credential_name"`
ForceDestroy bool `json:"force_destroy,omitempty"`
Id string `json:"id,omitempty"` Id string `json:"id,omitempty"`
MetastoreId string `json:"metastore_id,omitempty"` MetastoreId string `json:"metastore_id,omitempty"`
Name string `json:"name"` Name string `json:"name"`
Owner string `json:"owner,omitempty"` Owner string `json:"owner,omitempty"`
ReadOnly bool `json:"read_only,omitempty"`
SkipValidation bool `json:"skip_validation,omitempty"` SkipValidation bool `json:"skip_validation,omitempty"`
Url string `json:"url"` Url string `json:"url"`
} }

6
bundle/internal/tf/schema/resource_job.go
View File

@ -388,6 +388,11 @@ type ResourceJobPythonWheelTask struct {
type ResourceJobQueue struct { type ResourceJobQueue struct {
} }
type ResourceJobRunAs struct {
ServicePrincipalName string `json:"service_principal_name,omitempty"`
UserName string `json:"user_name,omitempty"`
}
type ResourceJobSchedule struct { type ResourceJobSchedule struct {
PauseStatus string `json:"pause_status,omitempty"` PauseStatus string `json:"pause_status,omitempty"`
QuartzCronExpression string `json:"quartz_cron_expression"` QuartzCronExpression string `json:"quartz_cron_expression"`
@ -743,6 +748,7 @@ type ResourceJob struct {
PipelineTask *ResourceJobPipelineTask `json:"pipeline_task,omitempty"` PipelineTask *ResourceJobPipelineTask `json:"pipeline_task,omitempty"`
PythonWheelTask *ResourceJobPythonWheelTask `json:"python_wheel_task,omitempty"` PythonWheelTask *ResourceJobPythonWheelTask `json:"python_wheel_task,omitempty"`
Queue *ResourceJobQueue `json:"queue,omitempty"` Queue *ResourceJobQueue `json:"queue,omitempty"`
RunAs *ResourceJobRunAs `json:"run_as,omitempty"`
Schedule *ResourceJobSchedule `json:"schedule,omitempty"` Schedule *ResourceJobSchedule `json:"schedule,omitempty"`
SparkJarTask *ResourceJobSparkJarTask `json:"spark_jar_task,omitempty"` SparkJarTask *ResourceJobSparkJarTask `json:"spark_jar_task,omitempty"`
SparkPythonTask *ResourceJobSparkPythonTask `json:"spark_python_task,omitempty"` SparkPythonTask *ResourceJobSparkPythonTask `json:"spark_python_task,omitempty"`

7
bundle/internal/tf/schema/resource_model_serving.go
View File

@ -25,7 +25,8 @@ type ResourceModelServingConfig struct {
} }
type ResourceModelServing struct { type ResourceModelServing struct {
Id string `json:"id,omitempty"` Id string `json:"id,omitempty"`
Name string `json:"name"` Name string `json:"name"`
Config *ResourceModelServingConfig `json:"config,omitempty"` ServingEndpointId string `json:"serving_endpoint_id,omitempty"`
Config *ResourceModelServingConfig `json:"config,omitempty"`
} }

1
bundle/internal/tf/schema/resource_permissions.go
View File

@ -26,6 +26,7 @@ type ResourcePermissions struct {
RegisteredModelId string `json:"registered_model_id,omitempty"` RegisteredModelId string `json:"registered_model_id,omitempty"`
RepoId string `json:"repo_id,omitempty"` RepoId string `json:"repo_id,omitempty"`
RepoPath string `json:"repo_path,omitempty"` RepoPath string `json:"repo_path,omitempty"`
ServingEndpointId string `json:"serving_endpoint_id,omitempty"`
SqlAlertId string `json:"sql_alert_id,omitempty"` SqlAlertId string `json:"sql_alert_id,omitempty"`
SqlDashboardId string `json:"sql_dashboard_id,omitempty"` SqlDashboardId string `json:"sql_dashboard_id,omitempty"`
SqlEndpointId string `json:"sql_endpoint_id,omitempty"` SqlEndpointId string `json:"sql_endpoint_id,omitempty"`

1
bundle/internal/tf/schema/resource_storage_credential.go
View File

@ -32,6 +32,7 @@ type ResourceStorageCredential struct {
MetastoreId string `json:"metastore_id,omitempty"` MetastoreId string `json:"metastore_id,omitempty"`
Name string `json:"name"` Name string `json:"name"`
Owner string `json:"owner,omitempty"` Owner string `json:"owner,omitempty"`
ReadOnly bool `json:"read_only,omitempty"`
AwsIamRole *ResourceStorageCredentialAwsIamRole `json:"aws_iam_role,omitempty"` AwsIamRole *ResourceStorageCredentialAwsIamRole `json:"aws_iam_role,omitempty"`
AzureManagedIdentity *ResourceStorageCredentialAzureManagedIdentity `json:"azure_managed_identity,omitempty"` AzureManagedIdentity *ResourceStorageCredentialAzureManagedIdentity `json:"azure_managed_identity,omitempty"`
AzureServicePrincipal *ResourceStorageCredentialAzureServicePrincipal `json:"azure_service_principal,omitempty"` AzureServicePrincipal *ResourceStorageCredentialAzureServicePrincipal `json:"azure_service_principal,omitempty"`

14
bundle/internal/tf/schema/resource_volume.go Normal file
View File

@ -0,0 +1,14 @@
// Generated from Databricks Terraform provider schema. DO NOT EDIT.
package schema
type ResourceVolume struct {
CatalogName string `json:"catalog_name"`
Comment string `json:"comment,omitempty"`
Id string `json:"id,omitempty"`
Name string `json:"name"`
Owner string `json:"owner,omitempty"`
SchemaName string `json:"schema_name"`
StorageLocation string `json:"storage_location,omitempty"`
VolumeType string `json:"volume_type"`
}

2
bundle/internal/tf/schema/resources.go
View File

@ -74,6 +74,7 @@ type Resources struct {
User map[string]*ResourceUser `json:"databricks_user,omitempty"` User map[string]*ResourceUser `json:"databricks_user,omitempty"`
UserInstanceProfile map[string]*ResourceUserInstanceProfile `json:"databricks_user_instance_profile,omitempty"` UserInstanceProfile map[string]*ResourceUserInstanceProfile `json:"databricks_user_instance_profile,omitempty"`
UserRole map[string]*ResourceUserRole `json:"databricks_user_role,omitempty"` UserRole map[string]*ResourceUserRole `json:"databricks_user_role,omitempty"`
Volume map[string]*ResourceVolume `json:"databricks_volume,omitempty"`
WorkspaceConf map[string]*ResourceWorkspaceConf `json:"databricks_workspace_conf,omitempty"` WorkspaceConf map[string]*ResourceWorkspaceConf `json:"databricks_workspace_conf,omitempty"`
WorkspaceFile map[string]*ResourceWorkspaceFile `json:"databricks_workspace_file,omitempty"` WorkspaceFile map[string]*ResourceWorkspaceFile `json:"databricks_workspace_file,omitempty"`
} }
@ -151,6 +152,7 @@ func NewResources() *Resources {
User: make(map[string]*ResourceUser), User: make(map[string]*ResourceUser),
UserInstanceProfile: make(map[string]*ResourceUserInstanceProfile), UserInstanceProfile: make(map[string]*ResourceUserInstanceProfile),
UserRole: make(map[string]*ResourceUserRole), UserRole: make(map[string]*ResourceUserRole),
Volume: make(map[string]*ResourceVolume),
WorkspaceConf: make(map[string]*ResourceWorkspaceConf), WorkspaceConf: make(map[string]*ResourceWorkspaceConf),
WorkspaceFile: make(map[string]*ResourceWorkspaceFile), WorkspaceFile: make(map[string]*ResourceWorkspaceFile),
} }