Skip to content

Commit

Permalink
Update prettier dev-dependency to v2.5.1 in KeyVault (Azure#19541)
Browse files Browse the repository at this point in the history
* Upgrade prettier version

* Format files

* Format keyvault-secrets
  • Loading branch information
JonathanCrd authored Jan 5, 2022
1 parent c26f9c2 commit e6dbd47
Show file tree
Hide file tree
Showing 153 changed files with 1,304 additions and 1,361 deletions.
32 changes: 16 additions & 16 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/keyvault/keyvault-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"mocha": "^7.1.1",
"mocha-junit-reporter": "^2.0.0",
"nyc": "^15.0.0",
"prettier": "^1.16.4",
"prettier": "^2.5.1",
"rimraf": "^3.0.0",
"rollup": "^1.16.3",
"sinon": "^9.0.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
KeyVaultAccessControlClient,
KeyVaultPermission,
KnownKeyVaultDataAction,
KnownKeyVaultRoleScope
KnownKeyVaultRoleScope,
} from "@azure/keyvault-admin";
import { DefaultAzureCredential } from "@azure/identity";
import * as uuid from "uuid";
Expand Down Expand Up @@ -38,14 +38,17 @@ export async function main(): Promise<void> {
const roleDefinitionName = uuid.v4();
const permissions: KeyVaultPermission[] = [
{
dataActions: [KnownKeyVaultDataAction.StartHsmBackup, KnownKeyVaultDataAction.StartHsmRestore]
}
dataActions: [
KnownKeyVaultDataAction.StartHsmBackup,
KnownKeyVaultDataAction.StartHsmRestore,
],
},
];
let roleDefinition = await client.setRoleDefinition(globalScope, {
roleDefinitionName,
roleName: "Backup Manager",
permissions,
description: "Allow backup actions"
description: "Allow backup actions",
});
console.log(roleDefinition);

Expand Down
22 changes: 11 additions & 11 deletions sdk/keyvault/keyvault-admin/src/accessControlClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
ListRoleAssignmentsPageSettings,
ListRoleDefinitionsOptions,
ListRoleDefinitionsPageSettings,
SetRoleDefinitionOptions
SetRoleDefinitionOptions,
} from "./accessControlModels";
import { LATEST_API_VERSION, authenticationScopes } from "./constants";
import { KeyVaultClient } from "./generated/keyVaultClient";
Expand Down Expand Up @@ -81,9 +81,9 @@ export class KeyVaultAccessControlClient {
additionalAllowedHeaderNames: [
"x-ms-keyvault-region",
"x-ms-keyvault-network-info",
"x-ms-keyvault-service-version"
]
}
"x-ms-keyvault-service-version",
],
},
};

this.client = new KeyVaultClient(serviceVersion, clientOptions);
Expand All @@ -92,7 +92,7 @@ export class KeyVaultAccessControlClient {
bearerTokenAuthenticationPolicy({
credential,
scopes: authenticationScopes,
challengeCallbacks: createChallengeCallbacks()
challengeCallbacks: createChallengeCallbacks(),
})
);
}
Expand Down Expand Up @@ -129,8 +129,8 @@ export class KeyVaultAccessControlClient {
{
properties: {
roleDefinitionId,
principalId
}
principalId,
},
},
updatedOptions
);
Expand Down Expand Up @@ -282,7 +282,7 @@ export class KeyVaultAccessControlClient {
return this;
},
byPage: (settings: ListRoleAssignmentsPageSettings = {}) =>
this.listRoleAssignmentsPage(roleScope, settings, options)
this.listRoleAssignmentsPage(roleScope, settings, options),
};
}

Expand Down Expand Up @@ -370,7 +370,7 @@ export class KeyVaultAccessControlClient {
return this;
},
byPage: (settings: ListRoleDefinitionsPageSettings = {}) =>
this.listRoleDefinitionsPage(roleScope, settings, options)
this.listRoleDefinitionsPage(roleScope, settings, options),
};
}

Expand Down Expand Up @@ -435,8 +435,8 @@ export class KeyVaultAccessControlClient {
permissions: options.permissions,
assignableScopes: [roleScope],
roleName: options.roleName,
roleType: "CustomRole"
}
roleType: "CustomRole",
},
},
updatedOptions
);
Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/keyvault-admin/src/accessControlModels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
DataAction as KeyVaultDataAction,
RoleScope as KeyVaultRoleScope,
KnownDataAction as KnownKeyVaultDataAction,
KnownRoleScope as KnownKeyVaultRoleScope
KnownRoleScope as KnownKeyVaultRoleScope,
} from "./generated/index";
import { SUPPORTED_API_VERSIONS } from "./constants";

Expand Down
18 changes: 9 additions & 9 deletions sdk/keyvault/keyvault-admin/src/backupClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
KeyVaultBeginRestoreOptions,
KeyVaultBeginSelectiveKeyRestoreOptions,
KeyVaultRestoreResult,
KeyVaultSelectiveKeyRestoreResult
KeyVaultSelectiveKeyRestoreResult,
} from "./backupClientModels";
import { LATEST_API_VERSION, authenticationScopes } from "./constants";
import { KeyVaultAdminPollOperationState } from "./lro/keyVaultAdminPoller";
Expand All @@ -30,7 +30,7 @@ export {
KeyVaultBackupOperationState,
KeyVaultRestoreOperationState,
KeyVaultSelectiveKeyRestoreOperationState,
KeyVaultAdminPollOperationState
KeyVaultAdminPollOperationState,
};

/**
Expand Down Expand Up @@ -83,17 +83,17 @@ export class KeyVaultBackupClient {
additionalAllowedHeaderNames: [
"x-ms-keyvault-region",
"x-ms-keyvault-network-info",
"x-ms-keyvault-service-version"
]
}
"x-ms-keyvault-service-version",
],
},
};

this.client = new KeyVaultClient(apiVersion, clientOptions);
this.client.pipeline.addPolicy(
bearerTokenAuthenticationPolicy({
credential,
scopes: authenticationScopes,
challengeCallbacks: createChallengeCallbacks()
challengeCallbacks: createChallengeCallbacks(),
})
);
}
Expand Down Expand Up @@ -141,7 +141,7 @@ export class KeyVaultBackupClient {
vaultUrl: this.vaultUrl,
intervalInMs: options.intervalInMs,
resumeFrom: options.resumeFrom,
requestOptions: options
requestOptions: options,
});

// This will initialize the poller's operation (the generation of the backup).
Expand Down Expand Up @@ -194,7 +194,7 @@ export class KeyVaultBackupClient {
vaultUrl: this.vaultUrl,
intervalInMs: options.intervalInMs,
resumeFrom: options.resumeFrom,
requestOptions: options
requestOptions: options,
});

// This will initialize the poller's operation (the generation of the backup).
Expand Down Expand Up @@ -252,7 +252,7 @@ export class KeyVaultBackupClient {
vaultUrl: this.vaultUrl,
intervalInMs: options.intervalInMs,
resumeFrom: options.resumeFrom,
requestOptions: options
requestOptions: options,
});

// This will initialize the poller's operation (the generation of the backup).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
AuthorizeRequestOptions,
ChallengeCallbacks,
PipelineRequest,
RequestBodyType
RequestBodyType,
} from "@azure/core-rest-pipeline";
import { ParsedWWWAuthenticate, parseWWWAuthenticate } from "../../keyvault-common/src";
import { GetTokenOptions } from "@azure/core-auth";
Expand Down Expand Up @@ -56,9 +56,9 @@ export function createChallengeCallbacks(): ChallengeCallbacks {
return {
abortSignal: request.abortSignal,
requestOptions: {
timeout: request.timeout
timeout: request.timeout,
},
tracingOptions: request.tracingOptions
tracingOptions: request.tracingOptions,
};
}

Expand All @@ -70,7 +70,7 @@ export function createChallengeCallbacks(): ChallengeCallbacks {
case "none":
challengeState = {
status: "started",
originalBody: request.body
originalBody: request.body,
};
request.body = null;
break;
Expand Down Expand Up @@ -119,14 +119,14 @@ export function createChallengeCallbacks(): ChallengeCallbacks {
options.request.headers.set("Authorization", `Bearer ${accessToken.token}`);

challengeState = {
status: "complete"
status: "complete",
};

return true;
}

return {
authorizeRequest,
authorizeRequestOnChallenge
authorizeRequestOnChallenge,
};
}
Loading

0 comments on commit e6dbd47

Please sign in to comment.