moving the internal properties to an options bag

sdk/keyvault/keyvault-admin/src/lro/backup/operation.ts

@@ -3,6 +3,7 @@
 
 import { AbortSignalLike } from "@azure/abort-controller";
 import { PollOperationState, PollOperation } from "@azure/core-lro";
+import { RequestOptionsBase } from "@azure/core-http";
 import { KeyVaultClient } from "../../generated/keyVaultClient";
 import {
   KeyVaultClientFullBackupOptionalParams,
@@ -36,33 +37,39 @@ export interface BackupOperationState extends PollOperationState<string> {
    * The end time of the backup operation in UTC
    */
   endTime?: Date;
+  /**
+   * Internal request parameters
+   */
+  requestParameters?: any;
 }
 
 /**
  * An internal interface representing the state of a backup Key Vault's poll operation.
  * @internal
  */
 export interface BackupPollOperationState extends PollOperationState<string> {
-  /**
-   * Options for the core-http requests.
-   */
-  requestOptions?: BeginBackupOptions;
-  /**
-   * An interface representing the internal KeyVaultClient.
-   */
-  client?: KeyVaultClient;
-  /**
-   * The base URL to the vault.
-   */
-  vaultUrl?: string;
-  /**
-   * The URI of the blob storage account.
-   */
-  blobStorageUri?: string;
-  /**
-   * The SAS token.
-   */
-  sasToken?: string;
+  requestParameters?: {
+    /**
+     * Options for the core-http requests.
+     */
+    requestOptions: RequestOptionsBase;
+    /**
+     * An interface representing the internal KeyVaultClient.
+     */
+    client: KeyVaultClient;
+    /**
+     * The base URL to the vault.
+     */
+    vaultUrl: string;
+    /**
+     * The URI of the blob storage account.
+     */
+    blobStorageUri: string;
+    /**
+     * The SAS token.
+     */
+    sasToken: string;
+  };
   /**
    * The id returned as part of the backup request
    */
@@ -143,13 +150,8 @@ async function update(
   } = {}
 ): Promise<BackupPollOperation> {
   const state = this.state;
-  const { vaultUrl, blobStorageUri, sasToken } = state;
-
-  // Internal properties,
-  // the reference is only potentially undefined in the public representation of the poller.
-  const client = state.client!;
+  const { requestOptions, vaultUrl, blobStorageUri, sasToken, client } = state.requestParameters!;
 
-  const requestOptions = state.requestOptions || {};
   if (options.abortSignal) {
     requestOptions.abortSignal = options.abortSignal;
   }

sdk/keyvault/keyvault-admin/src/lro/backup/poller.ts

@@ -50,11 +50,13 @@ export class BackupPoller extends Poller<BackupPollOperationState, string> {
 
     const operation = makeBackupPollOperation({
       ...state,
-      blobStorageUri,
-      sasToken,
-      requestOptions,
-      client,
-      vaultUrl
+      requestParameters: {
+        blobStorageUri,
+        sasToken,
+        requestOptions: requestOptions || {},
+        client,
+        vaultUrl
+      }
     });
 
     super(operation);

sdk/keyvault/keyvault-admin/src/lro/restore/operation.ts

@@ -16,22 +16,6 @@ import { KeyVaultClientFullRestoreOperationResponse } from "../../generated/mode
  * An interface representing the publicly available properties of the state of a restore Key Vault's poll operation.
  */
 export interface RestoreOperationState extends PollOperationState<undefined> {
-  /**
-   * The base URL to the vault
-   */
-  vaultUrl: string;
-  /**
-   * The URI of the blob storage account.
-   */
-  blobStorageUri: string;
-  /**
-   * The SAS token.
-   */
-  sasToken: string;
-  /**
-   * The Folder name of the blob where the previous successful full backup was stored.
-   */
-  folderName: string;
   /**
    * Identifier for the full restore operation.
    */
@@ -52,37 +36,43 @@ export interface RestoreOperationState extends PollOperationState<undefined> {
    * The end time of the restore operation in UTC
    */
   endTime?: Date;
+  /**
+   * Internal request parameters
+   */
+  requestParameters?: any;
 }
 
 /**
  * An internal interface representing the state of a restore Key Vault's poll operation.
  * @internal
  */
 export interface RestorePollOperationState extends PollOperationState<undefined> {
-  /**
-   * Options for the core-http requests.
-   */
-  requestOptions?: RequestOptionsBase;
-  /**
-   * An interface representing the internal KeyVaultClient.
-   */
-  client?: KeyVaultClient;
-  /**
-   * The base URL to the vault
-   */
-  vaultUrl: string;
-  /**
-   * The URI of the blob storage account.
-   */
-  blobStorageUri: string;
-  /**
-   * The SAS token.
-   */
-  sasToken: string;
-  /**
-   * The Folder name of the blob where the previous successful full backup was stored
-   */
-  folderName: string;
+  requestParameters?: {
+    /**
+     * Options for the core-http requests.
+     */
+    requestOptions: RequestOptionsBase;
+    /**
+     * An interface representing the internal KeyVaultClient.
+     */
+    client: KeyVaultClient;
+    /**
+     * The base URL to the vault.
+     */
+    vaultUrl: string;
+    /**
+     * The URI of the blob storage account.
+     */
+    blobStorageUri: string;
+    /**
+     * The SAS token.
+     */
+    sasToken: string;
+    /**
+     * The Folder name of the blob where the previous successful full backup was stored
+     */
+    folderName: string;
+  };
   /**
    * The id returned as part of the restore request
    */
@@ -163,13 +153,15 @@ async function update(
   } = {}
 ): Promise<RestorePollOperation> {
   const state = this.state;
-  const { vaultUrl, blobStorageUri, sasToken, folderName } = state;
-
-  // Internal properties,
-  // the reference is only potentially undefined in the public representation of the poller.
-  const client = state.client!;
+  const {
+    client,
+    requestOptions,
+    vaultUrl,
+    blobStorageUri,
+    sasToken,
+    folderName
+  } = state.requestParameters!;
 
-  const requestOptions = state.requestOptions || {};
   if (options.abortSignal) {
     requestOptions.abortSignal = options.abortSignal;
   }

sdk/keyvault/keyvault-admin/src/lro/restore/poller.ts

@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { delay } from "@azure/core-http";
+import { delay, RequestOptionsBase } from "@azure/core-http";
 import { Poller } from "@azure/core-lro";
-import { BeginRestoreOptions } from "../..";
 import { KeyVaultClient } from "../../generated/keyVaultClient";
 import {
   RestoreOperationState,
@@ -17,7 +16,7 @@ export interface RestorePollerOptions {
   blobStorageUri: string;
   sasToken: string;
   folderName: string;
-  requestOptions?: BeginRestoreOptions;
+  requestOptions?: RequestOptionsBase;
   intervalInMs?: number;
   resumeFrom?: string;
 }
@@ -51,12 +50,14 @@ export class RestorePoller extends Poller<RestorePollOperationState, undefined>
 
     const operation = makeRestorePollOperation({
       ...state,
-      blobStorageUri,
-      sasToken,
-      folderName,
-      requestOptions,
-      client,
-      vaultUrl
+      requestParameters: {
+        blobStorageUri,
+        sasToken,
+        folderName,
+        requestOptions: requestOptions || {},
+        client,
+        vaultUrl
+      }
     });
 
     super(operation);
@@ -78,10 +79,6 @@ export class RestorePoller extends Poller<RestorePollOperationState, undefined>
   public getOperationState(): RestoreOperationState {
     const state: RestoreOperationState = this.operation.state;
     return {
-      vaultUrl: state.vaultUrl,
-      blobStorageUri: state.blobStorageUri,
-      sasToken: state.sasToken,
-      folderName: state.folderName,
       isStarted: state.isStarted,
       isCompleted: state.isCompleted,
       isCancelled: state.isCancelled,