Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade terraform-provider-databricks to v1.62.1 #691

Merged
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .pulumi-java-gen.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.20.0
0.21.0
4 changes: 3 additions & 1 deletion docs/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ title: Databricks Provider
meta_desc: Provides an overview on how to configure the Pulumi Databricks provider.
layout: package
---

## Installation

The Databricks provider is available as a package in all Pulumi languages:
Expand All @@ -13,6 +14,7 @@ The Databricks provider is available as a package in all Pulumi languages:
* Go: [`github.com/pulumi/pulumi-databricks/sdk/go/databricks`](https://github.com/pulumi/pulumi-databricks)
* .NET: [`Pulumi.Databricks`](https://www.nuget.org/packages/Pulumi.Databricks)
* Java: [`com.pulumi/databricks`](https://central.sonatype.com/artifact/com.pulumi/databricks)

## Overview

Use the Databricks Pulumi provider to interact with almost all of [Databricks](http://databricks.com/) resources.
Expand Down Expand Up @@ -656,7 +658,7 @@ The provider configuration supports the following arguments:
* `configFile` - (optional) Location of the Databricks CLI credentials file created by `databricks configure --token` command (~/.databrickscfg by default). Check [Databricks CLI documentation](https://docs.databricks.com/dev-tools/cli/index.html#set-up-authentication) for more details. The provider uses configuration file credentials when you don't specify host/token/azure attributes. Alternatively, you can provide this value as an environment variable `DATABRICKS_CONFIG_FILE`. This field defaults to `~/.databrickscfg`.
* `profile` - (optional) Connection profile specified within ~/.databrickscfg. Please check [connection profiles section](https://docs.databricks.com/dev-tools/cli/index.html#connection-profiles) for more details. This field defaults to
`DEFAULT`.
* `accountId` - (optional for workspace-level operations, but required for account-level) Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). Alternatively, you can provide this value as an environment variable `DATABRICKS_ACCOUNT_ID`. Only has effect when `host = "https://accounts.cloud.databricks.com/"`, and is currently used to provision account admins via databricks_user. In the future releases of the provider this property will also be used specify account for `databricks_mws_*` resources as well.
* `accountId` - (required for account-level operations) Account ID found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). Alternatively, you can provide this value as an environment variable `DATABRICKS_ACCOUNT_ID`. Only has effect when `host = "https://accounts.cloud.databricks.com/"`, and is currently used to provision account admins via databricks_user. **Note: do NOT use in the workspace-level provider to avoid `...invalid Databricks Account configuration` errors**.
* `authType` - (optional) enforce specific auth type to be used in very rare cases, where a single Pulumi state manages Databricks workspaces on more than one cloud and `more than one authorization method configured` error is a false positive. Valid values are `pat`, `basic`, `oauth-m2m`, `azure-client-secret`, `azure-msi`, `azure-cli`, `github-oidc-azure`, `google-credentials`, and `google-id`.
## Special configurations for Azure

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Venelin <[email protected]>
Date: Fri, 3 Jan 2025 16:37:43 +0200
Subject: [PATCH] rename input property on guardrails to avoid name clash


diff --git a/internal/service/serving_tf/legacy_model.go b/internal/service/serving_tf/legacy_model.go
index faa0dbe8..3f3f370c 100755
--- a/internal/service/serving_tf/legacy_model.go
+++ b/internal/service/serving_tf/legacy_model.go
@@ -443,7 +443,7 @@ func (o AiGatewayGuardrailPiiBehavior_SdkV2) Type(ctx context.Context) attr.Type

type AiGatewayGuardrails_SdkV2 struct {
// Configuration for input guardrail filters.
- Input types.List `tfsdk:"input" tf:"optional,object"`
+ Input types.List `tfsdk:"input_properties" tf:"optional,object"`
// Configuration for output guardrail filters.
Output types.List `tfsdk:"output" tf:"optional,object"`
}
@@ -463,7 +463,7 @@ func (newState *AiGatewayGuardrails_SdkV2) SyncEffectiveFieldsDuringRead(existin
// SDK values.
func (a AiGatewayGuardrails_SdkV2) GetComplexFieldTypes(ctx context.Context) map[string]reflect.Type {
return map[string]reflect.Type{
- "input": reflect.TypeOf(AiGatewayGuardrailParameters_SdkV2{}),
+ "input_properties": reflect.TypeOf(AiGatewayGuardrailParameters_SdkV2{}),
"output": reflect.TypeOf(AiGatewayGuardrailParameters_SdkV2{}),
}
}
@@ -475,7 +475,7 @@ func (o AiGatewayGuardrails_SdkV2) ToObjectValue(ctx context.Context) basetypes.
return types.ObjectValueMust(
o.Type(ctx).(basetypes.ObjectType).AttrTypes,
map[string]attr.Value{
- "input": o.Input,
+ "input_properties": o.Input,
"output": o.Output,
})
}
@@ -484,7 +484,7 @@ func (o AiGatewayGuardrails_SdkV2) ToObjectValue(ctx context.Context) basetypes.
func (o AiGatewayGuardrails_SdkV2) Type(ctx context.Context) attr.Type {
return types.ObjectType{
AttrTypes: map[string]attr.Type{
- "input": basetypes.ListType{
+ "input_properties": basetypes.ListType{
ElemType: AiGatewayGuardrailParameters_SdkV2{}.Type(ctx),
},
"output": basetypes.ListType{
@@ -516,7 +516,7 @@ func (o *AiGatewayGuardrails_SdkV2) GetInput(ctx context.Context) (AiGatewayGuar
// SetInput sets the value of the Input field in AiGatewayGuardrails_SdkV2.
func (o *AiGatewayGuardrails_SdkV2) SetInput(ctx context.Context, v AiGatewayGuardrailParameters_SdkV2) {
vs := []attr.Value{v.ToObjectValue(ctx)}
- t := o.Type(ctx).(basetypes.ObjectType).AttrTypes["input"]
+ t := o.Type(ctx).(basetypes.ObjectType).AttrTypes["input_properties"]
o.Input = types.ListValueMust(t, vs)
}

diff --git a/internal/service/serving_tf/model.go b/internal/service/serving_tf/model.go
index f9bf0ddb..a8ef50bb 100755
--- a/internal/service/serving_tf/model.go
+++ b/internal/service/serving_tf/model.go
@@ -443,7 +443,7 @@ func (o AiGatewayGuardrailPiiBehavior) Type(ctx context.Context) attr.Type {

type AiGatewayGuardrails struct {
// Configuration for input guardrail filters.
- Input types.Object `tfsdk:"input" tf:"optional,object"`
+ Input types.Object `tfsdk:"input_properties" tf:"optional,object"`
// Configuration for output guardrail filters.
Output types.Object `tfsdk:"output" tf:"optional,object"`
}
@@ -463,7 +463,7 @@ func (newState *AiGatewayGuardrails) SyncEffectiveFieldsDuringRead(existingState
// SDK values.
func (a AiGatewayGuardrails) GetComplexFieldTypes(ctx context.Context) map[string]reflect.Type {
return map[string]reflect.Type{
- "input": reflect.TypeOf(AiGatewayGuardrailParameters{}),
+ "input_properties": reflect.TypeOf(AiGatewayGuardrailParameters{}),
"output": reflect.TypeOf(AiGatewayGuardrailParameters{}),
}
}
@@ -475,7 +475,7 @@ func (o AiGatewayGuardrails) ToObjectValue(ctx context.Context) basetypes.Object
return types.ObjectValueMust(
o.Type(ctx).(basetypes.ObjectType).AttrTypes,
map[string]attr.Value{
- "input": o.Input,
+ "input_properties": o.Input,
"output": o.Output,
})
}
@@ -484,7 +484,7 @@ func (o AiGatewayGuardrails) ToObjectValue(ctx context.Context) basetypes.Object
func (o AiGatewayGuardrails) Type(ctx context.Context) attr.Type {
return types.ObjectType{
AttrTypes: map[string]attr.Type{
- "input": AiGatewayGuardrailParameters{}.Type(ctx),
+ "input_properties": AiGatewayGuardrailParameters{}.Type(ctx),
"output": AiGatewayGuardrailParameters{}.Type(ctx),
},
}
Loading
Loading