From 9d1606d42b4cfd888b53986ff1eaf7154b4919f8 Mon Sep 17 00:00:00 2001 From: Ian Wahbe Date: Tue, 12 Dec 2023 00:05:12 -0800 Subject: [PATCH] Upgrade terraform-provider-databricks to v1.31.1 (#278) This PR was generated via `$ upgrade-provider pulumi/pulumi-databricks`. --- - Upgrading terraform-provider-databricks from 1.31.0 to 1.31.1. Fixes #268 --- .../bridge-metadata.json | 3 +- .../pulumi-resource-databricks/schema.json | 69 ++++++---- provider/go.mod | 14 +- provider/go.sum | 28 ++-- sdk/dotnet/GetAwsAssumeRolePolicy.cs | 4 +- sdk/dotnet/MwsCredentials.cs | 59 ++++----- sdk/dotnet/MwsCustomerManagedKeys.cs | 6 +- sdk/dotnet/MwsLogDelivery.cs | 6 +- sdk/dotnet/MwsNetworks.cs | 6 +- sdk/dotnet/MwsPermissionAssignment.cs | 2 +- sdk/dotnet/MwsStorageConfigurations.cs | 6 +- sdk/dotnet/MwsWorkspaces.cs | 6 +- sdk/dotnet/WorkspaceFile.cs | 12 ++ sdk/go/databricks/getAwsAssumeRolePolicy.go | 4 +- sdk/go/databricks/mwsCredentials.go | 52 ++++---- sdk/go/databricks/mwsCustomerManagedKeys.go | 12 +- sdk/go/databricks/mwsLogDelivery.go | 12 +- sdk/go/databricks/mwsNetworks.go | 12 +- sdk/go/databricks/mwsPermissionAssignment.go | 2 +- sdk/go/databricks/mwsStorageConfigurations.go | 12 +- sdk/go/databricks/mwsWorkspaces.go | 12 +- sdk/go/databricks/workspaceFile.go | 11 ++ .../com/pulumi/databricks/MwsCredentials.java | 21 +-- .../pulumi/databricks/MwsCredentialsArgs.java | 113 ++++++++++++++-- .../databricks/MwsCustomerManagedKeys.java | 4 +- .../MwsCustomerManagedKeysArgs.java | 8 +- .../com/pulumi/databricks/MwsLogDelivery.java | 4 +- .../pulumi/databricks/MwsLogDeliveryArgs.java | 8 +- .../com/pulumi/databricks/MwsNetworks.java | 4 +- .../pulumi/databricks/MwsNetworksArgs.java | 8 +- .../databricks/MwsPermissionAssignment.java | 2 +- .../databricks/MwsStorageConfigurations.java | 4 +- .../MwsStorageConfigurationsArgs.java | 8 +- .../com/pulumi/databricks/MwsWorkspaces.java | 4 +- .../pulumi/databricks/MwsWorkspacesArgs.java | 8 +- .../com/pulumi/databricks/WorkspaceFile.java | 14 ++ .../inputs/GetAwsAssumeRolePolicyArgs.java | 8 +- .../GetAwsAssumeRolePolicyPlainArgs.java | 6 +- .../inputs/MwsCredentialsState.java | 8 +- .../inputs/MwsCustomerManagedKeysState.java | 8 +- .../inputs/MwsLogDeliveryState.java | 8 +- .../databricks/inputs/MwsNetworksState.java | 8 +- .../inputs/MwsStorageConfigurationsState.java | 8 +- .../databricks/inputs/MwsWorkspacesState.java | 8 +- .../databricks/inputs/WorkspaceFileState.java | 37 ++++++ sdk/nodejs/getAwsAssumeRolePolicy.ts | 4 +- sdk/nodejs/mwsCredentials.ts | 44 ++++--- sdk/nodejs/mwsCustomerManagedKeys.ts | 6 +- sdk/nodejs/mwsLogDelivery.ts | 6 +- sdk/nodejs/mwsNetworks.ts | 6 +- sdk/nodejs/mwsPermissionAssignment.ts | 2 +- sdk/nodejs/mwsStorageConfigurations.ts | 6 +- sdk/nodejs/mwsWorkspaces.ts | 6 +- sdk/nodejs/workspaceFile.ts | 10 ++ .../get_aws_assume_role_policy.py | 4 +- .../pulumi_databricks/mws_credentials.py | 121 +++++++++++++----- .../mws_customer_managed_keys.py | 14 +- .../pulumi_databricks/mws_log_delivery.py | 14 +- sdk/python/pulumi_databricks/mws_networks.py | 14 +- .../mws_permission_assignment.py | 4 +- .../mws_storage_configurations.py | 14 +- .../pulumi_databricks/mws_workspaces.py | 14 +- .../pulumi_databricks/workspace_file.py | 32 ++++- 63 files changed, 634 insertions(+), 346 deletions(-) diff --git a/provider/cmd/pulumi-resource-databricks/bridge-metadata.json b/provider/cmd/pulumi-resource-databricks/bridge-metadata.json index 33a929ab..4574b49a 100644 --- a/provider/cmd/pulumi-resource-databricks/bridge-metadata.json +++ b/provider/cmd/pulumi-resource-databricks/bridge-metadata.json @@ -5220,7 +5220,8 @@ }, "databricks:index/workspaceFile:WorkspaceFile": { "contentBase64": "content_base64", - "objectId": "object_id" + "objectId": "object_id", + "workspacePath": "workspace_path" }, "databricks:index:Provider": { "accountId": "account_id", diff --git a/provider/cmd/pulumi-resource-databricks/schema.json b/provider/cmd/pulumi-resource-databricks/schema.json index 5952bad2..b4fb83e4 100644 --- a/provider/cmd/pulumi-resource-databricks/schema.json +++ b/provider/cmd/pulumi-resource-databricks/schema.json @@ -13820,12 +13820,11 @@ } }, "databricks:index/mwsCredentials:MwsCredentials": { - "description": "{{% examples %}}\n## Example Usage\n{{% example %}}\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as aws from \"@pulumi/aws\";\nimport * as databricks from \"@pulumi/databricks\";\n\nconst config = new pulumi.Config();\nconst databricksAccountId = config.requireObject(\"databricksAccountId\");\nconst thisAwsAssumeRolePolicy = databricks.getAwsAssumeRolePolicy({\n externalId: databricksAccountId,\n});\nconst crossAccountRole = new aws.iam.Role(\"crossAccountRole\", {\n assumeRolePolicy: thisAwsAssumeRolePolicy.then(thisAwsAssumeRolePolicy =\u003e thisAwsAssumeRolePolicy.json),\n tags: _var.tags,\n});\nconst thisAwsCrossAccountPolicy = databricks.getAwsCrossAccountPolicy({});\nconst thisRolePolicy = new aws.iam.RolePolicy(\"thisRolePolicy\", {\n role: crossAccountRole.id,\n policy: thisAwsCrossAccountPolicy.then(thisAwsCrossAccountPolicy =\u003e thisAwsCrossAccountPolicy.json),\n});\nconst thisMwsCredentials = new databricks.MwsCredentials(\"thisMwsCredentials\", {\n accountId: databricksAccountId,\n credentialsName: `${local.prefix}-creds`,\n roleArn: crossAccountRole.arn,\n}, {\n provider: databricks.mws,\n});\n```\n```python\nimport pulumi\nimport pulumi_aws as aws\nimport pulumi_databricks as databricks\n\nconfig = pulumi.Config()\ndatabricks_account_id = config.require_object(\"databricksAccountId\")\nthis_aws_assume_role_policy = databricks.get_aws_assume_role_policy(external_id=databricks_account_id)\ncross_account_role = aws.iam.Role(\"crossAccountRole\",\n assume_role_policy=this_aws_assume_role_policy.json,\n tags=var[\"tags\"])\nthis_aws_cross_account_policy = databricks.get_aws_cross_account_policy()\nthis_role_policy = aws.iam.RolePolicy(\"thisRolePolicy\",\n role=cross_account_role.id,\n policy=this_aws_cross_account_policy.json)\nthis_mws_credentials = databricks.MwsCredentials(\"thisMwsCredentials\",\n account_id=databricks_account_id,\n credentials_name=f\"{local['prefix']}-creds\",\n role_arn=cross_account_role.arn,\n opts=pulumi.ResourceOptions(provider=databricks[\"mws\"]))\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Aws = Pulumi.Aws;\nusing Databricks = Pulumi.Databricks;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var config = new Config();\n var databricksAccountId = config.RequireObject\u003cdynamic\u003e(\"databricksAccountId\");\n var thisAwsAssumeRolePolicy = Databricks.GetAwsAssumeRolePolicy.Invoke(new()\n {\n ExternalId = databricksAccountId,\n });\n\n var crossAccountRole = new Aws.Iam.Role(\"crossAccountRole\", new()\n {\n AssumeRolePolicy = thisAwsAssumeRolePolicy.Apply(getAwsAssumeRolePolicyResult =\u003e getAwsAssumeRolePolicyResult.Json),\n Tags = @var.Tags,\n });\n\n var thisAwsCrossAccountPolicy = Databricks.GetAwsCrossAccountPolicy.Invoke();\n\n var thisRolePolicy = new Aws.Iam.RolePolicy(\"thisRolePolicy\", new()\n {\n Role = crossAccountRole.Id,\n Policy = thisAwsCrossAccountPolicy.Apply(getAwsCrossAccountPolicyResult =\u003e getAwsCrossAccountPolicyResult.Json),\n });\n\n var thisMwsCredentials = new Databricks.MwsCredentials(\"thisMwsCredentials\", new()\n {\n AccountId = databricksAccountId,\n CredentialsName = $\"{local.Prefix}-creds\",\n RoleArn = crossAccountRole.Arn,\n }, new CustomResourceOptions\n {\n Provider = databricks.Mws,\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"fmt\"\n\n\t\"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/iam\"\n\t\"github.com/pulumi/pulumi-databricks/sdk/go/databricks\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi/config\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tcfg := config.New(ctx, \"\")\n\t\tdatabricksAccountId := cfg.RequireObject(\"databricksAccountId\")\n\t\tthisAwsAssumeRolePolicy, err := databricks.GetAwsAssumeRolePolicy(ctx, \u0026databricks.GetAwsAssumeRolePolicyArgs{\n\t\t\tExternalId: databricksAccountId,\n\t\t}, nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tcrossAccountRole, err := iam.NewRole(ctx, \"crossAccountRole\", \u0026iam.RoleArgs{\n\t\t\tAssumeRolePolicy: *pulumi.String(thisAwsAssumeRolePolicy.Json),\n\t\t\tTags: pulumi.Any(_var.Tags),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tthisAwsCrossAccountPolicy, err := databricks.GetAwsCrossAccountPolicy(ctx, nil, nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = iam.NewRolePolicy(ctx, \"thisRolePolicy\", \u0026iam.RolePolicyArgs{\n\t\t\tRole: crossAccountRole.ID(),\n\t\t\tPolicy: *pulumi.String(thisAwsCrossAccountPolicy.Json),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = databricks.NewMwsCredentials(ctx, \"thisMwsCredentials\", \u0026databricks.MwsCredentialsArgs{\n\t\t\tAccountId: pulumi.Any(databricksAccountId),\n\t\t\tCredentialsName: pulumi.String(fmt.Sprintf(\"%v-creds\", local.Prefix)),\n\t\t\tRoleArn: crossAccountRole.Arn,\n\t\t}, pulumi.Provider(databricks.Mws))\n\t\tif err != nil {\n\t\t\treturn err\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.GetAwsAssumeRolePolicyArgs;\nimport com.pulumi.aws.iam.Role;\nimport com.pulumi.aws.iam.RoleArgs;\nimport com.pulumi.databricks.inputs.GetAwsCrossAccountPolicyArgs;\nimport com.pulumi.aws.iam.RolePolicy;\nimport com.pulumi.aws.iam.RolePolicyArgs;\nimport com.pulumi.databricks.MwsCredentials;\nimport com.pulumi.databricks.MwsCredentialsArgs;\nimport com.pulumi.resources.CustomResourceOptions;\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 config = ctx.config();\n final var databricksAccountId = config.get(\"databricksAccountId\");\n final var thisAwsAssumeRolePolicy = DatabricksFunctions.getAwsAssumeRolePolicy(GetAwsAssumeRolePolicyArgs.builder()\n .externalId(databricksAccountId)\n .build());\n\n var crossAccountRole = new Role(\"crossAccountRole\", RoleArgs.builder() \n .assumeRolePolicy(thisAwsAssumeRolePolicy.applyValue(getAwsAssumeRolePolicyResult -\u003e getAwsAssumeRolePolicyResult.json()))\n .tags(var_.tags())\n .build());\n\n final var thisAwsCrossAccountPolicy = DatabricksFunctions.getAwsCrossAccountPolicy();\n\n var thisRolePolicy = new RolePolicy(\"thisRolePolicy\", RolePolicyArgs.builder() \n .role(crossAccountRole.id())\n .policy(thisAwsCrossAccountPolicy.applyValue(getAwsCrossAccountPolicyResult -\u003e getAwsCrossAccountPolicyResult.json()))\n .build());\n\n var thisMwsCredentials = new MwsCredentials(\"thisMwsCredentials\", MwsCredentialsArgs.builder() \n .accountId(databricksAccountId)\n .credentialsName(String.format(\"%s-creds\", local.prefix()))\n .roleArn(crossAccountRole.arn())\n .build(), CustomResourceOptions.builder()\n .provider(databricks.mws())\n .build());\n\n }\n}\n```\n```yaml\nconfiguration:\n databricksAccountId:\n type: dynamic\nresources:\n crossAccountRole:\n type: aws:iam:Role\n properties:\n assumeRolePolicy: ${thisAwsAssumeRolePolicy.json}\n tags: ${var.tags}\n thisRolePolicy:\n type: aws:iam:RolePolicy\n properties:\n role: ${crossAccountRole.id}\n policy: ${thisAwsCrossAccountPolicy.json}\n thisMwsCredentials:\n type: databricks:MwsCredentials\n properties:\n accountId: ${databricksAccountId}\n credentialsName: ${local.prefix}-creds\n roleArn: ${crossAccountRole.arn}\n options:\n provider: ${databricks.mws}\nvariables:\n thisAwsAssumeRolePolicy:\n fn::invoke:\n Function: databricks:getAwsAssumeRolePolicy\n Arguments:\n externalId: ${databricksAccountId}\n thisAwsCrossAccountPolicy:\n fn::invoke:\n Function: databricks:getAwsCrossAccountPolicy\n Arguments: {}\n```\n{{% /example %}}\n{{% /examples %}}\n## Related Resources\n\nThe following resources are used in the same context:\n\n* Provisioning Databricks on AWS guide.\n* databricks.MwsCustomerManagedKeys to configure KMS keys for new workspaces within AWS.\n* databricks.MwsLogDelivery to configure delivery of [billable usage logs](https://docs.databricks.com/administration-guide/account-settings/billable-usage-delivery.html) and [audit logs](https://docs.databricks.com/administration-guide/account-settings/audit-logs.html).\n* databricks.MwsNetworks to [configure VPC](https://docs.databricks.com/administration-guide/cloud-configurations/aws/customer-managed-vpc.html) \u0026 subnets for new workspaces within AWS.\n* databricks.MwsStorageConfigurations to configure root bucket new workspaces within AWS.\n* databricks.MwsWorkspaces to set up [workspaces in E2 architecture on AWS](https://docs.databricks.com/getting-started/overview.html#e2-architecture-1).\n\n\n## Import\n\n-\u003e **Note** Importing this resource is not currently supported. ", + "description": "{{% examples %}}\n## Example Usage\n{{% example %}}\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as aws from \"@pulumi/aws\";\nimport * as databricks from \"@pulumi/databricks\";\n\nconst config = new pulumi.Config();\nconst databricksAccountId = config.requireObject(\"databricksAccountId\");\nconst thisAwsAssumeRolePolicy = databricks.getAwsAssumeRolePolicy({\n externalId: databricksAccountId,\n});\nconst crossAccountRole = new aws.iam.Role(\"crossAccountRole\", {\n assumeRolePolicy: thisAwsAssumeRolePolicy.then(thisAwsAssumeRolePolicy =\u003e thisAwsAssumeRolePolicy.json),\n tags: _var.tags,\n});\nconst thisAwsCrossAccountPolicy = databricks.getAwsCrossAccountPolicy({});\nconst thisRolePolicy = new aws.iam.RolePolicy(\"thisRolePolicy\", {\n role: crossAccountRole.id,\n policy: thisAwsCrossAccountPolicy.then(thisAwsCrossAccountPolicy =\u003e thisAwsCrossAccountPolicy.json),\n});\nconst thisMwsCredentials = new databricks.MwsCredentials(\"thisMwsCredentials\", {\n accountId: databricksAccountId,\n credentialsName: `${local.prefix}-creds`,\n roleArn: crossAccountRole.arn,\n}, {\n provider: databricks.mws,\n});\n```\n```python\nimport pulumi\nimport pulumi_aws as aws\nimport pulumi_databricks as databricks\n\nconfig = pulumi.Config()\ndatabricks_account_id = config.require_object(\"databricksAccountId\")\nthis_aws_assume_role_policy = databricks.get_aws_assume_role_policy(external_id=databricks_account_id)\ncross_account_role = aws.iam.Role(\"crossAccountRole\",\n assume_role_policy=this_aws_assume_role_policy.json,\n tags=var[\"tags\"])\nthis_aws_cross_account_policy = databricks.get_aws_cross_account_policy()\nthis_role_policy = aws.iam.RolePolicy(\"thisRolePolicy\",\n role=cross_account_role.id,\n policy=this_aws_cross_account_policy.json)\nthis_mws_credentials = databricks.MwsCredentials(\"thisMwsCredentials\",\n account_id=databricks_account_id,\n credentials_name=f\"{local['prefix']}-creds\",\n role_arn=cross_account_role.arn,\n opts=pulumi.ResourceOptions(provider=databricks[\"mws\"]))\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Aws = Pulumi.Aws;\nusing Databricks = Pulumi.Databricks;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var config = new Config();\n var databricksAccountId = config.RequireObject\u003cdynamic\u003e(\"databricksAccountId\");\n var thisAwsAssumeRolePolicy = Databricks.GetAwsAssumeRolePolicy.Invoke(new()\n {\n ExternalId = databricksAccountId,\n });\n\n var crossAccountRole = new Aws.Iam.Role(\"crossAccountRole\", new()\n {\n AssumeRolePolicy = thisAwsAssumeRolePolicy.Apply(getAwsAssumeRolePolicyResult =\u003e getAwsAssumeRolePolicyResult.Json),\n Tags = @var.Tags,\n });\n\n var thisAwsCrossAccountPolicy = Databricks.GetAwsCrossAccountPolicy.Invoke();\n\n var thisRolePolicy = new Aws.Iam.RolePolicy(\"thisRolePolicy\", new()\n {\n Role = crossAccountRole.Id,\n Policy = thisAwsCrossAccountPolicy.Apply(getAwsCrossAccountPolicyResult =\u003e getAwsCrossAccountPolicyResult.Json),\n });\n\n var thisMwsCredentials = new Databricks.MwsCredentials(\"thisMwsCredentials\", new()\n {\n AccountId = databricksAccountId,\n CredentialsName = $\"{local.Prefix}-creds\",\n RoleArn = crossAccountRole.Arn,\n }, new CustomResourceOptions\n {\n Provider = databricks.Mws,\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"fmt\"\n\n\t\"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/iam\"\n\t\"github.com/pulumi/pulumi-databricks/sdk/go/databricks\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi/config\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\tcfg := config.New(ctx, \"\")\n\t\tdatabricksAccountId := cfg.RequireObject(\"databricksAccountId\")\n\t\tthisAwsAssumeRolePolicy, err := databricks.GetAwsAssumeRolePolicy(ctx, \u0026databricks.GetAwsAssumeRolePolicyArgs{\n\t\t\tExternalId: databricksAccountId,\n\t\t}, nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tcrossAccountRole, err := iam.NewRole(ctx, \"crossAccountRole\", \u0026iam.RoleArgs{\n\t\t\tAssumeRolePolicy: *pulumi.String(thisAwsAssumeRolePolicy.Json),\n\t\t\tTags: pulumi.Any(_var.Tags),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\tthisAwsCrossAccountPolicy, err := databricks.GetAwsCrossAccountPolicy(ctx, nil, nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = iam.NewRolePolicy(ctx, \"thisRolePolicy\", \u0026iam.RolePolicyArgs{\n\t\t\tRole: crossAccountRole.ID(),\n\t\t\tPolicy: *pulumi.String(thisAwsCrossAccountPolicy.Json),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = databricks.NewMwsCredentials(ctx, \"thisMwsCredentials\", \u0026databricks.MwsCredentialsArgs{\n\t\t\tAccountId: pulumi.Any(databricksAccountId),\n\t\t\tCredentialsName: pulumi.String(fmt.Sprintf(\"%v-creds\", local.Prefix)),\n\t\t\tRoleArn: crossAccountRole.Arn,\n\t\t}, pulumi.Provider(databricks.Mws))\n\t\tif err != nil {\n\t\t\treturn err\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.GetAwsAssumeRolePolicyArgs;\nimport com.pulumi.aws.iam.Role;\nimport com.pulumi.aws.iam.RoleArgs;\nimport com.pulumi.databricks.inputs.GetAwsCrossAccountPolicyArgs;\nimport com.pulumi.aws.iam.RolePolicy;\nimport com.pulumi.aws.iam.RolePolicyArgs;\nimport com.pulumi.databricks.MwsCredentials;\nimport com.pulumi.databricks.MwsCredentialsArgs;\nimport com.pulumi.resources.CustomResourceOptions;\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 config = ctx.config();\n final var databricksAccountId = config.get(\"databricksAccountId\");\n final var thisAwsAssumeRolePolicy = DatabricksFunctions.getAwsAssumeRolePolicy(GetAwsAssumeRolePolicyArgs.builder()\n .externalId(databricksAccountId)\n .build());\n\n var crossAccountRole = new Role(\"crossAccountRole\", RoleArgs.builder() \n .assumeRolePolicy(thisAwsAssumeRolePolicy.applyValue(getAwsAssumeRolePolicyResult -\u003e getAwsAssumeRolePolicyResult.json()))\n .tags(var_.tags())\n .build());\n\n final var thisAwsCrossAccountPolicy = DatabricksFunctions.getAwsCrossAccountPolicy();\n\n var thisRolePolicy = new RolePolicy(\"thisRolePolicy\", RolePolicyArgs.builder() \n .role(crossAccountRole.id())\n .policy(thisAwsCrossAccountPolicy.applyValue(getAwsCrossAccountPolicyResult -\u003e getAwsCrossAccountPolicyResult.json()))\n .build());\n\n var thisMwsCredentials = new MwsCredentials(\"thisMwsCredentials\", MwsCredentialsArgs.builder() \n .accountId(databricksAccountId)\n .credentialsName(String.format(\"%s-creds\", local.prefix()))\n .roleArn(crossAccountRole.arn())\n .build(), CustomResourceOptions.builder()\n .provider(databricks.mws())\n .build());\n\n }\n}\n```\n```yaml\nconfiguration:\n databricksAccountId:\n type: dynamic\nresources:\n crossAccountRole:\n type: aws:iam:Role\n properties:\n assumeRolePolicy: ${thisAwsAssumeRolePolicy.json}\n tags: ${var.tags}\n thisRolePolicy:\n type: aws:iam:RolePolicy\n properties:\n role: ${crossAccountRole.id}\n policy: ${thisAwsCrossAccountPolicy.json}\n thisMwsCredentials:\n type: databricks:MwsCredentials\n properties:\n accountId: ${databricksAccountId}\n credentialsName: ${local.prefix}-creds\n roleArn: ${crossAccountRole.arn}\n options:\n provider: ${databricks.mws}\nvariables:\n thisAwsAssumeRolePolicy:\n fn::invoke:\n Function: databricks:getAwsAssumeRolePolicy\n Arguments:\n externalId: ${databricksAccountId}\n thisAwsCrossAccountPolicy:\n fn::invoke:\n Function: databricks:getAwsCrossAccountPolicy\n Arguments: {}\n```\n{{% /example %}}\n{{% /examples %}}\n## Related Resources\n\nThe following resources are used in the same context:\n\n* Provisioning Databricks on AWS guide.\n* databricks.MwsCustomerManagedKeys to configure KMS keys for new workspaces within AWS.\n* databricks.MwsLogDelivery to configure delivery of [billable usage logs](https://docs.databricks.com/administration-guide/account-settings/billable-usage-delivery.html) and [audit logs](https://docs.databricks.com/administration-guide/account-settings/audit-logs.html).\n* databricks.MwsNetworks to [configure VPC](https://docs.databricks.com/administration-guide/cloud-configurations/aws/customer-managed-vpc.html) \u0026 subnets for new workspaces within AWS.\n* databricks.MwsStorageConfigurations to configure root bucket new workspaces within AWS.\n* databricks.MwsWorkspaces to set up [workspaces in E2 architecture on AWS](https://docs.databricks.com/getting-started/overview.html#e2-architecture-1).\n\n\n## Import\n\nThis resource can be imported by the combination of its identifier and the account idbash\n\n```sh\n $ pulumi import databricks:index/mwsCredentials:MwsCredentials this \u003caccount_id\u003e/\u003ccredentials_id\u003e\n```\n\n ", "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", - "secret": true + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n" }, "creationTime": { "type": "integer", @@ -13848,7 +13847,6 @@ } }, "required": [ - "accountId", "creationTime", "credentialsId", "credentialsName", @@ -13858,15 +13856,25 @@ "inputProperties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", - "secret": true, + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", "willReplaceOnChanges": true }, + "creationTime": { + "type": "integer", + "description": "(Integer) time of credentials registration\n" + }, + "credentialsId": { + "type": "string", + "description": "(String) identifier of credentials\n" + }, "credentialsName": { "type": "string", "description": "name of credentials to register\n", "willReplaceOnChanges": true }, + "externalId": { + "type": "string" + }, "roleArn": { "type": "string", "description": "ARN of cross-account role\n", @@ -13874,7 +13882,6 @@ } }, "requiredInputs": [ - "accountId", "credentialsName", "roleArn" ], @@ -13883,8 +13890,7 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", - "secret": true, + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", "willReplaceOnChanges": true }, "creationTime": { @@ -13917,7 +13923,7 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n" + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n" }, "awsKeyInfo": { "$ref": "#/types/databricks:index/MwsCustomerManagedKeysAwsKeyInfo:MwsCustomerManagedKeysAwsKeyInfo", @@ -13952,7 +13958,7 @@ "inputProperties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", "willReplaceOnChanges": true }, "awsKeyInfo": { @@ -13991,7 +13997,7 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", "willReplaceOnChanges": true }, "awsKeyInfo": { @@ -14029,7 +14035,7 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n" + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n" }, "configId": { "type": "string", @@ -14088,7 +14094,7 @@ "inputProperties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n", "willReplaceOnChanges": true }, "configId": { @@ -14156,7 +14162,7 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n", "willReplaceOnChanges": true }, "configId": { @@ -14220,7 +14226,7 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", "secret": true }, "creationTime": { @@ -14288,7 +14294,7 @@ "inputProperties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", "secret": true, "willReplaceOnChanges": true }, @@ -14359,7 +14365,7 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", "secret": true, "willReplaceOnChanges": true }, @@ -14425,7 +14431,7 @@ } }, "databricks:index/mwsPermissionAssignment:MwsPermissionAssignment": { - "description": "These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `account_id` attribute configured. Account Id that could be found in the bottom left corner of Accounts Console\n\n{{% examples %}}\n## Example Usage\n{{% example %}}\n\nIn account context, adding account-level group to a workspace:\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as databricks from \"@pulumi/databricks\";\n\nconst dataEng = new databricks.Group(\"dataEng\", {});\nconst addAdminGroup = new databricks.MwsPermissionAssignment(\"addAdminGroup\", {\n workspaceId: databricks_mws_workspaces[\"this\"].workspace_id,\n principalId: dataEng.id,\n permissions: [\"ADMIN\"],\n});\n```\n```python\nimport pulumi\nimport pulumi_databricks as databricks\n\ndata_eng = databricks.Group(\"dataEng\")\nadd_admin_group = databricks.MwsPermissionAssignment(\"addAdminGroup\",\n workspace_id=databricks_mws_workspaces[\"this\"][\"workspace_id\"],\n principal_id=data_eng.id,\n permissions=[\"ADMIN\"])\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Databricks = Pulumi.Databricks;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var dataEng = new Databricks.Group(\"dataEng\");\n\n var addAdminGroup = new Databricks.MwsPermissionAssignment(\"addAdminGroup\", new()\n {\n WorkspaceId = databricks_mws_workspaces.This.Workspace_id,\n PrincipalId = dataEng.Id,\n Permissions = new[]\n {\n \"ADMIN\",\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\tdataEng, err := databricks.NewGroup(ctx, \"dataEng\", nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = databricks.NewMwsPermissionAssignment(ctx, \"addAdminGroup\", \u0026databricks.MwsPermissionAssignmentArgs{\n\t\t\tWorkspaceId: pulumi.Any(databricks_mws_workspaces.This.Workspace_id),\n\t\t\tPrincipalId: dataEng.ID(),\n\t\t\tPermissions: pulumi.StringArray{\n\t\t\t\tpulumi.String(\"ADMIN\"),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\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.Group;\nimport com.pulumi.databricks.MwsPermissionAssignment;\nimport com.pulumi.databricks.MwsPermissionAssignmentArgs;\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 var dataEng = new Group(\"dataEng\");\n\n var addAdminGroup = new MwsPermissionAssignment(\"addAdminGroup\", MwsPermissionAssignmentArgs.builder() \n .workspaceId(databricks_mws_workspaces.this().workspace_id())\n .principalId(dataEng.id())\n .permissions(\"ADMIN\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n dataEng:\n type: databricks:Group\n addAdminGroup:\n type: databricks:MwsPermissionAssignment\n properties:\n workspaceId: ${databricks_mws_workspaces.this.workspace_id}\n principalId: ${dataEng.id}\n permissions:\n - ADMIN\n```\n\nIn account context, adding account-level user to a workspace:\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as databricks from \"@pulumi/databricks\";\n\nconst me = new databricks.User(\"me\", {userName: \"me@example.com\"});\nconst addUser = new databricks.MwsPermissionAssignment(\"addUser\", {\n workspaceId: databricks_mws_workspaces[\"this\"].workspace_id,\n principalId: me.id,\n permissions: [\"USER\"],\n});\n```\n```python\nimport pulumi\nimport pulumi_databricks as databricks\n\nme = databricks.User(\"me\", user_name=\"me@example.com\")\nadd_user = databricks.MwsPermissionAssignment(\"addUser\",\n workspace_id=databricks_mws_workspaces[\"this\"][\"workspace_id\"],\n principal_id=me.id,\n permissions=[\"USER\"])\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Databricks = Pulumi.Databricks;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var me = new Databricks.User(\"me\", new()\n {\n UserName = \"me@example.com\",\n });\n\n var addUser = new Databricks.MwsPermissionAssignment(\"addUser\", new()\n {\n WorkspaceId = databricks_mws_workspaces.This.Workspace_id,\n PrincipalId = me.Id,\n Permissions = new[]\n {\n \"USER\",\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\tme, err := databricks.NewUser(ctx, \"me\", \u0026databricks.UserArgs{\n\t\t\tUserName: pulumi.String(\"me@example.com\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = databricks.NewMwsPermissionAssignment(ctx, \"addUser\", \u0026databricks.MwsPermissionAssignmentArgs{\n\t\t\tWorkspaceId: pulumi.Any(databricks_mws_workspaces.This.Workspace_id),\n\t\t\tPrincipalId: me.ID(),\n\t\t\tPermissions: pulumi.StringArray{\n\t\t\t\tpulumi.String(\"USER\"),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\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.User;\nimport com.pulumi.databricks.UserArgs;\nimport com.pulumi.databricks.MwsPermissionAssignment;\nimport com.pulumi.databricks.MwsPermissionAssignmentArgs;\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 var me = new User(\"me\", UserArgs.builder() \n .userName(\"me@example.com\")\n .build());\n\n var addUser = new MwsPermissionAssignment(\"addUser\", MwsPermissionAssignmentArgs.builder() \n .workspaceId(databricks_mws_workspaces.this().workspace_id())\n .principalId(me.id())\n .permissions(\"USER\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n me:\n type: databricks:User\n properties:\n userName: me@example.com\n addUser:\n type: databricks:MwsPermissionAssignment\n properties:\n workspaceId: ${databricks_mws_workspaces.this.workspace_id}\n principalId: ${me.id}\n permissions:\n - USER\n```\n\nIn account context, adding account-level service principal to a workspace:\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as databricks from \"@pulumi/databricks\";\n\nconst sp = new databricks.ServicePrincipal(\"sp\", {displayName: \"Automation-only SP\"});\nconst addAdminSpn = new databricks.MwsPermissionAssignment(\"addAdminSpn\", {\n workspaceId: databricks_mws_workspaces[\"this\"].workspace_id,\n principalId: sp.id,\n permissions: [\"ADMIN\"],\n});\n```\n```python\nimport pulumi\nimport pulumi_databricks as databricks\n\nsp = databricks.ServicePrincipal(\"sp\", display_name=\"Automation-only SP\")\nadd_admin_spn = databricks.MwsPermissionAssignment(\"addAdminSpn\",\n workspace_id=databricks_mws_workspaces[\"this\"][\"workspace_id\"],\n principal_id=sp.id,\n permissions=[\"ADMIN\"])\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Databricks = Pulumi.Databricks;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var sp = new Databricks.ServicePrincipal(\"sp\", new()\n {\n DisplayName = \"Automation-only SP\",\n });\n\n var addAdminSpn = new Databricks.MwsPermissionAssignment(\"addAdminSpn\", new()\n {\n WorkspaceId = databricks_mws_workspaces.This.Workspace_id,\n PrincipalId = sp.Id,\n Permissions = new[]\n {\n \"ADMIN\",\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\tsp, err := databricks.NewServicePrincipal(ctx, \"sp\", \u0026databricks.ServicePrincipalArgs{\n\t\t\tDisplayName: pulumi.String(\"Automation-only SP\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = databricks.NewMwsPermissionAssignment(ctx, \"addAdminSpn\", \u0026databricks.MwsPermissionAssignmentArgs{\n\t\t\tWorkspaceId: pulumi.Any(databricks_mws_workspaces.This.Workspace_id),\n\t\t\tPrincipalId: sp.ID(),\n\t\t\tPermissions: pulumi.StringArray{\n\t\t\t\tpulumi.String(\"ADMIN\"),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\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.ServicePrincipal;\nimport com.pulumi.databricks.ServicePrincipalArgs;\nimport com.pulumi.databricks.MwsPermissionAssignment;\nimport com.pulumi.databricks.MwsPermissionAssignmentArgs;\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 var sp = new ServicePrincipal(\"sp\", ServicePrincipalArgs.builder() \n .displayName(\"Automation-only SP\")\n .build());\n\n var addAdminSpn = new MwsPermissionAssignment(\"addAdminSpn\", MwsPermissionAssignmentArgs.builder() \n .workspaceId(databricks_mws_workspaces.this().workspace_id())\n .principalId(sp.id())\n .permissions(\"ADMIN\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n sp:\n type: databricks:ServicePrincipal\n properties:\n displayName: Automation-only SP\n addAdminSpn:\n type: databricks:MwsPermissionAssignment\n properties:\n workspaceId: ${databricks_mws_workspaces.this.workspace_id}\n principalId: ${sp.id}\n permissions:\n - ADMIN\n```\n{{% /example %}}\n{{% /examples %}}\n## Related Resources\n\nThe following resources are used in the same context:\n\n* databricks.Group to manage [groups in Databricks Workspace](https://docs.databricks.com/administration-guide/users-groups/groups.html) or [Account Console](https://accounts.cloud.databricks.com/) (for AWS deployments).\n* databricks.Group data to retrieve information about databricks.Group members, entitlements and instance profiles.\n* databricks.GroupMember to attach users and groups as group members.\n* databricks.PermissionAssignment to manage permission assignment from a workspace context\n\n\n## Import\n\nThe resource `databricks_mws_permission_assignment` can be imported using the workspace id and principal id bash\n\n```sh\n $ pulumi import databricks:index/mwsPermissionAssignment:MwsPermissionAssignment this \"workspace_id|principal_id\"\n```\n\n ", + "description": "These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `account_id` attribute configured. Account Id that could be found in the top right corner of Accounts Console\n\n{{% examples %}}\n## Example Usage\n{{% example %}}\n\nIn account context, adding account-level group to a workspace:\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as databricks from \"@pulumi/databricks\";\n\nconst dataEng = new databricks.Group(\"dataEng\", {});\nconst addAdminGroup = new databricks.MwsPermissionAssignment(\"addAdminGroup\", {\n workspaceId: databricks_mws_workspaces[\"this\"].workspace_id,\n principalId: dataEng.id,\n permissions: [\"ADMIN\"],\n});\n```\n```python\nimport pulumi\nimport pulumi_databricks as databricks\n\ndata_eng = databricks.Group(\"dataEng\")\nadd_admin_group = databricks.MwsPermissionAssignment(\"addAdminGroup\",\n workspace_id=databricks_mws_workspaces[\"this\"][\"workspace_id\"],\n principal_id=data_eng.id,\n permissions=[\"ADMIN\"])\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Databricks = Pulumi.Databricks;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var dataEng = new Databricks.Group(\"dataEng\");\n\n var addAdminGroup = new Databricks.MwsPermissionAssignment(\"addAdminGroup\", new()\n {\n WorkspaceId = databricks_mws_workspaces.This.Workspace_id,\n PrincipalId = dataEng.Id,\n Permissions = new[]\n {\n \"ADMIN\",\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\tdataEng, err := databricks.NewGroup(ctx, \"dataEng\", nil)\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = databricks.NewMwsPermissionAssignment(ctx, \"addAdminGroup\", \u0026databricks.MwsPermissionAssignmentArgs{\n\t\t\tWorkspaceId: pulumi.Any(databricks_mws_workspaces.This.Workspace_id),\n\t\t\tPrincipalId: dataEng.ID(),\n\t\t\tPermissions: pulumi.StringArray{\n\t\t\t\tpulumi.String(\"ADMIN\"),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\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.Group;\nimport com.pulumi.databricks.MwsPermissionAssignment;\nimport com.pulumi.databricks.MwsPermissionAssignmentArgs;\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 var dataEng = new Group(\"dataEng\");\n\n var addAdminGroup = new MwsPermissionAssignment(\"addAdminGroup\", MwsPermissionAssignmentArgs.builder() \n .workspaceId(databricks_mws_workspaces.this().workspace_id())\n .principalId(dataEng.id())\n .permissions(\"ADMIN\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n dataEng:\n type: databricks:Group\n addAdminGroup:\n type: databricks:MwsPermissionAssignment\n properties:\n workspaceId: ${databricks_mws_workspaces.this.workspace_id}\n principalId: ${dataEng.id}\n permissions:\n - ADMIN\n```\n\nIn account context, adding account-level user to a workspace:\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as databricks from \"@pulumi/databricks\";\n\nconst me = new databricks.User(\"me\", {userName: \"me@example.com\"});\nconst addUser = new databricks.MwsPermissionAssignment(\"addUser\", {\n workspaceId: databricks_mws_workspaces[\"this\"].workspace_id,\n principalId: me.id,\n permissions: [\"USER\"],\n});\n```\n```python\nimport pulumi\nimport pulumi_databricks as databricks\n\nme = databricks.User(\"me\", user_name=\"me@example.com\")\nadd_user = databricks.MwsPermissionAssignment(\"addUser\",\n workspace_id=databricks_mws_workspaces[\"this\"][\"workspace_id\"],\n principal_id=me.id,\n permissions=[\"USER\"])\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Databricks = Pulumi.Databricks;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var me = new Databricks.User(\"me\", new()\n {\n UserName = \"me@example.com\",\n });\n\n var addUser = new Databricks.MwsPermissionAssignment(\"addUser\", new()\n {\n WorkspaceId = databricks_mws_workspaces.This.Workspace_id,\n PrincipalId = me.Id,\n Permissions = new[]\n {\n \"USER\",\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\tme, err := databricks.NewUser(ctx, \"me\", \u0026databricks.UserArgs{\n\t\t\tUserName: pulumi.String(\"me@example.com\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = databricks.NewMwsPermissionAssignment(ctx, \"addUser\", \u0026databricks.MwsPermissionAssignmentArgs{\n\t\t\tWorkspaceId: pulumi.Any(databricks_mws_workspaces.This.Workspace_id),\n\t\t\tPrincipalId: me.ID(),\n\t\t\tPermissions: pulumi.StringArray{\n\t\t\t\tpulumi.String(\"USER\"),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\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.User;\nimport com.pulumi.databricks.UserArgs;\nimport com.pulumi.databricks.MwsPermissionAssignment;\nimport com.pulumi.databricks.MwsPermissionAssignmentArgs;\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 var me = new User(\"me\", UserArgs.builder() \n .userName(\"me@example.com\")\n .build());\n\n var addUser = new MwsPermissionAssignment(\"addUser\", MwsPermissionAssignmentArgs.builder() \n .workspaceId(databricks_mws_workspaces.this().workspace_id())\n .principalId(me.id())\n .permissions(\"USER\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n me:\n type: databricks:User\n properties:\n userName: me@example.com\n addUser:\n type: databricks:MwsPermissionAssignment\n properties:\n workspaceId: ${databricks_mws_workspaces.this.workspace_id}\n principalId: ${me.id}\n permissions:\n - USER\n```\n\nIn account context, adding account-level service principal to a workspace:\n\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as databricks from \"@pulumi/databricks\";\n\nconst sp = new databricks.ServicePrincipal(\"sp\", {displayName: \"Automation-only SP\"});\nconst addAdminSpn = new databricks.MwsPermissionAssignment(\"addAdminSpn\", {\n workspaceId: databricks_mws_workspaces[\"this\"].workspace_id,\n principalId: sp.id,\n permissions: [\"ADMIN\"],\n});\n```\n```python\nimport pulumi\nimport pulumi_databricks as databricks\n\nsp = databricks.ServicePrincipal(\"sp\", display_name=\"Automation-only SP\")\nadd_admin_spn = databricks.MwsPermissionAssignment(\"addAdminSpn\",\n workspace_id=databricks_mws_workspaces[\"this\"][\"workspace_id\"],\n principal_id=sp.id,\n permissions=[\"ADMIN\"])\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Databricks = Pulumi.Databricks;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var sp = new Databricks.ServicePrincipal(\"sp\", new()\n {\n DisplayName = \"Automation-only SP\",\n });\n\n var addAdminSpn = new Databricks.MwsPermissionAssignment(\"addAdminSpn\", new()\n {\n WorkspaceId = databricks_mws_workspaces.This.Workspace_id,\n PrincipalId = sp.Id,\n Permissions = new[]\n {\n \"ADMIN\",\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\tsp, err := databricks.NewServicePrincipal(ctx, \"sp\", \u0026databricks.ServicePrincipalArgs{\n\t\t\tDisplayName: pulumi.String(\"Automation-only SP\"),\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\t_, err = databricks.NewMwsPermissionAssignment(ctx, \"addAdminSpn\", \u0026databricks.MwsPermissionAssignmentArgs{\n\t\t\tWorkspaceId: pulumi.Any(databricks_mws_workspaces.This.Workspace_id),\n\t\t\tPrincipalId: sp.ID(),\n\t\t\tPermissions: pulumi.StringArray{\n\t\t\t\tpulumi.String(\"ADMIN\"),\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\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.ServicePrincipal;\nimport com.pulumi.databricks.ServicePrincipalArgs;\nimport com.pulumi.databricks.MwsPermissionAssignment;\nimport com.pulumi.databricks.MwsPermissionAssignmentArgs;\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 var sp = new ServicePrincipal(\"sp\", ServicePrincipalArgs.builder() \n .displayName(\"Automation-only SP\")\n .build());\n\n var addAdminSpn = new MwsPermissionAssignment(\"addAdminSpn\", MwsPermissionAssignmentArgs.builder() \n .workspaceId(databricks_mws_workspaces.this().workspace_id())\n .principalId(sp.id())\n .permissions(\"ADMIN\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n sp:\n type: databricks:ServicePrincipal\n properties:\n displayName: Automation-only SP\n addAdminSpn:\n type: databricks:MwsPermissionAssignment\n properties:\n workspaceId: ${databricks_mws_workspaces.this.workspace_id}\n principalId: ${sp.id}\n permissions:\n - ADMIN\n```\n{{% /example %}}\n{{% /examples %}}\n## Related Resources\n\nThe following resources are used in the same context:\n\n* databricks.Group to manage [groups in Databricks Workspace](https://docs.databricks.com/administration-guide/users-groups/groups.html) or [Account Console](https://accounts.cloud.databricks.com/) (for AWS deployments).\n* databricks.Group data to retrieve information about databricks.Group members, entitlements and instance profiles.\n* databricks.GroupMember to attach users and groups as group members.\n* databricks.PermissionAssignment to manage permission assignment from a workspace context\n\n\n## Import\n\nThe resource `databricks_mws_permission_assignment` can be imported using the workspace id and principal id bash\n\n```sh\n $ pulumi import databricks:index/mwsPermissionAssignment:MwsPermissionAssignment this \"workspace_id|principal_id\"\n```\n\n ", "properties": { "permissions": { "type": "array", @@ -14631,7 +14637,7 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", "secret": true }, "bucketName": { @@ -14660,7 +14666,7 @@ "inputProperties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", "secret": true, "willReplaceOnChanges": true }, @@ -14685,7 +14691,7 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/)\n", "secret": true, "willReplaceOnChanges": true }, @@ -14863,7 +14869,7 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n", "secret": true }, "awsRegion": { @@ -14970,7 +14976,7 @@ "inputProperties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n", "secret": true, "willReplaceOnChanges": true }, @@ -15084,7 +15090,7 @@ "properties": { "accountId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n", + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n", "secret": true, "willReplaceOnChanges": true }, @@ -19273,12 +19279,17 @@ "url": { "type": "string", "description": "Routable URL of the workspace file\n" + }, + "workspacePath": { + "type": "string", + "description": "path on Workspace File System (WSFS) in form of `/Workspace` + `path`\n" } }, "required": [ "objectId", "path", - "url" + "url", + "workspacePath" ], "inputProperties": { "contentBase64": { @@ -19329,6 +19340,10 @@ "url": { "type": "string", "description": "Routable URL of the workspace file\n" + }, + "workspacePath": { + "type": "string", + "description": "path on Workspace File System (WSFS) in form of `/Workspace` + `path`\n" } }, "type": "object" @@ -19346,7 +19361,7 @@ }, "externalId": { "type": "string", - "description": "Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n" + "description": "Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/).\n" }, "forLogDelivery": { "type": "boolean", diff --git a/provider/go.mod b/provider/go.mod index f26c7154..c3cb2b4e 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.26.1 - github.com/databricks/terraform-provider-databricks v1.31.0 + github.com/databricks/databricks-sdk-go v0.26.2 + github.com/databricks/terraform-provider-databricks v1.31.1 github.com/pulumi/pulumi-terraform-bridge/v3 v3.68.0 ) @@ -215,7 +215,7 @@ require ( gocloud.dev v0.29.0 // indirect gocloud.dev/secrets/hashivault v0.27.0 // indirect golang.org/x/crypto v0.16.0 // indirect - golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect + golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.19.0 // indirect golang.org/x/oauth2 v0.15.0 // indirect @@ -224,13 +224,13 @@ require ( golang.org/x/term v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.15.0 // indirect + golang.org/x/tools v0.16.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.152.0 // indirect + google.golang.org/api v0.153.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect + google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/provider/go.sum b/provider/go.sum index 5cd4a75e..c4adc483 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -1148,10 +1148,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.26.1 h1:Wumg1H1K7Y3bNSRWERLE+9+BbCGljZAEwv/xc+xhT6s= -github.com/databricks/databricks-sdk-go v0.26.1/go.mod h1:cyFYsqaDiIdaKPdNAuh+YsMUL1k9Lt02JB/72+zgCxg= -github.com/databricks/terraform-provider-databricks v1.31.0 h1:5hX5Boil+iPm016VIIcgR+mP4mHVN9kKfdoZt2Yyaco= -github.com/databricks/terraform-provider-databricks v1.31.0/go.mod h1:rOhBR2zLjxfmrrXvxKwp3dLbSCWSQbPPgMTN/JsvcyU= +github.com/databricks/databricks-sdk-go v0.26.2 h1:OcA8aOpwCqCs+brATOuOR6BmqCK/Boye21+1rYw2MOg= +github.com/databricks/databricks-sdk-go v0.26.2/go.mod h1:cyFYsqaDiIdaKPdNAuh+YsMUL1k9Lt02JB/72+zgCxg= +github.com/databricks/terraform-provider-databricks v1.31.1 h1:s41kax1cC2jHG5yo76TlfbBh15pdDE0/+pFpQOiNRgg= +github.com/databricks/terraform-provider-databricks v1.31.1/go.mod h1:+zu4WS7TqXqDmiqaaRHhpDXahzsILqt9zL9TfcLtMcA= 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= @@ -2801,8 +2801,8 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp v0.0.0-20230124195608-d38c7dcee874/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= +golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8= +golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -3330,8 +3330,8 @@ golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= -golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= +golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= +golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -3417,8 +3417,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/ google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= -google.golang.org/api v0.152.0 h1:t0r1vPnfMc260S2Ci+en7kfCZaLOPs5KI0sVV/6jZrY= -google.golang.org/api v0.152.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY= +google.golang.org/api v0.153.0 h1:N1AwGhielyKFaUqH07/ZSIQR3uNPcV7NVw0vj+j4iR4= +google.golang.org/api v0.153.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -3584,16 +3584,16 @@ google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOl google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/genproto v0.0.0-20230525234025-438c736192d0/go.mod h1:9ExIQyXL5hZrHzQceCwuSYwZZ5QZBazOcprJ5rgs3lY= google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= -google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ= -google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY= +google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg= +google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY= google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.mod h1:ts19tUU+Z0ZShN1y3aPyq2+O3d5FUNNgT6FtOzmrNn8= google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a/go.mod h1:xURIpW9ES5+/GZhnV6beoEtxQrnkRGIfP5VQG2tCBLc= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= diff --git a/sdk/dotnet/GetAwsAssumeRolePolicy.cs b/sdk/dotnet/GetAwsAssumeRolePolicy.cs index a39e5837..bcc74d2e 100644 --- a/sdk/dotnet/GetAwsAssumeRolePolicy.cs +++ b/sdk/dotnet/GetAwsAssumeRolePolicy.cs @@ -159,7 +159,7 @@ public sealed class GetAwsAssumeRolePolicyArgs : global::Pulumi.InvokeArgs public string? DatabricksAccountId { get; set; } /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). /// [Input("externalId", required: true)] public string ExternalId { get; set; } = null!; @@ -182,7 +182,7 @@ public sealed class GetAwsAssumeRolePolicyInvokeArgs : global::Pulumi.InvokeArgs public Input? DatabricksAccountId { get; set; } /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). /// [Input("externalId", required: true)] public Input ExternalId { get; set; } = null!; diff --git a/sdk/dotnet/MwsCredentials.cs b/sdk/dotnet/MwsCredentials.cs index 8a291a99..85c5adaa 100644 --- a/sdk/dotnet/MwsCredentials.cs +++ b/sdk/dotnet/MwsCredentials.cs @@ -67,16 +67,20 @@ namespace Pulumi.Databricks /// /// ## Import /// - /// -> **Note** Importing this resource is not currently supported. + /// This resource can be imported by the combination of its identifier and the account idbash + /// + /// ```sh + /// $ pulumi import databricks:index/mwsCredentials:MwsCredentials this <account_id>/<credentials_id> + /// ``` /// [DatabricksResourceType("databricks:index/mwsCredentials:MwsCredentials")] public partial class MwsCredentials : global::Pulumi.CustomResource { /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) /// [Output("accountId")] - public Output AccountId { get; private set; } = null!; + public Output AccountId { get; private set; } = null!; /// /// (Integer) time of credentials registration @@ -128,10 +132,6 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? var defaultOptions = new CustomResourceOptions { Version = Utilities.Version, - AdditionalSecretOutputs = - { - "accountId", - }, }; var merged = CustomResourceOptions.Merge(defaultOptions, options); // Override the ID if one was specified for consistency with other language SDKs. @@ -155,21 +155,23 @@ public static MwsCredentials Get(string name, Input id, MwsCredentialsSt public sealed class MwsCredentialsArgs : global::Pulumi.ResourceArgs { - [Input("accountId", required: true)] - private Input? _accountId; + /// + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// + [Input("accountId")] + public Input? AccountId { get; set; } /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// (Integer) time of credentials registration /// - public Input? AccountId - { - get => _accountId; - set - { - var emptySecret = Output.CreateSecret(0); - _accountId = Output.Tuple?, int>(value, emptySecret).Apply(t => t.Item1); - } - } + [Input("creationTime")] + public Input? CreationTime { get; set; } + + /// + /// (String) identifier of credentials + /// + [Input("credentialsId")] + public Input? CredentialsId { get; set; } /// /// name of credentials to register @@ -177,6 +179,9 @@ public Input? AccountId [Input("credentialsName", required: true)] public Input CredentialsName { get; set; } = null!; + [Input("externalId")] + public Input? ExternalId { get; set; } + /// /// ARN of cross-account role /// @@ -191,21 +196,11 @@ public MwsCredentialsArgs() public sealed class MwsCredentialsState : global::Pulumi.ResourceArgs { - [Input("accountId")] - private Input? _accountId; - /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) /// - public Input? AccountId - { - get => _accountId; - set - { - var emptySecret = Output.CreateSecret(0); - _accountId = Output.Tuple?, int>(value, emptySecret).Apply(t => t.Item1); - } - } + [Input("accountId")] + public Input? AccountId { get; set; } /// /// (Integer) time of credentials registration diff --git a/sdk/dotnet/MwsCustomerManagedKeys.cs b/sdk/dotnet/MwsCustomerManagedKeys.cs index 99e51d61..4c52ea16 100644 --- a/sdk/dotnet/MwsCustomerManagedKeys.cs +++ b/sdk/dotnet/MwsCustomerManagedKeys.cs @@ -368,7 +368,7 @@ namespace Pulumi.Databricks public partial class MwsCustomerManagedKeys : global::Pulumi.CustomResource { /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) /// [Output("accountId")] public Output AccountId { get; private set; } = null!; @@ -450,7 +450,7 @@ public static MwsCustomerManagedKeys Get(string name, Input id, MwsCusto public sealed class MwsCustomerManagedKeysArgs : global::Pulumi.ResourceArgs { /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) /// [Input("accountId", required: true)] public Input AccountId { get; set; } = null!; @@ -500,7 +500,7 @@ public MwsCustomerManagedKeysArgs() public sealed class MwsCustomerManagedKeysState : global::Pulumi.ResourceArgs { /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) /// [Input("accountId")] public Input? AccountId { get; set; } diff --git a/sdk/dotnet/MwsLogDelivery.cs b/sdk/dotnet/MwsLogDelivery.cs index c0104f15..69cb02e1 100644 --- a/sdk/dotnet/MwsLogDelivery.cs +++ b/sdk/dotnet/MwsLogDelivery.cs @@ -89,7 +89,7 @@ namespace Pulumi.Databricks public partial class MwsLogDelivery : global::Pulumi.CustomResource { /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). /// [Output("accountId")] public Output AccountId { get; private set; } = null!; @@ -201,7 +201,7 @@ public static MwsLogDelivery Get(string name, Input id, MwsLogDeliverySt public sealed class MwsLogDeliveryArgs : global::Pulumi.ResourceArgs { /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). /// [Input("accountId", required: true)] public Input AccountId { get; set; } = null!; @@ -281,7 +281,7 @@ public MwsLogDeliveryArgs() public sealed class MwsLogDeliveryState : global::Pulumi.ResourceArgs { /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). /// [Input("accountId")] public Input? AccountId { get; set; } diff --git a/sdk/dotnet/MwsNetworks.cs b/sdk/dotnet/MwsNetworks.cs index d24612a1..444227e3 100644 --- a/sdk/dotnet/MwsNetworks.cs +++ b/sdk/dotnet/MwsNetworks.cs @@ -230,7 +230,7 @@ namespace Pulumi.Databricks public partial class MwsNetworks : global::Pulumi.CustomResource { /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) /// [Output("accountId")] public Output AccountId { get; private set; } = null!; @@ -349,7 +349,7 @@ public sealed class MwsNetworksArgs : global::Pulumi.ResourceArgs private Input? _accountId; /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) /// public Input? AccountId { @@ -450,7 +450,7 @@ public sealed class MwsNetworksState : global::Pulumi.ResourceArgs private Input? _accountId; /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) /// public Input? AccountId { diff --git a/sdk/dotnet/MwsPermissionAssignment.cs b/sdk/dotnet/MwsPermissionAssignment.cs index 7a688083..1a564b62 100644 --- a/sdk/dotnet/MwsPermissionAssignment.cs +++ b/sdk/dotnet/MwsPermissionAssignment.cs @@ -10,7 +10,7 @@ namespace Pulumi.Databricks { /// - /// These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `account_id` attribute configured. Account Id that could be found in the bottom left corner of Accounts Console + /// These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `account_id` attribute configured. Account Id that could be found in the top right corner of Accounts Console /// /// ## Example Usage /// diff --git a/sdk/dotnet/MwsStorageConfigurations.cs b/sdk/dotnet/MwsStorageConfigurations.cs index 5fc31d0e..93fd14cc 100644 --- a/sdk/dotnet/MwsStorageConfigurations.cs +++ b/sdk/dotnet/MwsStorageConfigurations.cs @@ -69,7 +69,7 @@ namespace Pulumi.Databricks public partial class MwsStorageConfigurations : global::Pulumi.CustomResource { /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) /// [Output("accountId")] public Output AccountId { get; private set; } = null!; @@ -149,7 +149,7 @@ public sealed class MwsStorageConfigurationsArgs : global::Pulumi.ResourceArgs private Input? _accountId; /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) /// public Input? AccountId { @@ -185,7 +185,7 @@ public sealed class MwsStorageConfigurationsState : global::Pulumi.ResourceArgs private Input? _accountId; /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) /// public Input? AccountId { diff --git a/sdk/dotnet/MwsWorkspaces.cs b/sdk/dotnet/MwsWorkspaces.cs index 95310ddb..d7b871e9 100644 --- a/sdk/dotnet/MwsWorkspaces.cs +++ b/sdk/dotnet/MwsWorkspaces.cs @@ -18,7 +18,7 @@ namespace Pulumi.Databricks public partial class MwsWorkspaces : global::Pulumi.CustomResource { /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). /// [Output("accountId")] public Output AccountId { get; private set; } = null!; @@ -197,7 +197,7 @@ public sealed class MwsWorkspacesArgs : global::Pulumi.ResourceArgs private Input? _accountId; /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). /// public Input? AccountId { @@ -341,7 +341,7 @@ public sealed class MwsWorkspacesState : global::Pulumi.ResourceArgs private Input? _accountId; /// - /// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + /// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). /// public Input? AccountId { diff --git a/sdk/dotnet/WorkspaceFile.cs b/sdk/dotnet/WorkspaceFile.cs index fa0a0b7e..1dd85343 100644 --- a/sdk/dotnet/WorkspaceFile.cs +++ b/sdk/dotnet/WorkspaceFile.cs @@ -51,6 +51,12 @@ public partial class WorkspaceFile : global::Pulumi.CustomResource [Output("url")] public Output Url { get; private set; } = null!; + /// + /// path on Workspace File System (WSFS) in form of `/Workspace` + `path` + /// + [Output("workspacePath")] + public Output WorkspacePath { get; private set; } = null!; + /// /// Create a WorkspaceFile resource with the given unique name, arguments, and options. @@ -159,6 +165,12 @@ public sealed class WorkspaceFileState : global::Pulumi.ResourceArgs [Input("url")] public Input? Url { get; set; } + /// + /// path on Workspace File System (WSFS) in form of `/Workspace` + `path` + /// + [Input("workspacePath")] + public Input? WorkspacePath { get; set; } + public WorkspaceFileState() { } diff --git a/sdk/go/databricks/getAwsAssumeRolePolicy.go b/sdk/go/databricks/getAwsAssumeRolePolicy.go index b4565f26..15dd366a 100644 --- a/sdk/go/databricks/getAwsAssumeRolePolicy.go +++ b/sdk/go/databricks/getAwsAssumeRolePolicy.go @@ -98,7 +98,7 @@ func GetAwsAssumeRolePolicy(ctx *pulumi.Context, args *GetAwsAssumeRolePolicyArg // A collection of arguments for invoking getAwsAssumeRolePolicy. type GetAwsAssumeRolePolicyArgs struct { DatabricksAccountId *string `pulumi:"databricksAccountId"` - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). ExternalId string `pulumi:"externalId"` // Either or not this assume role policy should be created for usage log delivery. Defaults to false. ForLogDelivery *bool `pulumi:"forLogDelivery"` @@ -131,7 +131,7 @@ func GetAwsAssumeRolePolicyOutput(ctx *pulumi.Context, args GetAwsAssumeRolePoli // A collection of arguments for invoking getAwsAssumeRolePolicy. type GetAwsAssumeRolePolicyOutputArgs struct { DatabricksAccountId pulumi.StringPtrInput `pulumi:"databricksAccountId"` - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). ExternalId pulumi.StringInput `pulumi:"externalId"` // Either or not this assume role policy should be created for usage log delivery. Defaults to false. ForLogDelivery pulumi.BoolPtrInput `pulumi:"forLogDelivery"` diff --git a/sdk/go/databricks/mwsCredentials.go b/sdk/go/databricks/mwsCredentials.go index 29a5c604..e56fe2a1 100644 --- a/sdk/go/databricks/mwsCredentials.go +++ b/sdk/go/databricks/mwsCredentials.go @@ -82,12 +82,18 @@ import ( // // ## Import // -// -> **Note** Importing this resource is not currently supported. +// # This resource can be imported by the combination of its identifier and the account idbash +// +// ```sh +// +// $ pulumi import databricks:index/mwsCredentials:MwsCredentials this / +// +// ``` type MwsCredentials struct { pulumi.CustomResourceState - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) - AccountId pulumi.StringOutput `pulumi:"accountId"` + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) + AccountId pulumi.StringPtrOutput `pulumi:"accountId"` // (Integer) time of credentials registration CreationTime pulumi.IntOutput `pulumi:"creationTime"` // (String) identifier of credentials @@ -106,22 +112,12 @@ func NewMwsCredentials(ctx *pulumi.Context, return nil, errors.New("missing one or more required arguments") } - if args.AccountId == nil { - return nil, errors.New("invalid value for required argument 'AccountId'") - } if args.CredentialsName == nil { return nil, errors.New("invalid value for required argument 'CredentialsName'") } if args.RoleArn == nil { return nil, errors.New("invalid value for required argument 'RoleArn'") } - if args.AccountId != nil { - args.AccountId = pulumi.ToSecret(args.AccountId).(pulumi.StringInput) - } - secrets := pulumi.AdditionalSecretOutputs([]string{ - "accountId", - }) - opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource MwsCredentials err := ctx.RegisterResource("databricks:index/mwsCredentials:MwsCredentials", name, args, &resource, opts...) @@ -145,7 +141,7 @@ func GetMwsCredentials(ctx *pulumi.Context, // Input properties used for looking up and filtering MwsCredentials resources. type mwsCredentialsState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId *string `pulumi:"accountId"` // (Integer) time of credentials registration CreationTime *int `pulumi:"creationTime"` @@ -159,7 +155,7 @@ type mwsCredentialsState struct { } type MwsCredentialsState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId pulumi.StringPtrInput // (Integer) time of credentials registration CreationTime pulumi.IntPtrInput @@ -177,20 +173,30 @@ func (MwsCredentialsState) ElementType() reflect.Type { } type mwsCredentialsArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) - AccountId string `pulumi:"accountId"` + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) + AccountId *string `pulumi:"accountId"` + // (Integer) time of credentials registration + CreationTime *int `pulumi:"creationTime"` + // (String) identifier of credentials + CredentialsId *string `pulumi:"credentialsId"` // name of credentials to register - CredentialsName string `pulumi:"credentialsName"` + CredentialsName string `pulumi:"credentialsName"` + ExternalId *string `pulumi:"externalId"` // ARN of cross-account role RoleArn string `pulumi:"roleArn"` } // The set of arguments for constructing a MwsCredentials resource. type MwsCredentialsArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) - AccountId pulumi.StringInput + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) + AccountId pulumi.StringPtrInput + // (Integer) time of credentials registration + CreationTime pulumi.IntPtrInput + // (String) identifier of credentials + CredentialsId pulumi.StringPtrInput // name of credentials to register CredentialsName pulumi.StringInput + ExternalId pulumi.StringPtrInput // ARN of cross-account role RoleArn pulumi.StringInput } @@ -282,9 +288,9 @@ func (o MwsCredentialsOutput) ToMwsCredentialsOutputWithContext(ctx context.Cont return o } -// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) -func (o MwsCredentialsOutput) AccountId() pulumi.StringOutput { - return o.ApplyT(func(v *MwsCredentials) pulumi.StringOutput { return v.AccountId }).(pulumi.StringOutput) +// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) +func (o MwsCredentialsOutput) AccountId() pulumi.StringPtrOutput { + return o.ApplyT(func(v *MwsCredentials) pulumi.StringPtrOutput { return v.AccountId }).(pulumi.StringPtrOutput) } // (Integer) time of credentials registration diff --git a/sdk/go/databricks/mwsCustomerManagedKeys.go b/sdk/go/databricks/mwsCustomerManagedKeys.go index 53d94e08..0caeb6ff 100644 --- a/sdk/go/databricks/mwsCustomerManagedKeys.go +++ b/sdk/go/databricks/mwsCustomerManagedKeys.go @@ -359,7 +359,7 @@ import ( type MwsCustomerManagedKeys struct { pulumi.CustomResourceState - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId pulumi.StringOutput `pulumi:"accountId"` // This field is a block and is documented below. This conflicts with `gcpKeyInfo` AwsKeyInfo MwsCustomerManagedKeysAwsKeyInfoPtrOutput `pulumi:"awsKeyInfo"` @@ -409,7 +409,7 @@ func GetMwsCustomerManagedKeys(ctx *pulumi.Context, // Input properties used for looking up and filtering MwsCustomerManagedKeys resources. type mwsCustomerManagedKeysState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId *string `pulumi:"accountId"` // This field is a block and is documented below. This conflicts with `gcpKeyInfo` AwsKeyInfo *MwsCustomerManagedKeysAwsKeyInfo `pulumi:"awsKeyInfo"` @@ -424,7 +424,7 @@ type mwsCustomerManagedKeysState struct { } type MwsCustomerManagedKeysState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId pulumi.StringPtrInput // This field is a block and is documented below. This conflicts with `gcpKeyInfo` AwsKeyInfo MwsCustomerManagedKeysAwsKeyInfoPtrInput @@ -443,7 +443,7 @@ func (MwsCustomerManagedKeysState) ElementType() reflect.Type { } type mwsCustomerManagedKeysArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId string `pulumi:"accountId"` // This field is a block and is documented below. This conflicts with `gcpKeyInfo` AwsKeyInfo *MwsCustomerManagedKeysAwsKeyInfo `pulumi:"awsKeyInfo"` @@ -459,7 +459,7 @@ type mwsCustomerManagedKeysArgs struct { // The set of arguments for constructing a MwsCustomerManagedKeys resource. type MwsCustomerManagedKeysArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId pulumi.StringInput // This field is a block and is documented below. This conflicts with `gcpKeyInfo` AwsKeyInfo MwsCustomerManagedKeysAwsKeyInfoPtrInput @@ -560,7 +560,7 @@ func (o MwsCustomerManagedKeysOutput) ToMwsCustomerManagedKeysOutputWithContext( return o } -// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) +// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) func (o MwsCustomerManagedKeysOutput) AccountId() pulumi.StringOutput { return o.ApplyT(func(v *MwsCustomerManagedKeys) pulumi.StringOutput { return v.AccountId }).(pulumi.StringOutput) } diff --git a/sdk/go/databricks/mwsLogDelivery.go b/sdk/go/databricks/mwsLogDelivery.go index 70a764a2..d1168bd9 100644 --- a/sdk/go/databricks/mwsLogDelivery.go +++ b/sdk/go/databricks/mwsLogDelivery.go @@ -105,7 +105,7 @@ import ( type MwsLogDelivery struct { pulumi.CustomResourceState - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). AccountId pulumi.StringOutput `pulumi:"accountId"` // Databricks log delivery configuration ID. ConfigId pulumi.StringOutput `pulumi:"configId"` @@ -174,7 +174,7 @@ func GetMwsLogDelivery(ctx *pulumi.Context, // Input properties used for looking up and filtering MwsLogDelivery resources. type mwsLogDeliveryState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). AccountId *string `pulumi:"accountId"` // Databricks log delivery configuration ID. ConfigId *string `pulumi:"configId"` @@ -199,7 +199,7 @@ type mwsLogDeliveryState struct { } type MwsLogDeliveryState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). AccountId pulumi.StringPtrInput // Databricks log delivery configuration ID. ConfigId pulumi.StringPtrInput @@ -228,7 +228,7 @@ func (MwsLogDeliveryState) ElementType() reflect.Type { } type mwsLogDeliveryArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). AccountId string `pulumi:"accountId"` // Databricks log delivery configuration ID. ConfigId *string `pulumi:"configId"` @@ -254,7 +254,7 @@ type mwsLogDeliveryArgs struct { // The set of arguments for constructing a MwsLogDelivery resource. type MwsLogDeliveryArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). AccountId pulumi.StringInput // Databricks log delivery configuration ID. ConfigId pulumi.StringPtrInput @@ -365,7 +365,7 @@ func (o MwsLogDeliveryOutput) ToMwsLogDeliveryOutputWithContext(ctx context.Cont return o } -// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). +// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). func (o MwsLogDeliveryOutput) AccountId() pulumi.StringOutput { return o.ApplyT(func(v *MwsLogDelivery) pulumi.StringOutput { return v.AccountId }).(pulumi.StringOutput) } diff --git a/sdk/go/databricks/mwsNetworks.go b/sdk/go/databricks/mwsNetworks.go index b1edfac2..bb90e926 100644 --- a/sdk/go/databricks/mwsNetworks.go +++ b/sdk/go/databricks/mwsNetworks.go @@ -257,7 +257,7 @@ import ( type MwsNetworks struct { pulumi.CustomResourceState - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId pulumi.StringOutput `pulumi:"accountId"` CreationTime pulumi.IntOutput `pulumi:"creationTime"` ErrorMessages MwsNetworksErrorMessageArrayOutput `pulumi:"errorMessages"` @@ -324,7 +324,7 @@ func GetMwsNetworks(ctx *pulumi.Context, // Input properties used for looking up and filtering MwsNetworks resources. type mwsNetworksState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId *string `pulumi:"accountId"` CreationTime *int `pulumi:"creationTime"` ErrorMessages []MwsNetworksErrorMessage `pulumi:"errorMessages"` @@ -349,7 +349,7 @@ type mwsNetworksState struct { } type MwsNetworksState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId pulumi.StringPtrInput CreationTime pulumi.IntPtrInput ErrorMessages MwsNetworksErrorMessageArrayInput @@ -378,7 +378,7 @@ func (MwsNetworksState) ElementType() reflect.Type { } type mwsNetworksArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId string `pulumi:"accountId"` CreationTime *int `pulumi:"creationTime"` ErrorMessages []MwsNetworksErrorMessage `pulumi:"errorMessages"` @@ -404,7 +404,7 @@ type mwsNetworksArgs struct { // The set of arguments for constructing a MwsNetworks resource. type MwsNetworksArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId pulumi.StringInput CreationTime pulumi.IntPtrInput ErrorMessages MwsNetworksErrorMessageArrayInput @@ -515,7 +515,7 @@ func (o MwsNetworksOutput) ToMwsNetworksOutputWithContext(ctx context.Context) M return o } -// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) +// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) func (o MwsNetworksOutput) AccountId() pulumi.StringOutput { return o.ApplyT(func(v *MwsNetworks) pulumi.StringOutput { return v.AccountId }).(pulumi.StringOutput) } diff --git a/sdk/go/databricks/mwsPermissionAssignment.go b/sdk/go/databricks/mwsPermissionAssignment.go index 3d079ad4..f8a13694 100644 --- a/sdk/go/databricks/mwsPermissionAssignment.go +++ b/sdk/go/databricks/mwsPermissionAssignment.go @@ -12,7 +12,7 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) -// These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `accountId` attribute configured. Account Id that could be found in the bottom left corner of Accounts Console +// These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `accountId` attribute configured. Account Id that could be found in the top right corner of Accounts Console // // ## Example Usage // diff --git a/sdk/go/databricks/mwsStorageConfigurations.go b/sdk/go/databricks/mwsStorageConfigurations.go index a2c5fcf4..60d9b556 100644 --- a/sdk/go/databricks/mwsStorageConfigurations.go +++ b/sdk/go/databricks/mwsStorageConfigurations.go @@ -78,7 +78,7 @@ import ( type MwsStorageConfigurations struct { pulumi.CustomResourceState - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId pulumi.StringOutput `pulumi:"accountId"` // name of AWS S3 bucket BucketName pulumi.StringOutput `pulumi:"bucketName"` @@ -135,7 +135,7 @@ func GetMwsStorageConfigurations(ctx *pulumi.Context, // Input properties used for looking up and filtering MwsStorageConfigurations resources. type mwsStorageConfigurationsState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId *string `pulumi:"accountId"` // name of AWS S3 bucket BucketName *string `pulumi:"bucketName"` @@ -147,7 +147,7 @@ type mwsStorageConfigurationsState struct { } type MwsStorageConfigurationsState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId pulumi.StringPtrInput // name of AWS S3 bucket BucketName pulumi.StringPtrInput @@ -163,7 +163,7 @@ func (MwsStorageConfigurationsState) ElementType() reflect.Type { } type mwsStorageConfigurationsArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId string `pulumi:"accountId"` // name of AWS S3 bucket BucketName string `pulumi:"bucketName"` @@ -173,7 +173,7 @@ type mwsStorageConfigurationsArgs struct { // The set of arguments for constructing a MwsStorageConfigurations resource. type MwsStorageConfigurationsArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) AccountId pulumi.StringInput // name of AWS S3 bucket BucketName pulumi.StringInput @@ -268,7 +268,7 @@ func (o MwsStorageConfigurationsOutput) ToMwsStorageConfigurationsOutputWithCont return o } -// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) +// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) func (o MwsStorageConfigurationsOutput) AccountId() pulumi.StringOutput { return o.ApplyT(func(v *MwsStorageConfigurations) pulumi.StringOutput { return v.AccountId }).(pulumi.StringOutput) } diff --git a/sdk/go/databricks/mwsWorkspaces.go b/sdk/go/databricks/mwsWorkspaces.go index a3c7218b..9aa89922 100644 --- a/sdk/go/databricks/mwsWorkspaces.go +++ b/sdk/go/databricks/mwsWorkspaces.go @@ -18,7 +18,7 @@ import ( type MwsWorkspaces struct { pulumi.CustomResourceState - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). AccountId pulumi.StringOutput `pulumi:"accountId"` // region of VPC. AwsRegion pulumi.StringPtrOutput `pulumi:"awsRegion"` @@ -106,7 +106,7 @@ func GetMwsWorkspaces(ctx *pulumi.Context, // Input properties used for looking up and filtering MwsWorkspaces resources. type mwsWorkspacesState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). AccountId *string `pulumi:"accountId"` // region of VPC. AwsRegion *string `pulumi:"awsRegion"` @@ -152,7 +152,7 @@ type mwsWorkspacesState struct { } type MwsWorkspacesState struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). AccountId pulumi.StringPtrInput // region of VPC. AwsRegion pulumi.StringPtrInput @@ -202,7 +202,7 @@ func (MwsWorkspacesState) ElementType() reflect.Type { } type mwsWorkspacesArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). AccountId string `pulumi:"accountId"` // region of VPC. AwsRegion *string `pulumi:"awsRegion"` @@ -249,7 +249,7 @@ type mwsWorkspacesArgs struct { // The set of arguments for constructing a MwsWorkspaces resource. type MwsWorkspacesArgs struct { - // Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + // Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). AccountId pulumi.StringInput // region of VPC. AwsRegion pulumi.StringPtrInput @@ -381,7 +381,7 @@ func (o MwsWorkspacesOutput) ToMwsWorkspacesOutputWithContext(ctx context.Contex return o } -// Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). +// Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). func (o MwsWorkspacesOutput) AccountId() pulumi.StringOutput { return o.ApplyT(func(v *MwsWorkspaces) pulumi.StringOutput { return v.AccountId }).(pulumi.StringOutput) } diff --git a/sdk/go/databricks/workspaceFile.go b/sdk/go/databricks/workspaceFile.go index d6dfe480..6d00201d 100644 --- a/sdk/go/databricks/workspaceFile.go +++ b/sdk/go/databricks/workspaceFile.go @@ -34,6 +34,8 @@ type WorkspaceFile struct { Source pulumi.StringPtrOutput `pulumi:"source"` // Routable URL of the workspace file Url pulumi.StringOutput `pulumi:"url"` + // path on Workspace File System (WSFS) in form of `/Workspace` + `path` + WorkspacePath pulumi.StringOutput `pulumi:"workspacePath"` } // NewWorkspaceFile registers a new resource with the given unique name, arguments, and options. @@ -79,6 +81,8 @@ type workspaceFileState struct { Source *string `pulumi:"source"` // Routable URL of the workspace file Url *string `pulumi:"url"` + // path on Workspace File System (WSFS) in form of `/Workspace` + `path` + WorkspacePath *string `pulumi:"workspacePath"` } type WorkspaceFileState struct { @@ -92,6 +96,8 @@ type WorkspaceFileState struct { Source pulumi.StringPtrInput // Routable URL of the workspace file Url pulumi.StringPtrInput + // path on Workspace File System (WSFS) in form of `/Workspace` + `path` + WorkspacePath pulumi.StringPtrInput } func (WorkspaceFileState) ElementType() reflect.Type { @@ -236,6 +242,11 @@ func (o WorkspaceFileOutput) Url() pulumi.StringOutput { return o.ApplyT(func(v *WorkspaceFile) pulumi.StringOutput { return v.Url }).(pulumi.StringOutput) } +// path on Workspace File System (WSFS) in form of `/Workspace` + `path` +func (o WorkspaceFileOutput) WorkspacePath() pulumi.StringOutput { + return o.ApplyT(func(v *WorkspaceFile) pulumi.StringOutput { return v.WorkspacePath }).(pulumi.StringOutput) +} + type WorkspaceFileArrayOutput struct{ *pulumi.OutputState } func (WorkspaceFileArrayOutput) ElementType() reflect.Type { diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsCredentials.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsCredentials.java index e64bde94..35dbfc2f 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsCredentials.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsCredentials.java @@ -12,7 +12,7 @@ import com.pulumi.databricks.inputs.MwsCredentialsState; import java.lang.Integer; import java.lang.String; -import java.util.List; +import java.util.Optional; import javax.annotation.Nullable; /** @@ -88,24 +88,28 @@ * * ## Import * - * -> **Note** Importing this resource is not currently supported. + * This resource can be imported by the combination of its identifier and the account idbash + * + * ```sh + * $ pulumi import databricks:index/mwsCredentials:MwsCredentials this <account_id>/<credentials_id> + * ``` * */ @ResourceType(type="databricks:index/mwsCredentials:MwsCredentials") public class MwsCredentials extends com.pulumi.resources.CustomResource { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ @Export(name="accountId", refs={String.class}, tree="[0]") - private Output accountId; + private Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ - public Output accountId() { - return this.accountId; + public Output> accountId() { + return Codegen.optional(this.accountId); } /** * (Integer) time of credentials registration @@ -202,9 +206,6 @@ private MwsCredentials(String name, Output id, @Nullable MwsCredentialsS private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() .version(Utilities.getVersion()) - .additionalSecretOutputs(List.of( - "accountId" - )) .build(); return com.pulumi.resources.CustomResourceOptions.merge(defaultOptions, options, id); } diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsCredentialsArgs.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsCredentialsArgs.java index af58aa6a..4d617305 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsCredentialsArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsCredentialsArgs.java @@ -5,8 +5,11 @@ import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; +import java.lang.Integer; import java.lang.String; import java.util.Objects; +import java.util.Optional; +import javax.annotation.Nullable; public final class MwsCredentialsArgs extends com.pulumi.resources.ResourceArgs { @@ -14,18 +17,48 @@ public final class MwsCredentialsArgs extends com.pulumi.resources.ResourceArgs public static final MwsCredentialsArgs Empty = new MwsCredentialsArgs(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ - @Import(name="accountId", required=true) - private Output accountId; + @Import(name="accountId") + private @Nullable Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ - public Output accountId() { - return this.accountId; + public Optional> accountId() { + return Optional.ofNullable(this.accountId); + } + + /** + * (Integer) time of credentials registration + * + */ + @Import(name="creationTime") + private @Nullable Output creationTime; + + /** + * @return (Integer) time of credentials registration + * + */ + public Optional> creationTime() { + return Optional.ofNullable(this.creationTime); + } + + /** + * (String) identifier of credentials + * + */ + @Import(name="credentialsId") + private @Nullable Output credentialsId; + + /** + * @return (String) identifier of credentials + * + */ + public Optional> credentialsId() { + return Optional.ofNullable(this.credentialsId); } /** @@ -43,6 +76,13 @@ public Output credentialsName() { return this.credentialsName; } + @Import(name="externalId") + private @Nullable Output externalId; + + public Optional> externalId() { + return Optional.ofNullable(this.externalId); + } + /** * ARN of cross-account role * @@ -62,7 +102,10 @@ private MwsCredentialsArgs() {} private MwsCredentialsArgs(MwsCredentialsArgs $) { this.accountId = $.accountId; + this.creationTime = $.creationTime; + this.credentialsId = $.credentialsId; this.credentialsName = $.credentialsName; + this.externalId = $.externalId; this.roleArn = $.roleArn; } @@ -85,18 +128,18 @@ public Builder(MwsCredentialsArgs defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * */ - public Builder accountId(Output accountId) { + public Builder accountId(@Nullable Output accountId) { $.accountId = accountId; return this; } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * @@ -105,6 +148,48 @@ public Builder accountId(String accountId) { return accountId(Output.of(accountId)); } + /** + * @param creationTime (Integer) time of credentials registration + * + * @return builder + * + */ + public Builder creationTime(@Nullable Output creationTime) { + $.creationTime = creationTime; + return this; + } + + /** + * @param creationTime (Integer) time of credentials registration + * + * @return builder + * + */ + public Builder creationTime(Integer creationTime) { + return creationTime(Output.of(creationTime)); + } + + /** + * @param credentialsId (String) identifier of credentials + * + * @return builder + * + */ + public Builder credentialsId(@Nullable Output credentialsId) { + $.credentialsId = credentialsId; + return this; + } + + /** + * @param credentialsId (String) identifier of credentials + * + * @return builder + * + */ + public Builder credentialsId(String credentialsId) { + return credentialsId(Output.of(credentialsId)); + } + /** * @param credentialsName name of credentials to register * @@ -126,6 +211,15 @@ public Builder credentialsName(String credentialsName) { return credentialsName(Output.of(credentialsName)); } + public Builder externalId(@Nullable Output externalId) { + $.externalId = externalId; + return this; + } + + public Builder externalId(String externalId) { + return externalId(Output.of(externalId)); + } + /** * @param roleArn ARN of cross-account role * @@ -148,7 +242,6 @@ public Builder roleArn(String roleArn) { } public MwsCredentialsArgs build() { - $.accountId = Objects.requireNonNull($.accountId, "expected parameter 'accountId' to be non-null"); $.credentialsName = Objects.requireNonNull($.credentialsName, "expected parameter 'credentialsName' to be non-null"); $.roleArn = Objects.requireNonNull($.roleArn, "expected parameter 'roleArn' to be non-null"); return $; diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsCustomerManagedKeys.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsCustomerManagedKeys.java index 5bc68bf3..6a67ded8 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsCustomerManagedKeys.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsCustomerManagedKeys.java @@ -320,14 +320,14 @@ @ResourceType(type="databricks:index/mwsCustomerManagedKeys:MwsCustomerManagedKeys") public class MwsCustomerManagedKeys extends com.pulumi.resources.CustomResource { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ @Export(name="accountId", refs={String.class}, tree="[0]") private Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ public Output accountId() { diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsCustomerManagedKeysArgs.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsCustomerManagedKeysArgs.java index 5d864828..3d6b09f3 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsCustomerManagedKeysArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsCustomerManagedKeysArgs.java @@ -20,14 +20,14 @@ public final class MwsCustomerManagedKeysArgs extends com.pulumi.resources.Resou public static final MwsCustomerManagedKeysArgs Empty = new MwsCustomerManagedKeysArgs(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ @Import(name="accountId", required=true) private Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ public Output accountId() { @@ -139,7 +139,7 @@ public Builder(MwsCustomerManagedKeysArgs defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * @@ -150,7 +150,7 @@ public Builder accountId(Output accountId) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsLogDelivery.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsLogDelivery.java index 31a219d0..c0fe874e 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsLogDelivery.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsLogDelivery.java @@ -120,14 +120,14 @@ @ResourceType(type="databricks:index/mwsLogDelivery:MwsLogDelivery") public class MwsLogDelivery extends com.pulumi.resources.CustomResource { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ @Export(name="accountId", refs={String.class}, tree="[0]") private Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ public Output accountId() { diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsLogDeliveryArgs.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsLogDeliveryArgs.java index a00dee19..a98149f7 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsLogDeliveryArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsLogDeliveryArgs.java @@ -18,14 +18,14 @@ public final class MwsLogDeliveryArgs extends com.pulumi.resources.ResourceArgs public static final MwsLogDeliveryArgs Empty = new MwsLogDeliveryArgs(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ @Import(name="accountId", required=true) private Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ public Output accountId() { @@ -217,7 +217,7 @@ public Builder(MwsLogDeliveryArgs defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * * @return builder * @@ -228,7 +228,7 @@ public Builder accountId(Output accountId) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsNetworks.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsNetworks.java index 42390a37..3d25c222 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsNetworks.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsNetworks.java @@ -262,14 +262,14 @@ @ResourceType(type="databricks:index/mwsNetworks:MwsNetworks") public class MwsNetworks extends com.pulumi.resources.CustomResource { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ @Export(name="accountId", refs={String.class}, tree="[0]") private Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ public Output accountId() { diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsNetworksArgs.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsNetworksArgs.java index 7aab6390..7ed81cce 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsNetworksArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsNetworksArgs.java @@ -21,14 +21,14 @@ public final class MwsNetworksArgs extends com.pulumi.resources.ResourceArgs { public static final MwsNetworksArgs Empty = new MwsNetworksArgs(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ @Import(name="accountId", required=true) private Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ public Output accountId() { @@ -220,7 +220,7 @@ public Builder(MwsNetworksArgs defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * @@ -231,7 +231,7 @@ public Builder accountId(Output accountId) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsPermissionAssignment.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsPermissionAssignment.java index 41546c50..81f236f2 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsPermissionAssignment.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsPermissionAssignment.java @@ -16,7 +16,7 @@ import javax.annotation.Nullable; /** - * These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `account_id` attribute configured. Account Id that could be found in the bottom left corner of Accounts Console + * These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `account_id` attribute configured. Account Id that could be found in the top right corner of Accounts Console * * ## Example Usage * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsStorageConfigurations.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsStorageConfigurations.java index e6f63f13..10754bc8 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsStorageConfigurations.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsStorageConfigurations.java @@ -88,14 +88,14 @@ @ResourceType(type="databricks:index/mwsStorageConfigurations:MwsStorageConfigurations") public class MwsStorageConfigurations extends com.pulumi.resources.CustomResource { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ @Export(name="accountId", refs={String.class}, tree="[0]") private Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ public Output accountId() { diff --git a/sdk/java/src/main/java/com/pulumi/databricks/MwsStorageConfigurationsArgs.java b/sdk/java/src/main/java/com/pulumi/databricks/MwsStorageConfigurationsArgs.java index 50bed3c2..51b7d785 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsStorageConfigurationsArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsStorageConfigurationsArgs.java @@ -14,14 +14,14 @@ public final class MwsStorageConfigurationsArgs extends com.pulumi.resources.Res public static final MwsStorageConfigurationsArgs Empty = new MwsStorageConfigurationsArgs(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ @Import(name="accountId", required=true) private Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ public Output accountId() { @@ -85,7 +85,7 @@ public Builder(MwsStorageConfigurationsArgs defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * @@ -96,7 +96,7 @@ public Builder accountId(Output accountId) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * 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 ea881b77..746869c0 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspaces.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspaces.java @@ -31,14 +31,14 @@ @ResourceType(type="databricks:index/mwsWorkspaces:MwsWorkspaces") public class MwsWorkspaces extends com.pulumi.resources.CustomResource { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ @Export(name="accountId", refs={String.class}, tree="[0]") private Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ public Output accountId() { 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 a183b259..58f13e4e 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspacesArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/MwsWorkspacesArgs.java @@ -23,14 +23,14 @@ public final class MwsWorkspacesArgs extends com.pulumi.resources.ResourceArgs { public static final MwsWorkspacesArgs Empty = new MwsWorkspacesArgs(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ @Import(name="accountId", required=true) private Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ public Output accountId() { @@ -394,7 +394,7 @@ public Builder(MwsWorkspacesArgs defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * * @return builder * @@ -405,7 +405,7 @@ public Builder accountId(Output accountId) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/WorkspaceFile.java b/sdk/java/src/main/java/com/pulumi/databricks/WorkspaceFile.java index 6b3184a7..42103eca 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/WorkspaceFile.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/WorkspaceFile.java @@ -95,6 +95,20 @@ public Output> source() { public Output url() { return this.url; } + /** + * path on Workspace File System (WSFS) in form of `/Workspace` + `path` + * + */ + @Export(name="workspacePath", refs={String.class}, tree="[0]") + private Output workspacePath; + + /** + * @return path on Workspace File System (WSFS) in form of `/Workspace` + `path` + * + */ + public Output workspacePath() { + return this.workspacePath; + } /** * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/GetAwsAssumeRolePolicyArgs.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/GetAwsAssumeRolePolicyArgs.java index 02da6007..7b045a18 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/GetAwsAssumeRolePolicyArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/GetAwsAssumeRolePolicyArgs.java @@ -24,14 +24,14 @@ public Optional> databricksAccountId() { } /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ @Import(name="externalId", required=true) private Output externalId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ public Output externalId() { @@ -89,7 +89,7 @@ public Builder databricksAccountId(String databricksAccountId) { } /** - * @param externalId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @param externalId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * * @return builder * @@ -100,7 +100,7 @@ public Builder externalId(Output externalId) { } /** - * @param externalId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @param externalId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/GetAwsAssumeRolePolicyPlainArgs.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/GetAwsAssumeRolePolicyPlainArgs.java index 4fe415a5..9075bb81 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/GetAwsAssumeRolePolicyPlainArgs.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/GetAwsAssumeRolePolicyPlainArgs.java @@ -23,14 +23,14 @@ public Optional databricksAccountId() { } /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ @Import(name="externalId", required=true) private String externalId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ public String externalId() { @@ -84,7 +84,7 @@ public Builder databricksAccountId(@Nullable String databricksAccountId) { } /** - * @param externalId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @param externalId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsCredentialsState.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsCredentialsState.java index 1fa1e422..96d85d08 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsCredentialsState.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsCredentialsState.java @@ -17,14 +17,14 @@ public final class MwsCredentialsState extends com.pulumi.resources.ResourceArgs public static final MwsCredentialsState Empty = new MwsCredentialsState(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ @Import(name="accountId") private @Nullable Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ public Optional> accountId() { @@ -128,7 +128,7 @@ public Builder(MwsCredentialsState defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * @@ -139,7 +139,7 @@ public Builder accountId(@Nullable Output accountId) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsCustomerManagedKeysState.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsCustomerManagedKeysState.java index b24fc676..fd751220 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsCustomerManagedKeysState.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsCustomerManagedKeysState.java @@ -20,14 +20,14 @@ public final class MwsCustomerManagedKeysState extends com.pulumi.resources.Reso public static final MwsCustomerManagedKeysState Empty = new MwsCustomerManagedKeysState(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ @Import(name="accountId") private @Nullable Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ public Optional> accountId() { @@ -139,7 +139,7 @@ public Builder(MwsCustomerManagedKeysState defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * @@ -150,7 +150,7 @@ public Builder accountId(@Nullable Output accountId) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsLogDeliveryState.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsLogDeliveryState.java index 0c1d337d..8c5fd0ae 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsLogDeliveryState.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsLogDeliveryState.java @@ -18,14 +18,14 @@ public final class MwsLogDeliveryState extends com.pulumi.resources.ResourceArgs public static final MwsLogDeliveryState Empty = new MwsLogDeliveryState(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ @Import(name="accountId") private @Nullable Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ public Optional> accountId() { @@ -217,7 +217,7 @@ public Builder(MwsLogDeliveryState defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * * @return builder * @@ -228,7 +228,7 @@ public Builder accountId(@Nullable Output accountId) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsNetworksState.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsNetworksState.java index 0f09280a..7dc6328d 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsNetworksState.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsNetworksState.java @@ -21,14 +21,14 @@ public final class MwsNetworksState extends com.pulumi.resources.ResourceArgs { public static final MwsNetworksState Empty = new MwsNetworksState(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ @Import(name="accountId") private @Nullable Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ public Optional> accountId() { @@ -220,7 +220,7 @@ public Builder(MwsNetworksState defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * @@ -231,7 +231,7 @@ public Builder accountId(@Nullable Output accountId) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsStorageConfigurationsState.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsStorageConfigurationsState.java index 66e51d72..3226b06f 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsStorageConfigurationsState.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/MwsStorageConfigurationsState.java @@ -17,14 +17,14 @@ public final class MwsStorageConfigurationsState extends com.pulumi.resources.Re public static final MwsStorageConfigurationsState Empty = new MwsStorageConfigurationsState(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ @Import(name="accountId") private @Nullable Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * */ public Optional> accountId() { @@ -112,7 +112,7 @@ public Builder(MwsStorageConfigurationsState defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * @@ -123,7 +123,7 @@ public Builder accountId(@Nullable Output accountId) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) * * @return builder * 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 f1f7bf68..a0cf8d60 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 @@ -23,14 +23,14 @@ public final class MwsWorkspacesState extends com.pulumi.resources.ResourceArgs public static final MwsWorkspacesState Empty = new MwsWorkspacesState(); /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ @Import(name="accountId") private @Nullable Output accountId; /** - * @return Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @return Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * */ public Optional> accountId() { @@ -394,7 +394,7 @@ public Builder(MwsWorkspacesState defaults) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * * @return builder * @@ -405,7 +405,7 @@ public Builder accountId(@Nullable Output accountId) { } /** - * @param accountId Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * @param accountId Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/databricks/inputs/WorkspaceFileState.java b/sdk/java/src/main/java/com/pulumi/databricks/inputs/WorkspaceFileState.java index fb1b8176..276fa77a 100644 --- a/sdk/java/src/main/java/com/pulumi/databricks/inputs/WorkspaceFileState.java +++ b/sdk/java/src/main/java/com/pulumi/databricks/inputs/WorkspaceFileState.java @@ -90,6 +90,21 @@ public Optional> url() { return Optional.ofNullable(this.url); } + /** + * path on Workspace File System (WSFS) in form of `/Workspace` + `path` + * + */ + @Import(name="workspacePath") + private @Nullable Output workspacePath; + + /** + * @return path on Workspace File System (WSFS) in form of `/Workspace` + `path` + * + */ + public Optional> workspacePath() { + return Optional.ofNullable(this.workspacePath); + } + private WorkspaceFileState() {} private WorkspaceFileState(WorkspaceFileState $) { @@ -99,6 +114,7 @@ private WorkspaceFileState(WorkspaceFileState $) { this.path = $.path; this.source = $.source; this.url = $.url; + this.workspacePath = $.workspacePath; } public static Builder builder() { @@ -221,6 +237,27 @@ public Builder url(String url) { return url(Output.of(url)); } + /** + * @param workspacePath path on Workspace File System (WSFS) in form of `/Workspace` + `path` + * + * @return builder + * + */ + public Builder workspacePath(@Nullable Output workspacePath) { + $.workspacePath = workspacePath; + return this; + } + + /** + * @param workspacePath path on Workspace File System (WSFS) in form of `/Workspace` + `path` + * + * @return builder + * + */ + public Builder workspacePath(String workspacePath) { + return workspacePath(Output.of(workspacePath)); + } + public WorkspaceFileState build() { return $; } diff --git a/sdk/nodejs/getAwsAssumeRolePolicy.ts b/sdk/nodejs/getAwsAssumeRolePolicy.ts index 99cacd0c..e32167b7 100644 --- a/sdk/nodejs/getAwsAssumeRolePolicy.ts +++ b/sdk/nodejs/getAwsAssumeRolePolicy.ts @@ -64,7 +64,7 @@ export function getAwsAssumeRolePolicy(args: GetAwsAssumeRolePolicyArgs, opts?: export interface GetAwsAssumeRolePolicyArgs { databricksAccountId?: string; /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). */ externalId: string; /** @@ -143,7 +143,7 @@ export function getAwsAssumeRolePolicyOutput(args: GetAwsAssumeRolePolicyOutputA export interface GetAwsAssumeRolePolicyOutputArgs { databricksAccountId?: pulumi.Input; /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). */ externalId: pulumi.Input; /** diff --git a/sdk/nodejs/mwsCredentials.ts b/sdk/nodejs/mwsCredentials.ts index 22dce2eb..b05367aa 100644 --- a/sdk/nodejs/mwsCredentials.ts +++ b/sdk/nodejs/mwsCredentials.ts @@ -47,7 +47,11 @@ import * as utilities from "./utilities"; * * ## Import * - * -> **Note** Importing this resource is not currently supported. + * This resource can be imported by the combination of its identifier and the account idbash + * + * ```sh + * $ pulumi import databricks:index/mwsCredentials:MwsCredentials this / + * ``` */ export class MwsCredentials extends pulumi.CustomResource { /** @@ -78,22 +82,22 @@ export class MwsCredentials extends pulumi.CustomResource { } /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ - public readonly accountId!: pulumi.Output; + public readonly accountId!: pulumi.Output; /** * (Integer) time of credentials registration */ - public /*out*/ readonly creationTime!: pulumi.Output; + public readonly creationTime!: pulumi.Output; /** * (String) identifier of credentials */ - public /*out*/ readonly credentialsId!: pulumi.Output; + public readonly credentialsId!: pulumi.Output; /** * name of credentials to register */ public readonly credentialsName!: pulumi.Output; - public /*out*/ readonly externalId!: pulumi.Output; + public readonly externalId!: pulumi.Output; /** * ARN of cross-account role */ @@ -120,25 +124,20 @@ export class MwsCredentials extends pulumi.CustomResource { resourceInputs["roleArn"] = state ? state.roleArn : undefined; } else { const args = argsOrState as MwsCredentialsArgs | undefined; - if ((!args || args.accountId === undefined) && !opts.urn) { - throw new Error("Missing required property 'accountId'"); - } if ((!args || args.credentialsName === undefined) && !opts.urn) { throw new Error("Missing required property 'credentialsName'"); } if ((!args || args.roleArn === undefined) && !opts.urn) { throw new Error("Missing required property 'roleArn'"); } - resourceInputs["accountId"] = args?.accountId ? pulumi.secret(args.accountId) : undefined; + resourceInputs["accountId"] = args ? args.accountId : undefined; + resourceInputs["creationTime"] = args ? args.creationTime : undefined; + resourceInputs["credentialsId"] = args ? args.credentialsId : undefined; resourceInputs["credentialsName"] = args ? args.credentialsName : undefined; + resourceInputs["externalId"] = args ? args.externalId : undefined; resourceInputs["roleArn"] = args ? args.roleArn : undefined; - resourceInputs["creationTime"] = undefined /*out*/; - resourceInputs["credentialsId"] = undefined /*out*/; - resourceInputs["externalId"] = undefined /*out*/; } opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts); - const secretOpts = { additionalSecretOutputs: ["accountId"] }; - opts = pulumi.mergeOptions(opts, secretOpts); super(MwsCredentials.__pulumiType, name, resourceInputs, opts); } } @@ -148,7 +147,7 @@ export class MwsCredentials extends pulumi.CustomResource { */ export interface MwsCredentialsState { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ accountId?: pulumi.Input; /** @@ -175,13 +174,22 @@ export interface MwsCredentialsState { */ export interface MwsCredentialsArgs { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ - accountId: pulumi.Input; + accountId?: pulumi.Input; + /** + * (Integer) time of credentials registration + */ + creationTime?: pulumi.Input; + /** + * (String) identifier of credentials + */ + credentialsId?: pulumi.Input; /** * name of credentials to register */ credentialsName: pulumi.Input; + externalId?: pulumi.Input; /** * ARN of cross-account role */ diff --git a/sdk/nodejs/mwsCustomerManagedKeys.ts b/sdk/nodejs/mwsCustomerManagedKeys.ts index d7304d57..25a24e35 100644 --- a/sdk/nodejs/mwsCustomerManagedKeys.ts +++ b/sdk/nodejs/mwsCustomerManagedKeys.ts @@ -233,7 +233,7 @@ export class MwsCustomerManagedKeys extends pulumi.CustomResource { } /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ public readonly accountId!: pulumi.Output; /** @@ -301,7 +301,7 @@ export class MwsCustomerManagedKeys extends pulumi.CustomResource { */ export interface MwsCustomerManagedKeysState { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ accountId?: pulumi.Input; /** @@ -331,7 +331,7 @@ export interface MwsCustomerManagedKeysState { */ export interface MwsCustomerManagedKeysArgs { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ accountId: pulumi.Input; /** diff --git a/sdk/nodejs/mwsLogDelivery.ts b/sdk/nodejs/mwsLogDelivery.ts index a4a5ea06..d0d73890 100644 --- a/sdk/nodejs/mwsLogDelivery.ts +++ b/sdk/nodejs/mwsLogDelivery.ts @@ -95,7 +95,7 @@ export class MwsLogDelivery extends pulumi.CustomResource { } /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). */ public readonly accountId!: pulumi.Output; /** @@ -202,7 +202,7 @@ export class MwsLogDelivery extends pulumi.CustomResource { */ export interface MwsLogDeliveryState { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). */ accountId?: pulumi.Input; /** @@ -252,7 +252,7 @@ export interface MwsLogDeliveryState { */ export interface MwsLogDeliveryArgs { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). */ accountId: pulumi.Input; /** diff --git a/sdk/nodejs/mwsNetworks.ts b/sdk/nodejs/mwsNetworks.ts index e76a2d68..a90b06ea 100644 --- a/sdk/nodejs/mwsNetworks.ts +++ b/sdk/nodejs/mwsNetworks.ts @@ -187,7 +187,7 @@ export class MwsNetworks extends pulumi.CustomResource { } /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ public readonly accountId!: pulumi.Output; public readonly creationTime!: pulumi.Output; @@ -287,7 +287,7 @@ export class MwsNetworks extends pulumi.CustomResource { */ export interface MwsNetworksState { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ accountId?: pulumi.Input; creationTime?: pulumi.Input; @@ -335,7 +335,7 @@ export interface MwsNetworksState { */ export interface MwsNetworksArgs { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ accountId: pulumi.Input; creationTime?: pulumi.Input; diff --git a/sdk/nodejs/mwsPermissionAssignment.ts b/sdk/nodejs/mwsPermissionAssignment.ts index 217cd78e..29dcba85 100644 --- a/sdk/nodejs/mwsPermissionAssignment.ts +++ b/sdk/nodejs/mwsPermissionAssignment.ts @@ -5,7 +5,7 @@ import * as pulumi from "@pulumi/pulumi"; import * as utilities from "./utilities"; /** - * These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `accountId` attribute configured. Account Id that could be found in the bottom left corner of Accounts Console + * These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `accountId` attribute configured. Account Id that could be found in the top right corner of Accounts Console * * ## Example Usage * diff --git a/sdk/nodejs/mwsStorageConfigurations.ts b/sdk/nodejs/mwsStorageConfigurations.ts index 5384bc06..1da1ed13 100644 --- a/sdk/nodejs/mwsStorageConfigurations.ts +++ b/sdk/nodejs/mwsStorageConfigurations.ts @@ -74,7 +74,7 @@ export class MwsStorageConfigurations extends pulumi.CustomResource { } /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ public readonly accountId!: pulumi.Output; /** @@ -138,7 +138,7 @@ export class MwsStorageConfigurations extends pulumi.CustomResource { */ export interface MwsStorageConfigurationsState { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ accountId?: pulumi.Input; /** @@ -161,7 +161,7 @@ export interface MwsStorageConfigurationsState { */ export interface MwsStorageConfigurationsArgs { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) */ accountId: pulumi.Input; /** diff --git a/sdk/nodejs/mwsWorkspaces.ts b/sdk/nodejs/mwsWorkspaces.ts index 81c94ec0..9374958b 100644 --- a/sdk/nodejs/mwsWorkspaces.ts +++ b/sdk/nodejs/mwsWorkspaces.ts @@ -40,7 +40,7 @@ export class MwsWorkspaces extends pulumi.CustomResource { } /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). */ public readonly accountId!: pulumi.Output; /** @@ -203,7 +203,7 @@ export class MwsWorkspaces extends pulumi.CustomResource { */ export interface MwsWorkspacesState { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). */ accountId?: pulumi.Input; /** @@ -288,7 +288,7 @@ export interface MwsWorkspacesState { */ export interface MwsWorkspacesArgs { /** - * Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + * Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). */ accountId: pulumi.Input; /** diff --git a/sdk/nodejs/workspaceFile.ts b/sdk/nodejs/workspaceFile.ts index 48c95ea8..1e54052b 100644 --- a/sdk/nodejs/workspaceFile.ts +++ b/sdk/nodejs/workspaceFile.ts @@ -59,6 +59,10 @@ export class WorkspaceFile extends pulumi.CustomResource { * Routable URL of the workspace file */ public /*out*/ readonly url!: pulumi.Output; + /** + * path on Workspace File System (WSFS) in form of `/Workspace` + `path` + */ + public /*out*/ readonly workspacePath!: pulumi.Output; /** * Create a WorkspaceFile resource with the given unique name, arguments, and options. @@ -79,6 +83,7 @@ export class WorkspaceFile extends pulumi.CustomResource { resourceInputs["path"] = state ? state.path : undefined; resourceInputs["source"] = state ? state.source : undefined; resourceInputs["url"] = state ? state.url : undefined; + resourceInputs["workspacePath"] = state ? state.workspacePath : undefined; } else { const args = argsOrState as WorkspaceFileArgs | undefined; if ((!args || args.path === undefined) && !opts.urn) { @@ -90,6 +95,7 @@ export class WorkspaceFile extends pulumi.CustomResource { resourceInputs["path"] = args ? args.path : undefined; resourceInputs["source"] = args ? args.source : undefined; resourceInputs["url"] = undefined /*out*/; + resourceInputs["workspacePath"] = undefined /*out*/; } opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts); super(WorkspaceFile.__pulumiType, name, resourceInputs, opts); @@ -118,6 +124,10 @@ export interface WorkspaceFileState { * Routable URL of the workspace file */ url?: pulumi.Input; + /** + * path on Workspace File System (WSFS) in form of `/Workspace` + `path` + */ + workspacePath?: pulumi.Input; } /** diff --git a/sdk/python/pulumi_databricks/get_aws_assume_role_policy.py b/sdk/python/pulumi_databricks/get_aws_assume_role_policy.py index 22b828f8..db8518b2 100644 --- a/sdk/python/pulumi_databricks/get_aws_assume_role_policy.py +++ b/sdk/python/pulumi_databricks/get_aws_assume_role_policy.py @@ -126,7 +126,7 @@ def get_aws_assume_role_policy(databricks_account_id: Optional[str] = None, * get_aws_cross_account_policy data to construct the necessary AWS cross-account policy for you, which is based on [official documentation](https://docs.databricks.com/administration-guide/account-api/iam-role.html#language-Your%C2%A0VPC,%C2%A0default). - :param str external_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + :param str external_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). :param bool for_log_delivery: Either or not this assume role policy should be created for usage log delivery. Defaults to false. """ __args__ = dict() @@ -188,7 +188,7 @@ def get_aws_assume_role_policy_output(databricks_account_id: Optional[pulumi.Inp * get_aws_cross_account_policy data to construct the necessary AWS cross-account policy for you, which is based on [official documentation](https://docs.databricks.com/administration-guide/account-api/iam-role.html#language-Your%C2%A0VPC,%C2%A0default). - :param str external_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + :param str external_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). :param bool for_log_delivery: Either or not this assume role policy should be created for usage log delivery. Defaults to false. """ ... diff --git a/sdk/python/pulumi_databricks/mws_credentials.py b/sdk/python/pulumi_databricks/mws_credentials.py index a00e6e6d..bbb077f5 100644 --- a/sdk/python/pulumi_databricks/mws_credentials.py +++ b/sdk/python/pulumi_databricks/mws_credentials.py @@ -14,30 +14,30 @@ @pulumi.input_type class MwsCredentialsArgs: def __init__(__self__, *, - account_id: pulumi.Input[str], credentials_name: pulumi.Input[str], - role_arn: pulumi.Input[str]): + role_arn: pulumi.Input[str], + account_id: Optional[pulumi.Input[str]] = None, + creation_time: Optional[pulumi.Input[int]] = None, + credentials_id: Optional[pulumi.Input[str]] = None, + external_id: Optional[pulumi.Input[str]] = None): """ The set of arguments for constructing a MwsCredentials resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[str] credentials_name: name of credentials to register :param pulumi.Input[str] role_arn: ARN of cross-account role + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[int] creation_time: (Integer) time of credentials registration + :param pulumi.Input[str] credentials_id: (String) identifier of credentials """ - pulumi.set(__self__, "account_id", account_id) pulumi.set(__self__, "credentials_name", credentials_name) pulumi.set(__self__, "role_arn", role_arn) - - @property - @pulumi.getter(name="accountId") - def account_id(self) -> pulumi.Input[str]: - """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) - """ - return pulumi.get(self, "account_id") - - @account_id.setter - def account_id(self, value: pulumi.Input[str]): - pulumi.set(self, "account_id", value) + if account_id is not None: + pulumi.set(__self__, "account_id", account_id) + if creation_time is not None: + pulumi.set(__self__, "creation_time", creation_time) + if credentials_id is not None: + pulumi.set(__self__, "credentials_id", credentials_id) + if external_id is not None: + pulumi.set(__self__, "external_id", external_id) @property @pulumi.getter(name="credentialsName") @@ -63,6 +63,51 @@ def role_arn(self) -> pulumi.Input[str]: def role_arn(self, value: pulumi.Input[str]): pulumi.set(self, "role_arn", value) + @property + @pulumi.getter(name="accountId") + def account_id(self) -> Optional[pulumi.Input[str]]: + """ + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) + """ + return pulumi.get(self, "account_id") + + @account_id.setter + def account_id(self, value: Optional[pulumi.Input[str]]): + pulumi.set(self, "account_id", value) + + @property + @pulumi.getter(name="creationTime") + def creation_time(self) -> Optional[pulumi.Input[int]]: + """ + (Integer) time of credentials registration + """ + return pulumi.get(self, "creation_time") + + @creation_time.setter + def creation_time(self, value: Optional[pulumi.Input[int]]): + pulumi.set(self, "creation_time", value) + + @property + @pulumi.getter(name="credentialsId") + def credentials_id(self) -> Optional[pulumi.Input[str]]: + """ + (String) identifier of credentials + """ + return pulumi.get(self, "credentials_id") + + @credentials_id.setter + def credentials_id(self, value: Optional[pulumi.Input[str]]): + pulumi.set(self, "credentials_id", value) + + @property + @pulumi.getter(name="externalId") + def external_id(self) -> Optional[pulumi.Input[str]]: + return pulumi.get(self, "external_id") + + @external_id.setter + def external_id(self, value: Optional[pulumi.Input[str]]): + pulumi.set(self, "external_id", value) + @pulumi.input_type class _MwsCredentialsState: @@ -75,7 +120,7 @@ def __init__(__self__, *, role_arn: Optional[pulumi.Input[str]] = None): """ Input properties used for looking up and filtering MwsCredentials resources. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[int] creation_time: (Integer) time of credentials registration :param pulumi.Input[str] credentials_id: (String) identifier of credentials :param pulumi.Input[str] credentials_name: name of credentials to register @@ -98,7 +143,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountId") def account_id(self) -> Optional[pulumi.Input[str]]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) """ return pulumi.get(self, "account_id") @@ -170,7 +215,10 @@ def __init__(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, account_id: Optional[pulumi.Input[str]] = None, + creation_time: Optional[pulumi.Input[int]] = None, + credentials_id: Optional[pulumi.Input[str]] = None, credentials_name: Optional[pulumi.Input[str]] = None, + external_id: Optional[pulumi.Input[str]] = None, role_arn: Optional[pulumi.Input[str]] = None, __props__=None): """ @@ -210,11 +258,17 @@ def __init__(__self__, ## Import - -> **Note** Importing this resource is not currently supported. + This resource can be imported by the combination of its identifier and the account idbash + + ```sh + $ pulumi import databricks:index/mwsCredentials:MwsCredentials this / + ``` :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[int] creation_time: (Integer) time of credentials registration + :param pulumi.Input[str] credentials_id: (String) identifier of credentials :param pulumi.Input[str] credentials_name: name of credentials to register :param pulumi.Input[str] role_arn: ARN of cross-account role """ @@ -261,7 +315,11 @@ def __init__(__self__, ## Import - -> **Note** Importing this resource is not currently supported. + This resource can be imported by the combination of its identifier and the account idbash + + ```sh + $ pulumi import databricks:index/mwsCredentials:MwsCredentials this / + ``` :param str resource_name: The name of the resource. :param MwsCredentialsArgs args: The arguments to use to populate this resource's properties. @@ -279,7 +337,10 @@ def _internal_init(__self__, resource_name: str, opts: Optional[pulumi.ResourceOptions] = None, account_id: Optional[pulumi.Input[str]] = None, + creation_time: Optional[pulumi.Input[int]] = None, + credentials_id: Optional[pulumi.Input[str]] = None, credentials_name: Optional[pulumi.Input[str]] = None, + external_id: Optional[pulumi.Input[str]] = None, role_arn: Optional[pulumi.Input[str]] = None, __props__=None): opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) @@ -290,20 +351,16 @@ def _internal_init(__self__, raise TypeError('__props__ is only valid when passed in combination with a valid opts.id to get an existing resource') __props__ = MwsCredentialsArgs.__new__(MwsCredentialsArgs) - if account_id is None and not opts.urn: - raise TypeError("Missing required property 'account_id'") - __props__.__dict__["account_id"] = None if account_id is None else pulumi.Output.secret(account_id) + __props__.__dict__["account_id"] = account_id + __props__.__dict__["creation_time"] = creation_time + __props__.__dict__["credentials_id"] = credentials_id if credentials_name is None and not opts.urn: raise TypeError("Missing required property 'credentials_name'") __props__.__dict__["credentials_name"] = credentials_name + __props__.__dict__["external_id"] = external_id if role_arn is None and not opts.urn: raise TypeError("Missing required property 'role_arn'") __props__.__dict__["role_arn"] = role_arn - __props__.__dict__["creation_time"] = None - __props__.__dict__["credentials_id"] = None - __props__.__dict__["external_id"] = None - secret_opts = pulumi.ResourceOptions(additional_secret_outputs=["accountId"]) - opts = pulumi.ResourceOptions.merge(opts, secret_opts) super(MwsCredentials, __self__).__init__( 'databricks:index/mwsCredentials:MwsCredentials', resource_name, @@ -327,7 +384,7 @@ def get(resource_name: str, :param str resource_name: The unique name of the resulting resource. :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[int] creation_time: (Integer) time of credentials registration :param pulumi.Input[str] credentials_id: (String) identifier of credentials :param pulumi.Input[str] credentials_name: name of credentials to register @@ -347,9 +404,9 @@ def get(resource_name: str, @property @pulumi.getter(name="accountId") - def account_id(self) -> pulumi.Output[str]: + def account_id(self) -> pulumi.Output[Optional[str]]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) """ return pulumi.get(self, "account_id") diff --git a/sdk/python/pulumi_databricks/mws_customer_managed_keys.py b/sdk/python/pulumi_databricks/mws_customer_managed_keys.py index e3ede4ca..8c015490 100644 --- a/sdk/python/pulumi_databricks/mws_customer_managed_keys.py +++ b/sdk/python/pulumi_databricks/mws_customer_managed_keys.py @@ -24,7 +24,7 @@ def __init__(__self__, *, gcp_key_info: Optional[pulumi.Input['MwsCustomerManagedKeysGcpKeyInfoArgs']] = None): """ The set of arguments for constructing a MwsCustomerManagedKeys resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[Sequence[pulumi.Input[str]]] use_cases: *(since v0.3.4)* List of use cases for which this key will be used. *If you've used the resource before, please add `use_cases = ["MANAGED_SERVICES"]` to keep the previous behaviour.* Possible values are: :param pulumi.Input['MwsCustomerManagedKeysAwsKeyInfoArgs'] aws_key_info: This field is a block and is documented below. This conflicts with `gcp_key_info` :param pulumi.Input[int] creation_time: (Integer) Time in epoch milliseconds when the customer key was created. @@ -46,7 +46,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Input[str]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) """ return pulumi.get(self, "account_id") @@ -126,7 +126,7 @@ def __init__(__self__, *, use_cases: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None): """ Input properties used for looking up and filtering MwsCustomerManagedKeys resources. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input['MwsCustomerManagedKeysAwsKeyInfoArgs'] aws_key_info: This field is a block and is documented below. This conflicts with `gcp_key_info` :param pulumi.Input[int] creation_time: (Integer) Time in epoch milliseconds when the customer key was created. :param pulumi.Input[str] customer_managed_key_id: (String) ID of the encryption key configuration object. @@ -150,7 +150,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountId") def account_id(self) -> Optional[pulumi.Input[str]]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) """ return pulumi.get(self, "account_id") @@ -423,7 +423,7 @@ def __init__(__self__, :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[pulumi.InputType['MwsCustomerManagedKeysAwsKeyInfoArgs']] aws_key_info: This field is a block and is documented below. This conflicts with `gcp_key_info` :param pulumi.Input[int] creation_time: (Integer) Time in epoch milliseconds when the customer key was created. :param pulumi.Input[str] customer_managed_key_id: (String) ID of the encryption key configuration object. @@ -689,7 +689,7 @@ def get(resource_name: str, :param str resource_name: The unique name of the resulting resource. :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[pulumi.InputType['MwsCustomerManagedKeysAwsKeyInfoArgs']] aws_key_info: This field is a block and is documented below. This conflicts with `gcp_key_info` :param pulumi.Input[int] creation_time: (Integer) Time in epoch milliseconds when the customer key was created. :param pulumi.Input[str] customer_managed_key_id: (String) ID of the encryption key configuration object. @@ -712,7 +712,7 @@ def get(resource_name: str, @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Output[str]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) """ return pulumi.get(self, "account_id") diff --git a/sdk/python/pulumi_databricks/mws_log_delivery.py b/sdk/python/pulumi_databricks/mws_log_delivery.py index b8f67fa4..7269ae77 100644 --- a/sdk/python/pulumi_databricks/mws_log_delivery.py +++ b/sdk/python/pulumi_databricks/mws_log_delivery.py @@ -27,7 +27,7 @@ def __init__(__self__, *, workspace_ids_filters: Optional[pulumi.Input[Sequence[pulumi.Input[int]]]] = None): """ The set of arguments for constructing a MwsLogDelivery resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). :param pulumi.Input[str] credentials_id: The ID for a Databricks credential configuration that represents the AWS IAM role with policy and trust relationship as described in the main billable usage documentation page. :param pulumi.Input[str] log_type: The type of log delivery. `BILLABLE_USAGE` and `AUDIT_LOGS` are supported. :param pulumi.Input[str] output_format: The file type of log delivery. Currently `CSV` (for `BILLABLE_USAGE`) and `JSON` (for `AUDIT_LOGS`) are supported. @@ -61,7 +61,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Input[str]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). """ return pulumi.get(self, "account_id") @@ -206,7 +206,7 @@ def __init__(__self__, *, workspace_ids_filters: Optional[pulumi.Input[Sequence[pulumi.Input[int]]]] = None): """ Input properties used for looking up and filtering MwsLogDelivery resources. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). :param pulumi.Input[str] config_id: Databricks log delivery configuration ID. :param pulumi.Input[str] config_name: The optional human-readable name of the log delivery configuration. Defaults to empty. :param pulumi.Input[str] credentials_id: The ID for a Databricks credential configuration that represents the AWS IAM role with policy and trust relationship as described in the main billable usage documentation page. @@ -245,7 +245,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountId") def account_id(self) -> Optional[pulumi.Input[str]]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). """ return pulumi.get(self, "account_id") @@ -453,7 +453,7 @@ def __init__(__self__, :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). :param pulumi.Input[str] config_id: Databricks log delivery configuration ID. :param pulumi.Input[str] config_name: The optional human-readable name of the log delivery configuration. Defaults to empty. :param pulumi.Input[str] credentials_id: The ID for a Databricks credential configuration that represents the AWS IAM role with policy and trust relationship as described in the main billable usage documentation page. @@ -615,7 +615,7 @@ def get(resource_name: str, :param str resource_name: The unique name of the resulting resource. :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). :param pulumi.Input[str] config_id: Databricks log delivery configuration ID. :param pulumi.Input[str] config_name: The optional human-readable name of the log delivery configuration. Defaults to empty. :param pulumi.Input[str] credentials_id: The ID for a Databricks credential configuration that represents the AWS IAM role with policy and trust relationship as described in the main billable usage documentation page. @@ -648,7 +648,7 @@ def get(resource_name: str, @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Output[str]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). """ return pulumi.get(self, "account_id") diff --git a/sdk/python/pulumi_databricks/mws_networks.py b/sdk/python/pulumi_databricks/mws_networks.py index 8e362e73..a957bec3 100644 --- a/sdk/python/pulumi_databricks/mws_networks.py +++ b/sdk/python/pulumi_databricks/mws_networks.py @@ -30,7 +30,7 @@ def __init__(__self__, *, workspace_id: Optional[pulumi.Input[int]] = None): """ The set of arguments for constructing a MwsNetworks resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[str] network_name: name under which this network is registered :param pulumi.Input['MwsNetworksGcpNetworkInfoArgs'] gcp_network_info: a block consists of Google Cloud specific information for this network, for example the VPC ID, subnet ID, and secondary IP ranges. It has the following fields: :param pulumi.Input[str] network_id: (String) id of network to be used for MwsWorkspaces resource. @@ -68,7 +68,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Input[str]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) """ return pulumi.get(self, "account_id") @@ -220,7 +220,7 @@ def __init__(__self__, *, workspace_id: Optional[pulumi.Input[int]] = None): """ Input properties used for looking up and filtering MwsNetworks resources. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input['MwsNetworksGcpNetworkInfoArgs'] gcp_network_info: a block consists of Google Cloud specific information for this network, for example the VPC ID, subnet ID, and secondary IP ranges. It has the following fields: :param pulumi.Input[str] network_id: (String) id of network to be used for MwsWorkspaces resource. :param pulumi.Input[str] network_name: name under which this network is registered @@ -260,7 +260,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountId") def account_id(self) -> Optional[pulumi.Input[str]]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) """ return pulumi.get(self, "account_id") @@ -557,7 +557,7 @@ def __init__(__self__, :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[pulumi.InputType['MwsNetworksGcpNetworkInfoArgs']] gcp_network_info: a block consists of Google Cloud specific information for this network, for example the VPC ID, subnet ID, and secondary IP ranges. It has the following fields: :param pulumi.Input[str] network_id: (String) id of network to be used for MwsWorkspaces resource. :param pulumi.Input[str] network_name: name under which this network is registered @@ -799,7 +799,7 @@ def get(resource_name: str, :param str resource_name: The unique name of the resulting resource. :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[pulumi.InputType['MwsNetworksGcpNetworkInfoArgs']] gcp_network_info: a block consists of Google Cloud specific information for this network, for example the VPC ID, subnet ID, and secondary IP ranges. It has the following fields: :param pulumi.Input[str] network_id: (String) id of network to be used for MwsWorkspaces resource. :param pulumi.Input[str] network_name: name under which this network is registered @@ -832,7 +832,7 @@ def get(resource_name: str, @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Output[str]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) """ return pulumi.get(self, "account_id") diff --git a/sdk/python/pulumi_databricks/mws_permission_assignment.py b/sdk/python/pulumi_databricks/mws_permission_assignment.py index d3be2e2c..aa4b32cc 100644 --- a/sdk/python/pulumi_databricks/mws_permission_assignment.py +++ b/sdk/python/pulumi_databricks/mws_permission_assignment.py @@ -138,7 +138,7 @@ def __init__(__self__, workspace_id: Optional[pulumi.Input[int]] = None, __props__=None): """ - These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `account_id` attribute configured. Account Id that could be found in the bottom left corner of Accounts Console + These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `account_id` attribute configured. Account Id that could be found in the top right corner of Accounts Console ## Example Usage @@ -212,7 +212,7 @@ def __init__(__self__, args: MwsPermissionAssignmentArgs, opts: Optional[pulumi.ResourceOptions] = None): """ - These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `account_id` attribute configured. Account Id that could be found in the bottom left corner of Accounts Console + These resources are invoked in the account context. Permission Assignment Account API endpoints are restricted to account admins. Provider must have `account_id` attribute configured. Account Id that could be found in the top right corner of Accounts Console ## Example Usage diff --git a/sdk/python/pulumi_databricks/mws_storage_configurations.py b/sdk/python/pulumi_databricks/mws_storage_configurations.py index bf6ba6cd..0aec37ad 100644 --- a/sdk/python/pulumi_databricks/mws_storage_configurations.py +++ b/sdk/python/pulumi_databricks/mws_storage_configurations.py @@ -19,7 +19,7 @@ def __init__(__self__, *, storage_configuration_name: pulumi.Input[str]): """ The set of arguments for constructing a MwsStorageConfigurations resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[str] bucket_name: name of AWS S3 bucket :param pulumi.Input[str] storage_configuration_name: name under which this storage configuration is stored """ @@ -31,7 +31,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Input[str]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) """ return pulumi.get(self, "account_id") @@ -74,7 +74,7 @@ def __init__(__self__, *, storage_configuration_name: Optional[pulumi.Input[str]] = None): """ Input properties used for looking up and filtering MwsStorageConfigurations resources. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[str] bucket_name: name of AWS S3 bucket :param pulumi.Input[str] storage_configuration_id: (String) id of storage config to be used for `databricks_mws_workspace` resource. :param pulumi.Input[str] storage_configuration_name: name under which this storage configuration is stored @@ -94,7 +94,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountId") def account_id(self) -> Optional[pulumi.Input[str]]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) """ return pulumi.get(self, "account_id") @@ -197,7 +197,7 @@ def __init__(__self__, :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[str] bucket_name: name of AWS S3 bucket :param pulumi.Input[str] storage_configuration_name: name under which this storage configuration is stored """ @@ -307,7 +307,7 @@ def get(resource_name: str, :param str resource_name: The unique name of the resulting resource. :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) :param pulumi.Input[str] bucket_name: name of AWS S3 bucket :param pulumi.Input[str] storage_configuration_id: (String) id of storage config to be used for `databricks_mws_workspace` resource. :param pulumi.Input[str] storage_configuration_name: name under which this storage configuration is stored @@ -327,7 +327,7 @@ def get(resource_name: str, @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Output[str]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/) + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/) """ return pulumi.get(self, "account_id") diff --git a/sdk/python/pulumi_databricks/mws_workspaces.py b/sdk/python/pulumi_databricks/mws_workspaces.py index d09bf615..6345a2a9 100644 --- a/sdk/python/pulumi_databricks/mws_workspaces.py +++ b/sdk/python/pulumi_databricks/mws_workspaces.py @@ -43,7 +43,7 @@ def __init__(__self__, *, workspace_url: Optional[pulumi.Input[str]] = None): """ The set of arguments for constructing a MwsWorkspaces resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). :param pulumi.Input[str] workspace_name: name of the workspace, will appear on UI. :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: @@ -117,7 +117,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Input[str]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). """ return pulumi.get(self, "account_id") @@ -423,7 +423,7 @@ def __init__(__self__, *, workspace_url: Optional[pulumi.Input[str]] = None): """ Input properties used for looking up and filtering MwsWorkspaces resources. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). :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 @@ -499,7 +499,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountId") def account_id(self) -> Optional[pulumi.Input[str]]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). """ return pulumi.get(self, "account_id") @@ -813,7 +813,7 @@ def __init__(__self__, :param str resource_name: The name of the resource. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). :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 @@ -964,7 +964,7 @@ def get(resource_name: str, :param str resource_name: The unique name of the resulting resource. :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] account_id: Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + :param pulumi.Input[str] account_id: Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). :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 @@ -1017,7 +1017,7 @@ def get(resource_name: str, @pulumi.getter(name="accountId") def account_id(self) -> pulumi.Output[str]: """ - Account Id that could be found in the bottom left corner of [Accounts Console](https://accounts.cloud.databricks.com/). + Account Id that could be found in the top right corner of [Accounts Console](https://accounts.cloud.databricks.com/). """ return pulumi.get(self, "account_id") diff --git a/sdk/python/pulumi_databricks/workspace_file.py b/sdk/python/pulumi_databricks/workspace_file.py index d85216b5..2f64bb9e 100644 --- a/sdk/python/pulumi_databricks/workspace_file.py +++ b/sdk/python/pulumi_databricks/workspace_file.py @@ -98,13 +98,15 @@ def __init__(__self__, *, object_id: Optional[pulumi.Input[int]] = None, path: Optional[pulumi.Input[str]] = None, source: Optional[pulumi.Input[str]] = None, - url: Optional[pulumi.Input[str]] = None): + url: Optional[pulumi.Input[str]] = None, + workspace_path: Optional[pulumi.Input[str]] = None): """ Input properties used for looking up and filtering WorkspaceFile resources. :param pulumi.Input[int] object_id: Unique identifier for a workspace file :param pulumi.Input[str] path: The absolute path of the workspace file, beginning with "/", e.g. "/Demo". :param pulumi.Input[str] source: Path to file on local filesystem. Conflicts with `content_base64`. :param pulumi.Input[str] url: Routable URL of the workspace file + :param pulumi.Input[str] workspace_path: path on Workspace File System (WSFS) in form of `/Workspace` + `path` """ if content_base64 is not None: pulumi.set(__self__, "content_base64", content_base64) @@ -118,6 +120,8 @@ def __init__(__self__, *, pulumi.set(__self__, "source", source) if url is not None: pulumi.set(__self__, "url", url) + if workspace_path is not None: + pulumi.set(__self__, "workspace_path", workspace_path) @property @pulumi.getter(name="contentBase64") @@ -185,6 +189,18 @@ def url(self) -> Optional[pulumi.Input[str]]: def url(self, value: Optional[pulumi.Input[str]]): pulumi.set(self, "url", value) + @property + @pulumi.getter(name="workspacePath") + def workspace_path(self) -> Optional[pulumi.Input[str]]: + """ + path on Workspace File System (WSFS) in form of `/Workspace` + `path` + """ + return pulumi.get(self, "workspace_path") + + @workspace_path.setter + def workspace_path(self, value: Optional[pulumi.Input[str]]): + pulumi.set(self, "workspace_path", value) + class WorkspaceFile(pulumi.CustomResource): @overload @@ -264,6 +280,7 @@ def _internal_init(__self__, __props__.__dict__["path"] = path __props__.__dict__["source"] = source __props__.__dict__["url"] = None + __props__.__dict__["workspace_path"] = None super(WorkspaceFile, __self__).__init__( 'databricks:index/workspaceFile:WorkspaceFile', resource_name, @@ -279,7 +296,8 @@ def get(resource_name: str, object_id: Optional[pulumi.Input[int]] = None, path: Optional[pulumi.Input[str]] = None, source: Optional[pulumi.Input[str]] = None, - url: Optional[pulumi.Input[str]] = None) -> 'WorkspaceFile': + url: Optional[pulumi.Input[str]] = None, + workspace_path: Optional[pulumi.Input[str]] = None) -> 'WorkspaceFile': """ Get an existing WorkspaceFile resource's state with the given name, id, and optional extra properties used to qualify the lookup. @@ -291,6 +309,7 @@ def get(resource_name: str, :param pulumi.Input[str] path: The absolute path of the workspace file, beginning with "/", e.g. "/Demo". :param pulumi.Input[str] source: Path to file on local filesystem. Conflicts with `content_base64`. :param pulumi.Input[str] url: Routable URL of the workspace file + :param pulumi.Input[str] workspace_path: path on Workspace File System (WSFS) in form of `/Workspace` + `path` """ opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id)) @@ -302,6 +321,7 @@ def get(resource_name: str, __props__.__dict__["path"] = path __props__.__dict__["source"] = source __props__.__dict__["url"] = url + __props__.__dict__["workspace_path"] = workspace_path return WorkspaceFile(resource_name, opts=opts, __props__=__props__) @property @@ -346,3 +366,11 @@ def url(self) -> pulumi.Output[str]: """ return pulumi.get(self, "url") + @property + @pulumi.getter(name="workspacePath") + def workspace_path(self) -> pulumi.Output[str]: + """ + path on Workspace File System (WSFS) in form of `/Workspace` + `path` + """ + return pulumi.get(self, "workspace_path") +