From 81edf332c17b462960e5b1b2a58d71fe9fc03413 Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Fri, 28 Jun 2024 08:29:57 -0700 Subject: [PATCH] Upgrade terraform-provider-databricks to v1.48.1 (#527) This PR was generated via `$ upgrade-provider pulumi/pulumi-databricks --kind=all --target-bridge-version=latest`. --- - Upgrading terraform-provider-databricks from 1.48.0 to 1.48.1. Fixes #526 --- .../pulumi-resource-databricks/schema.json | 9 +++---- provider/go.mod | 2 +- provider/go.sum | 4 +-- sdk/dotnet/ClusterPolicy.cs | 11 -------- sdk/go/databricks/clusterPolicy.go | 22 ++++++---------- .../com/pulumi/databricks/ClusterPolicy.java | 8 ------ .../pulumi/databricks/ClusterPolicyArgs.java | 26 ------------------- .../databricks/inputs/ClusterPolicyState.java | 26 ------------------- sdk/nodejs/clusterPolicy.ts | 9 ------- .../pulumi_databricks/cluster_policy.py | 13 ---------- 10 files changed, 14 insertions(+), 116 deletions(-) diff --git a/provider/cmd/pulumi-resource-databricks/schema.json b/provider/cmd/pulumi-resource-databricks/schema.json index 864589e6..cc659110 100644 --- a/provider/cmd/pulumi-resource-databricks/schema.json +++ b/provider/cmd/pulumi-resource-databricks/schema.json @@ -16170,8 +16170,7 @@ "type": "array", "items": { "$ref": "#/types/databricks:index/ClusterPolicyLibrary:ClusterPolicyLibrary" - }, - "description": "blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types.\n" + } }, "maxClustersPerUser": { "type": "integer", @@ -16212,8 +16211,7 @@ "type": "array", "items": { "$ref": "#/types/databricks:index/ClusterPolicyLibrary:ClusterPolicyLibrary" - }, - "description": "blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types.\n" + } }, "maxClustersPerUser": { "type": "integer", @@ -16247,8 +16245,7 @@ "type": "array", "items": { "$ref": "#/types/databricks:index/ClusterPolicyLibrary:ClusterPolicyLibrary" - }, - "description": "blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types.\n" + } }, "maxClustersPerUser": { "type": "integer", diff --git a/provider/go.mod b/provider/go.mod index 6e708b23..833bc86c 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -8,7 +8,7 @@ replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraf require ( github.com/databricks/databricks-sdk-go v0.43.0 - github.com/databricks/terraform-provider-databricks v1.48.0 + github.com/databricks/terraform-provider-databricks v1.48.1 github.com/pulumi/pulumi-terraform-bridge/v3 v3.85.0 ) diff --git a/provider/go.sum b/provider/go.sum index b84b430e..07b44cd7 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -1336,8 +1336,8 @@ github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53E github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/databricks/databricks-sdk-go v0.43.0 h1:x4laolWhYlsQg2t8yWEGyRPZy4/Wv3pKnLEoJfVin7I= github.com/databricks/databricks-sdk-go v0.43.0/go.mod h1:a9rr0FOHLL26kOjQjZZVFjIYmRABCbrAWVeundDEVG8= -github.com/databricks/terraform-provider-databricks v1.48.0 h1:SsJ0cTvaipwiuySB60SLkN6mH71sfLo5D4FWFvItoh8= -github.com/databricks/terraform-provider-databricks v1.48.0/go.mod h1:LtCv5f2Vfoyv9aBy3CY1PYgRovuE/tDoYt64hdS4Uts= +github.com/databricks/terraform-provider-databricks v1.48.1 h1:WFgDwvKqXatbhnr36SFvkkpV7uG2q15mKZqliufO7kw= +github.com/databricks/terraform-provider-databricks v1.48.1/go.mod h1:LtCv5f2Vfoyv9aBy3CY1PYgRovuE/tDoYt64hdS4Uts= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/sdk/dotnet/ClusterPolicy.cs b/sdk/dotnet/ClusterPolicy.cs index 5ecf7020..397bc499 100644 --- a/sdk/dotnet/ClusterPolicy.cs +++ b/sdk/dotnet/ClusterPolicy.cs @@ -114,9 +114,6 @@ public partial class ClusterPolicy : global::Pulumi.CustomResource [Output("description")] public Output Description { get; private set; } = null!; - /// - /// blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - /// [Output("libraries")] public Output> Libraries { get; private set; } = null!; @@ -210,10 +207,6 @@ public sealed class ClusterPolicyArgs : global::Pulumi.ResourceArgs [Input("libraries")] private InputList? _libraries; - - /// - /// blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - /// public InputList Libraries { get => _libraries ?? (_libraries = new InputList()); @@ -266,10 +259,6 @@ public sealed class ClusterPolicyState : global::Pulumi.ResourceArgs [Input("libraries")] private InputList? _libraries; - - /// - /// blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - /// public InputList Libraries { get => _libraries ?? (_libraries = new InputList()); diff --git a/sdk/go/databricks/clusterPolicy.go b/sdk/go/databricks/clusterPolicy.go index a747fee2..e9ecb2b2 100644 --- a/sdk/go/databricks/clusterPolicy.go +++ b/sdk/go/databricks/clusterPolicy.go @@ -115,9 +115,8 @@ type ClusterPolicy struct { // Policy definition: JSON document expressed in [Databricks Policy Definition Language](https://docs.databricks.com/administration-guide/clusters/policies.html#cluster-policy-definition). Cannot be used with `policyFamilyId` Definition pulumi.StringOutput `pulumi:"definition"` // Additional human-readable description of the cluster policy. - Description pulumi.StringPtrOutput `pulumi:"description"` - // blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. - Libraries ClusterPolicyLibraryArrayOutput `pulumi:"libraries"` + Description pulumi.StringPtrOutput `pulumi:"description"` + Libraries ClusterPolicyLibraryArrayOutput `pulumi:"libraries"` // Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. MaxClustersPerUser pulumi.IntPtrOutput `pulumi:"maxClustersPerUser"` // Cluster policy name. This must be unique. Length must be between 1 and 100 characters. @@ -163,9 +162,8 @@ type clusterPolicyState struct { // Policy definition: JSON document expressed in [Databricks Policy Definition Language](https://docs.databricks.com/administration-guide/clusters/policies.html#cluster-policy-definition). Cannot be used with `policyFamilyId` Definition *string `pulumi:"definition"` // Additional human-readable description of the cluster policy. - Description *string `pulumi:"description"` - // blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. - Libraries []ClusterPolicyLibrary `pulumi:"libraries"` + Description *string `pulumi:"description"` + Libraries []ClusterPolicyLibrary `pulumi:"libraries"` // Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. MaxClustersPerUser *int `pulumi:"maxClustersPerUser"` // Cluster policy name. This must be unique. Length must be between 1 and 100 characters. @@ -183,8 +181,7 @@ type ClusterPolicyState struct { Definition pulumi.StringPtrInput // Additional human-readable description of the cluster policy. Description pulumi.StringPtrInput - // blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. - Libraries ClusterPolicyLibraryArrayInput + Libraries ClusterPolicyLibraryArrayInput // Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. MaxClustersPerUser pulumi.IntPtrInput // Cluster policy name. This must be unique. Length must be between 1 and 100 characters. @@ -205,9 +202,8 @@ type clusterPolicyArgs struct { // Policy definition: JSON document expressed in [Databricks Policy Definition Language](https://docs.databricks.com/administration-guide/clusters/policies.html#cluster-policy-definition). Cannot be used with `policyFamilyId` Definition *string `pulumi:"definition"` // Additional human-readable description of the cluster policy. - Description *string `pulumi:"description"` - // blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. - Libraries []ClusterPolicyLibrary `pulumi:"libraries"` + Description *string `pulumi:"description"` + Libraries []ClusterPolicyLibrary `pulumi:"libraries"` // Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. MaxClustersPerUser *int `pulumi:"maxClustersPerUser"` // Cluster policy name. This must be unique. Length must be between 1 and 100 characters. @@ -224,8 +220,7 @@ type ClusterPolicyArgs struct { Definition pulumi.StringPtrInput // Additional human-readable description of the cluster policy. Description pulumi.StringPtrInput - // blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. - Libraries ClusterPolicyLibraryArrayInput + Libraries ClusterPolicyLibraryArrayInput // Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. MaxClustersPerUser pulumi.IntPtrInput // Cluster policy name. This must be unique. Length must be between 1 and 100 characters. @@ -333,7 +328,6 @@ func (o ClusterPolicyOutput) Description() pulumi.StringPtrOutput { return o.ApplyT(func(v *ClusterPolicy) pulumi.StringPtrOutput { return v.Description }).(pulumi.StringPtrOutput) } -// blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. func (o ClusterPolicyOutput) Libraries() ClusterPolicyLibraryArrayOutput { return o.ApplyT(func(v *ClusterPolicy) ClusterPolicyLibraryArrayOutput { return v.Libraries }).(ClusterPolicyLibraryArrayOutput) } diff --git a/sdk/java/src/main/java/com/pulumi/databricks/ClusterPolicy.java b/sdk/java/src/main/java/com/pulumi/databricks/ClusterPolicy.java index 842ab233..fc840cb0 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/ClusterPolicy.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/ClusterPolicy.java @@ -143,17 +143,9 @@ public Output definition() { public Output> description() { return Codegen.optional(this.description); } - /** - * blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - */ @Export(name="libraries", refs={List.class,ClusterPolicyLibrary.class}, tree="[0,1]") private Output> libraries; - /** - * @return blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - */ public Output>> libraries() { return Codegen.optional(this.libraries); } diff --git a/sdk/java/src/main/java/com/pulumi/databricks/ClusterPolicyArgs.java b/sdk/java/src/main/java/com/pulumi/databricks/ClusterPolicyArgs.java index fe8fec6d..0a10df74 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/ClusterPolicyArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/ClusterPolicyArgs.java @@ -48,17 +48,9 @@ public Optional> description() { return Optional.ofNullable(this.description); } - /** - * blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - */ @Import(name="libraries") private @Nullable Output> libraries; - /** - * @return blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - */ public Optional>> libraries() { return Optional.ofNullable(this.libraries); } @@ -195,33 +187,15 @@ public Builder description(String description) { return description(Output.of(description)); } - /** - * @param libraries blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - * @return builder - * - */ public Builder libraries(@Nullable Output> libraries) { $.libraries = libraries; return this; } - /** - * @param libraries blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - * @return builder - * - */ public Builder libraries(List libraries) { return libraries(Output.of(libraries)); } - /** - * @param libraries blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - * @return builder - * - */ public Builder libraries(ClusterPolicyLibraryArgs... libraries) { return libraries(List.of(libraries)); } diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/ClusterPolicyState.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/ClusterPolicyState.java index 302e4651..e6ad0243 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/ClusterPolicyState.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/ClusterPolicyState.java @@ -48,17 +48,9 @@ public Optional> description() { return Optional.ofNullable(this.description); } - /** - * blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - */ @Import(name="libraries") private @Nullable Output> libraries; - /** - * @return blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - */ public Optional>> libraries() { return Optional.ofNullable(this.libraries); } @@ -211,33 +203,15 @@ public Builder description(String description) { return description(Output.of(description)); } - /** - * @param libraries blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - * @return builder - * - */ public Builder libraries(@Nullable Output> libraries) { $.libraries = libraries; return this; } - /** - * @param libraries blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - * @return builder - * - */ public Builder libraries(List libraries) { return libraries(Output.of(libraries)); } - /** - * @param libraries blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - * - * @return builder - * - */ public Builder libraries(ClusterPolicyLibraryArgs... libraries) { return libraries(List.of(libraries)); } diff --git a/sdk/nodejs/clusterPolicy.ts b/sdk/nodejs/clusterPolicy.ts index 4e9ea706..545374e9 100644 --- a/sdk/nodejs/clusterPolicy.ts +++ b/sdk/nodejs/clusterPolicy.ts @@ -120,9 +120,6 @@ export class ClusterPolicy extends pulumi.CustomResource { * Additional human-readable description of the cluster policy. */ public readonly description!: pulumi.Output; - /** - * blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - */ public readonly libraries!: pulumi.Output; /** * Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. @@ -194,9 +191,6 @@ export interface ClusterPolicyState { * Additional human-readable description of the cluster policy. */ description?: pulumi.Input; - /** - * blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - */ libraries?: pulumi.Input[]>; /** * Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. @@ -232,9 +226,6 @@ export interface ClusterPolicyArgs { * Additional human-readable description of the cluster policy. */ description?: pulumi.Input; - /** - * blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See databricks.Cluster for more details about supported library types. - */ libraries?: pulumi.Input[]>; /** * Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. diff --git a/sdk/python/pulumi_databricks/cluster_policy.py b/sdk/python/pulumi_databricks/cluster_policy.py index 186a39cd..b3c4a85f 100644 --- a/sdk/python/pulumi_databricks/cluster_policy.py +++ b/sdk/python/pulumi_databricks/cluster_policy.py @@ -27,7 +27,6 @@ def __init__(__self__, *, The set of arguments for constructing a ClusterPolicy resource. :param pulumi.Input[str] definition: Policy definition: JSON document expressed in [Databricks Policy Definition Language](https://docs.databricks.com/administration-guide/clusters/policies.html#cluster-policy-definition). Cannot be used with `policy_family_id` :param pulumi.Input[str] description: Additional human-readable description of the cluster policy. - :param pulumi.Input[Sequence[pulumi.Input['ClusterPolicyLibraryArgs']]] libraries: blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. :param pulumi.Input[int] max_clusters_per_user: Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. :param pulumi.Input[str] name: Cluster policy name. This must be unique. Length must be between 1 and 100 characters. :param pulumi.Input[str] policy_family_definition_overrides: Policy definition JSON document expressed in Databricks Policy Definition Language. The JSON document must be passed as a string and cannot be embedded in the requests. You can use this to customize the policy definition inherited from the policy family. Policy rules specified here are merged into the inherited policy definition. @@ -75,9 +74,6 @@ def description(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter def libraries(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['ClusterPolicyLibraryArgs']]]]: - """ - blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. - """ return pulumi.get(self, "libraries") @libraries.setter @@ -148,7 +144,6 @@ def __init__(__self__, *, Input properties used for looking up and filtering ClusterPolicy resources. :param pulumi.Input[str] definition: Policy definition: JSON document expressed in [Databricks Policy Definition Language](https://docs.databricks.com/administration-guide/clusters/policies.html#cluster-policy-definition). Cannot be used with `policy_family_id` :param pulumi.Input[str] description: Additional human-readable description of the cluster policy. - :param pulumi.Input[Sequence[pulumi.Input['ClusterPolicyLibraryArgs']]] libraries: blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. :param pulumi.Input[int] max_clusters_per_user: Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. :param pulumi.Input[str] name: Cluster policy name. This must be unique. Length must be between 1 and 100 characters. :param pulumi.Input[str] policy_family_definition_overrides: Policy definition JSON document expressed in Databricks Policy Definition Language. The JSON document must be passed as a string and cannot be embedded in the requests. You can use this to customize the policy definition inherited from the policy family. Policy rules specified here are merged into the inherited policy definition. @@ -199,9 +194,6 @@ def description(self, value: Optional[pulumi.Input[str]]): @property @pulumi.getter def libraries(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['ClusterPolicyLibraryArgs']]]]: - """ - blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. - """ return pulumi.get(self, "libraries") @libraries.setter @@ -364,7 +356,6 @@ def __init__(__self__, :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[str] definition: Policy definition: JSON document expressed in [Databricks Policy Definition Language](https://docs.databricks.com/administration-guide/clusters/policies.html#cluster-policy-definition). Cannot be used with `policy_family_id` :param pulumi.Input[str] description: Additional human-readable description of the cluster policy. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClusterPolicyLibraryArgs']]]] libraries: blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. :param pulumi.Input[int] max_clusters_per_user: Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. :param pulumi.Input[str] name: Cluster policy name. This must be unique. Length must be between 1 and 100 characters. :param pulumi.Input[str] policy_family_definition_overrides: Policy definition JSON document expressed in Databricks Policy Definition Language. The JSON document must be passed as a string and cannot be embedded in the requests. You can use this to customize the policy definition inherited from the policy family. Policy rules specified here are merged into the inherited policy definition. @@ -520,7 +511,6 @@ def get(resource_name: str, :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[str] definition: Policy definition: JSON document expressed in [Databricks Policy Definition Language](https://docs.databricks.com/administration-guide/clusters/policies.html#cluster-policy-definition). Cannot be used with `policy_family_id` :param pulumi.Input[str] description: Additional human-readable description of the cluster policy. - :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClusterPolicyLibraryArgs']]]] libraries: blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. :param pulumi.Input[int] max_clusters_per_user: Maximum number of clusters allowed per user. When omitted, there is no limit. If specified, value must be greater than zero. :param pulumi.Input[str] name: Cluster policy name. This must be unique. Length must be between 1 and 100 characters. :param pulumi.Input[str] policy_family_definition_overrides: Policy definition JSON document expressed in Databricks Policy Definition Language. The JSON document must be passed as a string and cannot be embedded in the requests. You can use this to customize the policy definition inherited from the policy family. Policy rules specified here are merged into the inherited policy definition. @@ -560,9 +550,6 @@ def description(self) -> pulumi.Output[Optional[str]]: @property @pulumi.getter def libraries(self) -> pulumi.Output[Optional[Sequence['outputs.ClusterPolicyLibrary']]]: - """ - blocks defining individual libraries that will be installed on the cluster that uses a given cluster policy. See Cluster for more details about supported library types. - """ return pulumi.get(self, "libraries") @property