From 56327d6ec35a9dc022da588a858394f50794b013 Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Fri, 26 Jan 2024 10:24:24 -0800 Subject: [PATCH] Upgrade terraform-provider-databricks to v1.35.0 (#321) This PR was generated via `$ upgrade-provider pulumi/pulumi-databricks --kind=all --target-bridge-version=latest`. --- - Upgrading terraform-provider-databricks from 1.34.0 to 1.35.0. Fixes #320 --- .../bridge-metadata.json | 2 +- .../pulumi-resource-databricks/schema.json | 83 ++++++++--------- provider/go.mod | 4 +- provider/go.sum | 8 +- sdk/dotnet/Connection.cs | 2 +- sdk/dotnet/GetViews.cs | 90 ------------------- sdk/dotnet/Grants.cs | 18 ---- sdk/dotnet/MwsPrivateAccessSettings.cs | 24 +---- sdk/dotnet/MwsWorkspaces.cs | 30 +++++++ sdk/dotnet/SqlEndpoint.cs | 2 +- sdk/go/databricks/connection.go | 6 +- sdk/go/databricks/getViews.go | 47 ---------- sdk/go/databricks/grants.go | 18 ---- sdk/go/databricks/mwsPrivateAccessSettings.go | 39 ++++---- sdk/go/databricks/mwsWorkspaces.go | 15 ++++ sdk/go/databricks/sqlEndpoint.go | 6 +- .../com/pulumi/databricks/Connection.java | 6 +- .../databricks/DatabricksFunctions.java | 4 + .../java/com/pulumi/databricks/Grants.java | 12 --- .../com/pulumi/databricks/GrantsArgs.java | 34 ------- .../databricks/MwsPrivateAccessSettings.java | 22 ++--- .../MwsPrivateAccessSettingsArgs.java | 61 +++++-------- .../com/pulumi/databricks/MwsWorkspaces.java | 16 ++++ .../pulumi/databricks/MwsWorkspacesArgs.java | 39 ++++++++ .../com/pulumi/databricks/SqlEndpoint.java | 6 +- .../pulumi/databricks/inputs/GrantsState.java | 34 ------- .../inputs/MwsPrivateAccessSettingsState.java | 61 +++++-------- .../databricks/inputs/MwsWorkspacesState.java | 39 ++++++++ sdk/nodejs/connection.ts | 2 +- sdk/nodejs/getViews.ts | 56 ------------ sdk/nodejs/grants.ts | 10 --- sdk/nodejs/mwsPrivateAccessSettings.ts | 26 ++---- sdk/nodejs/mwsWorkspaces.ts | 14 +++ sdk/nodejs/sqlEndpoint.ts | 2 +- sdk/python/pulumi_databricks/connection.py | 2 +- sdk/python/pulumi_databricks/get_views.py | 44 --------- sdk/python/pulumi_databricks/grants.py | 68 -------------- .../mws_private_access_settings.py | 82 ++++++----------- .../pulumi_databricks/mws_workspaces.py | 47 ++++++++++ sdk/python/pulumi_databricks/sql_endpoint.py | 2 +- 40 files changed, 366 insertions(+), 717 deletions(-) diff --git a/provider/cmd/pulumi-resource-databricks/bridge-metadata.json b/provider/cmd/pulumi-resource-databricks/bridge-metadata.json index 6dfe7d8d..0092c45d 100644 --- a/provider/cmd/pulumi-resource-databricks/bridge-metadata.json +++ b/provider/cmd/pulumi-resource-databricks/bridge-metadata.json @@ -4857,7 +4857,6 @@ "externalLocation": "external_location", "foreignConnection": "foreign_connection", "grants": "grant", - "materializedView": "materialized_view", "storageCredential": "storage_credential" }, "databricks:index/group:Group": { @@ -5079,6 +5078,7 @@ "cloudResourceContainer": "cloud_resource_container", "creationTime": "creation_time", "credentialsId": "credentials_id", + "customTags": "custom_tags", "customerManagedKeyId": "customer_managed_key_id", "deploymentName": "deployment_name", "externalCustomerInfo": "external_customer_info", diff --git a/provider/cmd/pulumi-resource-databricks/schema.json b/provider/cmd/pulumi-resource-databricks/schema.json index 66b26225..93239a08 100644 --- a/provider/cmd/pulumi-resource-databricks/schema.json +++ b/provider/cmd/pulumi-resource-databricks/schema.json @@ -10937,6 +10937,7 @@ "metastoreId", "name", "options", + "owner", "readOnly" ], "inputProperties": { @@ -10967,8 +10968,7 @@ }, "owner": { "type": "string", - "description": "Name of the connection owner.\n", - "willReplaceOnChanges": true + "description": "Name of the connection owner.\n" }, "properties": { "type": "object", @@ -11017,8 +11017,7 @@ }, "owner": { "type": "string", - "description": "Name of the connection owner.\n", - "willReplaceOnChanges": true + "description": "Name of the connection owner.\n" }, "properties": { "type": "object", @@ -11875,9 +11874,6 @@ } } }, - "materializedView": { - "type": "string" - }, "metastore": { "type": "string" }, @@ -11896,9 +11892,6 @@ "table": { "type": "string" }, - "view": { - "type": "string" - }, "volume": { "type": "string" } @@ -11934,10 +11927,6 @@ } } }, - "materializedView": { - "type": "string", - "willReplaceOnChanges": true - }, "metastore": { "type": "string", "willReplaceOnChanges": true @@ -11962,10 +11951,6 @@ "type": "string", "willReplaceOnChanges": true }, - "view": { - "type": "string", - "willReplaceOnChanges": true - }, "volume": { "type": "string", "willReplaceOnChanges": true @@ -12004,10 +11989,6 @@ } } }, - "materializedView": { - "type": "string", - "willReplaceOnChanges": true - }, "metastore": { "type": "string", "willReplaceOnChanges": true @@ -12032,10 +12013,6 @@ "type": "string", "willReplaceOnChanges": true }, - "view": { - "type": "string", - "willReplaceOnChanges": true - }, "volume": { "type": "string", "willReplaceOnChanges": true @@ -15003,7 +14980,8 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/)\n" + "description": "Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/)\n", + "deprecationMessage": "Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead" }, "allowedVpcEndpointIds": { "type": "array", @@ -15026,27 +15004,23 @@ }, "publicAccessEnabled": { "type": "boolean", - "description": "If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network.\n" + "description": "If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory.\n" }, "region": { "type": "string", "description": "Region of AWS VPC or the Google Cloud VPC network\n" - }, - "status": { - "type": "string", - "description": "(AWS only) Status of Private Access Settings\n" } }, "required": [ "privateAccessSettingsId", "privateAccessSettingsName", - "region", - "status" + "region" ], "inputProperties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/)\n" + "description": "Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/)\n", + "deprecationMessage": "Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead" }, "allowedVpcEndpointIds": { "type": "array", @@ -15069,15 +15043,11 @@ }, "publicAccessEnabled": { "type": "boolean", - "description": "If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network.\n" + "description": "If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory.\n" }, "region": { "type": "string", "description": "Region of AWS VPC or the Google Cloud VPC network\n" - }, - "status": { - "type": "string", - "description": "(AWS only) Status of Private Access Settings\n" } }, "requiredInputs": [ @@ -15089,7 +15059,8 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/)\n" + "description": "Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/)\n", + "deprecationMessage": "Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead" }, "allowedVpcEndpointIds": { "type": "array", @@ -15112,15 +15083,11 @@ }, "publicAccessEnabled": { "type": "boolean", - "description": "If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network.\n" + "description": "If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory.\n" }, "region": { "type": "string", "description": "Region of AWS VPC or the Google Cloud VPC network\n" - }, - "status": { - "type": "string", - "description": "(AWS only) Status of Private Access Settings\n" } }, "type": "object" @@ -15384,6 +15351,13 @@ "credentialsId": { "type": "string" }, + "customTags": { + "type": "object", + "additionalProperties": { + "$ref": "pulumi.json#/Any" + }, + "description": "The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed.\n" + }, "customerManagedKeyId": { "type": "string", "deprecationMessage": "Use managed_services_customer_managed_key_id instead" @@ -15494,6 +15468,13 @@ "credentialsId": { "type": "string" }, + "customTags": { + "type": "object", + "additionalProperties": { + "$ref": "pulumi.json#/Any" + }, + "description": "The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed.\n" + }, "customerManagedKeyId": { "type": "string", "deprecationMessage": "Use managed_services_customer_managed_key_id instead", @@ -15608,6 +15589,13 @@ "credentialsId": { "type": "string" }, + "customTags": { + "type": "object", + "additionalProperties": { + "$ref": "pulumi.json#/Any" + }, + "description": "The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed.\n" + }, "customerManagedKeyId": { "type": "string", "deprecationMessage": "Use managed_services_customer_managed_key_id instead", @@ -17883,6 +17871,7 @@ "clusterSize", "creatorName", "dataSourceId", + "enableServerlessCompute", "healths", "jdbcUrl", "name", @@ -22197,7 +22186,7 @@ } }, "databricks:index/getViews:getViews": { - "description": "{{% examples %}}\n## Example Usage\n{{% example %}}\n\nGranting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ databricks.Schema from _sandbox_ databricks_catalog.\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as databricks from \"@pulumi/databricks\";\n\nexport = async () =\u003e {\n const thingsViews = await databricks.getViews({\n catalogName: \"sandbox\",\n schemaName: \"things\",\n });\n const thingsGrants: databricks.Grants[] = [];\n for (const range of thingsViews.ids.map((v, k) =\u003e ({key: k, value: v}))) {\n thingsGrants.push(new databricks.Grants(`thingsGrants-${range.key}`, {\n view: range.value,\n grants: [{\n principal: \"sensitive\",\n privileges: [\n \"SELECT\",\n \"MODIFY\",\n ],\n }],\n }));\n }\n}\n```\n```python\nimport pulumi\nimport pulumi_databricks as databricks\n\nthings_views = databricks.get_views(catalog_name=\"sandbox\",\n schema_name=\"things\")\nthings_grants = []\nfor range in [{\"key\": k, \"value\": v} for [k, v] in enumerate(things_views.ids)]:\n things_grants.append(databricks.Grants(f\"thingsGrants-{range['key']}\",\n view=range[\"value\"],\n grants=[databricks.GrantsGrantArgs(\n principal=\"sensitive\",\n privileges=[\n \"SELECT\",\n \"MODIFY\",\n ],\n )]))\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing System.Threading.Tasks;\nusing Pulumi;\nusing Databricks = Pulumi.Databricks;\n\nreturn await Deployment.RunAsync(async() =\u003e \n{\n var thingsViews = await Databricks.GetViews.InvokeAsync(new()\n {\n CatalogName = \"sandbox\",\n SchemaName = \"things\",\n });\n\n var thingsGrants = new List\u003cDatabricks.Grants\u003e();\n foreach (var range in )\n {\n thingsGrants.Add(new Databricks.Grants($\"thingsGrants-{range.Key}\", new()\n {\n View = range.Value,\n GrantDetails = new[]\n {\n new Databricks.Inputs.GrantsGrantArgs\n {\n Principal = \"sensitive\",\n Privileges = new[]\n {\n \"SELECT\",\n \"MODIFY\",\n },\n },\n },\n }));\n }\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-databricks/sdk/go/databricks\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tthingsViews, err := databricks.GetViews(ctx, \u0026databricks.GetViewsArgs{\n\t\t\tCatalogName: \"sandbox\",\n\t\t\tSchemaName: \"things\",\n\t\t}, nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tvar thingsGrants []*databricks.Grants\n\t\tfor key0, val0 := range thingsViews.Ids {\n\t\t\t__res, err := databricks.NewGrants(ctx, fmt.Sprintf(\"thingsGrants-%v\", key0), \u0026databricks.GrantsArgs{\n\t\t\t\tView: pulumi.String(val0),\n\t\t\t\tGrants: databricks.GrantsGrantArray{\n\t\t\t\t\t\u0026databricks.GrantsGrantArgs{\n\t\t\t\t\t\tPrincipal: pulumi.String(\"sensitive\"),\n\t\t\t\t\t\tPrivileges: pulumi.StringArray{\n\t\t\t\t\t\t\tpulumi.String(\"SELECT\"),\n\t\t\t\t\t\t\tpulumi.String(\"MODIFY\"),\n\t\t\t\t\t\t},\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t})\n\t\t\tif err != nil {\n\t\t\t\treturn err\n\t\t\t}\n\t\t\tthingsGrants = append(thingsGrants, __res)\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.databricks.DatabricksFunctions;\nimport com.pulumi.databricks.inputs.GetViewsArgs;\nimport com.pulumi.databricks.Grants;\nimport com.pulumi.databricks.GrantsArgs;\nimport com.pulumi.databricks.inputs.GrantsGrantArgs;\nimport com.pulumi.codegen.internal.KeyedValue;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n final var thingsViews = DatabricksFunctions.getViews(GetViewsArgs.builder()\n .catalogName(\"sandbox\")\n .schemaName(\"things\")\n .build());\n\n final var thingsGrants = thingsViews.applyValue(getViewsResult -\u003e {\n final var resources = new ArrayList\u003cGrants\u003e();\n for (var range : KeyedValue.of(getViewsResult.ids()) {\n var resource = new Grants(\"thingsGrants-\" + range.key(), GrantsArgs.builder() \n .view(range.value())\n .grants(GrantsGrantArgs.builder()\n .principal(\"sensitive\")\n .privileges( \n \"SELECT\",\n \"MODIFY\")\n .build())\n .build());\n\n resources.add(resource);\n }\n\n return resources;\n });\n\n }\n}\n```\n```yaml\nresources:\n thingsGrants:\n type: databricks:Grants\n properties:\n view: ${range.value}\n grants:\n - principal: sensitive\n privileges:\n - SELECT\n - MODIFY\n options: {}\nvariables:\n thingsViews:\n fn::invoke:\n Function: databricks:getViews\n Arguments:\n catalogName: sandbox\n schemaName: things\n```\n{{% /example %}}\n{{% /examples %}}\n## Related Resources\n\nThe following resources are used in the same context:\n\n* databricks.Schema to manage schemas within Unity Catalog.\n* databricks.Catalog to manage catalogs within Unity Catalog.\n", + "description": "{{% examples %}}\n## Example Usage\n{{% example %}}\n\nGranting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ databricks.Schema from _sandbox_ databricks_catalog.\n\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.databricks.DatabricksFunctions;\nimport com.pulumi.databricks.inputs.GetViewsArgs;\nimport com.pulumi.databricks.Grants;\nimport com.pulumi.databricks.GrantsArgs;\nimport com.pulumi.databricks.inputs.GrantsGrantArgs;\nimport com.pulumi.codegen.internal.KeyedValue;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n final var thingsViews = DatabricksFunctions.getViews(GetViewsArgs.builder()\n .catalogName(\"sandbox\")\n .schemaName(\"things\")\n .build());\n\n final var thingsGrants = thingsViews.applyValue(getViewsResult -\u003e {\n final var resources = new ArrayList\u003cGrants\u003e();\n for (var range : KeyedValue.of(getViewsResult.ids()) {\n var resource = new Grants(\"thingsGrants-\" + range.key(), GrantsArgs.builder() \n .view(range.value())\n .grants(GrantsGrantArgs.builder()\n .principal(\"sensitive\")\n .privileges( \n \"SELECT\",\n \"MODIFY\")\n .build())\n .build());\n\n resources.add(resource);\n }\n\n return resources;\n });\n\n }\n}\n```\n```yaml\nresources:\n thingsGrants:\n type: databricks:Grants\n properties:\n view: ${range.value}\n grants:\n - principal: sensitive\n privileges:\n - SELECT\n - MODIFY\n options: {}\nvariables:\n thingsViews:\n fn::invoke:\n Function: databricks:getViews\n Arguments:\n catalogName: sandbox\n schemaName: things\n```\n{{% /example %}}\n{{% /examples %}}\n## Related Resources\n\nThe following resources are used in the same context:\n\n* databricks.Schema to manage schemas within Unity Catalog.\n* databricks.Catalog to manage catalogs within Unity Catalog.\n", "inputs": { "description": "A collection of arguments for invoking getViews.\n", "properties": { diff --git a/provider/go.mod b/provider/go.mod index a20ebfbd..8f4ea2e2 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -5,8 +5,8 @@ go 1.21 replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230912190043-e6d96b3b8f7e require ( - github.com/databricks/databricks-sdk-go v0.29.0 - github.com/databricks/terraform-provider-databricks v1.34.0 + github.com/databricks/databricks-sdk-go v0.30.0 + github.com/databricks/terraform-provider-databricks v1.35.0 github.com/pulumi/pulumi-terraform-bridge/v3 v3.71.0 ) diff --git a/provider/go.sum b/provider/go.sum index aea67cee..e0711394 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -1151,10 +1151,10 @@ github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1S github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= -github.com/databricks/databricks-sdk-go v0.29.0 h1:p53y3IvYjNvWve3ALXdsJx67RPk/M4rt0JBgweq5s2Y= -github.com/databricks/databricks-sdk-go v0.29.0/go.mod h1:4Iy1e1XZiMC15BfWMQVrtr6va8wSEkiUXv0ZRMfgo3w= -github.com/databricks/terraform-provider-databricks v1.34.0 h1:EFVGTHivjCMUFtbhza+JSiQpC6SvMmiVL5D4uDbUK34= -github.com/databricks/terraform-provider-databricks v1.34.0/go.mod h1:1/6tWlnHIAsJDjwGI4ASDdLJdq4Hxh/KH+ic9gwELLs= +github.com/databricks/databricks-sdk-go v0.30.0 h1:nwJcnvW7NfV0oLrXmGcBDcefOZn4DIEByK0FFTkXCF0= +github.com/databricks/databricks-sdk-go v0.30.0/go.mod h1:QB64wT8EmR9T4ZPqeTRKjfIF4tPZuP9M9kM8Hcr019Q= +github.com/databricks/terraform-provider-databricks v1.35.0 h1:ROcPhB03BhBO10apnPKEifLEiAk1DmNdP4NgqXDSf9k= +github.com/databricks/terraform-provider-databricks v1.35.0/go.mod h1:2oUyM86z9+AbVzVRvl4EHYS2O94NWDiBkkjeavQaN0o= 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/Connection.cs b/sdk/dotnet/Connection.cs index 576546f5..912b5333 100644 --- a/sdk/dotnet/Connection.cs +++ b/sdk/dotnet/Connection.cs @@ -137,7 +137,7 @@ public partial class Connection : global::Pulumi.CustomResource /// Name of the connection owner. /// [Output("owner")] - public Output Owner { get; private set; } = null!; + public Output Owner { get; private set; } = null!; /// /// Free-form connection properties. diff --git a/sdk/dotnet/GetViews.cs b/sdk/dotnet/GetViews.cs index 46faf1d7..b39f77dd 100644 --- a/sdk/dotnet/GetViews.cs +++ b/sdk/dotnet/GetViews.cs @@ -12,51 +12,6 @@ namespace Pulumi.Databricks public static class GetViews { /// - /// {{% examples %}} - /// ## Example Usage - /// {{% example %}} - /// - /// Granting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ databricks.Schema from _sandbox_ databricks_catalog. - /// - /// ```csharp - /// using System.Collections.Generic; - /// using System.Linq; - /// using System.Threading.Tasks; - /// using Pulumi; - /// using Databricks = Pulumi.Databricks; - /// - /// return await Deployment.RunAsync(async() => - /// { - /// var thingsViews = await Databricks.GetViews.InvokeAsync(new() - /// { - /// CatalogName = "sandbox", - /// SchemaName = "things", - /// }); - /// - /// var thingsGrants = new List<Databricks.Grants>(); - /// foreach (var range in ) - /// { - /// thingsGrants.Add(new Databricks.Grants($"thingsGrants-{range.Key}", new() - /// { - /// View = range.Value, - /// GrantDetails = new[] - /// { - /// new Databricks.Inputs.GrantsGrantArgs - /// { - /// Principal = "sensitive", - /// Privileges = new[] - /// { - /// "SELECT", - /// "MODIFY", - /// }, - /// }, - /// }, - /// })); - /// } - /// }); - /// ``` - /// {{% /example %}} - /// {{% /examples %}} /// ## Related Resources /// /// The following resources are used in the same context: @@ -68,51 +23,6 @@ public static Task InvokeAsync(GetViewsArgs args, InvokeOptions? => global::Pulumi.Deployment.Instance.InvokeAsync("databricks:index/getViews:getViews", args ?? new GetViewsArgs(), options.WithDefaults()); /// - /// {{% examples %}} - /// ## Example Usage - /// {{% example %}} - /// - /// Granting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ databricks.Schema from _sandbox_ databricks_catalog. - /// - /// ```csharp - /// using System.Collections.Generic; - /// using System.Linq; - /// using System.Threading.Tasks; - /// using Pulumi; - /// using Databricks = Pulumi.Databricks; - /// - /// return await Deployment.RunAsync(async() => - /// { - /// var thingsViews = await Databricks.GetViews.InvokeAsync(new() - /// { - /// CatalogName = "sandbox", - /// SchemaName = "things", - /// }); - /// - /// var thingsGrants = new List<Databricks.Grants>(); - /// foreach (var range in ) - /// { - /// thingsGrants.Add(new Databricks.Grants($"thingsGrants-{range.Key}", new() - /// { - /// View = range.Value, - /// GrantDetails = new[] - /// { - /// new Databricks.Inputs.GrantsGrantArgs - /// { - /// Principal = "sensitive", - /// Privileges = new[] - /// { - /// "SELECT", - /// "MODIFY", - /// }, - /// }, - /// }, - /// })); - /// } - /// }); - /// ``` - /// {{% /example %}} - /// {{% /examples %}} /// ## Related Resources /// /// The following resources are used in the same context: diff --git a/sdk/dotnet/Grants.cs b/sdk/dotnet/Grants.cs index bedf72c8..9ce8e67d 100644 --- a/sdk/dotnet/Grants.cs +++ b/sdk/dotnet/Grants.cs @@ -27,9 +27,6 @@ public partial class Grants : global::Pulumi.CustomResource [Output("grants")] public Output> GrantDetails { get; private set; } = null!; - [Output("materializedView")] - public Output MaterializedView { get; private set; } = null!; - [Output("metastore")] public Output Metastore { get; private set; } = null!; @@ -48,9 +45,6 @@ public partial class Grants : global::Pulumi.CustomResource [Output("table")] public Output Table { get; private set; } = null!; - [Output("view")] - public Output View { get; private set; } = null!; - [Output("volume")] public Output Volume { get; private set; } = null!; @@ -120,9 +114,6 @@ public InputList GrantDetails set => _grants = value; } - [Input("materializedView")] - public Input? MaterializedView { get; set; } - [Input("metastore")] public Input? Metastore { get; set; } @@ -141,9 +132,6 @@ public InputList GrantDetails [Input("table")] public Input? Table { get; set; } - [Input("view")] - public Input? View { get; set; } - [Input("volume")] public Input? Volume { get; set; } @@ -175,9 +163,6 @@ public InputList GrantDetails set => _grants = value; } - [Input("materializedView")] - public Input? MaterializedView { get; set; } - [Input("metastore")] public Input? Metastore { get; set; } @@ -196,9 +181,6 @@ public InputList GrantDetails [Input("table")] public Input? Table { get; set; } - [Input("view")] - public Input? View { get; set; } - [Input("volume")] public Input? Volume { get; set; } diff --git a/sdk/dotnet/MwsPrivateAccessSettings.cs b/sdk/dotnet/MwsPrivateAccessSettings.cs index 341e6c20..678ef307 100644 --- a/sdk/dotnet/MwsPrivateAccessSettings.cs +++ b/sdk/dotnet/MwsPrivateAccessSettings.cs @@ -166,7 +166,7 @@ public partial class MwsPrivateAccessSettings : global::Pulumi.CustomResource public Output PrivateAccessSettingsName { get; private set; } = null!; /// - /// If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + /// If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. /// [Output("publicAccessEnabled")] public Output PublicAccessEnabled { get; private set; } = null!; @@ -177,12 +177,6 @@ public partial class MwsPrivateAccessSettings : global::Pulumi.CustomResource [Output("region")] public Output Region { get; private set; } = null!; - /// - /// (AWS only) Status of Private Access Settings - /// - [Output("status")] - public Output Status { get; private set; } = null!; - /// /// Create a MwsPrivateAccessSettings resource with the given unique name, arguments, and options. @@ -266,7 +260,7 @@ public InputList AllowedVpcEndpointIds public Input PrivateAccessSettingsName { get; set; } = null!; /// - /// If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + /// If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. /// [Input("publicAccessEnabled")] public Input? PublicAccessEnabled { get; set; } @@ -277,12 +271,6 @@ public InputList AllowedVpcEndpointIds [Input("region", required: true)] public Input Region { get; set; } = null!; - /// - /// (AWS only) Status of Private Access Settings - /// - [Input("status")] - public Input? Status { get; set; } - public MwsPrivateAccessSettingsArgs() { } @@ -328,7 +316,7 @@ public InputList AllowedVpcEndpointIds public Input? PrivateAccessSettingsName { get; set; } /// - /// If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + /// If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. /// [Input("publicAccessEnabled")] public Input? PublicAccessEnabled { get; set; } @@ -339,12 +327,6 @@ public InputList AllowedVpcEndpointIds [Input("region")] public Input? Region { get; set; } - /// - /// (AWS only) Status of Private Access Settings - /// - [Input("status")] - public Input? Status { get; set; } - public MwsPrivateAccessSettingsState() { } diff --git a/sdk/dotnet/MwsWorkspaces.cs b/sdk/dotnet/MwsWorkspaces.cs index d7b871e9..c39e3b57 100644 --- a/sdk/dotnet/MwsWorkspaces.cs +++ b/sdk/dotnet/MwsWorkspaces.cs @@ -47,6 +47,12 @@ public partial class MwsWorkspaces : global::Pulumi.CustomResource [Output("credentialsId")] public Output CredentialsId { get; private set; } = null!; + /// + /// The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + /// + [Output("customTags")] + public Output?> CustomTags { get; private set; } = null!; + [Output("customerManagedKeyId")] public Output CustomerManagedKeyId { get; private set; } = null!; @@ -233,6 +239,18 @@ public Input? AccountId [Input("credentialsId")] public Input? CredentialsId { get; set; } + [Input("customTags")] + private InputMap? _customTags; + + /// + /// The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + /// + public InputMap CustomTags + { + get => _customTags ?? (_customTags = new InputMap()); + set => _customTags = value; + } + [Input("customerManagedKeyId")] public Input? CustomerManagedKeyId { get; set; } @@ -377,6 +395,18 @@ public Input? AccountId [Input("credentialsId")] public Input? CredentialsId { get; set; } + [Input("customTags")] + private InputMap? _customTags; + + /// + /// The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + /// + public InputMap CustomTags + { + get => _customTags ?? (_customTags = new InputMap()); + set => _customTags = value; + } + [Input("customerManagedKeyId")] public Input? CustomerManagedKeyId { get; set; } diff --git a/sdk/dotnet/SqlEndpoint.cs b/sdk/dotnet/SqlEndpoint.cs index 0b67abbe..0c90709f 100644 --- a/sdk/dotnet/SqlEndpoint.cs +++ b/sdk/dotnet/SqlEndpoint.cs @@ -113,7 +113,7 @@ public partial class SqlEndpoint : global::Pulumi.CustomResource /// - **For Azure**, If omitted, the default is `false` for most workspaces. However, if this workspace used the SQL Warehouses API to create a warehouse between November 1, 2022 and May 19, 2023, the default remains the previous behavior which is default to `true` if the workspace is enabled for serverless and fits the requirements for serverless SQL warehouses. A workspace must meet the [requirements](https://learn.microsoft.com/azure/databricks/sql/admin/serverless) and might require an update to its [Azure storage firewall](https://learn.microsoft.com/azure/databricks/sql/admin/serverless-firewall). /// [Output("enableServerlessCompute")] - public Output EnableServerlessCompute { get; private set; } = null!; + public Output EnableServerlessCompute { get; private set; } = null!; /// /// Health status of the endpoint. diff --git a/sdk/go/databricks/connection.go b/sdk/go/databricks/connection.go index 50f8960a..4c50daac 100644 --- a/sdk/go/databricks/connection.go +++ b/sdk/go/databricks/connection.go @@ -133,7 +133,7 @@ type Connection struct { // The key value of options required by the connection, e.g. `host`, `port`, `user`, `password` or `GoogleServiceAccountKeyJson`. Please consult the [documentation](https://docs.databricks.com/query-federation/index.html#supported-data-sources) for the required option. Options pulumi.MapOutput `pulumi:"options"` // Name of the connection owner. - Owner pulumi.StringPtrOutput `pulumi:"owner"` + Owner pulumi.StringOutput `pulumi:"owner"` // Free-form connection properties. Properties pulumi.MapOutput `pulumi:"properties"` ReadOnly pulumi.BoolOutput `pulumi:"readOnly"` @@ -366,8 +366,8 @@ func (o ConnectionOutput) Options() pulumi.MapOutput { } // Name of the connection owner. -func (o ConnectionOutput) Owner() pulumi.StringPtrOutput { - return o.ApplyT(func(v *Connection) pulumi.StringPtrOutput { return v.Owner }).(pulumi.StringPtrOutput) +func (o ConnectionOutput) Owner() pulumi.StringOutput { + return o.ApplyT(func(v *Connection) pulumi.StringOutput { return v.Owner }).(pulumi.StringOutput) } // Free-form connection properties. diff --git a/sdk/go/databricks/getViews.go b/sdk/go/databricks/getViews.go index 611bc90f..3a0bfe96 100644 --- a/sdk/go/databricks/getViews.go +++ b/sdk/go/databricks/getViews.go @@ -11,53 +11,6 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) -// ## Example Usage -// -// Granting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ Schema from _sandbox_ databricks_catalog. -// -// ```go -// package main -// -// import ( -// -// "github.com/pulumi/pulumi-databricks/sdk/go/databricks" -// "github.com/pulumi/pulumi/sdk/v3/go/pulumi" -// -// ) -// -// func main() { -// pulumi.Run(func(ctx *pulumi.Context) error { -// thingsViews, err := databricks.GetViews(ctx, &databricks.GetViewsArgs{ -// CatalogName: "sandbox", -// SchemaName: "things", -// }, nil) -// if err != nil { -// return err -// } -// var thingsGrants []*databricks.Grants -// for key0, val0 := range thingsViews.Ids { -// __res, err := databricks.NewGrants(ctx, fmt.Sprintf("thingsGrants-%v", key0), &databricks.GrantsArgs{ -// View: pulumi.String(val0), -// Grants: databricks.GrantsGrantArray{ -// &databricks.GrantsGrantArgs{ -// Principal: pulumi.String("sensitive"), -// Privileges: pulumi.StringArray{ -// pulumi.String("SELECT"), -// pulumi.String("MODIFY"), -// }, -// }, -// }, -// }) -// if err != nil { -// return err -// } -// thingsGrants = append(thingsGrants, __res) -// } -// return nil -// }) -// } -// -// ``` // ## Related Resources // // The following resources are used in the same context: diff --git a/sdk/go/databricks/grants.go b/sdk/go/databricks/grants.go index 96474e95..27d8a461 100644 --- a/sdk/go/databricks/grants.go +++ b/sdk/go/databricks/grants.go @@ -20,14 +20,12 @@ type Grants struct { ForeignConnection pulumi.StringPtrOutput `pulumi:"foreignConnection"` Function pulumi.StringPtrOutput `pulumi:"function"` Grants GrantsGrantArrayOutput `pulumi:"grants"` - MaterializedView pulumi.StringPtrOutput `pulumi:"materializedView"` Metastore pulumi.StringPtrOutput `pulumi:"metastore"` Model pulumi.StringPtrOutput `pulumi:"model"` Schema pulumi.StringPtrOutput `pulumi:"schema"` Share pulumi.StringPtrOutput `pulumi:"share"` StorageCredential pulumi.StringPtrOutput `pulumi:"storageCredential"` Table pulumi.StringPtrOutput `pulumi:"table"` - View pulumi.StringPtrOutput `pulumi:"view"` Volume pulumi.StringPtrOutput `pulumi:"volume"` } @@ -69,14 +67,12 @@ type grantsState struct { ForeignConnection *string `pulumi:"foreignConnection"` Function *string `pulumi:"function"` Grants []GrantsGrant `pulumi:"grants"` - MaterializedView *string `pulumi:"materializedView"` Metastore *string `pulumi:"metastore"` Model *string `pulumi:"model"` Schema *string `pulumi:"schema"` Share *string `pulumi:"share"` StorageCredential *string `pulumi:"storageCredential"` Table *string `pulumi:"table"` - View *string `pulumi:"view"` Volume *string `pulumi:"volume"` } @@ -86,14 +82,12 @@ type GrantsState struct { ForeignConnection pulumi.StringPtrInput Function pulumi.StringPtrInput Grants GrantsGrantArrayInput - MaterializedView pulumi.StringPtrInput Metastore pulumi.StringPtrInput Model pulumi.StringPtrInput Schema pulumi.StringPtrInput Share pulumi.StringPtrInput StorageCredential pulumi.StringPtrInput Table pulumi.StringPtrInput - View pulumi.StringPtrInput Volume pulumi.StringPtrInput } @@ -107,14 +101,12 @@ type grantsArgs struct { ForeignConnection *string `pulumi:"foreignConnection"` Function *string `pulumi:"function"` Grants []GrantsGrant `pulumi:"grants"` - MaterializedView *string `pulumi:"materializedView"` Metastore *string `pulumi:"metastore"` Model *string `pulumi:"model"` Schema *string `pulumi:"schema"` Share *string `pulumi:"share"` StorageCredential *string `pulumi:"storageCredential"` Table *string `pulumi:"table"` - View *string `pulumi:"view"` Volume *string `pulumi:"volume"` } @@ -125,14 +117,12 @@ type GrantsArgs struct { ForeignConnection pulumi.StringPtrInput Function pulumi.StringPtrInput Grants GrantsGrantArrayInput - MaterializedView pulumi.StringPtrInput Metastore pulumi.StringPtrInput Model pulumi.StringPtrInput Schema pulumi.StringPtrInput Share pulumi.StringPtrInput StorageCredential pulumi.StringPtrInput Table pulumi.StringPtrInput - View pulumi.StringPtrInput Volume pulumi.StringPtrInput } @@ -243,10 +233,6 @@ func (o GrantsOutput) Grants() GrantsGrantArrayOutput { return o.ApplyT(func(v *Grants) GrantsGrantArrayOutput { return v.Grants }).(GrantsGrantArrayOutput) } -func (o GrantsOutput) MaterializedView() pulumi.StringPtrOutput { - return o.ApplyT(func(v *Grants) pulumi.StringPtrOutput { return v.MaterializedView }).(pulumi.StringPtrOutput) -} - func (o GrantsOutput) Metastore() pulumi.StringPtrOutput { return o.ApplyT(func(v *Grants) pulumi.StringPtrOutput { return v.Metastore }).(pulumi.StringPtrOutput) } @@ -271,10 +257,6 @@ func (o GrantsOutput) Table() pulumi.StringPtrOutput { return o.ApplyT(func(v *Grants) pulumi.StringPtrOutput { return v.Table }).(pulumi.StringPtrOutput) } -func (o GrantsOutput) View() pulumi.StringPtrOutput { - return o.ApplyT(func(v *Grants) pulumi.StringPtrOutput { return v.View }).(pulumi.StringPtrOutput) -} - func (o GrantsOutput) Volume() pulumi.StringPtrOutput { return o.ApplyT(func(v *Grants) pulumi.StringPtrOutput { return v.Volume }).(pulumi.StringPtrOutput) } diff --git a/sdk/go/databricks/mwsPrivateAccessSettings.go b/sdk/go/databricks/mwsPrivateAccessSettings.go index 8ad99cfa..dd509c01 100644 --- a/sdk/go/databricks/mwsPrivateAccessSettings.go +++ b/sdk/go/databricks/mwsPrivateAccessSettings.go @@ -147,6 +147,8 @@ type MwsPrivateAccessSettings struct { pulumi.CustomResourceState // Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) + // + // Deprecated: Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead AccountId pulumi.StringPtrOutput `pulumi:"accountId"` // An array of MwsVpcEndpoint `vpcEndpointId` (not `id`). Only used when `privateAccessLevel` is set to `ENDPOINT`. This is an allow list of MwsVpcEndpoint that in your account that can connect to your MwsWorkspaces over AWS PrivateLink. If hybrid access to your workspace is enabled by setting `publicAccessEnabled` to true, then this control only works for PrivateLink connections. To control how your workspace is accessed via public internet, see the article for databricks_ip_access_list. AllowedVpcEndpointIds pulumi.StringArrayOutput `pulumi:"allowedVpcEndpointIds"` @@ -156,12 +158,10 @@ type MwsPrivateAccessSettings struct { PrivateAccessSettingsId pulumi.StringOutput `pulumi:"privateAccessSettingsId"` // Name of Private Access Settings in Databricks Account PrivateAccessSettingsName pulumi.StringOutput `pulumi:"privateAccessSettingsName"` - // If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + // If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. PublicAccessEnabled pulumi.BoolPtrOutput `pulumi:"publicAccessEnabled"` // Region of AWS VPC or the Google Cloud VPC network Region pulumi.StringOutput `pulumi:"region"` - // (AWS only) Status of Private Access Settings - Status pulumi.StringOutput `pulumi:"status"` } // NewMwsPrivateAccessSettings registers a new resource with the given unique name, arguments, and options. @@ -201,6 +201,8 @@ func GetMwsPrivateAccessSettings(ctx *pulumi.Context, // Input properties used for looking up and filtering MwsPrivateAccessSettings resources. type mwsPrivateAccessSettingsState struct { // Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) + // + // Deprecated: Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead AccountId *string `pulumi:"accountId"` // An array of MwsVpcEndpoint `vpcEndpointId` (not `id`). Only used when `privateAccessLevel` is set to `ENDPOINT`. This is an allow list of MwsVpcEndpoint that in your account that can connect to your MwsWorkspaces over AWS PrivateLink. If hybrid access to your workspace is enabled by setting `publicAccessEnabled` to true, then this control only works for PrivateLink connections. To control how your workspace is accessed via public internet, see the article for databricks_ip_access_list. AllowedVpcEndpointIds []string `pulumi:"allowedVpcEndpointIds"` @@ -210,16 +212,16 @@ type mwsPrivateAccessSettingsState struct { PrivateAccessSettingsId *string `pulumi:"privateAccessSettingsId"` // Name of Private Access Settings in Databricks Account PrivateAccessSettingsName *string `pulumi:"privateAccessSettingsName"` - // If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + // If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. PublicAccessEnabled *bool `pulumi:"publicAccessEnabled"` // Region of AWS VPC or the Google Cloud VPC network Region *string `pulumi:"region"` - // (AWS only) Status of Private Access Settings - Status *string `pulumi:"status"` } type MwsPrivateAccessSettingsState struct { // Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) + // + // Deprecated: Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead AccountId pulumi.StringPtrInput // An array of MwsVpcEndpoint `vpcEndpointId` (not `id`). Only used when `privateAccessLevel` is set to `ENDPOINT`. This is an allow list of MwsVpcEndpoint that in your account that can connect to your MwsWorkspaces over AWS PrivateLink. If hybrid access to your workspace is enabled by setting `publicAccessEnabled` to true, then this control only works for PrivateLink connections. To control how your workspace is accessed via public internet, see the article for databricks_ip_access_list. AllowedVpcEndpointIds pulumi.StringArrayInput @@ -229,12 +231,10 @@ type MwsPrivateAccessSettingsState struct { PrivateAccessSettingsId pulumi.StringPtrInput // Name of Private Access Settings in Databricks Account PrivateAccessSettingsName pulumi.StringPtrInput - // If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + // If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. PublicAccessEnabled pulumi.BoolPtrInput // Region of AWS VPC or the Google Cloud VPC network Region pulumi.StringPtrInput - // (AWS only) Status of Private Access Settings - Status pulumi.StringPtrInput } func (MwsPrivateAccessSettingsState) ElementType() reflect.Type { @@ -243,6 +243,8 @@ func (MwsPrivateAccessSettingsState) ElementType() reflect.Type { type mwsPrivateAccessSettingsArgs struct { // Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) + // + // Deprecated: Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead AccountId *string `pulumi:"accountId"` // An array of MwsVpcEndpoint `vpcEndpointId` (not `id`). Only used when `privateAccessLevel` is set to `ENDPOINT`. This is an allow list of MwsVpcEndpoint that in your account that can connect to your MwsWorkspaces over AWS PrivateLink. If hybrid access to your workspace is enabled by setting `publicAccessEnabled` to true, then this control only works for PrivateLink connections. To control how your workspace is accessed via public internet, see the article for databricks_ip_access_list. AllowedVpcEndpointIds []string `pulumi:"allowedVpcEndpointIds"` @@ -252,17 +254,17 @@ type mwsPrivateAccessSettingsArgs struct { PrivateAccessSettingsId *string `pulumi:"privateAccessSettingsId"` // Name of Private Access Settings in Databricks Account PrivateAccessSettingsName string `pulumi:"privateAccessSettingsName"` - // If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + // If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. PublicAccessEnabled *bool `pulumi:"publicAccessEnabled"` // Region of AWS VPC or the Google Cloud VPC network Region string `pulumi:"region"` - // (AWS only) Status of Private Access Settings - Status *string `pulumi:"status"` } // The set of arguments for constructing a MwsPrivateAccessSettings resource. type MwsPrivateAccessSettingsArgs struct { // Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) + // + // Deprecated: Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead AccountId pulumi.StringPtrInput // An array of MwsVpcEndpoint `vpcEndpointId` (not `id`). Only used when `privateAccessLevel` is set to `ENDPOINT`. This is an allow list of MwsVpcEndpoint that in your account that can connect to your MwsWorkspaces over AWS PrivateLink. If hybrid access to your workspace is enabled by setting `publicAccessEnabled` to true, then this control only works for PrivateLink connections. To control how your workspace is accessed via public internet, see the article for databricks_ip_access_list. AllowedVpcEndpointIds pulumi.StringArrayInput @@ -272,12 +274,10 @@ type MwsPrivateAccessSettingsArgs struct { PrivateAccessSettingsId pulumi.StringPtrInput // Name of Private Access Settings in Databricks Account PrivateAccessSettingsName pulumi.StringInput - // If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + // If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. PublicAccessEnabled pulumi.BoolPtrInput // Region of AWS VPC or the Google Cloud VPC network Region pulumi.StringInput - // (AWS only) Status of Private Access Settings - Status pulumi.StringPtrInput } func (MwsPrivateAccessSettingsArgs) ElementType() reflect.Type { @@ -368,6 +368,8 @@ func (o MwsPrivateAccessSettingsOutput) ToMwsPrivateAccessSettingsOutputWithCont } // Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) +// +// Deprecated: Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead func (o MwsPrivateAccessSettingsOutput) AccountId() pulumi.StringPtrOutput { return o.ApplyT(func(v *MwsPrivateAccessSettings) pulumi.StringPtrOutput { return v.AccountId }).(pulumi.StringPtrOutput) } @@ -392,7 +394,7 @@ func (o MwsPrivateAccessSettingsOutput) PrivateAccessSettingsName() pulumi.Strin return o.ApplyT(func(v *MwsPrivateAccessSettings) pulumi.StringOutput { return v.PrivateAccessSettingsName }).(pulumi.StringOutput) } -// If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. +// If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. func (o MwsPrivateAccessSettingsOutput) PublicAccessEnabled() pulumi.BoolPtrOutput { return o.ApplyT(func(v *MwsPrivateAccessSettings) pulumi.BoolPtrOutput { return v.PublicAccessEnabled }).(pulumi.BoolPtrOutput) } @@ -402,11 +404,6 @@ func (o MwsPrivateAccessSettingsOutput) Region() pulumi.StringOutput { return o.ApplyT(func(v *MwsPrivateAccessSettings) pulumi.StringOutput { return v.Region }).(pulumi.StringOutput) } -// (AWS only) Status of Private Access Settings -func (o MwsPrivateAccessSettingsOutput) Status() pulumi.StringOutput { - return o.ApplyT(func(v *MwsPrivateAccessSettings) pulumi.StringOutput { return v.Status }).(pulumi.StringOutput) -} - type MwsPrivateAccessSettingsArrayOutput struct{ *pulumi.OutputState } func (MwsPrivateAccessSettingsArrayOutput) ElementType() reflect.Type { diff --git a/sdk/go/databricks/mwsWorkspaces.go b/sdk/go/databricks/mwsWorkspaces.go index 9aa89922..390c3555 100644 --- a/sdk/go/databricks/mwsWorkspaces.go +++ b/sdk/go/databricks/mwsWorkspaces.go @@ -28,6 +28,8 @@ type MwsWorkspaces struct { // (Integer) time when workspace was created CreationTime pulumi.IntOutput `pulumi:"creationTime"` CredentialsId pulumi.StringPtrOutput `pulumi:"credentialsId"` + // The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `defaultTags` or `customTags` on a cluster level. Please note it can take up to an hour for customTags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + CustomTags pulumi.MapOutput `pulumi:"customTags"` // Deprecated: Use managed_services_customer_managed_key_id instead CustomerManagedKeyId pulumi.StringPtrOutput `pulumi:"customerManagedKeyId"` // part of URL as in `https://-.cloud.databricks.com`. Deployment name cannot be used until a deployment name prefix is defined. Please contact your Databricks representative. Once a new deployment prefix is added/updated, it only will affect the new workspaces created. @@ -116,6 +118,8 @@ type mwsWorkspacesState struct { // (Integer) time when workspace was created CreationTime *int `pulumi:"creationTime"` CredentialsId *string `pulumi:"credentialsId"` + // The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `defaultTags` or `customTags` on a cluster level. Please note it can take up to an hour for customTags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + CustomTags map[string]interface{} `pulumi:"customTags"` // Deprecated: Use managed_services_customer_managed_key_id instead CustomerManagedKeyId *string `pulumi:"customerManagedKeyId"` // part of URL as in `https://-.cloud.databricks.com`. Deployment name cannot be used until a deployment name prefix is defined. Please contact your Databricks representative. Once a new deployment prefix is added/updated, it only will affect the new workspaces created. @@ -162,6 +166,8 @@ type MwsWorkspacesState struct { // (Integer) time when workspace was created CreationTime pulumi.IntPtrInput CredentialsId pulumi.StringPtrInput + // The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `defaultTags` or `customTags` on a cluster level. Please note it can take up to an hour for customTags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + CustomTags pulumi.MapInput // Deprecated: Use managed_services_customer_managed_key_id instead CustomerManagedKeyId pulumi.StringPtrInput // part of URL as in `https://-.cloud.databricks.com`. Deployment name cannot be used until a deployment name prefix is defined. Please contact your Databricks representative. Once a new deployment prefix is added/updated, it only will affect the new workspaces created. @@ -212,6 +218,8 @@ type mwsWorkspacesArgs struct { // (Integer) time when workspace was created CreationTime *int `pulumi:"creationTime"` CredentialsId *string `pulumi:"credentialsId"` + // The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `defaultTags` or `customTags` on a cluster level. Please note it can take up to an hour for customTags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + CustomTags map[string]interface{} `pulumi:"customTags"` // Deprecated: Use managed_services_customer_managed_key_id instead CustomerManagedKeyId *string `pulumi:"customerManagedKeyId"` // part of URL as in `https://-.cloud.databricks.com`. Deployment name cannot be used until a deployment name prefix is defined. Please contact your Databricks representative. Once a new deployment prefix is added/updated, it only will affect the new workspaces created. @@ -259,6 +267,8 @@ type MwsWorkspacesArgs struct { // (Integer) time when workspace was created CreationTime pulumi.IntPtrInput CredentialsId pulumi.StringPtrInput + // The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `defaultTags` or `customTags` on a cluster level. Please note it can take up to an hour for customTags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + CustomTags pulumi.MapInput // Deprecated: Use managed_services_customer_managed_key_id instead CustomerManagedKeyId pulumi.StringPtrInput // part of URL as in `https://-.cloud.databricks.com`. Deployment name cannot be used until a deployment name prefix is defined. Please contact your Databricks representative. Once a new deployment prefix is added/updated, it only will affect the new workspaces created. @@ -409,6 +419,11 @@ func (o MwsWorkspacesOutput) CredentialsId() pulumi.StringPtrOutput { return o.ApplyT(func(v *MwsWorkspaces) pulumi.StringPtrOutput { return v.CredentialsId }).(pulumi.StringPtrOutput) } +// The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `defaultTags` or `customTags` on a cluster level. Please note it can take up to an hour for customTags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. +func (o MwsWorkspacesOutput) CustomTags() pulumi.MapOutput { + return o.ApplyT(func(v *MwsWorkspaces) pulumi.MapOutput { return v.CustomTags }).(pulumi.MapOutput) +} + // Deprecated: Use managed_services_customer_managed_key_id instead func (o MwsWorkspacesOutput) CustomerManagedKeyId() pulumi.StringPtrOutput { return o.ApplyT(func(v *MwsWorkspaces) pulumi.StringPtrOutput { return v.CustomerManagedKeyId }).(pulumi.StringPtrOutput) diff --git a/sdk/go/databricks/sqlEndpoint.go b/sdk/go/databricks/sqlEndpoint.go index b18de05e..65760dcc 100644 --- a/sdk/go/databricks/sqlEndpoint.go +++ b/sdk/go/databricks/sqlEndpoint.go @@ -96,7 +96,7 @@ type SqlEndpoint struct { // - **For AWS**, If omitted, the default is `false` for most workspaces. However, if this workspace used the SQL Warehouses API to create a warehouse between September 1, 2022 and April 30, 2023, the default remains the previous behavior which is default to `true` if the workspace is enabled for serverless and fits the requirements for serverless SQL warehouses. If your account needs updated [terms of use](https://docs.databricks.com/sql/admin/serverless.html#accept-terms), workspace admins are prompted in the Databricks SQL UI. A workspace must meet the [requirements](https://docs.databricks.com/sql/admin/serverless.html#requirements) and might require an update to its instance profile role to [add a trust relationship](https://docs.databricks.com/sql/admin/serverless.html#aws-instance-profile-setup). // // - **For Azure**, If omitted, the default is `false` for most workspaces. However, if this workspace used the SQL Warehouses API to create a warehouse between November 1, 2022 and May 19, 2023, the default remains the previous behavior which is default to `true` if the workspace is enabled for serverless and fits the requirements for serverless SQL warehouses. A workspace must meet the [requirements](https://learn.microsoft.com/azure/databricks/sql/admin/serverless) and might require an update to its [Azure storage firewall](https://learn.microsoft.com/azure/databricks/sql/admin/serverless-firewall). - EnableServerlessCompute pulumi.BoolPtrOutput `pulumi:"enableServerlessCompute"` + EnableServerlessCompute pulumi.BoolOutput `pulumi:"enableServerlessCompute"` // Health status of the endpoint. Healths SqlEndpointHealthArrayOutput `pulumi:"healths"` InstanceProfileArn pulumi.StringPtrOutput `pulumi:"instanceProfileArn"` @@ -439,8 +439,8 @@ func (o SqlEndpointOutput) EnablePhoton() pulumi.BoolPtrOutput { // - **For AWS**, If omitted, the default is `false` for most workspaces. However, if this workspace used the SQL Warehouses API to create a warehouse between September 1, 2022 and April 30, 2023, the default remains the previous behavior which is default to `true` if the workspace is enabled for serverless and fits the requirements for serverless SQL warehouses. If your account needs updated [terms of use](https://docs.databricks.com/sql/admin/serverless.html#accept-terms), workspace admins are prompted in the Databricks SQL UI. A workspace must meet the [requirements](https://docs.databricks.com/sql/admin/serverless.html#requirements) and might require an update to its instance profile role to [add a trust relationship](https://docs.databricks.com/sql/admin/serverless.html#aws-instance-profile-setup). // // - **For Azure**, If omitted, the default is `false` for most workspaces. However, if this workspace used the SQL Warehouses API to create a warehouse between November 1, 2022 and May 19, 2023, the default remains the previous behavior which is default to `true` if the workspace is enabled for serverless and fits the requirements for serverless SQL warehouses. A workspace must meet the [requirements](https://learn.microsoft.com/azure/databricks/sql/admin/serverless) and might require an update to its [Azure storage firewall](https://learn.microsoft.com/azure/databricks/sql/admin/serverless-firewall). -func (o SqlEndpointOutput) EnableServerlessCompute() pulumi.BoolPtrOutput { - return o.ApplyT(func(v *SqlEndpoint) pulumi.BoolPtrOutput { return v.EnableServerlessCompute }).(pulumi.BoolPtrOutput) +func (o SqlEndpointOutput) EnableServerlessCompute() pulumi.BoolOutput { + return o.ApplyT(func(v *SqlEndpoint) pulumi.BoolOutput { return v.EnableServerlessCompute }).(pulumi.BoolOutput) } // Health status of the endpoint. diff --git a/sdk/java/src/main/java/com/pulumi/databricks/Connection.java b/sdk/java/src/main/java/com/pulumi/databricks/Connection.java index ef034761..63d46d68 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/Connection.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/Connection.java @@ -197,14 +197,14 @@ public Output> options() { * */ @Export(name="owner", refs={String.class}, tree="[0]") - private Output owner; + private Output owner; /** * @return Name of the connection owner. * */ - public Output> owner() { - return Codegen.optional(this.owner); + public Output owner() { + return this.owner; } /** * Free-form connection properties. diff --git a/sdk/java/src/main/java/com/pulumi/databricks/DatabricksFunctions.java b/sdk/java/src/main/java/com/pulumi/databricks/DatabricksFunctions.java index f7ae9778..cfe98c8c 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/DatabricksFunctions.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/DatabricksFunctions.java @@ -10273,6 +10273,7 @@ public static CompletableFuture getUserPlain(GetUserPlainArgs arg * ## Example Usage * * Granting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ databricks.Schema from _sandbox_ databricks_catalog. + * * ```java * package generated_program; * @@ -10340,6 +10341,7 @@ public static Output getViews(GetViewsArgs args) { * ## Example Usage * * Granting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ databricks.Schema from _sandbox_ databricks_catalog. + * * ```java * package generated_program; * @@ -10407,6 +10409,7 @@ public static CompletableFuture getViewsPlain(GetViewsPlainArgs * ## Example Usage * * Granting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ databricks.Schema from _sandbox_ databricks_catalog. + * * ```java * package generated_program; * @@ -10474,6 +10477,7 @@ public static Output getViews(GetViewsArgs args, InvokeOptions o * ## Example Usage * * Granting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ databricks.Schema from _sandbox_ databricks_catalog. + * * ```java * package generated_program; * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/Grants.java b/sdk/java/src/main/java/com/pulumi/databricks/Grants.java index b5fa6c7e..3a745add 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/Grants.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/Grants.java @@ -48,12 +48,6 @@ public Output> function() { public Output> grants() { return this.grants; } - @Export(name="materializedView", refs={String.class}, tree="[0]") - private Output materializedView; - - public Output> materializedView() { - return Codegen.optional(this.materializedView); - } @Export(name="metastore", refs={String.class}, tree="[0]") private Output metastore; @@ -90,12 +84,6 @@ public Output> storageCredential() { public Output> table() { return Codegen.optional(this.table); } - @Export(name="view", refs={String.class}, tree="[0]") - private Output view; - - public Output> view() { - return Codegen.optional(this.view); - } @Export(name="volume", refs={String.class}, tree="[0]") private Output volume; diff --git a/sdk/java/src/main/java/com/pulumi/databricks/GrantsArgs.java b/sdk/java/src/main/java/com/pulumi/databricks/GrantsArgs.java index f90de2f3..475541a9 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/GrantsArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/GrantsArgs.java @@ -53,13 +53,6 @@ public Output> grants() { return this.grants; } - @Import(name="materializedView") - private @Nullable Output materializedView; - - public Optional> materializedView() { - return Optional.ofNullable(this.materializedView); - } - @Import(name="metastore") private @Nullable Output metastore; @@ -102,13 +95,6 @@ public Optional> table() { return Optional.ofNullable(this.table); } - @Import(name="view") - private @Nullable Output view; - - public Optional> view() { - return Optional.ofNullable(this.view); - } - @Import(name="volume") private @Nullable Output volume; @@ -124,14 +110,12 @@ private GrantsArgs(GrantsArgs $) { this.foreignConnection = $.foreignConnection; this.function = $.function; this.grants = $.grants; - this.materializedView = $.materializedView; this.metastore = $.metastore; this.model = $.model; this.schema = $.schema; this.share = $.share; this.storageCredential = $.storageCredential; this.table = $.table; - this.view = $.view; this.volume = $.volume; } @@ -202,15 +186,6 @@ public Builder grants(GrantsGrantArgs... grants) { return grants(List.of(grants)); } - public Builder materializedView(@Nullable Output materializedView) { - $.materializedView = materializedView; - return this; - } - - public Builder materializedView(String materializedView) { - return materializedView(Output.of(materializedView)); - } - public Builder metastore(@Nullable Output metastore) { $.metastore = metastore; return this; @@ -265,15 +240,6 @@ public Builder table(String table) { return table(Output.of(table)); } - public Builder view(@Nullable Output view) { - $.view = view; - return this; - } - - public Builder view(String view) { - return view(Output.of(view)); - } - public Builder volume(@Nullable Output volume) { $.volume = volume; return this; diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsPrivateAccessSettings.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsPrivateAccessSettings.java index f92802f7..7fa6fa4f 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsPrivateAccessSettings.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsPrivateAccessSettings.java @@ -175,7 +175,11 @@ public class MwsPrivateAccessSettings extends com.pulumi.resources.CustomResourc /** * Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) * + * @deprecated + * Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead + * */ + @Deprecated /* Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ @Export(name="accountId", refs={String.class}, tree="[0]") private Output accountId; @@ -243,14 +247,14 @@ public Output privateAccessSettingsName() { return this.privateAccessSettingsName; } /** - * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. * */ @Export(name="publicAccessEnabled", refs={Boolean.class}, tree="[0]") private Output publicAccessEnabled; /** - * @return If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * @return If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. * */ public Output> publicAccessEnabled() { @@ -270,20 +274,6 @@ public Output> publicAccessEnabled() { public Output region() { return this.region; } - /** - * (AWS only) Status of Private Access Settings - * - */ - @Export(name="status", refs={String.class}, tree="[0]") - private Output status; - - /** - * @return (AWS only) Status of Private Access Settings - * - */ - public Output status() { - return this.status; - } /** * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsPrivateAccessSettingsArgs.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsPrivateAccessSettingsArgs.java index cf6ab16b..bbd14547 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsPrivateAccessSettingsArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsPrivateAccessSettingsArgs.java @@ -21,14 +21,22 @@ public final class MwsPrivateAccessSettingsArgs extends com.pulumi.resources.Res /** * Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) * + * @deprecated + * Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead + * */ + @Deprecated /* Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ @Import(name="accountId") private @Nullable Output accountId; /** * @return Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) * + * @deprecated + * Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead + * */ + @Deprecated /* Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ public Optional> accountId() { return Optional.ofNullable(this.accountId); } @@ -94,14 +102,14 @@ public Output privateAccessSettingsName() { } /** - * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. * */ @Import(name="publicAccessEnabled") private @Nullable Output publicAccessEnabled; /** - * @return If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * @return If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. * */ public Optional> publicAccessEnabled() { @@ -123,21 +131,6 @@ public Output region() { return this.region; } - /** - * (AWS only) Status of Private Access Settings - * - */ - @Import(name="status") - private @Nullable Output status; - - /** - * @return (AWS only) Status of Private Access Settings - * - */ - public Optional> status() { - return Optional.ofNullable(this.status); - } - private MwsPrivateAccessSettingsArgs() {} private MwsPrivateAccessSettingsArgs(MwsPrivateAccessSettingsArgs $) { @@ -148,7 +141,6 @@ private MwsPrivateAccessSettingsArgs(MwsPrivateAccessSettingsArgs $) { this.privateAccessSettingsName = $.privateAccessSettingsName; this.publicAccessEnabled = $.publicAccessEnabled; this.region = $.region; - this.status = $.status; } public static Builder builder() { @@ -174,7 +166,11 @@ public Builder(MwsPrivateAccessSettingsArgs defaults) { * * @return builder * + * @deprecated + * Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead + * */ + @Deprecated /* Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ public Builder accountId(@Nullable Output accountId) { $.accountId = accountId; return this; @@ -185,7 +181,11 @@ public Builder accountId(@Nullable Output accountId) { * * @return builder * + * @deprecated + * Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead + * */ + @Deprecated /* Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ public Builder accountId(String accountId) { return accountId(Output.of(accountId)); } @@ -285,7 +285,7 @@ public Builder privateAccessSettingsName(String privateAccessSettingsName) { } /** - * @param publicAccessEnabled If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * @param publicAccessEnabled If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. * * @return builder * @@ -296,7 +296,7 @@ public Builder publicAccessEnabled(@Nullable Output publicAccessEnabled } /** - * @param publicAccessEnabled If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * @param publicAccessEnabled If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. * * @return builder * @@ -326,27 +326,6 @@ public Builder region(String region) { return region(Output.of(region)); } - /** - * @param status (AWS only) Status of Private Access Settings - * - * @return builder - * - */ - public Builder status(@Nullable Output status) { - $.status = status; - return this; - } - - /** - * @param status (AWS only) Status of Private Access Settings - * - * @return builder - * - */ - public Builder status(String status) { - return status(Output.of(status)); - } - public MwsPrivateAccessSettingsArgs build() { if ($.privateAccessSettingsName == null) { throw new MissingRequiredPropertyException("MwsPrivateAccessSettingsArgs", "privateAccessSettingsName"); diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspaces.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspaces.java index 746869c0..378c140b 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspaces.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspaces.java @@ -17,8 +17,10 @@ import com.pulumi.databricks.outputs.MwsWorkspacesToken; import java.lang.Boolean; import java.lang.Integer; +import java.lang.Object; import java.lang.String; import java.util.List; +import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; @@ -98,6 +100,20 @@ public Output creationTime() { public Output> credentialsId() { return Codegen.optional(this.credentialsId); } + /** + * The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + * + */ + @Export(name="customTags", refs={Map.class,String.class,Object.class}, tree="[0,1,2]") + private Output> customTags; + + /** + * @return The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + * + */ + public Output>> customTags() { + return Codegen.optional(this.customTags); + } /** * @deprecated * Use managed_services_customer_managed_key_id instead diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspacesArgs.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspacesArgs.java index 42463a8c..3853bf33 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspacesArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspacesArgs.java @@ -13,7 +13,9 @@ import com.pulumi.exceptions.MissingRequiredPropertyException; import java.lang.Boolean; import java.lang.Integer; +import java.lang.Object; import java.lang.String; +import java.util.Map; import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; @@ -97,6 +99,21 @@ public Optional> credentialsId() { return Optional.ofNullable(this.credentialsId); } + /** + * The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + * + */ + @Import(name="customTags") + private @Nullable Output> customTags; + + /** + * @return The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + * + */ + public Optional>> customTags() { + return Optional.ofNullable(this.customTags); + } + /** * @deprecated * Use managed_services_customer_managed_key_id instead @@ -355,6 +372,7 @@ private MwsWorkspacesArgs(MwsWorkspacesArgs $) { this.cloudResourceContainer = $.cloudResourceContainer; this.creationTime = $.creationTime; this.credentialsId = $.credentialsId; + this.customTags = $.customTags; this.customerManagedKeyId = $.customerManagedKeyId; this.deploymentName = $.deploymentName; this.externalCustomerInfo = $.externalCustomerInfo; @@ -496,6 +514,27 @@ public Builder credentialsId(String credentialsId) { return credentialsId(Output.of(credentialsId)); } + /** + * @param customTags The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + * + * @return builder + * + */ + public Builder customTags(@Nullable Output> customTags) { + $.customTags = customTags; + return this; + } + + /** + * @param customTags The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + * + * @return builder + * + */ + public Builder customTags(Map customTags) { + return customTags(Output.of(customTags)); + } + /** * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/SqlEndpoint.java b/sdk/java/src/main/java/com/pulumi/databricks/SqlEndpoint.java index ff7038dd..2887e8ae 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/SqlEndpoint.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/SqlEndpoint.java @@ -183,7 +183,7 @@ public Output> enablePhoton() { * */ @Export(name="enableServerlessCompute", refs={Boolean.class}, tree="[0]") - private Output enableServerlessCompute; + private Output enableServerlessCompute; /** * @return Whether this SQL warehouse is a serverless endpoint. See below for details about the default values. To avoid ambiguity, especially for organizations with many workspaces, Databricks recommends that you always set this field explicitly. @@ -193,8 +193,8 @@ public Output> enablePhoton() { * - **For Azure**, If omitted, the default is `false` for most workspaces. However, if this workspace used the SQL Warehouses API to create a warehouse between November 1, 2022 and May 19, 2023, the default remains the previous behavior which is default to `true` if the workspace is enabled for serverless and fits the requirements for serverless SQL warehouses. A workspace must meet the [requirements](https://learn.microsoft.com/azure/databricks/sql/admin/serverless) and might require an update to its [Azure storage firewall](https://learn.microsoft.com/azure/databricks/sql/admin/serverless-firewall). * */ - public Output> enableServerlessCompute() { - return Codegen.optional(this.enableServerlessCompute); + public Output enableServerlessCompute() { + return this.enableServerlessCompute; } /** * Health status of the endpoint. diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/GrantsState.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/GrantsState.java index 413557b7..5cb0cf05 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/GrantsState.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/GrantsState.java @@ -52,13 +52,6 @@ public Optional>> grants() { return Optional.ofNullable(this.grants); } - @Import(name="materializedView") - private @Nullable Output materializedView; - - public Optional> materializedView() { - return Optional.ofNullable(this.materializedView); - } - @Import(name="metastore") private @Nullable Output metastore; @@ -101,13 +94,6 @@ public Optional> table() { return Optional.ofNullable(this.table); } - @Import(name="view") - private @Nullable Output view; - - public Optional> view() { - return Optional.ofNullable(this.view); - } - @Import(name="volume") private @Nullable Output volume; @@ -123,14 +109,12 @@ private GrantsState(GrantsState $) { this.foreignConnection = $.foreignConnection; this.function = $.function; this.grants = $.grants; - this.materializedView = $.materializedView; this.metastore = $.metastore; this.model = $.model; this.schema = $.schema; this.share = $.share; this.storageCredential = $.storageCredential; this.table = $.table; - this.view = $.view; this.volume = $.volume; } @@ -201,15 +185,6 @@ public Builder grants(GrantsGrantArgs... grants) { return grants(List.of(grants)); } - public Builder materializedView(@Nullable Output materializedView) { - $.materializedView = materializedView; - return this; - } - - public Builder materializedView(String materializedView) { - return materializedView(Output.of(materializedView)); - } - public Builder metastore(@Nullable Output metastore) { $.metastore = metastore; return this; @@ -264,15 +239,6 @@ public Builder table(String table) { return table(Output.of(table)); } - public Builder view(@Nullable Output view) { - $.view = view; - return this; - } - - public Builder view(String view) { - return view(Output.of(view)); - } - public Builder volume(@Nullable Output volume) { $.volume = volume; return this; diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsPrivateAccessSettingsState.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsPrivateAccessSettingsState.java index e047dd47..06d9032b 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsPrivateAccessSettingsState.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsPrivateAccessSettingsState.java @@ -20,14 +20,22 @@ public final class MwsPrivateAccessSettingsState extends com.pulumi.resources.Re /** * Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) * + * @deprecated + * Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead + * */ + @Deprecated /* Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ @Import(name="accountId") private @Nullable Output accountId; /** * @return Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) * + * @deprecated + * Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead + * */ + @Deprecated /* Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ public Optional> accountId() { return Optional.ofNullable(this.accountId); } @@ -93,14 +101,14 @@ public Optional> privateAccessSettingsName() { } /** - * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. * */ @Import(name="publicAccessEnabled") private @Nullable Output publicAccessEnabled; /** - * @return If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * @return If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. * */ public Optional> publicAccessEnabled() { @@ -122,21 +130,6 @@ public Optional> region() { return Optional.ofNullable(this.region); } - /** - * (AWS only) Status of Private Access Settings - * - */ - @Import(name="status") - private @Nullable Output status; - - /** - * @return (AWS only) Status of Private Access Settings - * - */ - public Optional> status() { - return Optional.ofNullable(this.status); - } - private MwsPrivateAccessSettingsState() {} private MwsPrivateAccessSettingsState(MwsPrivateAccessSettingsState $) { @@ -147,7 +140,6 @@ private MwsPrivateAccessSettingsState(MwsPrivateAccessSettingsState $) { this.privateAccessSettingsName = $.privateAccessSettingsName; this.publicAccessEnabled = $.publicAccessEnabled; this.region = $.region; - this.status = $.status; } public static Builder builder() { @@ -173,7 +165,11 @@ public Builder(MwsPrivateAccessSettingsState defaults) { * * @return builder * + * @deprecated + * Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead + * */ + @Deprecated /* Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ public Builder accountId(@Nullable Output accountId) { $.accountId = accountId; return this; @@ -184,7 +180,11 @@ public Builder accountId(@Nullable Output accountId) { * * @return builder * + * @deprecated + * Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead + * */ + @Deprecated /* Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ public Builder accountId(String accountId) { return accountId(Output.of(accountId)); } @@ -284,7 +284,7 @@ public Builder privateAccessSettingsName(String privateAccessSettingsName) { } /** - * @param publicAccessEnabled If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * @param publicAccessEnabled If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. * * @return builder * @@ -295,7 +295,7 @@ public Builder publicAccessEnabled(@Nullable Output publicAccessEnabled } /** - * @param publicAccessEnabled If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * @param publicAccessEnabled If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. * * @return builder * @@ -325,27 +325,6 @@ public Builder region(String region) { return region(Output.of(region)); } - /** - * @param status (AWS only) Status of Private Access Settings - * - * @return builder - * - */ - public Builder status(@Nullable Output status) { - $.status = status; - return this; - } - - /** - * @param status (AWS only) Status of Private Access Settings - * - * @return builder - * - */ - public Builder status(String status) { - return status(Output.of(status)); - } - public MwsPrivateAccessSettingsState build() { return $; } diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsWorkspacesState.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsWorkspacesState.java index a0cf8d60..3d281e88 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsWorkspacesState.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsWorkspacesState.java @@ -12,7 +12,9 @@ import com.pulumi.databricks.inputs.MwsWorkspacesTokenArgs; import java.lang.Boolean; import java.lang.Integer; +import java.lang.Object; import java.lang.String; +import java.util.Map; import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; @@ -96,6 +98,21 @@ public Optional> credentialsId() { return Optional.ofNullable(this.credentialsId); } + /** + * The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + * + */ + @Import(name="customTags") + private @Nullable Output> customTags; + + /** + * @return The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + * + */ + public Optional>> customTags() { + return Optional.ofNullable(this.customTags); + } + /** * @deprecated * Use managed_services_customer_managed_key_id instead @@ -354,6 +371,7 @@ private MwsWorkspacesState(MwsWorkspacesState $) { this.cloudResourceContainer = $.cloudResourceContainer; this.creationTime = $.creationTime; this.credentialsId = $.credentialsId; + this.customTags = $.customTags; this.customerManagedKeyId = $.customerManagedKeyId; this.deploymentName = $.deploymentName; this.externalCustomerInfo = $.externalCustomerInfo; @@ -495,6 +513,27 @@ public Builder credentialsId(String credentialsId) { return credentialsId(Output.of(credentialsId)); } + /** + * @param customTags The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + * + * @return builder + * + */ + public Builder customTags(@Nullable Output> customTags) { + $.customTags = customTags; + return this; + } + + /** + * @param customTags The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + * + * @return builder + * + */ + public Builder customTags(Map customTags) { + return customTags(Output.of(customTags)); + } + /** * @return builder * diff --git a/sdk/nodejs/connection.ts b/sdk/nodejs/connection.ts index 52673509..8dcdbe11 100644 --- a/sdk/nodejs/connection.ts +++ b/sdk/nodejs/connection.ts @@ -126,7 +126,7 @@ export class Connection extends pulumi.CustomResource { /** * Name of the connection owner. */ - public readonly owner!: pulumi.Output; + public readonly owner!: pulumi.Output; /** * Free-form connection properties. */ diff --git a/sdk/nodejs/getViews.ts b/sdk/nodejs/getViews.ts index 5d83f03c..5e3a1946 100644 --- a/sdk/nodejs/getViews.ts +++ b/sdk/nodejs/getViews.ts @@ -5,34 +5,6 @@ import * as pulumi from "@pulumi/pulumi"; import * as utilities from "./utilities"; /** - * ## Example Usage - * - * Granting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ databricks.Schema from _sandbox_ databricks_catalog. - * - * ```typescript - * import * as pulumi from "@pulumi/pulumi"; - * import * as databricks from "@pulumi/databricks"; - * - * export = async () => { - * const thingsViews = await databricks.getViews({ - * catalogName: "sandbox", - * schemaName: "things", - * }); - * const thingsGrants: databricks.Grants[] = []; - * for (const range of thingsViews.ids.map((v, k) => ({key: k, value: v}))) { - * thingsGrants.push(new databricks.Grants(`thingsGrants-${range.key}`, { - * view: range.value, - * grants: [{ - * principal: "sensitive", - * privileges: [ - * "SELECT", - * "MODIFY", - * ], - * }], - * })); - * } - * } - * ``` * ## Related Resources * * The following resources are used in the same context: @@ -84,34 +56,6 @@ export interface GetViewsResult { readonly schemaName: string; } /** - * ## Example Usage - * - * Granting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ databricks.Schema from _sandbox_ databricks_catalog. - * - * ```typescript - * import * as pulumi from "@pulumi/pulumi"; - * import * as databricks from "@pulumi/databricks"; - * - * export = async () => { - * const thingsViews = await databricks.getViews({ - * catalogName: "sandbox", - * schemaName: "things", - * }); - * const thingsGrants: databricks.Grants[] = []; - * for (const range of thingsViews.ids.map((v, k) => ({key: k, value: v}))) { - * thingsGrants.push(new databricks.Grants(`thingsGrants-${range.key}`, { - * view: range.value, - * grants: [{ - * principal: "sensitive", - * privileges: [ - * "SELECT", - * "MODIFY", - * ], - * }], - * })); - * } - * } - * ``` * ## Related Resources * * The following resources are used in the same context: diff --git a/sdk/nodejs/grants.ts b/sdk/nodejs/grants.ts index 78d11ebc..8fbb11e0 100644 --- a/sdk/nodejs/grants.ts +++ b/sdk/nodejs/grants.ts @@ -39,14 +39,12 @@ export class Grants extends pulumi.CustomResource { public readonly foreignConnection!: pulumi.Output; public readonly function!: pulumi.Output; public readonly grants!: pulumi.Output; - public readonly materializedView!: pulumi.Output; public readonly metastore!: pulumi.Output; public readonly model!: pulumi.Output; public readonly schema!: pulumi.Output; public readonly share!: pulumi.Output; public readonly storageCredential!: pulumi.Output; public readonly table!: pulumi.Output; - public readonly view!: pulumi.Output; public readonly volume!: pulumi.Output; /** @@ -67,14 +65,12 @@ export class Grants extends pulumi.CustomResource { resourceInputs["foreignConnection"] = state ? state.foreignConnection : undefined; resourceInputs["function"] = state ? state.function : undefined; resourceInputs["grants"] = state ? state.grants : undefined; - resourceInputs["materializedView"] = state ? state.materializedView : undefined; resourceInputs["metastore"] = state ? state.metastore : undefined; resourceInputs["model"] = state ? state.model : undefined; resourceInputs["schema"] = state ? state.schema : undefined; resourceInputs["share"] = state ? state.share : undefined; resourceInputs["storageCredential"] = state ? state.storageCredential : undefined; resourceInputs["table"] = state ? state.table : undefined; - resourceInputs["view"] = state ? state.view : undefined; resourceInputs["volume"] = state ? state.volume : undefined; } else { const args = argsOrState as GrantsArgs | undefined; @@ -86,14 +82,12 @@ export class Grants extends pulumi.CustomResource { resourceInputs["foreignConnection"] = args ? args.foreignConnection : undefined; resourceInputs["function"] = args ? args.function : undefined; resourceInputs["grants"] = args ? args.grants : undefined; - resourceInputs["materializedView"] = args ? args.materializedView : undefined; resourceInputs["metastore"] = args ? args.metastore : undefined; resourceInputs["model"] = args ? args.model : undefined; resourceInputs["schema"] = args ? args.schema : undefined; resourceInputs["share"] = args ? args.share : undefined; resourceInputs["storageCredential"] = args ? args.storageCredential : undefined; resourceInputs["table"] = args ? args.table : undefined; - resourceInputs["view"] = args ? args.view : undefined; resourceInputs["volume"] = args ? args.volume : undefined; } opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts); @@ -110,14 +104,12 @@ export interface GrantsState { foreignConnection?: pulumi.Input; function?: pulumi.Input; grants?: pulumi.Input[]>; - materializedView?: pulumi.Input; metastore?: pulumi.Input; model?: pulumi.Input; schema?: pulumi.Input; share?: pulumi.Input; storageCredential?: pulumi.Input; table?: pulumi.Input; - view?: pulumi.Input; volume?: pulumi.Input; } @@ -130,13 +122,11 @@ export interface GrantsArgs { foreignConnection?: pulumi.Input; function?: pulumi.Input; grants: pulumi.Input[]>; - materializedView?: pulumi.Input; metastore?: pulumi.Input; model?: pulumi.Input; schema?: pulumi.Input; share?: pulumi.Input; storageCredential?: pulumi.Input; table?: pulumi.Input; - view?: pulumi.Input; volume?: pulumi.Input; } diff --git a/sdk/nodejs/mwsPrivateAccessSettings.ts b/sdk/nodejs/mwsPrivateAccessSettings.ts index f9ecfbb9..ae403f6d 100644 --- a/sdk/nodejs/mwsPrivateAccessSettings.ts +++ b/sdk/nodejs/mwsPrivateAccessSettings.ts @@ -124,6 +124,8 @@ export class MwsPrivateAccessSettings extends pulumi.CustomResource { /** * Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) + * + * @deprecated Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ public readonly accountId!: pulumi.Output; /** @@ -143,17 +145,13 @@ export class MwsPrivateAccessSettings extends pulumi.CustomResource { */ public readonly privateAccessSettingsName!: pulumi.Output; /** - * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. */ public readonly publicAccessEnabled!: pulumi.Output; /** * Region of AWS VPC or the Google Cloud VPC network */ public readonly region!: pulumi.Output; - /** - * (AWS only) Status of Private Access Settings - */ - public readonly status!: pulumi.Output; /** * Create a MwsPrivateAccessSettings resource with the given unique name, arguments, and options. @@ -175,7 +173,6 @@ export class MwsPrivateAccessSettings extends pulumi.CustomResource { resourceInputs["privateAccessSettingsName"] = state ? state.privateAccessSettingsName : undefined; resourceInputs["publicAccessEnabled"] = state ? state.publicAccessEnabled : undefined; resourceInputs["region"] = state ? state.region : undefined; - resourceInputs["status"] = state ? state.status : undefined; } else { const args = argsOrState as MwsPrivateAccessSettingsArgs | undefined; if ((!args || args.privateAccessSettingsName === undefined) && !opts.urn) { @@ -191,7 +188,6 @@ export class MwsPrivateAccessSettings extends pulumi.CustomResource { resourceInputs["privateAccessSettingsName"] = args ? args.privateAccessSettingsName : undefined; resourceInputs["publicAccessEnabled"] = args ? args.publicAccessEnabled : undefined; resourceInputs["region"] = args ? args.region : undefined; - resourceInputs["status"] = args ? args.status : undefined; } opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts); super(MwsPrivateAccessSettings.__pulumiType, name, resourceInputs, opts); @@ -204,6 +200,8 @@ export class MwsPrivateAccessSettings extends pulumi.CustomResource { export interface MwsPrivateAccessSettingsState { /** * Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) + * + * @deprecated Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ accountId?: pulumi.Input; /** @@ -223,17 +221,13 @@ export interface MwsPrivateAccessSettingsState { */ privateAccessSettingsName?: pulumi.Input; /** - * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. */ publicAccessEnabled?: pulumi.Input; /** * Region of AWS VPC or the Google Cloud VPC network */ region?: pulumi.Input; - /** - * (AWS only) Status of Private Access Settings - */ - status?: pulumi.Input; } /** @@ -242,6 +236,8 @@ export interface MwsPrivateAccessSettingsState { export interface MwsPrivateAccessSettingsArgs { /** * Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) + * + * @deprecated Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead */ accountId?: pulumi.Input; /** @@ -261,15 +257,11 @@ export interface MwsPrivateAccessSettingsArgs { */ privateAccessSettingsName: pulumi.Input; /** - * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + * If `true`, the databricks.MwsWorkspaces can be accessed over the databricks.MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an databricks.IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. */ publicAccessEnabled?: pulumi.Input; /** * Region of AWS VPC or the Google Cloud VPC network */ region: pulumi.Input; - /** - * (AWS only) Status of Private Access Settings - */ - status?: pulumi.Input; } diff --git a/sdk/nodejs/mwsWorkspaces.ts b/sdk/nodejs/mwsWorkspaces.ts index 9374958b..d7755961 100644 --- a/sdk/nodejs/mwsWorkspaces.ts +++ b/sdk/nodejs/mwsWorkspaces.ts @@ -57,6 +57,10 @@ export class MwsWorkspaces extends pulumi.CustomResource { */ public readonly creationTime!: pulumi.Output; public readonly credentialsId!: pulumi.Output; + /** + * The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `defaultTags` or `customTags` on a cluster level. Please note it can take up to an hour for customTags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + */ + public readonly customTags!: pulumi.Output<{[key: string]: any} | undefined>; /** * @deprecated Use managed_services_customer_managed_key_id instead */ @@ -138,6 +142,7 @@ export class MwsWorkspaces extends pulumi.CustomResource { resourceInputs["cloudResourceContainer"] = state ? state.cloudResourceContainer : undefined; resourceInputs["creationTime"] = state ? state.creationTime : undefined; resourceInputs["credentialsId"] = state ? state.credentialsId : undefined; + resourceInputs["customTags"] = state ? state.customTags : undefined; resourceInputs["customerManagedKeyId"] = state ? state.customerManagedKeyId : undefined; resourceInputs["deploymentName"] = state ? state.deploymentName : undefined; resourceInputs["externalCustomerInfo"] = state ? state.externalCustomerInfo : undefined; @@ -171,6 +176,7 @@ export class MwsWorkspaces extends pulumi.CustomResource { resourceInputs["cloudResourceContainer"] = args ? args.cloudResourceContainer : undefined; resourceInputs["creationTime"] = args ? args.creationTime : undefined; resourceInputs["credentialsId"] = args ? args.credentialsId : undefined; + resourceInputs["customTags"] = args ? args.customTags : undefined; resourceInputs["customerManagedKeyId"] = args ? args.customerManagedKeyId : undefined; resourceInputs["deploymentName"] = args ? args.deploymentName : undefined; resourceInputs["externalCustomerInfo"] = args ? args.externalCustomerInfo : undefined; @@ -220,6 +226,10 @@ export interface MwsWorkspacesState { */ creationTime?: pulumi.Input; credentialsId?: pulumi.Input; + /** + * The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `defaultTags` or `customTags` on a cluster level. Please note it can take up to an hour for customTags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + */ + customTags?: pulumi.Input<{[key: string]: any}>; /** * @deprecated Use managed_services_customer_managed_key_id instead */ @@ -305,6 +315,10 @@ export interface MwsWorkspacesArgs { */ creationTime?: pulumi.Input; credentialsId?: pulumi.Input; + /** + * The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `defaultTags` or `customTags` on a cluster level. Please note it can take up to an hour for customTags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + */ + customTags?: pulumi.Input<{[key: string]: any}>; /** * @deprecated Use managed_services_customer_managed_key_id instead */ diff --git a/sdk/nodejs/sqlEndpoint.ts b/sdk/nodejs/sqlEndpoint.ts index bad4d7d4..ac3b6f57 100644 --- a/sdk/nodejs/sqlEndpoint.ts +++ b/sdk/nodejs/sqlEndpoint.ts @@ -109,7 +109,7 @@ export class SqlEndpoint extends pulumi.CustomResource { * * - **For Azure**, If omitted, the default is `false` for most workspaces. However, if this workspace used the SQL Warehouses API to create a warehouse between November 1, 2022 and May 19, 2023, the default remains the previous behavior which is default to `true` if the workspace is enabled for serverless and fits the requirements for serverless SQL warehouses. A workspace must meet the [requirements](https://learn.microsoft.com/azure/databricks/sql/admin/serverless) and might require an update to its [Azure storage firewall](https://learn.microsoft.com/azure/databricks/sql/admin/serverless-firewall). */ - public readonly enableServerlessCompute!: pulumi.Output; + public readonly enableServerlessCompute!: pulumi.Output; /** * Health status of the endpoint. */ diff --git a/sdk/python/pulumi_databricks/connection.py b/sdk/python/pulumi_databricks/connection.py index 39d62b9a..b3e6ce12 100644 --- a/sdk/python/pulumi_databricks/connection.py +++ b/sdk/python/pulumi_databricks/connection.py @@ -571,7 +571,7 @@ def options(self) -> pulumi.Output[Mapping[str, Any]]: @property @pulumi.getter - def owner(self) -> pulumi.Output[Optional[str]]: + def owner(self) -> pulumi.Output[str]: """ Name of the connection owner. """ diff --git a/sdk/python/pulumi_databricks/get_views.py b/sdk/python/pulumi_databricks/get_views.py index f7aade14..711b8dda 100644 --- a/sdk/python/pulumi_databricks/get_views.py +++ b/sdk/python/pulumi_databricks/get_views.py @@ -79,28 +79,6 @@ def get_views(catalog_name: Optional[str] = None, schema_name: Optional[str] = None, opts: Optional[pulumi.InvokeOptions] = None) -> AwaitableGetViewsResult: """ - ## Example Usage - - Granting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ Schema from _sandbox_ databricks_catalog. - - ```python - import pulumi - import pulumi_databricks as databricks - - things_views = databricks.get_views(catalog_name="sandbox", - schema_name="things") - things_grants = [] - for range in [{"key": k, "value": v} for [k, v] in enumerate(things_views.ids)]: - things_grants.append(databricks.Grants(f"thingsGrants-{range['key']}", - view=range["value"], - grants=[databricks.GrantsGrantArgs( - principal="sensitive", - privileges=[ - "SELECT", - "MODIFY", - ], - )])) - ``` ## Related Resources The following resources are used in the same context: @@ -133,28 +111,6 @@ def get_views_output(catalog_name: Optional[pulumi.Input[str]] = None, schema_name: Optional[pulumi.Input[str]] = None, opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetViewsResult]: """ - ## Example Usage - - Granting `SELECT` and `MODIFY` to `sensitive` group on all views in a _things_ Schema from _sandbox_ databricks_catalog. - - ```python - import pulumi - import pulumi_databricks as databricks - - things_views = databricks.get_views(catalog_name="sandbox", - schema_name="things") - things_grants = [] - for range in [{"key": k, "value": v} for [k, v] in enumerate(things_views.ids)]: - things_grants.append(databricks.Grants(f"thingsGrants-{range['key']}", - view=range["value"], - grants=[databricks.GrantsGrantArgs( - principal="sensitive", - privileges=[ - "SELECT", - "MODIFY", - ], - )])) - ``` ## Related Resources The following resources are used in the same context: diff --git a/sdk/python/pulumi_databricks/grants.py b/sdk/python/pulumi_databricks/grants.py index 9185bfe4..94ce5577 100644 --- a/sdk/python/pulumi_databricks/grants.py +++ b/sdk/python/pulumi_databricks/grants.py @@ -21,14 +21,12 @@ def __init__(__self__, *, external_location: Optional[pulumi.Input[str]] = None, foreign_connection: Optional[pulumi.Input[str]] = None, function: Optional[pulumi.Input[str]] = None, - materialized_view: Optional[pulumi.Input[str]] = None, metastore: Optional[pulumi.Input[str]] = None, model: Optional[pulumi.Input[str]] = None, schema: Optional[pulumi.Input[str]] = None, share: Optional[pulumi.Input[str]] = None, storage_credential: Optional[pulumi.Input[str]] = None, table: Optional[pulumi.Input[str]] = None, - view: Optional[pulumi.Input[str]] = None, volume: Optional[pulumi.Input[str]] = None): """ The set of arguments for constructing a Grants resource. @@ -42,8 +40,6 @@ def __init__(__self__, *, pulumi.set(__self__, "foreign_connection", foreign_connection) if function is not None: pulumi.set(__self__, "function", function) - if materialized_view is not None: - pulumi.set(__self__, "materialized_view", materialized_view) if metastore is not None: pulumi.set(__self__, "metastore", metastore) if model is not None: @@ -56,8 +52,6 @@ def __init__(__self__, *, pulumi.set(__self__, "storage_credential", storage_credential) if table is not None: pulumi.set(__self__, "table", table) - if view is not None: - pulumi.set(__self__, "view", view) if volume is not None: pulumi.set(__self__, "volume", volume) @@ -106,15 +100,6 @@ def function(self) -> Optional[pulumi.Input[str]]: def function(self, value: Optional[pulumi.Input[str]]): pulumi.set(self, "function", value) - @property - @pulumi.getter(name="materializedView") - def materialized_view(self) -> Optional[pulumi.Input[str]]: - return pulumi.get(self, "materialized_view") - - @materialized_view.setter - def materialized_view(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "materialized_view", value) - @property @pulumi.getter def metastore(self) -> Optional[pulumi.Input[str]]: @@ -169,15 +154,6 @@ def table(self) -> Optional[pulumi.Input[str]]: def table(self, value: Optional[pulumi.Input[str]]): pulumi.set(self, "table", value) - @property - @pulumi.getter - def view(self) -> Optional[pulumi.Input[str]]: - return pulumi.get(self, "view") - - @view.setter - def view(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "view", value) - @property @pulumi.getter def volume(self) -> Optional[pulumi.Input[str]]: @@ -196,14 +172,12 @@ def __init__(__self__, *, foreign_connection: Optional[pulumi.Input[str]] = None, function: Optional[pulumi.Input[str]] = None, grants: Optional[pulumi.Input[Sequence[pulumi.Input['GrantsGrantArgs']]]] = None, - materialized_view: Optional[pulumi.Input[str]] = None, metastore: Optional[pulumi.Input[str]] = None, model: Optional[pulumi.Input[str]] = None, schema: Optional[pulumi.Input[str]] = None, share: Optional[pulumi.Input[str]] = None, storage_credential: Optional[pulumi.Input[str]] = None, table: Optional[pulumi.Input[str]] = None, - view: Optional[pulumi.Input[str]] = None, volume: Optional[pulumi.Input[str]] = None): """ Input properties used for looking up and filtering Grants resources. @@ -218,8 +192,6 @@ def __init__(__self__, *, pulumi.set(__self__, "function", function) if grants is not None: pulumi.set(__self__, "grants", grants) - if materialized_view is not None: - pulumi.set(__self__, "materialized_view", materialized_view) if metastore is not None: pulumi.set(__self__, "metastore", metastore) if model is not None: @@ -232,8 +204,6 @@ def __init__(__self__, *, pulumi.set(__self__, "storage_credential", storage_credential) if table is not None: pulumi.set(__self__, "table", table) - if view is not None: - pulumi.set(__self__, "view", view) if volume is not None: pulumi.set(__self__, "volume", volume) @@ -282,15 +252,6 @@ def grants(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['GrantsGrantArgs def grants(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['GrantsGrantArgs']]]]): pulumi.set(self, "grants", value) - @property - @pulumi.getter(name="materializedView") - def materialized_view(self) -> Optional[pulumi.Input[str]]: - return pulumi.get(self, "materialized_view") - - @materialized_view.setter - def materialized_view(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "materialized_view", value) - @property @pulumi.getter def metastore(self) -> Optional[pulumi.Input[str]]: @@ -345,15 +306,6 @@ def table(self) -> Optional[pulumi.Input[str]]: def table(self, value: Optional[pulumi.Input[str]]): pulumi.set(self, "table", value) - @property - @pulumi.getter - def view(self) -> Optional[pulumi.Input[str]]: - return pulumi.get(self, "view") - - @view.setter - def view(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "view", value) - @property @pulumi.getter def volume(self) -> Optional[pulumi.Input[str]]: @@ -374,14 +326,12 @@ def __init__(__self__, foreign_connection: Optional[pulumi.Input[str]] = None, function: Optional[pulumi.Input[str]] = None, grants: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['GrantsGrantArgs']]]]] = None, - materialized_view: Optional[pulumi.Input[str]] = None, metastore: Optional[pulumi.Input[str]] = None, model: Optional[pulumi.Input[str]] = None, schema: Optional[pulumi.Input[str]] = None, share: Optional[pulumi.Input[str]] = None, storage_credential: Optional[pulumi.Input[str]] = None, table: Optional[pulumi.Input[str]] = None, - view: Optional[pulumi.Input[str]] = None, volume: Optional[pulumi.Input[str]] = None, __props__=None): """ @@ -417,14 +367,12 @@ def _internal_init(__self__, foreign_connection: Optional[pulumi.Input[str]] = None, function: Optional[pulumi.Input[str]] = None, grants: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['GrantsGrantArgs']]]]] = None, - materialized_view: Optional[pulumi.Input[str]] = None, metastore: Optional[pulumi.Input[str]] = None, model: Optional[pulumi.Input[str]] = None, schema: Optional[pulumi.Input[str]] = None, share: Optional[pulumi.Input[str]] = None, storage_credential: Optional[pulumi.Input[str]] = None, table: Optional[pulumi.Input[str]] = None, - view: Optional[pulumi.Input[str]] = None, volume: Optional[pulumi.Input[str]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) @@ -442,14 +390,12 @@ def _internal_init(__self__, if grants is None and not opts.urn: raise TypeError("Missing required property 'grants'") __props__.__dict__["grants"] = grants - __props__.__dict__["materialized_view"] = materialized_view __props__.__dict__["metastore"] = metastore __props__.__dict__["model"] = model __props__.__dict__["schema"] = schema __props__.__dict__["share"] = share __props__.__dict__["storage_credential"] = storage_credential __props__.__dict__["table"] = table - __props__.__dict__["view"] = view __props__.__dict__["volume"] = volume super(Grants, __self__).__init__( 'databricks:index/grants:Grants', @@ -466,14 +412,12 @@ def get(resource_name: str, foreign_connection: Optional[pulumi.Input[str]] = None, function: Optional[pulumi.Input[str]] = None, grants: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['GrantsGrantArgs']]]]] = None, - materialized_view: Optional[pulumi.Input[str]] = None, metastore: Optional[pulumi.Input[str]] = None, model: Optional[pulumi.Input[str]] = None, schema: Optional[pulumi.Input[str]] = None, share: Optional[pulumi.Input[str]] = None, storage_credential: Optional[pulumi.Input[str]] = None, table: Optional[pulumi.Input[str]] = None, - view: Optional[pulumi.Input[str]] = None, volume: Optional[pulumi.Input[str]] = None) -> 'Grants': """ Get an existing Grants resource's state with the given name, id, and optional extra @@ -492,14 +436,12 @@ def get(resource_name: str, __props__.__dict__["foreign_connection"] = foreign_connection __props__.__dict__["function"] = function __props__.__dict__["grants"] = grants - __props__.__dict__["materialized_view"] = materialized_view __props__.__dict__["metastore"] = metastore __props__.__dict__["model"] = model __props__.__dict__["schema"] = schema __props__.__dict__["share"] = share __props__.__dict__["storage_credential"] = storage_credential __props__.__dict__["table"] = table - __props__.__dict__["view"] = view __props__.__dict__["volume"] = volume return Grants(resource_name, opts=opts, __props__=__props__) @@ -528,11 +470,6 @@ def function(self) -> pulumi.Output[Optional[str]]: def grants(self) -> pulumi.Output[Sequence['outputs.GrantsGrant']]: return pulumi.get(self, "grants") - @property - @pulumi.getter(name="materializedView") - def materialized_view(self) -> pulumi.Output[Optional[str]]: - return pulumi.get(self, "materialized_view") - @property @pulumi.getter def metastore(self) -> pulumi.Output[Optional[str]]: @@ -563,11 +500,6 @@ def storage_credential(self) -> pulumi.Output[Optional[str]]: def table(self) -> pulumi.Output[Optional[str]]: return pulumi.get(self, "table") - @property - @pulumi.getter - def view(self) -> pulumi.Output[Optional[str]]: - return pulumi.get(self, "view") - @property @pulumi.getter def volume(self) -> pulumi.Output[Optional[str]]: diff --git a/sdk/python/pulumi_databricks/mws_private_access_settings.py b/sdk/python/pulumi_databricks/mws_private_access_settings.py index 472ff343..5a06c511 100644 --- a/sdk/python/pulumi_databricks/mws_private_access_settings.py +++ b/sdk/python/pulumi_databricks/mws_private_access_settings.py @@ -20,8 +20,7 @@ def __init__(__self__, *, allowed_vpc_endpoint_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None, private_access_level: Optional[pulumi.Input[str]] = None, private_access_settings_id: Optional[pulumi.Input[str]] = None, - public_access_enabled: Optional[pulumi.Input[bool]] = None, - status: Optional[pulumi.Input[str]] = None): + public_access_enabled: Optional[pulumi.Input[bool]] = None): """ The set of arguments for constructing a MwsPrivateAccessSettings resource. :param pulumi.Input[str] private_access_settings_name: Name of Private Access Settings in Databricks Account @@ -30,11 +29,13 @@ def __init__(__self__, *, :param pulumi.Input[Sequence[pulumi.Input[str]]] allowed_vpc_endpoint_ids: An array of MwsVpcEndpoint `vpc_endpoint_id` (not `id`). Only used when `private_access_level` is set to `ENDPOINT`. This is an allow list of MwsVpcEndpoint that in your account that can connect to your MwsWorkspaces over AWS PrivateLink. If hybrid access to your workspace is enabled by setting `public_access_enabled` to true, then this control only works for PrivateLink connections. To control how your workspace is accessed via public internet, see the article for databricks_ip_access_list. :param pulumi.Input[str] private_access_level: The private access level controls which VPC endpoints can connect to the UI or API of any workspace that attaches this private access settings object. `ACCOUNT` level access _(default)_ lets only MwsVpcEndpoint that are registered in your Databricks account connect to your databricks_mws_workspaces. `ENDPOINT` level access lets only specified MwsVpcEndpoint connect to your workspace. Please see the `allowed_vpc_endpoint_ids` documentation for more details. :param pulumi.Input[str] private_access_settings_id: Canonical unique identifier of Private Access Settings in Databricks Account - :param pulumi.Input[bool] public_access_enabled: If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. - :param pulumi.Input[str] status: (AWS only) Status of Private Access Settings + :param pulumi.Input[bool] public_access_enabled: If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. """ pulumi.set(__self__, "private_access_settings_name", private_access_settings_name) pulumi.set(__self__, "region", region) + if account_id is not None: + warnings.warn("""Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead""", DeprecationWarning) + pulumi.log.warn("""account_id is deprecated: Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead""") if account_id is not None: pulumi.set(__self__, "account_id", account_id) if allowed_vpc_endpoint_ids is not None: @@ -45,8 +46,6 @@ def __init__(__self__, *, pulumi.set(__self__, "private_access_settings_id", private_access_settings_id) if public_access_enabled is not None: pulumi.set(__self__, "public_access_enabled", public_access_enabled) - if status is not None: - pulumi.set(__self__, "status", status) @property @pulumi.getter(name="privateAccessSettingsName") @@ -78,6 +77,9 @@ def account_id(self) -> Optional[pulumi.Input[str]]: """ Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) """ + warnings.warn("""Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead""", DeprecationWarning) + pulumi.log.warn("""account_id is deprecated: Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead""") + return pulumi.get(self, "account_id") @account_id.setter @@ -124,7 +126,7 @@ def private_access_settings_id(self, value: Optional[pulumi.Input[str]]): @pulumi.getter(name="publicAccessEnabled") def public_access_enabled(self) -> Optional[pulumi.Input[bool]]: """ - If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. """ return pulumi.get(self, "public_access_enabled") @@ -132,18 +134,6 @@ def public_access_enabled(self) -> Optional[pulumi.Input[bool]]: def public_access_enabled(self, value: Optional[pulumi.Input[bool]]): pulumi.set(self, "public_access_enabled", value) - @property - @pulumi.getter - def status(self) -> Optional[pulumi.Input[str]]: - """ - (AWS only) Status of Private Access Settings - """ - return pulumi.get(self, "status") - - @status.setter - def status(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "status", value) - @pulumi.input_type class _MwsPrivateAccessSettingsState: @@ -154,8 +144,7 @@ def __init__(__self__, *, private_access_settings_id: Optional[pulumi.Input[str]] = None, private_access_settings_name: Optional[pulumi.Input[str]] = None, public_access_enabled: Optional[pulumi.Input[bool]] = None, - region: Optional[pulumi.Input[str]] = None, - status: Optional[pulumi.Input[str]] = None): + region: Optional[pulumi.Input[str]] = None): """ Input properties used for looking up and filtering MwsPrivateAccessSettings resources. :param pulumi.Input[str] account_id: Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) @@ -163,10 +152,12 @@ def __init__(__self__, *, :param pulumi.Input[str] private_access_level: The private access level controls which VPC endpoints can connect to the UI or API of any workspace that attaches this private access settings object. `ACCOUNT` level access _(default)_ lets only MwsVpcEndpoint that are registered in your Databricks account connect to your databricks_mws_workspaces. `ENDPOINT` level access lets only specified MwsVpcEndpoint connect to your workspace. Please see the `allowed_vpc_endpoint_ids` documentation for more details. :param pulumi.Input[str] private_access_settings_id: Canonical unique identifier of Private Access Settings in Databricks Account :param pulumi.Input[str] private_access_settings_name: Name of Private Access Settings in Databricks Account - :param pulumi.Input[bool] public_access_enabled: If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + :param pulumi.Input[bool] public_access_enabled: If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. :param pulumi.Input[str] region: Region of AWS VPC or the Google Cloud VPC network - :param pulumi.Input[str] status: (AWS only) Status of Private Access Settings """ + if account_id is not None: + warnings.warn("""Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead""", DeprecationWarning) + pulumi.log.warn("""account_id is deprecated: Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead""") if account_id is not None: pulumi.set(__self__, "account_id", account_id) if allowed_vpc_endpoint_ids is not None: @@ -181,8 +172,6 @@ def __init__(__self__, *, pulumi.set(__self__, "public_access_enabled", public_access_enabled) if region is not None: pulumi.set(__self__, "region", region) - if status is not None: - pulumi.set(__self__, "status", status) @property @pulumi.getter(name="accountId") @@ -190,6 +179,9 @@ def account_id(self) -> Optional[pulumi.Input[str]]: """ Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) """ + warnings.warn("""Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead""", DeprecationWarning) + pulumi.log.warn("""account_id is deprecated: Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead""") + return pulumi.get(self, "account_id") @account_id.setter @@ -248,7 +240,7 @@ def private_access_settings_name(self, value: Optional[pulumi.Input[str]]): @pulumi.getter(name="publicAccessEnabled") def public_access_enabled(self) -> Optional[pulumi.Input[bool]]: """ - If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. """ return pulumi.get(self, "public_access_enabled") @@ -268,18 +260,6 @@ def region(self) -> Optional[pulumi.Input[str]]: def region(self, value: Optional[pulumi.Input[str]]): pulumi.set(self, "region", value) - @property - @pulumi.getter - def status(self) -> Optional[pulumi.Input[str]]: - """ - (AWS only) Status of Private Access Settings - """ - return pulumi.get(self, "status") - - @status.setter - def status(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "status", value) - class MwsPrivateAccessSettings(pulumi.CustomResource): @overload @@ -293,7 +273,6 @@ def __init__(__self__, private_access_settings_name: Optional[pulumi.Input[str]] = None, public_access_enabled: Optional[pulumi.Input[bool]] = None, region: Optional[pulumi.Input[str]] = None, - status: Optional[pulumi.Input[str]] = None, __props__=None): """ Allows you to create a [Private Access Setting]that can be used as part of a MwsWorkspaces resource to create a [Databricks Workspace that leverages AWS PrivateLink](https://docs.databricks.com/administration-guide/cloud-configurations/aws/privatelink.html) or [GCP Private Service Connect](https://docs.gcp.databricks.com/administration-guide/cloud-configurations/gcp/private-service-connect.html) @@ -386,9 +365,8 @@ def __init__(__self__, :param pulumi.Input[str] private_access_level: The private access level controls which VPC endpoints can connect to the UI or API of any workspace that attaches this private access settings object. `ACCOUNT` level access _(default)_ lets only MwsVpcEndpoint that are registered in your Databricks account connect to your databricks_mws_workspaces. `ENDPOINT` level access lets only specified MwsVpcEndpoint connect to your workspace. Please see the `allowed_vpc_endpoint_ids` documentation for more details. :param pulumi.Input[str] private_access_settings_id: Canonical unique identifier of Private Access Settings in Databricks Account :param pulumi.Input[str] private_access_settings_name: Name of Private Access Settings in Databricks Account - :param pulumi.Input[bool] public_access_enabled: If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + :param pulumi.Input[bool] public_access_enabled: If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. :param pulumi.Input[str] region: Region of AWS VPC or the Google Cloud VPC network - :param pulumi.Input[str] status: (AWS only) Status of Private Access Settings """ ... @overload @@ -502,7 +480,6 @@ def _internal_init(__self__, private_access_settings_name: Optional[pulumi.Input[str]] = None, public_access_enabled: Optional[pulumi.Input[bool]] = None, region: Optional[pulumi.Input[str]] = None, - status: Optional[pulumi.Input[str]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) if not isinstance(opts, pulumi.ResourceOptions): @@ -523,7 +500,6 @@ def _internal_init(__self__, if region is None and not opts.urn: raise TypeError("Missing required property 'region'") __props__.__dict__["region"] = region - __props__.__dict__["status"] = status super(MwsPrivateAccessSettings, __self__).__init__( 'databricks:index/mwsPrivateAccessSettings:MwsPrivateAccessSettings', resource_name, @@ -540,8 +516,7 @@ def get(resource_name: str, private_access_settings_id: Optional[pulumi.Input[str]] = None, private_access_settings_name: Optional[pulumi.Input[str]] = None, public_access_enabled: Optional[pulumi.Input[bool]] = None, - region: Optional[pulumi.Input[str]] = None, - status: Optional[pulumi.Input[str]] = None) -> 'MwsPrivateAccessSettings': + region: Optional[pulumi.Input[str]] = None) -> 'MwsPrivateAccessSettings': """ Get an existing MwsPrivateAccessSettings resource's state with the given name, id, and optional extra properties used to qualify the lookup. @@ -554,9 +529,8 @@ def get(resource_name: str, :param pulumi.Input[str] private_access_level: The private access level controls which VPC endpoints can connect to the UI or API of any workspace that attaches this private access settings object. `ACCOUNT` level access _(default)_ lets only MwsVpcEndpoint that are registered in your Databricks account connect to your databricks_mws_workspaces. `ENDPOINT` level access lets only specified MwsVpcEndpoint connect to your workspace. Please see the `allowed_vpc_endpoint_ids` documentation for more details. :param pulumi.Input[str] private_access_settings_id: Canonical unique identifier of Private Access Settings in Databricks Account :param pulumi.Input[str] private_access_settings_name: Name of Private Access Settings in Databricks Account - :param pulumi.Input[bool] public_access_enabled: If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + :param pulumi.Input[bool] public_access_enabled: If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. :param pulumi.Input[str] region: Region of AWS VPC or the Google Cloud VPC network - :param pulumi.Input[str] status: (AWS only) Status of Private Access Settings """ opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id)) @@ -569,7 +543,6 @@ def get(resource_name: str, __props__.__dict__["private_access_settings_name"] = private_access_settings_name __props__.__dict__["public_access_enabled"] = public_access_enabled __props__.__dict__["region"] = region - __props__.__dict__["status"] = status return MwsPrivateAccessSettings(resource_name, opts=opts, __props__=__props__) @property @@ -578,6 +551,9 @@ def account_id(self) -> pulumi.Output[Optional[str]]: """ Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/) """ + warnings.warn("""Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead""", DeprecationWarning) + pulumi.log.warn("""account_id is deprecated: Configuring `account_id` at the resource-level is deprecated; please specify it in the `provider {}` configuration block instead""") + return pulumi.get(self, "account_id") @property @@ -616,7 +592,7 @@ def private_access_settings_name(self) -> pulumi.Output[str]: @pulumi.getter(name="publicAccessEnabled") def public_access_enabled(self) -> pulumi.Output[Optional[bool]]: """ - If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. + If `true`, the MwsWorkspaces can be accessed over the MwsVpcEndpoint as well as over the public network. In such a case, you could also configure an IpAccessList for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory. """ return pulumi.get(self, "public_access_enabled") @@ -628,11 +604,3 @@ def region(self) -> pulumi.Output[str]: """ return pulumi.get(self, "region") - @property - @pulumi.getter - def status(self) -> pulumi.Output[str]: - """ - (AWS only) Status of Private Access Settings - """ - return pulumi.get(self, "status") - diff --git a/sdk/python/pulumi_databricks/mws_workspaces.py b/sdk/python/pulumi_databricks/mws_workspaces.py index 6345a2a9..2f7975ea 100644 --- a/sdk/python/pulumi_databricks/mws_workspaces.py +++ b/sdk/python/pulumi_databricks/mws_workspaces.py @@ -23,6 +23,7 @@ def __init__(__self__, *, cloud_resource_container: Optional[pulumi.Input['MwsWorkspacesCloudResourceContainerArgs']] = None, creation_time: Optional[pulumi.Input[int]] = None, credentials_id: Optional[pulumi.Input[str]] = None, + custom_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None, customer_managed_key_id: Optional[pulumi.Input[str]] = None, deployment_name: Optional[pulumi.Input[str]] = None, external_customer_info: Optional[pulumi.Input['MwsWorkspacesExternalCustomerInfoArgs']] = None, @@ -48,6 +49,7 @@ def __init__(__self__, *, :param pulumi.Input[str] aws_region: region of VPC. :param pulumi.Input['MwsWorkspacesCloudResourceContainerArgs'] cloud_resource_container: A block that specifies GCP workspace configurations, consisting of following blocks: :param pulumi.Input[int] creation_time: (Integer) time when workspace was created + :param pulumi.Input[Mapping[str, Any]] custom_tags: The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. :param pulumi.Input[str] deployment_name: part of URL as in `https://-.cloud.databricks.com`. Deployment name cannot be used until a deployment name prefix is defined. Please contact your Databricks representative. Once a new deployment prefix is added/updated, it only will affect the new workspaces created. :param pulumi.Input['MwsWorkspacesGkeConfigArgs'] gke_config: A block that specifies GKE configuration for the Databricks workspace: :param pulumi.Input[str] location: region of the subnet. @@ -73,6 +75,8 @@ def __init__(__self__, *, pulumi.set(__self__, "creation_time", creation_time) if credentials_id is not None: pulumi.set(__self__, "credentials_id", credentials_id) + if custom_tags is not None: + pulumi.set(__self__, "custom_tags", custom_tags) if customer_managed_key_id is not None: warnings.warn("""Use managed_services_customer_managed_key_id instead""", DeprecationWarning) pulumi.log.warn("""customer_managed_key_id is deprecated: Use managed_services_customer_managed_key_id instead""") @@ -191,6 +195,18 @@ def credentials_id(self) -> Optional[pulumi.Input[str]]: def credentials_id(self, value: Optional[pulumi.Input[str]]): pulumi.set(self, "credentials_id", value) + @property + @pulumi.getter(name="customTags") + def custom_tags(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + """ + The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + """ + return pulumi.get(self, "custom_tags") + + @custom_tags.setter + def custom_tags(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + pulumi.set(self, "custom_tags", value) + @property @pulumi.getter(name="customerManagedKeyId") def customer_managed_key_id(self) -> Optional[pulumi.Input[str]]: @@ -402,6 +418,7 @@ def __init__(__self__, *, cloud_resource_container: Optional[pulumi.Input['MwsWorkspacesCloudResourceContainerArgs']] = None, creation_time: Optional[pulumi.Input[int]] = None, credentials_id: Optional[pulumi.Input[str]] = None, + custom_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None, customer_managed_key_id: Optional[pulumi.Input[str]] = None, deployment_name: Optional[pulumi.Input[str]] = None, external_customer_info: Optional[pulumi.Input['MwsWorkspacesExternalCustomerInfoArgs']] = None, @@ -427,6 +444,7 @@ def __init__(__self__, *, :param pulumi.Input[str] aws_region: region of VPC. :param pulumi.Input['MwsWorkspacesCloudResourceContainerArgs'] cloud_resource_container: A block that specifies GCP workspace configurations, consisting of following blocks: :param pulumi.Input[int] creation_time: (Integer) time when workspace was created + :param pulumi.Input[Mapping[str, Any]] custom_tags: The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. :param pulumi.Input[str] deployment_name: part of URL as in `https://-.cloud.databricks.com`. Deployment name cannot be used until a deployment name prefix is defined. Please contact your Databricks representative. Once a new deployment prefix is added/updated, it only will affect the new workspaces created. :param pulumi.Input['MwsWorkspacesGkeConfigArgs'] gke_config: A block that specifies GKE configuration for the Databricks workspace: :param pulumi.Input[str] location: region of the subnet. @@ -453,6 +471,8 @@ def __init__(__self__, *, pulumi.set(__self__, "creation_time", creation_time) if credentials_id is not None: pulumi.set(__self__, "credentials_id", credentials_id) + if custom_tags is not None: + pulumi.set(__self__, "custom_tags", custom_tags) if customer_managed_key_id is not None: warnings.warn("""Use managed_services_customer_managed_key_id instead""", DeprecationWarning) pulumi.log.warn("""customer_managed_key_id is deprecated: Use managed_services_customer_managed_key_id instead""") @@ -561,6 +581,18 @@ def credentials_id(self) -> Optional[pulumi.Input[str]]: def credentials_id(self, value: Optional[pulumi.Input[str]]): pulumi.set(self, "credentials_id", value) + @property + @pulumi.getter(name="customTags") + def custom_tags(self) -> Optional[pulumi.Input[Mapping[str, Any]]]: + """ + The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + """ + return pulumi.get(self, "custom_tags") + + @custom_tags.setter + def custom_tags(self, value: Optional[pulumi.Input[Mapping[str, Any]]]): + pulumi.set(self, "custom_tags", value) + @property @pulumi.getter(name="customerManagedKeyId") def customer_managed_key_id(self) -> Optional[pulumi.Input[str]]: @@ -786,6 +818,7 @@ def __init__(__self__, cloud_resource_container: Optional[pulumi.Input[pulumi.InputType['MwsWorkspacesCloudResourceContainerArgs']]] = None, creation_time: Optional[pulumi.Input[int]] = None, credentials_id: Optional[pulumi.Input[str]] = None, + custom_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None, customer_managed_key_id: Optional[pulumi.Input[str]] = None, deployment_name: Optional[pulumi.Input[str]] = None, external_customer_info: Optional[pulumi.Input[pulumi.InputType['MwsWorkspacesExternalCustomerInfoArgs']]] = None, @@ -817,6 +850,7 @@ def __init__(__self__, :param pulumi.Input[str] aws_region: region of VPC. :param pulumi.Input[pulumi.InputType['MwsWorkspacesCloudResourceContainerArgs']] cloud_resource_container: A block that specifies GCP workspace configurations, consisting of following blocks: :param pulumi.Input[int] creation_time: (Integer) time when workspace was created + :param pulumi.Input[Mapping[str, Any]] custom_tags: The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. :param pulumi.Input[str] deployment_name: part of URL as in `https://-.cloud.databricks.com`. Deployment name cannot be used until a deployment name prefix is defined. Please contact your Databricks representative. Once a new deployment prefix is added/updated, it only will affect the new workspaces created. :param pulumi.Input[pulumi.InputType['MwsWorkspacesGkeConfigArgs']] gke_config: A block that specifies GKE configuration for the Databricks workspace: :param pulumi.Input[str] location: region of the subnet. @@ -863,6 +897,7 @@ def _internal_init(__self__, cloud_resource_container: Optional[pulumi.Input[pulumi.InputType['MwsWorkspacesCloudResourceContainerArgs']]] = None, creation_time: Optional[pulumi.Input[int]] = None, credentials_id: Optional[pulumi.Input[str]] = None, + custom_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None, customer_managed_key_id: Optional[pulumi.Input[str]] = None, deployment_name: Optional[pulumi.Input[str]] = None, external_customer_info: Optional[pulumi.Input[pulumi.InputType['MwsWorkspacesExternalCustomerInfoArgs']]] = None, @@ -899,6 +934,7 @@ def _internal_init(__self__, __props__.__dict__["cloud_resource_container"] = cloud_resource_container __props__.__dict__["creation_time"] = creation_time __props__.__dict__["credentials_id"] = credentials_id + __props__.__dict__["custom_tags"] = custom_tags __props__.__dict__["customer_managed_key_id"] = customer_managed_key_id __props__.__dict__["deployment_name"] = deployment_name __props__.__dict__["external_customer_info"] = external_customer_info @@ -938,6 +974,7 @@ def get(resource_name: str, cloud_resource_container: Optional[pulumi.Input[pulumi.InputType['MwsWorkspacesCloudResourceContainerArgs']]] = None, creation_time: Optional[pulumi.Input[int]] = None, credentials_id: Optional[pulumi.Input[str]] = None, + custom_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None, customer_managed_key_id: Optional[pulumi.Input[str]] = None, deployment_name: Optional[pulumi.Input[str]] = None, external_customer_info: Optional[pulumi.Input[pulumi.InputType['MwsWorkspacesExternalCustomerInfoArgs']]] = None, @@ -968,6 +1005,7 @@ def get(resource_name: str, :param pulumi.Input[str] aws_region: region of VPC. :param pulumi.Input[pulumi.InputType['MwsWorkspacesCloudResourceContainerArgs']] cloud_resource_container: A block that specifies GCP workspace configurations, consisting of following blocks: :param pulumi.Input[int] creation_time: (Integer) time when workspace was created + :param pulumi.Input[Mapping[str, Any]] custom_tags: The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. :param pulumi.Input[str] deployment_name: part of URL as in `https://-.cloud.databricks.com`. Deployment name cannot be used until a deployment name prefix is defined. Please contact your Databricks representative. Once a new deployment prefix is added/updated, it only will affect the new workspaces created. :param pulumi.Input[pulumi.InputType['MwsWorkspacesGkeConfigArgs']] gke_config: A block that specifies GKE configuration for the Databricks workspace: :param pulumi.Input[str] location: region of the subnet. @@ -992,6 +1030,7 @@ def get(resource_name: str, __props__.__dict__["cloud_resource_container"] = cloud_resource_container __props__.__dict__["creation_time"] = creation_time __props__.__dict__["credentials_id"] = credentials_id + __props__.__dict__["custom_tags"] = custom_tags __props__.__dict__["customer_managed_key_id"] = customer_managed_key_id __props__.__dict__["deployment_name"] = deployment_name __props__.__dict__["external_customer_info"] = external_customer_info @@ -1055,6 +1094,14 @@ def creation_time(self) -> pulumi.Output[int]: def credentials_id(self) -> pulumi.Output[Optional[str]]: return pulumi.get(self, "credentials_id") + @property + @pulumi.getter(name="customTags") + def custom_tags(self) -> pulumi.Output[Optional[Mapping[str, Any]]]: + """ + The custom tags key-value pairing that is attached to this workspace. These tags will be applied to clusters automatically in addition to any `default_tags` or `custom_tags` on a cluster level. Please note it can take up to an hour for custom_tags to be set due to scheduling on Control Plane. After custom tags are applied, they can be modified however they can never be completely removed. + """ + return pulumi.get(self, "custom_tags") + @property @pulumi.getter(name="customerManagedKeyId") def customer_managed_key_id(self) -> pulumi.Output[Optional[str]]: diff --git a/sdk/python/pulumi_databricks/sql_endpoint.py b/sdk/python/pulumi_databricks/sql_endpoint.py index 3be8e72f..b2f94e83 100644 --- a/sdk/python/pulumi_databricks/sql_endpoint.py +++ b/sdk/python/pulumi_databricks/sql_endpoint.py @@ -890,7 +890,7 @@ def enable_photon(self) -> pulumi.Output[Optional[bool]]: @property @pulumi.getter(name="enableServerlessCompute") - def enable_serverless_compute(self) -> pulumi.Output[Optional[bool]]: + def enable_serverless_compute(self) -> pulumi.Output[bool]: """ Whether this SQL warehouse is a serverless endpoint. See below for details about the default values. To avoid ambiguity, especially for organizations with many workspaces, Databricks recommends that you always set this field explicitly.