From bf3c15be99191513bb7590b24e1b49506ab9b898 Mon Sep 17 00:00:00 2001
From: Steve Faulkner <southpolesteve@gmail.com>
Date: Thu, 21 Nov 2019 09:01:09 -0600
Subject: [PATCH] [Cosmos] Make changeFeed and query options optional. Fix
 #6232 Fix #6277 (#6258)

---
 sdk/cosmosdb/cosmos/changelog.md                     |  4 ++++
 sdk/cosmosdb/cosmos/review/cosmos.api.md             | 10 +++++-----
 sdk/cosmosdb/cosmos/src/client/Item/Items.ts         | 12 ++++++------
 .../{incrementalFeed.spec.ts => changeFeed.spec.ts}  |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)
 rename sdk/cosmosdb/cosmos/test/integration/{incrementalFeed.spec.ts => changeFeed.spec.ts} (98%)

diff --git a/sdk/cosmosdb/cosmos/changelog.md b/sdk/cosmosdb/cosmos/changelog.md
index eb194d9d86b3..477a346ce2b4 100644
--- a/sdk/cosmosdb/cosmos/changelog.md
+++ b/sdk/cosmosdb/cosmos/changelog.md
@@ -1,3 +1,7 @@
+## 3.4.3
+
+- Makes changeFeed and query options optional. Fix #6232 Fix #6277 (#6273)
+
 ## 3.4.2
 
 - Fixes bug where the query may throw a 410 error during a split operation. Instead, throw 503 (#6074)
diff --git a/sdk/cosmosdb/cosmos/review/cosmos.api.md b/sdk/cosmosdb/cosmos/review/cosmos.api.md
index 8d2364ec1888..3db752ccb9c5 100644
--- a/sdk/cosmosdb/cosmos/review/cosmos.api.md
+++ b/sdk/cosmosdb/cosmos/review/cosmos.api.md
@@ -561,26 +561,26 @@ export class ItemResponse<T extends ItemDefinition> extends ResourceResponse<T &
 // @public
 export class Items {
     constructor(container: Container, clientContext: ClientContext);
-    changeFeed(partitionKey: string | number | boolean, changeFeedOptions: ChangeFeedOptions): ChangeFeedIterator<any>;
+    changeFeed(partitionKey: string | number | boolean, changeFeedOptions?: ChangeFeedOptions): ChangeFeedIterator<any>;
     changeFeed(changeFeedOptions?: ChangeFeedOptions): ChangeFeedIterator<any>;
-    changeFeed<T>(partitionKey: string | number | boolean, changeFeedOptions: ChangeFeedOptions): ChangeFeedIterator<T>;
+    changeFeed<T>(partitionKey: string | number | boolean, changeFeedOptions?: ChangeFeedOptions): ChangeFeedIterator<T>;
     changeFeed<T>(changeFeedOptions?: ChangeFeedOptions): ChangeFeedIterator<T>;
     // (undocumented)
     readonly container: Container;
     create<T extends ItemDefinition = any>(body: T, options?: RequestOptions): Promise<ItemResponse<T>>;
     query(query: string | SqlQuerySpec, options?: FeedOptions): QueryIterator<any>;
-    query<T>(query: string | SqlQuerySpec, options: FeedOptions): QueryIterator<T>;
+    query<T>(query: string | SqlQuerySpec, options?: FeedOptions): QueryIterator<T>;
     readAll(options?: FeedOptions): QueryIterator<ItemDefinition>;
     readAll<T extends ItemDefinition>(options?: FeedOptions): QueryIterator<T>;
     // Warning: (ae-forgotten-export) The symbol "ChangeFeedOptions" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "ChangeFeedIterator" needs to be exported by the entry point index.d.ts
     //
     // @deprecated
-    readChangeFeed(partitionKey: string | number | boolean, changeFeedOptions: ChangeFeedOptions): ChangeFeedIterator<any>;
+    readChangeFeed(partitionKey: string | number | boolean, changeFeedOptions?: ChangeFeedOptions): ChangeFeedIterator<any>;
     // @deprecated
     readChangeFeed(changeFeedOptions?: ChangeFeedOptions): ChangeFeedIterator<any>;
     // @deprecated
-    readChangeFeed<T>(partitionKey: string | number | boolean, changeFeedOptions: ChangeFeedOptions): ChangeFeedIterator<T>;
+    readChangeFeed<T>(partitionKey: string | number | boolean, changeFeedOptions?: ChangeFeedOptions): ChangeFeedIterator<T>;
     // @deprecated
     readChangeFeed<T>(changeFeedOptions?: ChangeFeedOptions): ChangeFeedIterator<T>;
     upsert(body: any, options?: RequestOptions): Promise<ItemResponse<ItemDefinition>>;
diff --git a/sdk/cosmosdb/cosmos/src/client/Item/Items.ts b/sdk/cosmosdb/cosmos/src/client/Item/Items.ts
index 1d4e0ea22f6d..b1ad79769b97 100644
--- a/sdk/cosmosdb/cosmos/src/client/Item/Items.ts
+++ b/sdk/cosmosdb/cosmos/src/client/Item/Items.ts
@@ -72,7 +72,7 @@ export class Items {
    * const {result: items} = await items.query<{firstName: string}>(querySpec).fetchAll();
    * ```
    */
-  public query<T>(query: string | SqlQuerySpec, options: FeedOptions): QueryIterator<T>;
+  public query<T>(query: string | SqlQuerySpec, options?: FeedOptions): QueryIterator<T>;
   public query<T>(query: string | SqlQuerySpec, options: FeedOptions = {}): QueryIterator<T> {
     const path = getPathFromLink(this.container.url, ResourceType.item);
     const id = getIdFromLink(this.container.url);
@@ -115,7 +115,7 @@ export class Items {
    */
   public readChangeFeed(
     partitionKey: string | number | boolean,
-    changeFeedOptions: ChangeFeedOptions
+    changeFeedOptions?: ChangeFeedOptions
   ): ChangeFeedIterator<any>;
   /**
    * Create a `ChangeFeedIterator` to iterate over pages of changes
@@ -133,7 +133,7 @@ export class Items {
    */
   public readChangeFeed<T>(
     partitionKey: string | number | boolean,
-    changeFeedOptions: ChangeFeedOptions
+    changeFeedOptions?: ChangeFeedOptions
   ): ChangeFeedIterator<T>;
   /**
    * Create a `ChangeFeedIterator` to iterate over pages of changes
@@ -169,7 +169,7 @@ export class Items {
    */
   public changeFeed(
     partitionKey: string | number | boolean,
-    changeFeedOptions: ChangeFeedOptions
+    changeFeedOptions?: ChangeFeedOptions
   ): ChangeFeedIterator<any>;
   /**
    * Create a `ChangeFeedIterator` to iterate over pages of changes
@@ -185,7 +185,7 @@ export class Items {
    */
   public changeFeed<T>(
     partitionKey: string | number | boolean,
-    changeFeedOptions: ChangeFeedOptions
+    changeFeedOptions?: ChangeFeedOptions
   ): ChangeFeedIterator<T>;
   /**
    * Create a `ChangeFeedIterator` to iterate over pages of changes
@@ -209,7 +209,7 @@ export class Items {
     }
 
     if (!changeFeedOptions) {
-      throw new Error("changeFeedOptions must be a valid object");
+      changeFeedOptions = {};
     }
 
     const path = getPathFromLink(this.container.url, ResourceType.item);
diff --git a/sdk/cosmosdb/cosmos/test/integration/incrementalFeed.spec.ts b/sdk/cosmosdb/cosmos/test/integration/changeFeed.spec.ts
similarity index 98%
rename from sdk/cosmosdb/cosmos/test/integration/incrementalFeed.spec.ts
rename to sdk/cosmosdb/cosmos/test/integration/changeFeed.spec.ts
index 2fd900b0f6a9..f6afbc8c0659 100644
--- a/sdk/cosmosdb/cosmos/test/integration/incrementalFeed.spec.ts
+++ b/sdk/cosmosdb/cosmos/test/integration/changeFeed.spec.ts
@@ -107,7 +107,7 @@ describe("Change Feed Iterator", function() {
     });
 
     it("should fetch new items only", async function() {
-      const iterator = container.items.changeFeed("0", {});
+      const iterator = container.items.changeFeed("0");
 
       const { result: items, headers } = await iterator.fetchNext();
       assert(headers.etag, "change feed response should have etag header");