Skip to content

Commit bbd0a4b

Browse files
shreyas-goenkashreyas-goenka
committed
[WIP] direct: secret scopes
1 parent 14e8e43 commit bbd0a4b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2039
-283
lines changed

‎acceptance/bundle/refschema/out.fields.txt‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2950,6 +2950,35 @@ resources.schemas.*.storage_root string ALL
29502950
resources.schemas.*.updated_at int64 REMOTE
29512951
resources.schemas.*.updated_by string REMOTE
29522952
resources.schemas.*.url string INPUT
2953+
resources.secret_scopes.*.backend_azure_keyvault *workspace.AzureKeyVaultSecretScopeMetadata STATE
2954+
resources.secret_scopes.*.backend_azure_keyvault.dns_name string STATE
2955+
resources.secret_scopes.*.backend_azure_keyvault.resource_id string STATE
2956+
resources.secret_scopes.*.backend_type workspace.ScopeBackendType INPUT REMOTE
2957+
resources.secret_scopes.*.id string INPUT
2958+
resources.secret_scopes.*.initial_manage_principal string STATE
2959+
resources.secret_scopes.*.keyvault_metadata *workspace.AzureKeyVaultSecretScopeMetadata INPUT REMOTE
2960+
resources.secret_scopes.*.keyvault_metadata.dns_name string INPUT REMOTE
2961+
resources.secret_scopes.*.keyvault_metadata.resource_id string INPUT REMOTE
2962+
resources.secret_scopes.*.lifecycle resources.Lifecycle INPUT
2963+
resources.secret_scopes.*.lifecycle.prevent_destroy bool INPUT
2964+
resources.secret_scopes.*.modified_status string INPUT
2965+
resources.secret_scopes.*.name string INPUT REMOTE
2966+
resources.secret_scopes.*.permissions []resources.SecretScopePermission INPUT
2967+
resources.secret_scopes.*.permissions[*] resources.SecretScopePermission INPUT
2968+
resources.secret_scopes.*.permissions[*].group_name string INPUT
2969+
resources.secret_scopes.*.permissions[*].level resources.SecretScopePermissionLevel INPUT
2970+
resources.secret_scopes.*.permissions[*].service_principal_name string INPUT
2971+
resources.secret_scopes.*.permissions[*].user_name string INPUT
2972+
resources.secret_scopes.*.scope string STATE
2973+
resources.secret_scopes.*.scope_backend_type workspace.ScopeBackendType STATE
2974+
resources.secret_scopes.*.url string INPUT
2975+
resources.secret_scopes.*.permissions.acls []resources.SecretScopePermission ALL
2976+
resources.secret_scopes.*.permissions.acls[*] resources.SecretScopePermission ALL
2977+
resources.secret_scopes.*.permissions.acls[*].group_name string ALL
2978+
resources.secret_scopes.*.permissions.acls[*].level resources.SecretScopePermissionLevel ALL
2979+
resources.secret_scopes.*.permissions.acls[*].service_principal_name string ALL
2980+
resources.secret_scopes.*.permissions.acls[*].user_name string ALL
2981+
resources.secret_scopes.*.permissions.scope_name string ALL
29532982
resources.sql_warehouses.*.auto_stop_mins int ALL
29542983
resources.sql_warehouses.*.channel *sql.Channel ALL
29552984
resources.sql_warehouses.*.channel.dbsql_version string ALL

‎acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/out.plan_.terraform.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,3 @@
2626
}
2727
}
2828
}
29-
{
30-
"plan": {
31-
"resources.clusters.test_cluster": {
32-
"action": "update"
33-
}
34-
}
35-
}

‎acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/out.plan_.terraform.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
1010
update clusters.test_cluster
1111

1212
Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
13-
update clusters.test_cluster
14-
15-
Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged

‎acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/out.requests.txt‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"method": "GET",
3+
"path": "/api/2.1/clusters/get",
4+
"q": {
5+
"cluster_id": "[CLUSTER_ID]"
6+
}
7+
}
8+
{
9+
"method": "GET",
10+
"path": "/api/2.0/preview/scim/v2/Me"
11+
}
12+
{
13+
"method": "GET",
14+
"path": "/api/2.0/workspace/get-status",
15+
"q": {
16+
"path": "/Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/state/terraform.tfstate",
17+
"return_export_info": "true"
18+
}
19+
}
20+
{
21+
"method": "GET",
22+
"path": "/api/2.0/workspace-files/Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/state/terraform.tfstate"
23+
}
24+
{
25+
"method": "GET",
26+
"path": "/api/2.0/workspace/get-status",
27+
"q": {
28+
"path": "/Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/state/deployment.json",
29+
"return_export_info": "true"
30+
}
31+
}
32+
{
33+
"method": "GET",
34+
"path": "/api/2.0/workspace-files/Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/state/deployment.json"
35+
}
36+
{
37+
"method": "GET",
38+
"path": "/api/2.1/clusters/get",
39+
"q": {
40+
"cluster_id": "[CLUSTER_ID]"
41+
}
42+
}
43+
{
44+
"method": "GET",
45+
"path": "/api/2.1/clusters/list",
46+
"q": {
47+
"filter_by.is_pinned": "true",
48+
"page_size": "100"
49+
}
50+
}

‎acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -129,34 +129,4 @@ Deployment complete!
129129

130130
=== Removing autoscale section should call resize API
131131

132-
>>> [CLI] bundle deploy
133-
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
134-
Deploying resources...
135-
Updating deployment state...
136-
Deployment complete!
137-
138-
>>> jq select(.method == "POST" and (.path | contains("/clusters/resize"))) out.requests.txt
139-
{
140-
"method": "POST",
141-
"path": "/api/2.1/clusters/resize",
142-
"body": {
143-
"cluster_id": "[CLUSTER_ID]",
144-
"num_workers": 3
145-
}
146-
}
147-
148-
=== Cluster should have num_workers
149-
{
150-
"cluster_name": "test-cluster-[UNIQUE_NAME]",
151-
"num_workers": 3,
152-
"autoscale": null
153-
}
154-
155-
>>> [CLI] bundle destroy --auto-approve
156-
The following resources will be deleted:
157-
delete cluster test_cluster
158-
159-
All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]
160-
161-
Deleting files...
162-
Destroy complete!
132+
Error: Test script killed due to a timeout

0 commit comments

Comments
 (0)