Skip to content

Commit

Permalink
Upgrade TF provider to 1.50.0 (#1681)
Browse files Browse the repository at this point in the history
## Changes

See
databricks/terraform-provider-databricks#3900

## Tests

* Manually test on a bundle with a pipeline and a schema
* Integration tests pass
  • Loading branch information
pietern authored Aug 15, 2024
1 parent 7aaaee2 commit 6b3d33a
Show file tree
Hide file tree
Showing 12 changed files with 234 additions and 57 deletions.
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.49.1"
const ProviderVersion = "1.50.0"
15 changes: 8 additions & 7 deletions bundle/internal/tf/schema/data_source_notebook.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
package schema

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"`
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"`
}
1 change: 1 addition & 0 deletions bundle/internal/tf/schema/data_source_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package schema

type DataSourceUser struct {
AclPrincipalId string `json:"acl_principal_id,omitempty"`
Active bool `json:"active,omitempty"`
Alphanumeric string `json:"alphanumeric,omitempty"`
ApplicationId string `json:"application_id,omitempty"`
DisplayName string `json:"display_name,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion bundle/internal/tf/schema/resource_cluster_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type ResourceClusterPolicy struct {
Description string `json:"description,omitempty"`
Id string `json:"id,omitempty"`
MaxClustersPerUser int `json:"max_clusters_per_user,omitempty"`
Name string `json:"name"`
Name string `json:"name,omitempty"`
PolicyFamilyDefinitionOverrides string `json:"policy_family_definition_overrides,omitempty"`
PolicyFamilyId string `json:"policy_family_id,omitempty"`
PolicyId string `json:"policy_id,omitempty"`
Expand Down
7 changes: 7 additions & 0 deletions bundle/internal/tf/schema/resource_metastore_data_access.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ type ResourceMetastoreDataAccessAzureServicePrincipal struct {
DirectoryId string `json:"directory_id"`
}

type ResourceMetastoreDataAccessCloudflareApiToken struct {
AccessKeyId string `json:"access_key_id"`
AccountId string `json:"account_id"`
SecretAccessKey string `json:"secret_access_key"`
}

type ResourceMetastoreDataAccessDatabricksGcpServiceAccount struct {
CredentialId string `json:"credential_id,omitempty"`
Email string `json:"email,omitempty"`
Expand All @@ -46,6 +52,7 @@ type ResourceMetastoreDataAccess struct {
AwsIamRole *ResourceMetastoreDataAccessAwsIamRole `json:"aws_iam_role,omitempty"`
AzureManagedIdentity *ResourceMetastoreDataAccessAzureManagedIdentity `json:"azure_managed_identity,omitempty"`
AzureServicePrincipal *ResourceMetastoreDataAccessAzureServicePrincipal `json:"azure_service_principal,omitempty"`
CloudflareApiToken *ResourceMetastoreDataAccessCloudflareApiToken `json:"cloudflare_api_token,omitempty"`
DatabricksGcpServiceAccount *ResourceMetastoreDataAccessDatabricksGcpServiceAccount `json:"databricks_gcp_service_account,omitempty"`
GcpServiceAccountKey *ResourceMetastoreDataAccessGcpServiceAccountKey `json:"gcp_service_account_key,omitempty"`
}
56 changes: 37 additions & 19 deletions bundle/internal/tf/schema/resource_model_serving.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,60 @@ type ResourceModelServingConfigAutoCaptureConfig struct {
}

type ResourceModelServingConfigServedEntitiesExternalModelAi21LabsConfig struct {
Ai21LabsApiKey string `json:"ai21labs_api_key"`
Ai21LabsApiKey string `json:"ai21labs_api_key,omitempty"`
Ai21LabsApiKeyPlaintext string `json:"ai21labs_api_key_plaintext,omitempty"`
}

type ResourceModelServingConfigServedEntitiesExternalModelAmazonBedrockConfig struct {
AwsAccessKeyId string `json:"aws_access_key_id"`
AwsRegion string `json:"aws_region"`
AwsSecretAccessKey string `json:"aws_secret_access_key"`
BedrockProvider string `json:"bedrock_provider"`
AwsAccessKeyId string `json:"aws_access_key_id,omitempty"`
AwsAccessKeyIdPlaintext string `json:"aws_access_key_id_plaintext,omitempty"`
AwsRegion string `json:"aws_region"`
AwsSecretAccessKey string `json:"aws_secret_access_key,omitempty"`
AwsSecretAccessKeyPlaintext string `json:"aws_secret_access_key_plaintext,omitempty"`
BedrockProvider string `json:"bedrock_provider"`
}

type ResourceModelServingConfigServedEntitiesExternalModelAnthropicConfig struct {
AnthropicApiKey string `json:"anthropic_api_key"`
AnthropicApiKey string `json:"anthropic_api_key,omitempty"`
AnthropicApiKeyPlaintext string `json:"anthropic_api_key_plaintext,omitempty"`
}

type ResourceModelServingConfigServedEntitiesExternalModelCohereConfig struct {
CohereApiKey string `json:"cohere_api_key"`
CohereApiBase string `json:"cohere_api_base,omitempty"`
CohereApiKey string `json:"cohere_api_key,omitempty"`
CohereApiKeyPlaintext string `json:"cohere_api_key_plaintext,omitempty"`
}

type ResourceModelServingConfigServedEntitiesExternalModelDatabricksModelServingConfig struct {
DatabricksApiToken string `json:"databricks_api_token"`
DatabricksWorkspaceUrl string `json:"databricks_workspace_url"`
DatabricksApiToken string `json:"databricks_api_token,omitempty"`
DatabricksApiTokenPlaintext string `json:"databricks_api_token_plaintext,omitempty"`
DatabricksWorkspaceUrl string `json:"databricks_workspace_url"`
}

type ResourceModelServingConfigServedEntitiesExternalModelGoogleCloudVertexAiConfig struct {
PrivateKey string `json:"private_key,omitempty"`
PrivateKeyPlaintext string `json:"private_key_plaintext,omitempty"`
ProjectId string `json:"project_id,omitempty"`
Region string `json:"region,omitempty"`
}

type ResourceModelServingConfigServedEntitiesExternalModelOpenaiConfig struct {
MicrosoftEntraClientId string `json:"microsoft_entra_client_id,omitempty"`
MicrosoftEntraClientSecret string `json:"microsoft_entra_client_secret,omitempty"`
MicrosoftEntraTenantId string `json:"microsoft_entra_tenant_id,omitempty"`
OpenaiApiBase string `json:"openai_api_base,omitempty"`
OpenaiApiKey string `json:"openai_api_key,omitempty"`
OpenaiApiType string `json:"openai_api_type,omitempty"`
OpenaiApiVersion string `json:"openai_api_version,omitempty"`
OpenaiDeploymentName string `json:"openai_deployment_name,omitempty"`
OpenaiOrganization string `json:"openai_organization,omitempty"`
MicrosoftEntraClientId string `json:"microsoft_entra_client_id,omitempty"`
MicrosoftEntraClientSecret string `json:"microsoft_entra_client_secret,omitempty"`
MicrosoftEntraClientSecretPlaintext string `json:"microsoft_entra_client_secret_plaintext,omitempty"`
MicrosoftEntraTenantId string `json:"microsoft_entra_tenant_id,omitempty"`
OpenaiApiBase string `json:"openai_api_base,omitempty"`
OpenaiApiKey string `json:"openai_api_key,omitempty"`
OpenaiApiKeyPlaintext string `json:"openai_api_key_plaintext,omitempty"`
OpenaiApiType string `json:"openai_api_type,omitempty"`
OpenaiApiVersion string `json:"openai_api_version,omitempty"`
OpenaiDeploymentName string `json:"openai_deployment_name,omitempty"`
OpenaiOrganization string `json:"openai_organization,omitempty"`
}

type ResourceModelServingConfigServedEntitiesExternalModelPalmConfig struct {
PalmApiKey string `json:"palm_api_key"`
PalmApiKey string `json:"palm_api_key,omitempty"`
PalmApiKeyPlaintext string `json:"palm_api_key_plaintext,omitempty"`
}

type ResourceModelServingConfigServedEntitiesExternalModel struct {
Expand All @@ -58,6 +75,7 @@ type ResourceModelServingConfigServedEntitiesExternalModel struct {
AnthropicConfig *ResourceModelServingConfigServedEntitiesExternalModelAnthropicConfig `json:"anthropic_config,omitempty"`
CohereConfig *ResourceModelServingConfigServedEntitiesExternalModelCohereConfig `json:"cohere_config,omitempty"`
DatabricksModelServingConfig *ResourceModelServingConfigServedEntitiesExternalModelDatabricksModelServingConfig `json:"databricks_model_serving_config,omitempty"`
GoogleCloudVertexAiConfig *ResourceModelServingConfigServedEntitiesExternalModelGoogleCloudVertexAiConfig `json:"google_cloud_vertex_ai_config,omitempty"`
OpenaiConfig *ResourceModelServingConfigServedEntitiesExternalModelOpenaiConfig `json:"openai_config,omitempty"`
PalmConfig *ResourceModelServingConfigServedEntitiesExternalModelPalmConfig `json:"palm_config,omitempty"`
}
Expand Down
1 change: 1 addition & 0 deletions bundle/internal/tf/schema/resource_notebook.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ type ResourceNotebook struct {
Path string `json:"path"`
Source string `json:"source,omitempty"`
Url string `json:"url,omitempty"`
WorkspacePath string `json:"workspace_path,omitempty"`
}
46 changes: 46 additions & 0 deletions bundle/internal/tf/schema/resource_notification_destination.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// Generated from Databricks Terraform provider schema. DO NOT EDIT.

package schema

type ResourceNotificationDestinationConfigEmail struct {
Addresses []string `json:"addresses,omitempty"`
}

type ResourceNotificationDestinationConfigGenericWebhook struct {
Password string `json:"password,omitempty"`
PasswordSet bool `json:"password_set,omitempty"`
Url string `json:"url,omitempty"`
UrlSet bool `json:"url_set,omitempty"`
Username string `json:"username,omitempty"`
UsernameSet bool `json:"username_set,omitempty"`
}

type ResourceNotificationDestinationConfigMicrosoftTeams struct {
Url string `json:"url,omitempty"`
UrlSet bool `json:"url_set,omitempty"`
}

type ResourceNotificationDestinationConfigPagerduty struct {
IntegrationKey string `json:"integration_key,omitempty"`
IntegrationKeySet bool `json:"integration_key_set,omitempty"`
}

type ResourceNotificationDestinationConfigSlack struct {
Url string `json:"url,omitempty"`
UrlSet bool `json:"url_set,omitempty"`
}

type ResourceNotificationDestinationConfig struct {
Email *ResourceNotificationDestinationConfigEmail `json:"email,omitempty"`
GenericWebhook *ResourceNotificationDestinationConfigGenericWebhook `json:"generic_webhook,omitempty"`
MicrosoftTeams *ResourceNotificationDestinationConfigMicrosoftTeams `json:"microsoft_teams,omitempty"`
Pagerduty *ResourceNotificationDestinationConfigPagerduty `json:"pagerduty,omitempty"`
Slack *ResourceNotificationDestinationConfigSlack `json:"slack,omitempty"`
}

type ResourceNotificationDestination struct {
DestinationType string `json:"destination_type,omitempty"`
DisplayName string `json:"display_name"`
Id string `json:"id,omitempty"`
Config *ResourceNotificationDestinationConfig `json:"config,omitempty"`
}
Loading

0 comments on commit 6b3d33a

Please sign in to comment.