Skip to content

Commit

Permalink
cherry-pick #1363 CosmosClientOptions fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@stevengum
mdrichardson authored and stevengum committed Oct 25, 2019
1 parent 5d14feb commit 969555b
Show file tree
Hide file tree
Showing 8 changed files with 1,083 additions and 1,003 deletions.
392 changes: 196 additions & 196 deletions ...tData/CosmosDbPartitionedStorage/should_correctly_proceed_through_a_waterfall_dialog.json
View file

Large diffs are not rendered by default.

470 changes: 92 additions & 378 deletions ...s/botbuilder-azure/tests/TestData/CosmosDbPartitionedStorage/should_create_an_object.json
View file

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions ...s/botbuilder-azure/tests/TestData/CosmosDbPartitionedStorage/should_delete_an_object.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"id": 1,
"count": 1
},
"_rid": "Ep0pAI+J7qcGAAAAAAAAAA==",
"_self": "dbs/Ep0pAA==/colls/Ep0pAI+J7qc=/docs/Ep0pAI+J7qcGAAAAAAAAAA==/",
"_etag": "\"00000000-0000-0000-7fd9-253474c001d5\"",
"_rid": "OuRPAMPSwdkGAAAAAAAAAA==",
"_self": "dbs/OuRPAA==/colls/OuRPAMPSwdk=/docs/OuRPAMPSwdkGAAAAAAAAAA==/",
"_etag": "\"00000000-0000-0000-8b80-b7af83f101d5\"",
"_attachments": "attachments/",
"_ts": 1570759868
"_ts": 1572041303
},
"rawHeaders": [
"Cache-Control",
Expand All @@ -41,23 +41,23 @@
"Access-Control-Allow-Credentials",
"true",
"x-ms-last-state-change-utc",
"Wed, 09 Oct 2019 20:28:25.042 GMT",
"Fri, 25 Oct 2019 17:40:39.327 GMT",
"etag",
"\"00000000-0000-0000-7fd9-253474c001d5\"",
"\"00000000-0000-0000-8b80-b7af83f101d5\"",
"x-ms-resource-quota",
"documentSize=10240;documentsSize=10485760;documentsCount=-1;collectionSize=10485760;",
"x-ms-resource-usage",
"documentSize=0;documentsSize=0;documentsCount=5;collectionSize=6;",
"lsn",
"1582",
"2133",
"x-ms-schemaversion",
"1.8",
"x-ms-alt-content-path",
"dbs/test-db/colls/bot-storage",
"x-ms-content-path",
"Ep0pAI+J7qc=",
"OuRPAMPSwdk=",
"x-ms-quorum-acked-lsn",
"1581",
"2132",
"x-ms-current-write-quorum",
"1",
"x-ms-current-replica-set-size",
Expand All @@ -69,23 +69,23 @@
"x-ms-number-of-read-regions",
"0",
"x-ms-transport-request-id",
"1729",
"2692",
"x-ms-cosmos-llsn",
"1582",
"2133",
"x-ms-cosmos-quorum-acked-llsn",
"1581",
"2132",
"x-ms-session-token",
"0:-1#1582",
"0:-1#2133",
"x-ms-request-charge",
"6.86",
"x-ms-serviceversion",
"version=2.4.0.0",
"x-ms-activity-id",
"28e3f23b-b7b6-4daf-8f39-487332bf8484",
"cc64c158-1793-4742-96e7-81da608048ac",
"x-ms-gatewayversion",
"version=2.4.0.0",
"Date",
"Fri, 11 Oct 2019 02:11:07 GMT"
"Fri, 25 Oct 2019 22:08:22 GMT"
]
},
{
Expand All @@ -101,11 +101,11 @@
"id": 1,
"count": 1
},
"_rid": "Ep0pAI+J7qcGAAAAAAAAAA==",
"_self": "dbs/Ep0pAA==/colls/Ep0pAI+J7qc=/docs/Ep0pAI+J7qcGAAAAAAAAAA==/",
"_etag": "\"00000000-0000-0000-7fd9-253474c001d5\"",
"_rid": "OuRPAMPSwdkGAAAAAAAAAA==",
"_self": "dbs/OuRPAA==/colls/OuRPAMPSwdk=/docs/OuRPAMPSwdkGAAAAAAAAAA==/",
"_etag": "\"00000000-0000-0000-8b80-b7af83f101d5\"",
"_attachments": "attachments/",
"_ts": 1570759868
"_ts": 1572041303
},
"rawHeaders": [
"Cache-Control",
Expand All @@ -125,23 +125,23 @@
"Access-Control-Allow-Credentials",
"true",
"x-ms-last-state-change-utc",
"Wed, 09 Oct 2019 20:28:25.042 GMT",
"Fri, 25 Oct 2019 17:40:39.327 GMT",
"etag",
"\"00000000-0000-0000-7fd9-253474c001d5\"",
"\"00000000-0000-0000-8b80-b7af83f101d5\"",
"x-ms-resource-quota",
"documentSize=10240;documentsSize=10485760;documentsCount=-1;collectionSize=10485760;",
"x-ms-resource-usage",
"documentSize=0;documentsSize=0;documentsCount=6;collectionSize=6;",
"lsn",
"1582",
"2133",
"x-ms-schemaversion",
"1.8",
"x-ms-alt-content-path",
"dbs/test-db/colls/bot-storage",
"x-ms-content-path",
"Ep0pAI+J7qc=",
"OuRPAMPSwdk=",
"x-ms-quorum-acked-lsn",
"1582",
"2133",
"x-ms-current-write-quorum",
"1",
"x-ms-current-replica-set-size",
Expand All @@ -153,27 +153,27 @@
"x-ms-number-of-read-regions",
"0",
"x-ms-item-lsn",
"1582",
"2133",
"x-ms-transport-request-id",
"1730",
"2693",
"x-ms-cosmos-llsn",
"1582",
"2133",
"x-ms-cosmos-quorum-acked-llsn",
"1582",
"2133",
"x-ms-cosmos-item-llsn",
"1582",
"2133",
"x-ms-session-token",
"0:-1#1582",
"0:-1#2133",
"x-ms-request-charge",
"1",
"x-ms-serviceversion",
"version=2.4.0.0",
"x-ms-activity-id",
"30ce2663-ac0e-48c6-b5f4-35193970ef7c",
"82125f55-b900-4477-9696-ff6dadab15b6",
"x-ms-gatewayversion",
"version=2.4.0.0",
"Date",
"Fri, 11 Oct 2019 02:11:07 GMT"
"Fri, 25 Oct 2019 22:08:22 GMT"
]
},
{
Expand Down Expand Up @@ -201,21 +201,21 @@
"Access-Control-Allow-Credentials",
"true",
"x-ms-last-state-change-utc",
"Wed, 09 Oct 2019 20:28:25.042 GMT",
"Fri, 25 Oct 2019 17:40:39.327 GMT",
"x-ms-resource-quota",
"documentSize=10240;documentsSize=10485760;documentsCount=-1;collectionSize=10485760;",
"x-ms-resource-usage",
"documentSize=0;documentsSize=0;documentsCount=6;collectionSize=5;",
"lsn",
"1583",
"2134",
"x-ms-schemaversion",
"1.8",
"x-ms-alt-content-path",
"dbs/test-db/colls/bot-storage",
"x-ms-content-path",
"Ep0pAI+J7qc=",
"OuRPAMPSwdk=",
"x-ms-quorum-acked-lsn",
"1582",
"2133",
"x-ms-current-write-quorum",
"1",
"x-ms-current-replica-set-size",
Expand All @@ -227,23 +227,23 @@
"x-ms-number-of-read-regions",
"0",
"x-ms-transport-request-id",
"1731",
"2694",
"x-ms-cosmos-llsn",
"1583",
"2134",
"x-ms-cosmos-quorum-acked-llsn",
"1582",
"2133",
"x-ms-session-token",
"0:-1#1583",
"0:-1#2134",
"x-ms-request-charge",
"6.86",
"x-ms-serviceversion",
"version=2.4.0.0",
"x-ms-activity-id",
"3b2939f8-075a-451b-a236-81a6b627c8cb",
"07036d44-f5c8-465b-be35-3d6ee1d0bab2",
"x-ms-gatewayversion",
"version=2.4.0.0",
"Date",
"Fri, 11 Oct 2019 02:11:07 GMT"
"Fri, 25 Oct 2019 22:08:22 GMT"
]
},
{
Expand All @@ -254,7 +254,7 @@
"status": 404,
"response": {
"code": "NotFound",
"message": "Message: {\"Errors\":[\"Resource Not Found\"]}\r\nActivityId: 8c477aef-bd10-4a98-be73-b3fafe89f2a2, Request URI: /apps/DocDbApp/services/DocDbServer15/partitions/a4cb495b-38c8-11e6-8106-8cdcd42c33be/replicas/1p/, RequestStats: \r\nRequestStartTime: 2019-10-11T02:11:08.6345223Z, RequestEndTime: 2019-10-11T02:11:08.6355233Z, Number of regions attempted: 1\r\nResponseTime: 2019-10-11T02:11:08.6355233Z, StoreResult: StorePhysicalAddress: rntbd://127.0.0.1:10253/apps/DocDbApp/services/DocDbServer15/partitions/a4cb495b-38c8-11e6-8106-8cdcd42c33be/replicas/1p/, LSN: 1583, GlobalCommittedLsn: -1, PartitionKeyRangeId: 0, IsValid: True, StatusCode: 404, SubStatusCode: 0, RequestCharge: 1, ItemLSN: -1, SessionToken: -1#1583, UsingLocalLSN: True, TransportException: null, ResourceType: Document, OperationType: Read\r\n, SDK: Microsoft.Azure.Documents.Common/2.4.0.0"
"message": "Message: {\"Errors\":[\"Resource Not Found\"]}\r\nActivityId: fb711a49-6eb0-40d6-a038-92e73203b353, Request URI: /apps/DocDbApp/services/DocDbServer15/partitions/a4cb495b-38c8-11e6-8106-8cdcd42c33be/replicas/1p/, RequestStats: \r\nRequestStartTime: 2019-10-25T22:08:23.1432899Z, RequestEndTime: 2019-10-25T22:08:23.1442883Z, Number of regions attempted: 1\r\nResponseTime: 2019-10-25T22:08:23.1442883Z, StoreResult: StorePhysicalAddress: rntbd://127.0.0.1:10253/apps/DocDbApp/services/DocDbServer15/partitions/a4cb495b-38c8-11e6-8106-8cdcd42c33be/replicas/1p/, LSN: 2134, GlobalCommittedLsn: -1, PartitionKeyRangeId: 0, IsValid: True, StatusCode: 404, SubStatusCode: 0, RequestCharge: 1, ItemLSN: -1, SessionToken: -1#2134, UsingLocalLSN: True, TransportException: null, ResourceType: Document, OperationType: Read\r\n, SDK: Microsoft.Azure.Documents.Common/2.4.0.0"
},
"rawHeaders": [
"Transfer-Encoding",
Expand All @@ -270,13 +270,13 @@
"Access-Control-Allow-Credentials",
"true",
"x-ms-last-state-change-utc",
"Wed, 09 Oct 2019 20:28:25.042 GMT",
"Fri, 25 Oct 2019 17:40:39.327 GMT",
"lsn",
"1583",
"2134",
"x-ms-schemaversion",
"1.8",
"x-ms-quorum-acked-lsn",
"1583",
"2134",
"x-ms-current-write-quorum",
"1",
"x-ms-current-replica-set-size",
Expand All @@ -288,23 +288,23 @@
"x-ms-number-of-read-regions",
"0",
"x-ms-transport-request-id",
"1732",
"2695",
"x-ms-cosmos-llsn",
"1583",
"2134",
"x-ms-cosmos-quorum-acked-llsn",
"1583",
"2134",
"x-ms-session-token",
"0:-1#1583",
"0:-1#2134",
"x-ms-request-charge",
"1",
"x-ms-serviceversion",
"version=2.4.0.0",
"x-ms-activity-id",
"8c477aef-bd10-4a98-be73-b3fafe89f2a2",
"fb711a49-6eb0-40d6-a038-92e73203b353",
"x-ms-gatewayversion",
"version=2.4.0.0",
"Date",
"Fri, 11 Oct 2019 02:11:07 GMT"
"Fri, 25 Oct 2019 22:08:22 GMT"
]
}
]
Loading

0 comments on commit 969555b

Please sign in to comment.