From 7eaf255899bf46a9ede4d493e387f6d69ebe4a96 Mon Sep 17 00:00:00 2001 From: Jeff Fisher Date: Thu, 3 Oct 2019 23:45:22 -0700 Subject: [PATCH] Fixup keyvault packages --- .../keyvault-certificates/package.json | 1 + .../keyvault-certificates/src/index.ts | 7 +- sdk/keyvault/keyvault-keys/package.json | 1 + sdk/keyvault/keyvault-keys/src/index.ts | 108 ++++++++++++------ sdk/keyvault/keyvault-secrets/package.json | 1 + sdk/keyvault/keyvault-secrets/src/index.ts | 51 ++++++--- 6 files changed, 116 insertions(+), 53 deletions(-) diff --git a/sdk/keyvault/keyvault-certificates/package.json b/sdk/keyvault/keyvault-certificates/package.json index 95cb8f73e617..f87d4fc1de50 100644 --- a/sdk/keyvault/keyvault-certificates/package.json +++ b/sdk/keyvault/keyvault-certificates/package.json @@ -71,6 +71,7 @@ "@azure/core-arm": "1.0.0-preview.3", "@azure/core-http": "1.0.0-preview.3", "@azure/core-paging": "1.0.0-preview.2", + "@azure/core-tracing": "1.0.0-preview.3", "tslib": "^1.9.3" }, "devDependencies": { diff --git a/sdk/keyvault/keyvault-certificates/src/index.ts b/sdk/keyvault/keyvault-certificates/src/index.ts index 9781b0ee531c..5c5cf6c52143 100644 --- a/sdk/keyvault/keyvault-certificates/src/index.ts +++ b/sdk/keyvault/keyvault-certificates/src/index.ts @@ -15,10 +15,13 @@ import { isNode, userAgentPolicy, RequestOptionsBase, - tracingPolicy, + tracingPolicy +} from "@azure/core-http"; + +import { getTracer, Span -} from "@azure/core-http"; +} from "@azure/core-tracing"; import { CertificateAttributes, diff --git a/sdk/keyvault/keyvault-keys/package.json b/sdk/keyvault/keyvault-keys/package.json index b322ec68c02c..59d79526e054 100644 --- a/sdk/keyvault/keyvault-keys/package.json +++ b/sdk/keyvault/keyvault-keys/package.json @@ -73,6 +73,7 @@ "@azure/core-http": "1.0.0-preview.3", "@azure/core-paging": "1.0.0-preview.2", "@azure/identity": "1.0.0-preview.3", + "@azure/core-tracing": "1.0.0-preview.3", "tslib": "^1.9.3" }, "devDependencies": { diff --git a/sdk/keyvault/keyvault-keys/src/index.ts b/sdk/keyvault/keyvault-keys/src/index.ts index d30f257edc64..17fae88f4a10 100644 --- a/sdk/keyvault/keyvault-keys/src/index.ts +++ b/sdk/keyvault/keyvault-keys/src/index.ts @@ -19,11 +19,11 @@ import { isNode, userAgentPolicy, RequestOptionsBase, - tracingPolicy, - getTracer, - Span + tracingPolicy } from "@azure/core-http"; +import { getTracer, Span } from "@azure/core-tracing"; + import "@azure/core-paging"; import { PageSettings, PagedAsyncIterableIterator } from "@azure/core-paging"; @@ -295,8 +295,12 @@ export class KeysClient { let response: CreateKeyResponse; try { - response = await this.client - .createKey(this.vaultBaseUrl, name, keyType, this.setParentSpan(span, unflattenedOptions)); + response = await this.client.createKey( + this.vaultBaseUrl, + name, + keyType, + this.setParentSpan(span, unflattenedOptions) + ); } finally { span.end(); } @@ -345,8 +349,12 @@ export class KeysClient { let response: CreateKeyResponse; try { - response = await this.client - .createKey(this.vaultBaseUrl, name, options.hsm ? "EC-HSM" : "EC", this.setParentSpan(span, unflattenedOptions)); + response = await this.client.createKey( + this.vaultBaseUrl, + name, + options.hsm ? "EC-HSM" : "EC", + this.setParentSpan(span, unflattenedOptions) + ); } finally { span.end(); } @@ -396,8 +404,12 @@ export class KeysClient { let response: CreateKeyResponse; try { - response = await this.client - .createKey(this.vaultBaseUrl, name, options.hsm ? "RSA-HSM" : "RSA", this.setParentSpan(span, unflattenedOptions)); + response = await this.client.createKey( + this.vaultBaseUrl, + name, + options.hsm ? "RSA-HSM" : "RSA", + this.setParentSpan(span, unflattenedOptions) + ); } finally { span.end(); } @@ -447,8 +459,12 @@ export class KeysClient { let response: ImportKeyResponse; try { - response = await this.client - .importKey(this.vaultBaseUrl, name, key, this.setParentSpan(span, unflattenedOptions)); + response = await this.client.importKey( + this.vaultBaseUrl, + name, + key, + this.setParentSpan(span, unflattenedOptions) + ); } finally { span.end(); } @@ -481,8 +497,11 @@ export class KeysClient { let response: DeleteKeyResponse; try { - response = await this.client - .deleteKey(this.vaultBaseUrl, name, this.setParentSpan(span, requestOptions)); + response = await this.client.deleteKey( + this.vaultBaseUrl, + name, + this.setParentSpan(span, requestOptions) + ); } finally { span.end(); } @@ -534,8 +553,12 @@ export class KeysClient { let response: UpdateKeyResponse; try { - response = await this.client - .updateKey(this.vaultBaseUrl, name, keyVersion, this.setParentSpan(span, unflattenedOptions)); + response = await this.client.updateKey( + this.vaultBaseUrl, + name, + keyVersion, + this.setParentSpan(span, unflattenedOptions) + ); } finally { span.end(); } @@ -567,13 +590,12 @@ export class KeysClient { let response: GetKeyResponse; try { - response = await this.client - .getKey( - this.vaultBaseUrl, - name, - options && options.version ? options.version : "", - this.setParentSpan(span, requestOptions) - ); + response = await this.client.getKey( + this.vaultBaseUrl, + name, + options && options.version ? options.version : "", + this.setParentSpan(span, requestOptions) + ); } finally { span.end(); } @@ -601,8 +623,11 @@ export class KeysClient { let response: GetDeletedKeyResponse; try { - response = await this.client - .getDeletedKey(this.vaultBaseUrl, name, this.setParentSpan(span, requestOptions)); + response = await this.client.getDeletedKey( + this.vaultBaseUrl, + name, + this.setParentSpan(span, requestOptions) + ); } finally { span.end(); } @@ -632,11 +657,14 @@ export class KeysClient { const span = this.createSpan("purgeDeletedKey", requestOptions); try { - await this.client.purgeDeletedKey(this.vaultBaseUrl, name, this.setParentSpan(span, requestOptions)); + await this.client.purgeDeletedKey( + this.vaultBaseUrl, + name, + this.setParentSpan(span, requestOptions) + ); } finally { span.end(); } - } /** @@ -661,8 +689,11 @@ export class KeysClient { let response: RecoverDeletedKeyResponse; try { - response = await this.client - .recoverDeletedKey(this.vaultBaseUrl, name, this.setParentSpan(span, requestOptions)); + response = await this.client.recoverDeletedKey( + this.vaultBaseUrl, + name, + this.setParentSpan(span, requestOptions) + ); } finally { span.end(); } @@ -690,8 +721,11 @@ export class KeysClient { let response: BackupKeyResponse; try { - response = await this.client - .backupKey(this.vaultBaseUrl, name, this.setParentSpan(span, requestOptions)); + response = await this.client.backupKey( + this.vaultBaseUrl, + name, + this.setParentSpan(span, requestOptions) + ); } finally { span.end(); } @@ -721,8 +755,11 @@ export class KeysClient { let response: RestoreKeyResponse; try { - response = await this.client - .restoreKey(this.vaultBaseUrl, backup, this.setParentSpan(span, requestOptions)); + response = await this.client.restoreKey( + this.vaultBaseUrl, + backup, + this.setParentSpan(span, requestOptions) + ); } finally { span.end(); } @@ -807,7 +844,8 @@ export class KeysClient { [Symbol.asyncIterator]() { return this; }, - byPage: (settings: PageSettings = {}) => this.listKeyVersionsPage(name, settings, updatedOptions) + byPage: (settings: PageSettings = {}) => + this.listKeyVersionsPage(name, settings, updatedOptions) }; } @@ -1030,9 +1068,9 @@ export class KeysClient { ...options, spanOptions: { ...options.spanOptions, - parent: span, + parent: span } - } + }; } else { return options; } diff --git a/sdk/keyvault/keyvault-secrets/package.json b/sdk/keyvault/keyvault-secrets/package.json index 3f93b9456c8d..c27b9dbb8e6e 100644 --- a/sdk/keyvault/keyvault-secrets/package.json +++ b/sdk/keyvault/keyvault-secrets/package.json @@ -74,6 +74,7 @@ "@azure/core-http": "1.0.0-preview.3", "@azure/core-paging": "1.0.0-preview.2", "@azure/identity": "1.0.0-preview.3", + "@azure/core-tracing": "1.0.0-preview.3", "tslib": "^1.9.3" }, "devDependencies": { diff --git a/sdk/keyvault/keyvault-secrets/src/index.ts b/sdk/keyvault/keyvault-secrets/src/index.ts index 84893c467254..038346d28463 100644 --- a/sdk/keyvault/keyvault-secrets/src/index.ts +++ b/sdk/keyvault/keyvault-secrets/src/index.ts @@ -19,11 +19,11 @@ import { getDefaultProxySettings, isNode, userAgentPolicy, - tracingPolicy, - getTracer, - Span + tracingPolicy } from "@azure/core-http"; +import { getTracer, Span } from "@azure/core-tracing"; + import "@azure/core-paging"; import { PageSettings, PagedAsyncIterableIterator } from "@azure/core-paging"; import { @@ -77,11 +77,7 @@ export { UpdateSecretOptions }; -export { - ProxyOptions, - RetryOptions, - TelemetryOptions -}; +export { ProxyOptions, RetryOptions, TelemetryOptions }; /** * The client to interact with the KeyVault secrets functionality @@ -290,7 +286,11 @@ export class SecretsClient { let response: DeleteSecretResponse; try { - response = await this.client.deleteSecret(this.vaultBaseUrl, secretName, this.setParentSpan(span, options)); + response = await this.client.deleteSecret( + this.vaultBaseUrl, + secretName, + this.setParentSpan(span, options) + ); } finally { span.end(); } @@ -420,7 +420,11 @@ export class SecretsClient { let response: GetDeletedSecretResponse; try { - response = await this.client.getDeletedSecret(this.vaultBaseUrl, secretName, this.setParentSpan(span, options)); + response = await this.client.getDeletedSecret( + this.vaultBaseUrl, + secretName, + this.setParentSpan(span, options) + ); } finally { span.end(); } @@ -448,7 +452,11 @@ export class SecretsClient { const span = this.createSpan("purgeDeletedSecret", options); try { - await this.client.purgeDeletedSecret(this.vaultBaseUrl, secretName, this.setParentSpan(span, options)); + await this.client.purgeDeletedSecret( + this.vaultBaseUrl, + secretName, + this.setParentSpan(span, options) + ); } finally { span.end(); } @@ -478,7 +486,11 @@ export class SecretsClient { let response: RecoverDeletedSecretResponse; try { - response = await this.client.recoverDeletedSecret(this.vaultBaseUrl, secretName, this.setParentSpan(span, options)); + response = await this.client.recoverDeletedSecret( + this.vaultBaseUrl, + secretName, + this.setParentSpan(span, options) + ); } finally { span.end(); } @@ -500,13 +512,20 @@ export class SecretsClient { * @param [options] The optional parameters * @returns Promise */ - public async backupSecret(secretName: string, options?: RequestOptionsBase): Promise { + public async backupSecret( + secretName: string, + options?: RequestOptionsBase + ): Promise { const span = this.createSpan("backupSecret", options); let response: BackupSecretResponse; try { - response = await this.client.backupSecret(this.vaultBaseUrl, secretName, this.setParentSpan(span, options)); + response = await this.client.backupSecret( + this.vaultBaseUrl, + secretName, + this.setParentSpan(span, options) + ); } finally { span.end(); } @@ -849,9 +868,9 @@ export class SecretsClient { ...options, spanOptions: { ...options.spanOptions, - parent: span, + parent: span } - } + }; } else { return options; }