Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions packages/accessmanagement/src/v1/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import type {
DeleteWorkspacePermissionAssignmentRequest,
DeleteWorkspacePermissionAssignmentResponse,
GetObjectPermissionsRequest,
GetPermissionLevelsResponse,
GetRuleSetRequest,
GetWorkspacePermissionAssignmentsResponse,
ListAssignableRolesForResourceRequest,
ListAssignableRolesForResourceResponse,
ListPermissionLevelsRequest,
ListPermissionLevelsResponse,
ListWorkspacePermissionAssignmentsRequest,
ListWorkspacePermissionAssignmentsResponse,
ListWorkspacePermissionsRequest,
ListWorkspacePermissionsResponse,
PermissionsResponse,
Expand All @@ -50,9 +50,9 @@ import {
marshalUpdateWorkspacePermissionAssignmentRequestSchema,
unmarshalCheckPolicyResponseSchema,
unmarshalDeleteWorkspacePermissionAssignmentResponseSchema,
unmarshalGetPermissionLevelsResponseSchema,
unmarshalGetWorkspacePermissionAssignmentsResponseSchema,
unmarshalListAssignableRolesForResourceResponseSchema,
unmarshalListPermissionLevelsResponseSchema,
unmarshalListWorkspacePermissionAssignmentsResponseSchema,
unmarshalListWorkspacePermissionsResponseSchema,
unmarshalPermissionsResponseSchema,
unmarshalRuleSetSchema,
Expand Down Expand Up @@ -125,10 +125,10 @@ export class AccessManagementClient {
async listWorkspacePermissionAssignments(
req: ListWorkspacePermissionAssignmentsRequest,
options?: CallOptions
): Promise<GetWorkspacePermissionAssignmentsResponse> {
): Promise<ListWorkspacePermissionAssignmentsResponse> {
const {host, accountId, httpClient} = await this.resolveConfig();
const url = `${host}/api/2.0/accounts/${req.accountId ?? accountId ?? ''}/workspaces/${String(req.workspaceId ?? '')}/permissionassignments`;
let resp: GetWorkspacePermissionAssignmentsResponse | undefined;
let resp: ListWorkspacePermissionAssignmentsResponse | undefined;
const call = async (callSignal?: AbortSignal): Promise<void> => {
const headers = new Headers();
headers.set('User-Agent', this.userAgent);
Expand All @@ -140,7 +140,7 @@ export class AccessManagementClient {
});
resp = parseResponse(
respBody,
unmarshalGetWorkspacePermissionAssignmentsResponseSchema
unmarshalListWorkspacePermissionAssignmentsResponseSchema
);
};
await executeCall(call, options);
Expand Down Expand Up @@ -457,10 +457,10 @@ export class AccessManagementClient {
async listPermissionLevels(
req: ListPermissionLevelsRequest,
options?: CallOptions
): Promise<GetPermissionLevelsResponse> {
): Promise<ListPermissionLevelsResponse> {
const {host, workspaceId, httpClient} = await this.resolveConfig();
const url = `${host}/api/2.0/permissions/${req.requestObjectType ?? ''}/${req.requestObjectId ?? ''}/permissionLevels`;
let resp: GetPermissionLevelsResponse | undefined;
let resp: ListPermissionLevelsResponse | undefined;
const call = async (callSignal?: AbortSignal): Promise<void> => {
const headers = new Headers();
if (workspaceId !== undefined) {
Expand All @@ -475,7 +475,7 @@ export class AccessManagementClient {
});
resp = parseResponse(
respBody,
unmarshalGetPermissionLevelsResponseSchema
unmarshalListPermissionLevelsResponseSchema
);
};
await executeCall(call, options);
Expand Down
4 changes: 2 additions & 2 deletions packages/accessmanagement/src/v1/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ export type {
DeleteWorkspacePermissionAssignmentRequest,
DeleteWorkspacePermissionAssignmentResponse,
GetObjectPermissionsRequest,
GetPermissionLevelsResponse,
GetRuleSetRequest,
GetWorkspacePermissionAssignmentsResponse,
GrantRule,
ListAssignableRolesForResourceRequest,
ListAssignableRolesForResourceResponse,
ListPermissionLevelsRequest,
ListPermissionLevelsResponse,
ListWorkspacePermissionAssignmentsRequest,
ListWorkspacePermissionAssignmentsResponse,
ListWorkspacePermissionsRequest,
ListWorkspacePermissionsResponse,
Permission,
Expand Down
62 changes: 31 additions & 31 deletions packages/accessmanagement/src/v1/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,6 @@ export interface GetObjectPermissionsRequest {
requestObjectId?: string | undefined;
}

export interface GetPermissionLevelsResponse {
/** Specific permission levels */
permissionLevels?: PermissionsDescription[] | undefined;
}

export interface GetRuleSetRequest {
/** <Databricks> account ID. */
accountId?: string | undefined;
Expand Down Expand Up @@ -185,11 +180,6 @@ export interface GetRuleSetRequest {
etag?: string | undefined;
}

export interface GetWorkspacePermissionAssignmentsResponse {
/** Array of permissions assignments defined for a workspace. */
permissionAssignments?: WorkspacePermissionAssignmentOutput[] | undefined;
}

export interface GrantRule {
/**
* Principals this grant rule applies to.
Expand Down Expand Up @@ -230,6 +220,11 @@ export interface ListPermissionLevelsRequest {
requestObjectId?: string | undefined;
}

export interface ListPermissionLevelsResponse {
/** Specific permission levels */
permissionLevels?: PermissionsDescription[] | undefined;
}

/** Gets all the permission assignments for a workspace, given an account and a workspace. */
export interface ListWorkspacePermissionAssignmentsRequest {
/** The account ID. */
Expand All @@ -238,6 +233,11 @@ export interface ListWorkspacePermissionAssignmentsRequest {
workspaceId?: bigint | undefined;
}

export interface ListWorkspacePermissionAssignmentsResponse {
/** Array of permissions assignments defined for a workspace. */
permissionAssignments?: WorkspacePermissionAssignmentOutput[] | undefined;
}

/** List permissions for a workspace, given an account and a workspace. */
export interface ListWorkspacePermissionsRequest {
/** The account ID. */
Expand Down Expand Up @@ -450,7 +450,26 @@ export const unmarshalConsistencyTokenSchema: z.ZodType<ConsistencyToken> = z
export const unmarshalDeleteWorkspacePermissionAssignmentResponseSchema: z.ZodType<DeleteWorkspacePermissionAssignmentResponse> =
z.object({});

export const unmarshalGetPermissionLevelsResponseSchema: z.ZodType<GetPermissionLevelsResponse> =
export const unmarshalGrantRuleSchema: z.ZodType<GrantRule> = z
.object({
principals: z.array(z.string()).optional(),
role: z.string().optional(),
})
.transform(d => ({
principals: d.principals,
role: d.role,
}));

export const unmarshalListAssignableRolesForResourceResponseSchema: z.ZodType<ListAssignableRolesForResourceResponse> =
z
.object({
roles: z.array(z.lazy(() => unmarshalRoleSchema)).optional(),
})
.transform(d => ({
roles: d.roles,
}));

export const unmarshalListPermissionLevelsResponseSchema: z.ZodType<ListPermissionLevelsResponse> =
z
.object({
permission_levels: z
Expand All @@ -461,7 +480,7 @@ export const unmarshalGetPermissionLevelsResponseSchema: z.ZodType<GetPermission
permissionLevels: d.permission_levels,
}));

export const unmarshalGetWorkspacePermissionAssignmentsResponseSchema: z.ZodType<GetWorkspacePermissionAssignmentsResponse> =
export const unmarshalListWorkspacePermissionAssignmentsResponseSchema: z.ZodType<ListWorkspacePermissionAssignmentsResponse> =
z
.object({
permission_assignments: z
Expand All @@ -472,25 +491,6 @@ export const unmarshalGetWorkspacePermissionAssignmentsResponseSchema: z.ZodType
permissionAssignments: d.permission_assignments,
}));

export const unmarshalGrantRuleSchema: z.ZodType<GrantRule> = z
.object({
principals: z.array(z.string()).optional(),
role: z.string().optional(),
})
.transform(d => ({
principals: d.principals,
role: d.role,
}));

export const unmarshalListAssignableRolesForResourceResponseSchema: z.ZodType<ListAssignableRolesForResourceResponse> =
z
.object({
roles: z.array(z.lazy(() => unmarshalRoleSchema)).optional(),
})
.transform(d => ({
roles: d.roles,
}));

export const unmarshalListWorkspacePermissionsResponseSchema: z.ZodType<ListWorkspacePermissionsResponse> =
z
.object({
Expand Down
9 changes: 3 additions & 6 deletions packages/cleanrooms/src/v1/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ export class CleanRoomsClient {
}

/** List all the historical notebook task runs in a clean room. */
async listCleanRoomNotebookTaskRunsHandler(
async listCleanRoomNotebookTaskRuns(
req: ListCleanRoomNotebookTaskRunsRequest,
options?: CallOptions
): Promise<ListCleanRoomNotebookTaskRunsResponse> {
Expand Down Expand Up @@ -723,16 +723,13 @@ export class CleanRoomsClient {
return resp;
}

async *listCleanRoomNotebookTaskRunsHandlerIter(
async *listCleanRoomNotebookTaskRunsIter(
req: ListCleanRoomNotebookTaskRunsRequest,
options?: CallOptions
): AsyncGenerator<CleanRoomNotebookTaskRun> {
const pageReq: ListCleanRoomNotebookTaskRunsRequest = {...req};
for (;;) {
const resp = await this.listCleanRoomNotebookTaskRunsHandler(
pageReq,
options
);
const resp = await this.listCleanRoomNotebookTaskRuns(pageReq, options);
for (const item of resp.runs ?? []) {
yield item;
}
Expand Down
Loading
Loading