diff --git a/sdk/eventgrid/eventgrid/package.json b/sdk/eventgrid/eventgrid/package.json index 28c1d5b69055..7cc84f0d8086 100644 --- a/sdk/eventgrid/eventgrid/package.json +++ b/sdk/eventgrid/eventgrid/package.json @@ -80,11 +80,13 @@ "autoPublish": false, "dependencies": { "@azure/core-auth": "^1.1.3", - "@azure/core-http": "^1.2.0", + "@azure/core-client": "1.0.0-beta.1", + "@azure/core-https": "1.0.0-beta.1", "@azure/core-tracing": "1.0.0-preview.9", "@azure/logger": "^1.0.0", "@opentelemetry/api": "^0.10.2", - "tslib": "^2.0.0" + "tslib": "^2.0.0", + "uuid": "^8.3.0" }, "devDependencies": { "@azure/dev-tool": "^1.0.0", diff --git a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_enriches_events_with_distributed_tracing_information.json b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_enriches_events_with_distributed_tracing_information.json index 177d140987a9..ca5258355f95 100644 --- a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_enriches_events_with_distributed_tracing_information.json +++ b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_enriches_events_with_distributed_tracing_information.json @@ -6,27 +6,27 @@ "query": { "api-version": "2018-01-01" }, - "requestBody": "[{\"id\":\"cloudTracingEventId160161957922404717\",\"source\":\"/earth/unitedstates/washington/kirkland/finnhill\",\"data\":{\"hello\":\"world\"},\"type\":\"Azure.Sdk.TestEvent1\",\"time\":\"2020-10-02T06:19:39.224Z\",\"specversion\":\"1.0\",\"datacontenttype\":\"application/json\",\"subject\":\"Single with Trace Parent\",\"traceparent\":\"00-1-3-00\"}]", + "requestBody": "[{\"id\":\"cloudTracingEventId161168561609301106\",\"source\":\"/earth/unitedstates/washington/kirkland/finnhill\",\"data\":{\"hello\":\"world\"},\"type\":\"Azure.Sdk.TestEvent1\",\"time\":\"2021-01-26T18:26:56.093Z\",\"specversion\":\"1.0\",\"datacontenttype\":\"application/json\",\"subject\":\"Single with Trace Parent\",\"traceparent\":\"00-1-3-00\"}]", "status": 200, "response": "", "responseHeaders": { "api-supported-versions": "2018-01-01", "content-length": "0", - "date": "Fri, 02 Oct 2020 06:19:39 GMT", + "date": "Tue, 26 Jan 2021 18:26:57 GMT", "server": "Microsoft-HTTPAPI/2.0", "status": "200", "strict-transport-security": "max-age=31536000; includeSubDomains", - "x-ms-request-id": "98b6d722-9da2-4723-88dd-03201af90be8" + "x-ms-request-id": "d942cfd6-ecea-42fa-8b9f-1bb6f902807f" } } ], "uniqueTestInfo": { "uniqueName": { - "cloudTracingEventId": "cloudTracingEventId160161957922404717" + "cloudTracingEventId": "cloudTracingEventId161168561609301106" }, "newDate": { - "cloudTracingEventDate": "2020-10-02T06:19:39.224Z" + "cloudTracingEventDate": "2021-01-26T18:26:56.093Z" } }, - "hash": "25b86eb5cf132e9be63d832bd8de85a7" + "hash": "a86111d1b0f8c543eaae49983af5c18d" } \ No newline at end of file diff --git a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_a_single_event.json b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_a_single_event.json index 62c2db666bec..50e1f5a89074 100644 --- a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_a_single_event.json +++ b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_a_single_event.json @@ -6,27 +6,27 @@ "query": { "api-version": "2018-01-01" }, - "requestBody": "[{\"id\":\"cloudSingleEventId160161957916908323\",\"source\":\"/earth/unitedstates/washington/kirkland/finnhill\",\"data\":{\"hello\":\"world\"},\"type\":\"Azure.Sdk.TestEvent1\",\"time\":\"2020-10-02T06:19:39.169Z\",\"specversion\":\"1.0\",\"datacontenttype\":\"application/json\"}]", + "requestBody": "[{\"id\":\"cloudSingleEventId161168561586109228\",\"source\":\"/earth/unitedstates/washington/kirkland/finnhill\",\"data\":{\"hello\":\"world\"},\"type\":\"Azure.Sdk.TestEvent1\",\"time\":\"2021-01-26T18:26:55.861Z\",\"specversion\":\"1.0\",\"datacontenttype\":\"application/json\"}]", "status": 200, "response": "", "responseHeaders": { "api-supported-versions": "2018-01-01", "content-length": "0", - "date": "Fri, 02 Oct 2020 06:19:39 GMT", + "date": "Tue, 26 Jan 2021 18:26:57 GMT", "server": "Microsoft-HTTPAPI/2.0", "status": "200", "strict-transport-security": "max-age=31536000; includeSubDomains", - "x-ms-request-id": "a7889d03-9a79-4916-b459-cb52b7f28794" + "x-ms-request-id": "c205280c-2772-4cd9-ac3d-5081a149b607" } } ], "uniqueTestInfo": { "uniqueName": { - "cloudSingleEventId": "cloudSingleEventId160161957916908323" + "cloudSingleEventId": "cloudSingleEventId161168561586109228" }, "newDate": { - "cloudSingleEventDate": "2020-10-02T06:19:39.169Z" + "cloudSingleEventDate": "2021-01-26T18:26:55.861Z" } }, - "hash": "7fe25ee020ac364dae32ce81a81c7c3f" + "hash": "e9ae659c7a27be413640b9855586a0a7" } \ No newline at end of file diff --git a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_multiple_events.json b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_multiple_events.json index 1c6482037261..0482078ebbe5 100644 --- a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_multiple_events.json +++ b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_multiple_events.json @@ -6,29 +6,29 @@ "query": { "api-version": "2018-01-01" }, - "requestBody": "[{\"id\":\"cloudMultiEventId1160161957919602606\",\"source\":\"/earth/unitedstates/washington/kirkland/finnhill\",\"data\":{\"hello\":\"world\"},\"type\":\"Azure.Sdk.TestEvent1\",\"time\":\"2020-10-02T06:19:39.196Z\",\"specversion\":\"1.0\",\"datacontenttype\":\"application/json\",\"subject\":\"Multiple 1\"},{\"id\":\"cloudMultiEventId2160161957919607521\",\"source\":\"/earth/unitedstates/washington/kirkland/finnhill\",\"data\":{\"hello\":\"world\"},\"type\":\"Azure.Sdk.TestEvent1\",\"time\":\"2020-10-02T06:19:39.196Z\",\"specversion\":\"1.0\",\"datacontenttype\":\"application/json\",\"subject\":\"Multiple 2\"}]", + "requestBody": "[{\"id\":\"cloudMultiEventId1161168561604100322\",\"source\":\"/earth/unitedstates/washington/kirkland/finnhill\",\"data\":{\"hello\":\"world\"},\"type\":\"Azure.Sdk.TestEvent1\",\"time\":\"2021-01-26T18:26:56.041Z\",\"specversion\":\"1.0\",\"datacontenttype\":\"application/json\",\"subject\":\"Multiple 1\"},{\"id\":\"cloudMultiEventId2161168561604104763\",\"source\":\"/earth/unitedstates/washington/kirkland/finnhill\",\"data\":{\"hello\":\"world\"},\"type\":\"Azure.Sdk.TestEvent1\",\"time\":\"2021-01-26T18:26:56.041Z\",\"specversion\":\"1.0\",\"datacontenttype\":\"application/json\",\"subject\":\"Multiple 2\"}]", "status": 200, "response": "", "responseHeaders": { "api-supported-versions": "2018-01-01", "content-length": "0", - "date": "Fri, 02 Oct 2020 06:19:39 GMT", + "date": "Tue, 26 Jan 2021 18:26:57 GMT", "server": "Microsoft-HTTPAPI/2.0", "status": "200", "strict-transport-security": "max-age=31536000; includeSubDomains", - "x-ms-request-id": "8ff6465b-3625-4a89-b5d9-a37604f36895" + "x-ms-request-id": "00ab6c21-ca97-4e37-b865-cc970a56150b" } } ], "uniqueTestInfo": { "uniqueName": { - "cloudMultiEventId1": "cloudMultiEventId1160161957919602606", - "cloudMultiEventId2": "cloudMultiEventId2160161957919607521" + "cloudMultiEventId1": "cloudMultiEventId1161168561604100322", + "cloudMultiEventId2": "cloudMultiEventId2161168561604104763" }, "newDate": { - "cloudMultiEventDate1": "2020-10-02T06:19:39.196Z", - "cloudMultiEventDate2": "2020-10-02T06:19:39.196Z" + "cloudMultiEventDate1": "2021-01-26T18:26:56.041Z", + "cloudMultiEventDate2": "2021-01-26T18:26:56.041Z" } }, - "hash": "799392d36931d99dc2c24d3db67fcb0b" + "hash": "90f3347253c0ab36ce2f8788c29f14cf" } \ No newline at end of file diff --git a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcustomschemaevents/recording_sends_a_single_event.json b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcustomschemaevents/recording_sends_a_single_event.json index 655b61dc580f..4b6c365d25c6 100644 --- a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcustomschemaevents/recording_sends_a_single_event.json +++ b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcustomschemaevents/recording_sends_a_single_event.json @@ -12,11 +12,11 @@ "responseHeaders": { "api-supported-versions": "2018-01-01", "content-length": "0", - "date": "Fri, 02 Oct 2020 06:19:39 GMT", + "date": "Tue, 26 Jan 2021 18:26:57 GMT", "server": "Microsoft-HTTPAPI/2.0", "status": "200", "strict-transport-security": "max-age=31536000; includeSubDomains", - "x-ms-request-id": "83c15d3b-2389-48c1-b34a-f38772788075" + "x-ms-request-id": "f7b74313-5d60-4ef4-8e96-d578057a083d" } } ], @@ -24,5 +24,5 @@ "uniqueName": {}, "newDate": {} }, - "hash": "3aa867d763b256df1511358d9616f18f" + "hash": "2bf0e079ba8b532c1cef46c3458d62fb" } \ No newline at end of file diff --git a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcustomschemaevents/recording_sends_multiple_events.json b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcustomschemaevents/recording_sends_multiple_events.json index c26be7cf35b7..f1386ea73e02 100644 --- a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcustomschemaevents/recording_sends_multiple_events.json +++ b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendcustomschemaevents/recording_sends_multiple_events.json @@ -12,11 +12,11 @@ "responseHeaders": { "api-supported-versions": "2018-01-01", "content-length": "0", - "date": "Fri, 02 Oct 2020 06:19:39 GMT", + "date": "Tue, 26 Jan 2021 18:26:57 GMT", "server": "Microsoft-HTTPAPI/2.0", "status": "200", "strict-transport-security": "max-age=31536000; includeSubDomains", - "x-ms-request-id": "dab12263-7746-4a18-b9f5-36b83d744385" + "x-ms-request-id": "68d97039-694e-4fa4-a79e-c44ca2a546c9" } } ], @@ -24,5 +24,5 @@ "uniqueName": {}, "newDate": {} }, - "hash": "1cfb052616732940934c2dfe9e0f6713" + "hash": "addc857213f6786f86c3555fbe3a8b27" } \ No newline at end of file diff --git a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendevents/recording_sends_a_single_event.json b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendevents/recording_sends_a_single_event.json index fb52f32afd5d..f28bf27c9afd 100644 --- a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendevents/recording_sends_a_single_event.json +++ b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendevents/recording_sends_a_single_event.json @@ -6,27 +6,27 @@ "query": { "api-version": "2018-01-01" }, - "requestBody": "[{\"id\":\"singleEventId160161957902009844\",\"subject\":\"Single 1\",\"data\":{\"hello\":\"world\"},\"eventType\":\"Azure.Sdk.TestEvent1\",\"eventTime\":\"2020-10-02T06:19:39.020Z\",\"dataVersion\":\"1.0\"}]", + "requestBody": "[{\"id\":\"singleEventId161168561545607277\",\"subject\":\"Single 1\",\"data\":{\"hello\":\"world\"},\"eventType\":\"Azure.Sdk.TestEvent1\",\"eventTime\":\"2021-01-26T18:26:55.456Z\",\"dataVersion\":\"1.0\"}]", "status": 200, "response": "", "responseHeaders": { "api-supported-versions": "2018-01-01", "content-length": "0", - "date": "Fri, 02 Oct 2020 06:19:39 GMT", + "date": "Tue, 26 Jan 2021 18:26:57 GMT", "server": "Microsoft-HTTPAPI/2.0", "status": "200", "strict-transport-security": "max-age=31536000; includeSubDomains", - "x-ms-request-id": "4ac1571b-c1eb-4795-92a6-f7d1e1f5ea5d" + "x-ms-request-id": "94489308-b9e5-4aaa-92db-2cf37a107347" } } ], "uniqueTestInfo": { "uniqueName": { - "singleEventId": "singleEventId160161957902009844" + "singleEventId": "singleEventId161168561545607277" }, "newDate": { - "singleEventDate": "2020-10-02T06:19:39.020Z" + "singleEventDate": "2021-01-26T18:26:55.456Z" } }, - "hash": "9b44e18369316233af4458904ca8ae09" + "hash": "85c2b7be05b423dcdac7d9214a5cf0cd" } \ No newline at end of file diff --git a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendevents/recording_sends_multiple_events.json b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendevents/recording_sends_multiple_events.json index c91100a7889d..d9e518573962 100644 --- a/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendevents/recording_sends_multiple_events.json +++ b/sdk/eventgrid/eventgrid/recordings/browsers/eventgridpublisherclient_sendevents/recording_sends_multiple_events.json @@ -6,29 +6,29 @@ "query": { "api-version": "2018-01-01" }, - "requestBody": "[{\"id\":\"multiEventId1160161957914201725\",\"subject\":\"Multiple 1\",\"data\":{\"hello\":\"world\"},\"eventType\":\"Azure.Sdk.TestEvent1\",\"eventTime\":\"2020-10-02T06:19:39.142Z\",\"dataVersion\":\"1.0\"},{\"id\":\"multiEventId2160161957914306573\",\"subject\":\"Multiple 2\",\"data\":{\"hello\":\"world\"},\"eventType\":\"Azure.Sdk.TestEvent1\",\"eventTime\":\"2020-10-02T06:19:39.143Z\",\"dataVersion\":\"1.0\"}]", + "requestBody": "[{\"id\":\"multiEventId1161168561578108616\",\"subject\":\"Multiple 1\",\"data\":{\"hello\":\"world\"},\"eventType\":\"Azure.Sdk.TestEvent1\",\"eventTime\":\"2021-01-26T18:26:55.781Z\",\"dataVersion\":\"1.0\"},{\"id\":\"multiEventId2161168561578101127\",\"subject\":\"Multiple 2\",\"data\":{\"hello\":\"world\"},\"eventType\":\"Azure.Sdk.TestEvent1\",\"eventTime\":\"2021-01-26T18:26:55.781Z\",\"dataVersion\":\"1.0\"}]", "status": 200, "response": "", "responseHeaders": { "api-supported-versions": "2018-01-01", "content-length": "0", - "date": "Fri, 02 Oct 2020 06:19:39 GMT", + "date": "Tue, 26 Jan 2021 18:26:57 GMT", "server": "Microsoft-HTTPAPI/2.0", "status": "200", "strict-transport-security": "max-age=31536000; includeSubDomains", - "x-ms-request-id": "00cbfe5a-179b-4cda-a2a3-8bd1d6a56cb1" + "x-ms-request-id": "67f3db14-1f7d-4423-99ad-b5ab1f0824f0" } } ], "uniqueTestInfo": { "uniqueName": { - "multiEventId1": "multiEventId1160161957914201725", - "multiEventId2": "multiEventId2160161957914306573" + "multiEventId1": "multiEventId1161168561578108616", + "multiEventId2": "multiEventId2161168561578101127" }, "newDate": { - "multiEventDate1": "2020-10-02T06:19:39.142Z", - "multiEventDate2": "2020-10-02T06:19:39.143Z" + "multiEventDate1": "2021-01-26T18:26:55.781Z", + "multiEventDate2": "2021-01-26T18:26:55.781Z" } }, - "hash": "a1eefb69b1513dc523f50ee66055787d" + "hash": "674c21f74c191eb62010e1f031a67e59" } \ No newline at end of file diff --git a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_enriches_events_with_distributed_tracing_information.js b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_enriches_events_with_distributed_tracing_information.js index 8570a2c12027..805da4f33211 100644 --- a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_enriches_events_with_distributed_tracing_information.js +++ b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_enriches_events_with_distributed_tracing_information.js @@ -1,11 +1,11 @@ let nock = require('nock'); -module.exports.hash = "e2a76a5d9d938e00781cf1196fef789c"; +module.exports.hash = "357bb46a327afd892edc5a89b1d5c4c3"; -module.exports.testInfo = {"uniqueName":{"cloudTracingEventId":"cloudTracingEventId160161957338401351"},"newDate":{"cloudTracingEventDate":"2020-10-02T06:19:33.384Z"}} +module.exports.testInfo = {"uniqueName":{"cloudTracingEventId":"cloudTracingEventId161168561052005009"},"newDate":{"cloudTracingEventDate":"2021-01-26T18:26:50.520Z"}} nock('https://endpoint', {"encodedQueryParams":true}) - .post('/api/events', [{"id":"cloudTracingEventId160161957338401351","source":"/earth/unitedstates/washington/kirkland/finnhill","data":{"hello":"world"},"type":"Azure.Sdk.TestEvent1","time":"2020-10-02T06:19:33.384Z","specversion":"1.0","datacontenttype":"application/json","subject":"Single with Trace Parent","traceparent":"00-1-3-00"}]) + .post('/api/events', [{"id":"cloudTracingEventId161168561052005009","source":"/earth/unitedstates/washington/kirkland/finnhill","data":{"hello":"world"},"type":"Azure.Sdk.TestEvent1","time":"2021-01-26T18:26:50.520Z","specversion":"1.0","datacontenttype":"application/json","subject":"Single with Trace Parent","traceparent":"00-1-3-00"}]) .query(true) .reply(200, "", [ 'Content-Length', @@ -17,7 +17,7 @@ nock('https://endpoint', {"encodedQueryParams":true}) 'api-supported-versions', '2018-01-01', 'x-ms-request-id', - '53541e19-8134-404e-b98f-5606335f3849', + 'cd6b4b67-a45b-4f2e-9864-a4e5c29d0172', 'Date', - 'Fri, 02 Oct 2020 06:19:34 GMT' + 'Tue, 26 Jan 2021 18:26:51 GMT' ]); diff --git a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_a_single_event.js b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_a_single_event.js index c93b0c80b798..7f2096e669b1 100644 --- a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_a_single_event.js +++ b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_a_single_event.js @@ -1,11 +1,11 @@ let nock = require('nock'); -module.exports.hash = "b15b1edb6fd215ff27f66c70053afbb8"; +module.exports.hash = "f54a8b7d13e4ae34fadeb0393c88eaf4"; -module.exports.testInfo = {"uniqueName":{"cloudSingleEventId":"cloudSingleEventId160161957312109296"},"newDate":{"cloudSingleEventDate":"2020-10-02T06:19:33.121Z"}} +module.exports.testInfo = {"uniqueName":{"cloudSingleEventId":"cloudSingleEventId161168561021500558"},"newDate":{"cloudSingleEventDate":"2021-01-26T18:26:50.215Z"}} nock('https://endpoint', {"encodedQueryParams":true}) - .post('/api/events', [{"id":"cloudSingleEventId160161957312109296","source":"/earth/unitedstates/washington/kirkland/finnhill","data":{"hello":"world"},"type":"Azure.Sdk.TestEvent1","time":"2020-10-02T06:19:33.121Z","specversion":"1.0","datacontenttype":"application/json"}]) + .post('/api/events', [{"id":"cloudSingleEventId161168561021500558","source":"/earth/unitedstates/washington/kirkland/finnhill","data":{"hello":"world"},"type":"Azure.Sdk.TestEvent1","time":"2021-01-26T18:26:50.215Z","specversion":"1.0","datacontenttype":"application/json"}]) .query(true) .reply(200, "", [ 'Content-Length', @@ -17,7 +17,7 @@ nock('https://endpoint', {"encodedQueryParams":true}) 'api-supported-versions', '2018-01-01', 'x-ms-request-id', - '8cb4c799-b937-4ebf-b2c5-5803f9af5f30', + 'd5f15325-e97d-4a27-ab57-531dd130301b', 'Date', - 'Fri, 02 Oct 2020 06:19:33 GMT' + 'Tue, 26 Jan 2021 18:26:51 GMT' ]); diff --git a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_multiple_events.js b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_multiple_events.js index 3e248783176e..ea4e8e44b1c5 100644 --- a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_multiple_events.js +++ b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcloudeventschemaevents/recording_sends_multiple_events.js @@ -1,11 +1,11 @@ let nock = require('nock'); -module.exports.hash = "cefc29910fbb6c53981faf8430a3521b"; +module.exports.hash = "f6fe3d52d717fd3630ba906ade952f7b"; -module.exports.testInfo = {"uniqueName":{"cloudMultiEventId1":"cloudMultiEventId1160161957330706944","cloudMultiEventId2":"cloudMultiEventId2160161957330706023"},"newDate":{"cloudMultiEventDate1":"2020-10-02T06:19:33.307Z","cloudMultiEventDate2":"2020-10-02T06:19:33.307Z"}} +module.exports.testInfo = {"uniqueName":{"cloudMultiEventId1":"cloudMultiEventId1161168561047203144","cloudMultiEventId2":"cloudMultiEventId2161168561047204678"},"newDate":{"cloudMultiEventDate1":"2021-01-26T18:26:50.472Z","cloudMultiEventDate2":"2021-01-26T18:26:50.472Z"}} nock('https://endpoint', {"encodedQueryParams":true}) - .post('/api/events', [{"id":"cloudMultiEventId1160161957330706944","source":"/earth/unitedstates/washington/kirkland/finnhill","data":{"hello":"world"},"type":"Azure.Sdk.TestEvent1","time":"2020-10-02T06:19:33.307Z","specversion":"1.0","datacontenttype":"application/json","subject":"Multiple 1"},{"id":"cloudMultiEventId2160161957330706023","source":"/earth/unitedstates/washington/kirkland/finnhill","data":{"hello":"world"},"type":"Azure.Sdk.TestEvent1","time":"2020-10-02T06:19:33.307Z","specversion":"1.0","datacontenttype":"application/json","subject":"Multiple 2"}]) + .post('/api/events', [{"id":"cloudMultiEventId1161168561047203144","source":"/earth/unitedstates/washington/kirkland/finnhill","data":{"hello":"world"},"type":"Azure.Sdk.TestEvent1","time":"2021-01-26T18:26:50.472Z","specversion":"1.0","datacontenttype":"application/json","subject":"Multiple 1"},{"id":"cloudMultiEventId2161168561047204678","source":"/earth/unitedstates/washington/kirkland/finnhill","data":{"hello":"world"},"type":"Azure.Sdk.TestEvent1","time":"2021-01-26T18:26:50.472Z","specversion":"1.0","datacontenttype":"application/json","subject":"Multiple 2"}]) .query(true) .reply(200, "", [ 'Content-Length', @@ -17,7 +17,7 @@ nock('https://endpoint', {"encodedQueryParams":true}) 'api-supported-versions', '2018-01-01', 'x-ms-request-id', - 'ce2dbd99-384b-450a-9644-23508bdcbfc0', + 'fae08b75-3f7b-4cff-86f5-d77b1ffe4763', 'Date', - 'Fri, 02 Oct 2020 06:19:34 GMT' + 'Tue, 26 Jan 2021 18:26:51 GMT' ]); diff --git a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcustomschemaevents/recording_sends_a_single_event.js b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcustomschemaevents/recording_sends_a_single_event.js index 324f24a0fae2..d61775f8cc7a 100644 --- a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcustomschemaevents/recording_sends_a_single_event.js +++ b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcustomschemaevents/recording_sends_a_single_event.js @@ -1,6 +1,6 @@ let nock = require('nock'); -module.exports.hash = "3243d9d0032a64c42cdeaf331c65085e"; +module.exports.hash = "6a0323357c112a7fee98ad57d952016e"; module.exports.testInfo = {"uniqueName":{},"newDate":{}} @@ -17,7 +17,7 @@ nock('https://endpoint', {"encodedQueryParams":true}) 'api-supported-versions', '2018-01-01', 'x-ms-request-id', - '1164c7cc-b631-4fed-979b-912946a72d7b', + '9cfbebf2-66c8-48c0-b9b5-deecf52b8dbc', 'Date', - 'Fri, 02 Oct 2020 06:19:33 GMT' + 'Tue, 26 Jan 2021 18:26:51 GMT' ]); diff --git a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcustomschemaevents/recording_sends_multiple_events.js b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcustomschemaevents/recording_sends_multiple_events.js index 9d236f8ffc2a..506e713ad976 100644 --- a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcustomschemaevents/recording_sends_multiple_events.js +++ b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendcustomschemaevents/recording_sends_multiple_events.js @@ -1,6 +1,6 @@ let nock = require('nock'); -module.exports.hash = "d76e8a9024ff01c8e6c19fad4188cddb"; +module.exports.hash = "f4fce400dc651a8acd221ee29b4512ca"; module.exports.testInfo = {"uniqueName":{},"newDate":{}} @@ -17,7 +17,7 @@ nock('https://endpoint', {"encodedQueryParams":true}) 'api-supported-versions', '2018-01-01', 'x-ms-request-id', - 'a541a967-991c-4d1f-9bc5-59b318703d1c', + '43d477f7-32cd-4b33-8d4d-d0a9b85139d7', 'Date', - 'Fri, 02 Oct 2020 06:19:34 GMT' + 'Tue, 26 Jan 2021 18:26:51 GMT' ]); diff --git a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendevents/recording_sends_a_single_event.js b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendevents/recording_sends_a_single_event.js index da0749021af4..a3cca8ba2662 100644 --- a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendevents/recording_sends_a_single_event.js +++ b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendevents/recording_sends_a_single_event.js @@ -1,11 +1,11 @@ let nock = require('nock'); -module.exports.hash = "93ae44857b9e0329bc4ac9a07e444214"; +module.exports.hash = "d3836591952c853e63413c6baee86b80"; -module.exports.testInfo = {"uniqueName":{"singleEventId":"singleEventId160161957273508409"},"newDate":{"singleEventDate":"2020-10-02T06:19:32.735Z"}} +module.exports.testInfo = {"uniqueName":{"singleEventId":"singleEventId161168560981909647"},"newDate":{"singleEventDate":"2021-01-26T18:26:49.819Z"}} nock('https://endpoint', {"encodedQueryParams":true}) - .post('/api/events', [{"id":"singleEventId160161957273508409","subject":"Single 1","data":{"hello":"world"},"eventType":"Azure.Sdk.TestEvent1","eventTime":"2020-10-02T06:19:32.735Z","dataVersion":"1.0"}]) + .post('/api/events', [{"id":"singleEventId161168560981909647","subject":"Single 1","data":{"hello":"world"},"eventType":"Azure.Sdk.TestEvent1","eventTime":"2021-01-26T18:26:49.819Z","dataVersion":"1.0"}]) .query(true) .reply(200, "", [ 'Content-Length', @@ -17,7 +17,7 @@ nock('https://endpoint', {"encodedQueryParams":true}) 'api-supported-versions', '2018-01-01', 'x-ms-request-id', - 'd713b5c5-e878-4527-91f4-a4264f98124d', + 'e0334842-8c3c-4fe1-bc7d-6a97ae11ccb1', 'Date', - 'Fri, 02 Oct 2020 06:19:33 GMT' + 'Tue, 26 Jan 2021 18:26:50 GMT' ]); diff --git a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendevents/recording_sends_multiple_events.js b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendevents/recording_sends_multiple_events.js index b5cb6c854196..b275dae183f2 100644 --- a/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendevents/recording_sends_multiple_events.js +++ b/sdk/eventgrid/eventgrid/recordings/node/eventgridpublisherclient_sendevents/recording_sends_multiple_events.js @@ -1,11 +1,11 @@ let nock = require('nock'); -module.exports.hash = "b8c32c266a21a9129c07d237cc8e3d2b"; +module.exports.hash = "fdc26a5ca6514dd6a88d88a54394469a"; -module.exports.testInfo = {"uniqueName":{"multiEventId1":"multiEventId1160161957303904323","multiEventId2":"multiEventId2160161957303900629"},"newDate":{"multiEventDate1":"2020-10-02T06:19:33.039Z","multiEventDate2":"2020-10-02T06:19:33.039Z"}} +module.exports.testInfo = {"uniqueName":{"multiEventId1":"multiEventId1161168561017305186","multiEventId2":"multiEventId2161168561017304614"},"newDate":{"multiEventDate1":"2021-01-26T18:26:50.173Z","multiEventDate2":"2021-01-26T18:26:50.173Z"}} nock('https://endpoint', {"encodedQueryParams":true}) - .post('/api/events', [{"id":"multiEventId1160161957303904323","subject":"Multiple 1","data":{"hello":"world"},"eventType":"Azure.Sdk.TestEvent1","eventTime":"2020-10-02T06:19:33.039Z","dataVersion":"1.0"},{"id":"multiEventId2160161957303900629","subject":"Multiple 2","data":{"hello":"world"},"eventType":"Azure.Sdk.TestEvent1","eventTime":"2020-10-02T06:19:33.039Z","dataVersion":"1.0"}]) + .post('/api/events', [{"id":"multiEventId1161168561017305186","subject":"Multiple 1","data":{"hello":"world"},"eventType":"Azure.Sdk.TestEvent1","eventTime":"2021-01-26T18:26:50.173Z","dataVersion":"1.0"},{"id":"multiEventId2161168561017304614","subject":"Multiple 2","data":{"hello":"world"},"eventType":"Azure.Sdk.TestEvent1","eventTime":"2021-01-26T18:26:50.173Z","dataVersion":"1.0"}]) .query(true) .reply(200, "", [ 'Content-Length', @@ -17,7 +17,7 @@ nock('https://endpoint', {"encodedQueryParams":true}) 'api-supported-versions', '2018-01-01', 'x-ms-request-id', - 'dfdb4176-a8de-4aa4-a900-c5b21303284f', + '50d8a8ab-5c25-464d-b244-48eaa0115199', 'Date', - 'Fri, 02 Oct 2020 06:19:34 GMT' + 'Tue, 26 Jan 2021 18:26:50 GMT' ]); diff --git a/sdk/eventgrid/eventgrid/review/eventgrid.api.md b/sdk/eventgrid/eventgrid/review/eventgrid.api.md index 1965c2637099..7adf627f3c10 100644 --- a/sdk/eventgrid/eventgrid/review/eventgrid.api.md +++ b/sdk/eventgrid/eventgrid/review/eventgrid.api.md @@ -5,10 +5,9 @@ ```ts import { AzureKeyCredential } from '@azure/core-auth'; -import { HttpResponse } from '@azure/core-http'; import { KeyCredential } from '@azure/core-auth'; -import { OperationOptions } from '@azure/core-http'; -import { PipelineOptions } from '@azure/core-http'; +import { OperationOptions } from '@azure/core-client'; +import { PipelineOptions } from '@azure/core-https'; // @public export interface ACSChatEventBase { @@ -350,9 +349,9 @@ export class EventGridPublisherClient { constructor(endpointUrl: string, credential: KeyCredential | SignatureCredential, options?: EventGridPublisherClientOptions); readonly apiVersion: string; readonly endpointUrl: string; - sendCloudEvents(events: SendCloudEventInput[], options?: SendCloudEventsOptions): Promise; - sendCustomSchemaEvents(events: Record[], options?: SendCustomSchemaEventsOptions): Promise; - sendEvents(events: SendEventGridEventInput[], options?: SendEventsOptions): Promise; + sendCloudEvents(events: SendCloudEventInput[], options?: SendCloudEventsOptions): Promise; + sendCustomSchemaEvents(events: Record[], options?: SendCustomSchemaEventsOptions): Promise; + sendEvents(events: SendEventGridEventInput[], options?: SendEventsOptions): Promise; } // @public @@ -1003,11 +1002,6 @@ export interface SendEventGridEventInput { // @public export type SendEventsOptions = OperationOptions; -// @public -export interface SendEventsResponse { - _response: HttpResponse; -} - // @public export interface ServiceBusActiveMessagesAvailableWithNoListenersEventData { entityType?: string; diff --git a/sdk/eventgrid/eventgrid/rollup.base.config.js b/sdk/eventgrid/eventgrid/rollup.base.config.js index 4afe7353e0ce..5e0261bd2ac6 100644 --- a/sdk/eventgrid/eventgrid/rollup.base.config.js +++ b/sdk/eventgrid/eventgrid/rollup.base.config.js @@ -65,8 +65,7 @@ export function browserConfig(test = false, production = false) { file: "dist-browser/azure-eventgrid.js", format: "umd", name: "Azure.MessagingEventGrid", - sourcemap: true, - globals: { "@azure/core-http": "Azure.Core.HTTP" } + sourcemap: true }, preserveSymlinks: false, external: ["fs-extra"], diff --git a/sdk/eventgrid/eventgrid/src/cloudEventDistrubtedTracingEnricherPolicy.ts b/sdk/eventgrid/eventgrid/src/cloudEventDistrubtedTracingEnricherPolicy.ts index 73792592aa03..069a3cfa6809 100644 --- a/sdk/eventgrid/eventgrid/src/cloudEventDistrubtedTracingEnricherPolicy.ts +++ b/sdk/eventgrid/eventgrid/src/cloudEventDistrubtedTracingEnricherPolicy.ts @@ -1,29 +1,21 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -import { - HttpOperationResponse, - RequestPolicy, - RequestPolicyOptions, - RequestPolicyFactory, - WebResourceLike -} from "@azure/core-http"; +import { PipelineResponse, PipelineRequest, SendRequest, PipelinePolicy } from "@azure/core-https"; export const CloudEventBatchContentType = "application/cloudevents-batch+json; charset=utf-8"; export const TraceParentHeaderName = "traceparent"; export const TraceStateHeaderName = "tracestate"; export const ContentTypeHeaderName = "Content-Type"; -export function cloudEventDistributedTracingEnricherPolicy(): RequestPolicyFactory { - return { - create: (nextPolicy: RequestPolicy, _options: RequestPolicyOptions) => { - return new CloudEventDistributedTracingEnricherPolicy(nextPolicy); - } - }; -} +/** + * The programmatic identifier of the cloudEventDistributedTracingEnricherPolicy. + */ +export const cloudEventDistributedTracingEnricherPolicyName = + "cloudEventDistributedTracingEnricherPolicy"; /** - * CloudEventDistributedTracingEnricherPolicy is a policy which adds distributed tracing information + * cloudEventDistributedTracingEnricherPolicy is a policy which adds distributed tracing information * to a batch of cloud events. It does so by copying the `traceparent` and `tracestate` properties * from the HTTP request into the individual events as extension properties. * @@ -34,39 +26,40 @@ export function cloudEventDistributedTracingEnricherPolicy(): RequestPolicyFacto * See https://github.com/cloudevents/spec/blob/master/extensions/distributed-tracing.md * for more information on distributed tracing and cloud events. */ -export class CloudEventDistributedTracingEnricherPolicy implements RequestPolicy { - constructor(readonly _nextPolicy: RequestPolicy) {} +export function cloudEventDistributedTracingEnricherPolicy(): PipelinePolicy { + return { + name: cloudEventDistributedTracingEnricherPolicyName, + async sendRequest(request: PipelineRequest, next: SendRequest): Promise { + const traceparent = request.headers.get(TraceParentHeaderName); + const tracestate = request.headers.get(TraceStateHeaderName); - sendRequest(httpRequest: WebResourceLike): Promise { - const traceparent = httpRequest.headers.get(TraceParentHeaderName); - const tracestate = httpRequest.headers.get(TraceStateHeaderName); + if ( + request.headers.get(ContentTypeHeaderName) === CloudEventBatchContentType && + typeof request.body === "string" && + traceparent + ) { + // per the cloud event batched content type we know the body is an array encoded in JSON. + const parsedBody = JSON.parse(request.body) as any[]; - if ( - httpRequest.headers.get(ContentTypeHeaderName) === CloudEventBatchContentType && - typeof httpRequest.body === "string" && - traceparent - ) { - // per the cloud event batched content type we know the body is an array encoded in JSON. - const parsedBody = JSON.parse(httpRequest.body) as any[]; + for (const item of parsedBody) { + // When using the distributed tracing extension, the "traceparent" is a required property + // and "tracestate" is optional. This means if an item already has a "traceparent" property + // we should not stomp over it. Well formed events will not have a "tracestate" without + // also having a "traceparent" so there's no need to guard against that case. + if (typeof item !== "object" || item.traceparent) { + continue; + } - for (const item of parsedBody) { - // When using the distributed tracing extension, the "traceparent" is a required property - // and "tracestate" is optional. This means if an item already has a "traceparent" property - // we should not stomp over it. Well formed events will not have a "tracestate" without - // also having a "traceparent" so there's no need to guard against that case. - if (typeof item !== "object" || item.traceparent) { - continue; + item.traceparent = traceparent; + if (tracestate) { + item.tracestate = tracestate; + } } - item.traceparent = traceparent; - if (tracestate) { - item.tracestate = tracestate; - } + request.body = JSON.stringify(parsedBody); } - httpRequest.body = JSON.stringify(parsedBody); + return next(request); } - - return this._nextPolicy.sendRequest(httpRequest); - } + }; } diff --git a/sdk/eventgrid/eventgrid/src/consumer.ts b/sdk/eventgrid/eventgrid/src/consumer.ts index 1b61aa134403..855ed8d46645 100644 --- a/sdk/eventgrid/eventgrid/src/consumer.ts +++ b/sdk/eventgrid/eventgrid/src/consumer.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -import { Serializer } from "@azure/core-http"; +import { createSerializer } from "@azure/core-client"; import { CloudEvent as WireCloudEvent } from "./generated/models"; import { CustomEventDataDeserializer, @@ -16,7 +16,7 @@ import { import { parseAndWrap, validateEventGridEvent, validateCloudEventEvent } from "./util"; import { systemDeserializers } from "./systemEventDecoders"; -const serializer = new Serializer(); +const serializer = createSerializer(); /** * Options for the Event Grid Consumer diff --git a/sdk/eventgrid/eventgrid/src/eventGridAuthenticationPolicy.ts b/sdk/eventgrid/eventgrid/src/eventGridAuthenticationPolicy.ts index 95896bb83492..e1a85317bddf 100644 --- a/sdk/eventgrid/eventgrid/src/eventGridAuthenticationPolicy.ts +++ b/sdk/eventgrid/eventgrid/src/eventGridAuthenticationPolicy.ts @@ -2,14 +2,7 @@ // Licensed under the MIT license. import { KeyCredential } from "@azure/core-auth"; -import { - RequestPolicyFactory, - RequestPolicy, - BaseRequestPolicy, - WebResourceLike, - HttpOperationResponse, - RequestPolicyOptionsLike -} from "@azure/core-http"; +import { PipelineResponse, PipelineRequest, SendRequest, PipelinePolicy } from "@azure/core-https"; import { SignatureCredential } from "./sharedAccessSignitureCredential"; import { isKeyCredentialLike } from "./util"; @@ -25,46 +18,27 @@ const API_KEY_HEADER_NAME = "aeg-sas-key"; const SAS_TOKEN_HEADER_NAME = "aeg-sas-token"; /** - * Create an HTTP pipeline policy to authenticate a request - * using an `AzureKeyCredential` for Event Grid + * The programmatic identifier of the eventGridCredentialPolicy. */ -export function createEventGridCredentialPolicy( - credential: KeyCredential | SignatureCredential -): RequestPolicyFactory { - return { - create: (nextPolicy: RequestPolicy, options: RequestPolicyOptionsLike) => { - return new EventGridAzureKeyCredentialPolicy(nextPolicy, options, credential); - } - }; -} +export const eventGridCredentialPolicyName = "eventGridCredentialPolicy"; /** * A concrete implementation of an AzureKeyCredential policy * using the appropriate header for Event Grid */ -class EventGridAzureKeyCredentialPolicy extends BaseRequestPolicy { - private credential: KeyCredential | SignatureCredential; - - constructor( - nextPolicy: RequestPolicy, - options: RequestPolicyOptionsLike, - credential: KeyCredential | SignatureCredential - ) { - super(nextPolicy, options); - this.credential = credential; - } - - public async sendRequest(webResource: WebResourceLike): Promise { - if (!webResource) { - throw new Error("webResource cannot be null or undefined"); - } - - if (isKeyCredentialLike(this.credential)) { - webResource.headers.set(API_KEY_HEADER_NAME, this.credential.key); - } else { - webResource.headers.set(SAS_TOKEN_HEADER_NAME, this.credential.signature()); +export function eventGridCredentialPolicy( + credential: KeyCredential | SignatureCredential +): PipelinePolicy { + return { + name: eventGridCredentialPolicyName, + async sendRequest(request: PipelineRequest, next: SendRequest): Promise { + if (isKeyCredentialLike(credential)) { + request.headers.set(API_KEY_HEADER_NAME, credential.key); + } else { + request.headers.set(SAS_TOKEN_HEADER_NAME, credential.signature()); + } + + return next(request); } - - return this._nextPolicy.sendRequest(webResource); - } + }; } diff --git a/sdk/eventgrid/eventgrid/src/eventGridClient.ts b/sdk/eventgrid/eventgrid/src/eventGridClient.ts index abeeab6da9c4..8ade6fb2aea8 100644 --- a/sdk/eventgrid/eventgrid/src/eventGridClient.ts +++ b/sdk/eventgrid/eventgrid/src/eventGridClient.ts @@ -2,17 +2,10 @@ // Licensed under the MIT license. import { KeyCredential } from "@azure/core-auth"; -import { - PipelineOptions, - createPipelineFromOptions, - OperationOptions, - generateUuid, - HttpResponse, - RequestPolicyFactory, - RestResponse -} from "@azure/core-http"; +import { PipelineOptions } from "@azure/core-https"; +import { OperationOptions, createClientPipeline } from "@azure/core-client"; -import { createEventGridCredentialPolicy } from "./eventGridAuthenticationPolicy"; +import { eventGridCredentialPolicy } from "./eventGridAuthenticationPolicy"; import { SignatureCredential } from "./sharedAccessSignitureCredential"; import { SDK_VERSION } from "./constants"; import { @@ -28,6 +21,7 @@ import { import { cloudEventDistributedTracingEnricherPolicy } from "./cloudEventDistrubtedTracingEnricherPolicy"; import { createSpan } from "./tracing"; import { CanonicalCode } from "@opentelemetry/api"; +import { v4 as uuidv4 } from "uuid"; /** * Options for the Event Grid Client. @@ -49,16 +43,6 @@ export type SendCloudEventsOptions = OperationOptions; */ export type SendCustomSchemaEventsOptions = OperationOptions; -/** - * The response when sending events to the Event Grid service. - */ -export interface SendEventsResponse { - /** - * Event Response - */ - _response: HttpResponse; -} - /** * Client class for publishing events to the Event Grid Service. */ @@ -115,14 +99,12 @@ export class EventGridPublisherClient { pipelineOptions.userAgentOptions.userAgentPrefix = libInfo; } - const authPolicy = createEventGridCredentialPolicy(credential); - const pipeline = createPipelineFromOptions(options, authPolicy); + const pipeline = createClientPipeline(pipelineOptions); + const authPolicy = eventGridCredentialPolicy(credential); + pipeline.addPolicy(authPolicy); + pipeline.addPolicy(cloudEventDistributedTracingEnricherPolicy()); - (pipeline.requestPolicyFactories as RequestPolicyFactory[]).push( - cloudEventDistributedTracingEnricherPolicy() - ); - - this.client = new GeneratedClient(pipeline); + this.client = new GeneratedClient({ pipeline }); this.apiVersion = this.client.apiVersion; } @@ -134,19 +116,18 @@ export class EventGridPublisherClient { async sendEvents( events: SendEventGridEventInput[], options?: SendEventsOptions - ): Promise { + ): Promise { const { span, updatedOptions } = createSpan( "EventGridPublisherClient-sendEvents", options || {} ); try { - const r = await this.client.publishEvents( + return await this.client.publishEvents( this.endpointUrl, (events || []).map(convertEventGridEventToModelType), updatedOptions ); - return buildResponse(r); } catch (e) { span.setStatus({ code: CanonicalCode.UNKNOWN, message: e.message }); throw e; @@ -163,19 +144,18 @@ export class EventGridPublisherClient { async sendCloudEvents( events: SendCloudEventInput[], options?: SendCloudEventsOptions - ): Promise { + ): Promise { const { span, updatedOptions } = createSpan( "EventGridPublisherClient-sendCloudEvents", options || {} ); try { - const r = await this.client.publishCloudEventEvents( + return await this.client.publishCloudEventEvents( this.endpointUrl, (events || []).map(convertCloudEventToModelType), updatedOptions ); - return buildResponse(r); } catch (e) { span.setStatus({ code: CanonicalCode.UNKNOWN, message: e.message }); throw e; @@ -192,19 +172,18 @@ export class EventGridPublisherClient { async sendCustomSchemaEvents( events: Record[], options?: SendCustomSchemaEventsOptions - ): Promise { + ): Promise { const { span, updatedOptions } = createSpan( "EventGridPublisherClient-sendCustomSchemaEvents", options || {} ); try { - const r = await this.client.publishCustomEventEvents( + return await this.client.publishCustomEventEvents( this.endpointUrl, events || [], updatedOptions ); - return buildResponse(r); } catch (e) { span.setStatus({ code: CanonicalCode.UNKNOWN, message: e.message }); throw e; @@ -214,16 +193,6 @@ export class EventGridPublisherClient { } } -function buildResponse(r: RestResponse): SendEventsResponse { - const ret = { _response: r._response }; - - Object.defineProperty(ret, "_response", { - enumerable: false - }); - - return ret; -} - /** * @internal */ @@ -233,7 +202,7 @@ export function convertEventGridEventToModelType( return { eventType: event.eventType, eventTime: event.eventTime ?? new Date(), - id: event.id ?? generateUuid(), + id: event.id ?? uuidv4(), subject: event.subject, topic: event.topic, data: event.data, @@ -263,7 +232,7 @@ export function convertCloudEventToModelType(event: SendCloudEventInput): C specversion: "1.0", type: event.type, source: event.source, - id: event.id ?? generateUuid(), + id: event.id ?? uuidv4(), time: event.time ?? new Date(), subject: event.subject, dataschema: event.dataschema, diff --git a/sdk/eventgrid/eventgrid/src/generated/generatedClient.ts b/sdk/eventgrid/eventgrid/src/generated/generatedClient.ts index 1cdbe07e62ea..3c1bfb6c8472 100644 --- a/sdk/eventgrid/eventgrid/src/generated/generatedClient.ts +++ b/sdk/eventgrid/eventgrid/src/generated/generatedClient.ts @@ -6,15 +6,11 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import * as coreHttp from "@azure/core-http"; +import { OperationOptions, OperationSpec, createSerializer } from "@azure/core-client"; import * as Parameters from "./models/parameters"; import * as Mappers from "./models/mappers"; import { GeneratedClientContext } from "./generatedClientContext"; -import { - GeneratedClientOptionalParams, - EventGridEvent, - CloudEvent -} from "./models"; +import { GeneratedClientOptionalParams, EventGridEvent, CloudEvent } from "./models"; /** @hidden */ export class GeneratedClient extends GeneratedClientContext { @@ -35,17 +31,12 @@ export class GeneratedClient extends GeneratedClientContext { publishEvents( topicHostname: string, events: EventGridEvent[], - options?: coreHttp.OperationOptions - ): Promise { - const operationArguments: coreHttp.OperationArguments = { - topicHostname, - events, - options: coreHttp.operationOptionsToRequestOptionsBase(options || {}) - }; - return this.sendOperationRequest( - operationArguments, + options?: OperationOptions + ): Promise { + return this.sendOperationRequest( + { topicHostname, events, options }, publishEventsOperationSpec - ) as Promise; + ); } /** @@ -57,17 +48,12 @@ export class GeneratedClient extends GeneratedClientContext { publishCloudEventEvents( topicHostname: string, events: CloudEvent[], - options?: coreHttp.OperationOptions - ): Promise { - const operationArguments: coreHttp.OperationArguments = { - topicHostname, - events, - options: coreHttp.operationOptionsToRequestOptionsBase(options || {}) - }; - return this.sendOperationRequest( - operationArguments, + options?: OperationOptions + ): Promise { + return this.sendOperationRequest( + { topicHostname, events, options }, publishCloudEventEventsOperationSpec - ) as Promise; + ); } /** @@ -79,24 +65,20 @@ export class GeneratedClient extends GeneratedClientContext { publishCustomEventEvents( topicHostname: string, events: any[], - options?: coreHttp.OperationOptions - ): Promise { - const operationArguments: coreHttp.OperationArguments = { - topicHostname, - events, - options: coreHttp.operationOptionsToRequestOptionsBase(options || {}) - }; - return this.sendOperationRequest( - operationArguments, + options?: OperationOptions + ): Promise { + return this.sendOperationRequest( + { topicHostname, events, options }, publishCustomEventEventsOperationSpec - ) as Promise; + ); } } // Operation Specifications -const serializer = new coreHttp.Serializer(Mappers, /* isXml */ false); -const publishEventsOperationSpec: coreHttp.OperationSpec = { - path: "/api/events", +const serializer = createSerializer(Mappers, /* isXml */ false); + +const publishEventsOperationSpec: OperationSpec = { + path: "", httpMethod: "POST", responses: { 200: {}, default: {} }, requestBody: Parameters.events, @@ -106,8 +88,8 @@ const publishEventsOperationSpec: coreHttp.OperationSpec = { mediaType: "json", serializer }; -const publishCloudEventEventsOperationSpec: coreHttp.OperationSpec = { - path: "/api/events", +const publishCloudEventEventsOperationSpec: OperationSpec = { + path: "", httpMethod: "POST", responses: { 200: {}, default: {} }, requestBody: Parameters.events1, @@ -117,8 +99,8 @@ const publishCloudEventEventsOperationSpec: coreHttp.OperationSpec = { mediaType: "json", serializer }; -const publishCustomEventEventsOperationSpec: coreHttp.OperationSpec = { - path: "/api/events", +const publishCustomEventEventsOperationSpec: OperationSpec = { + path: "", httpMethod: "POST", responses: { 200: {}, default: {} }, requestBody: Parameters.events2, diff --git a/sdk/eventgrid/eventgrid/src/generated/generatedClientContext.ts b/sdk/eventgrid/eventgrid/src/generated/generatedClientContext.ts index 0b465c57b41a..e54dccb52e98 100644 --- a/sdk/eventgrid/eventgrid/src/generated/generatedClientContext.ts +++ b/sdk/eventgrid/eventgrid/src/generated/generatedClientContext.ts @@ -6,38 +6,32 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import * as coreHttp from "@azure/core-http"; +import { ServiceClient } from "@azure/core-client"; import { GeneratedClientOptionalParams } from "./models"; -const packageName = "@azure/eventgrid"; -const packageVersion = "3.0.0-beta.3"; - -/** @hidden */ -export class GeneratedClientContext extends coreHttp.ServiceClient { +export class GeneratedClientContext extends ServiceClient { apiVersion: string; /** * Initializes a new instance of the GeneratedClientContext class. * @param options The parameter options */ - constructor(options?: GeneratedClientOptionalParams) { - // Initializing default values for options - if (!options) { - options = {}; - } - - if (!options.userAgent) { - const defaultUserAgent = coreHttp.getDefaultUserAgentValue(); - options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; - } + constructor(options: GeneratedClientOptionalParams = {}) { + const defaults: GeneratedClientOptionalParams = { + requestContentType: "application/json; charset=utf-8" + }; - super(undefined, options); + const { endpoint, apiVersion, ...restOptions } = options; - this.requestContentType = "application/json; charset=utf-8"; + const optionsWithDefaults: GeneratedClientOptionalParams = { + ...defaults, + ...restOptions, + baseUri: endpoint || "{topicHostname}" + }; - this.baseUri = options.endpoint || "https://{topicHostname}"; + super(optionsWithDefaults); // Assigning values to Constant parameters - this.apiVersion = options.apiVersion || "2018-01-01"; + this.apiVersion = apiVersion || "2018-01-01"; } } diff --git a/sdk/eventgrid/eventgrid/src/generated/models/index.ts b/sdk/eventgrid/eventgrid/src/generated/models/index.ts index 2f8824745b25..61eea4acd489 100644 --- a/sdk/eventgrid/eventgrid/src/generated/models/index.ts +++ b/sdk/eventgrid/eventgrid/src/generated/models/index.ts @@ -6,7 +6,7 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import * as coreHttp from "@azure/core-http"; +import { ServiceClientOptions } from "@azure/core-client"; export type MediaJobOutputUnion = MediaJobOutput | MediaJobOutputAsset; @@ -2165,18 +2165,12 @@ export type MediaJobErrorCode = | "ContentMalformed" | "ContentUnsupported"; /** Defines values for MediaJobErrorCategory. */ -export type MediaJobErrorCategory = - | "Service" - | "Download" - | "Upload" - | "Configuration" - | "Content"; +export type MediaJobErrorCategory = "Service" | "Download" | "Upload" | "Configuration" | "Content"; /** Defines values for MediaJobRetry. */ export type MediaJobRetry = "DoNotRetry" | "MayRetry"; /** Optional parameters. */ -export interface GeneratedClientOptionalParams - extends coreHttp.ServiceClientOptions { +export interface GeneratedClientOptionalParams extends ServiceClientOptions { /** Api Version */ apiVersion?: string; /** Overrides client endpoint. */ diff --git a/sdk/eventgrid/eventgrid/src/generated/models/mappers.ts b/sdk/eventgrid/eventgrid/src/generated/models/mappers.ts index 5ba5f1f3a7bc..fd38a5f1efb0 100644 --- a/sdk/eventgrid/eventgrid/src/generated/models/mappers.ts +++ b/sdk/eventgrid/eventgrid/src/generated/models/mappers.ts @@ -6,9 +6,9 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import * as coreHttp from "@azure/core-http"; +import { CompositeMapper } from "@azure/core-client"; -export const EventGridEvent: coreHttp.CompositeMapper = { +export const EventGridEvent: CompositeMapper = { type: { name: "Composite", className: "EventGridEvent", @@ -72,7 +72,7 @@ export const EventGridEvent: coreHttp.CompositeMapper = { } }; -export const CloudEvent: coreHttp.CompositeMapper = { +export const CloudEvent: CompositeMapper = { type: { name: "Composite", className: "CloudEvent", @@ -146,7 +146,7 @@ export const CloudEvent: coreHttp.CompositeMapper = { } }; -export const StorageBlobCreatedEventData: coreHttp.CompositeMapper = { +export const StorageBlobCreatedEventData: CompositeMapper = { type: { name: "Composite", className: "StorageBlobCreatedEventData", @@ -227,7 +227,7 @@ export const StorageBlobCreatedEventData: coreHttp.CompositeMapper = { } }; -export const StorageBlobDeletedEventData: coreHttp.CompositeMapper = { +export const StorageBlobDeletedEventData: CompositeMapper = { type: { name: "Composite", className: "StorageBlobDeletedEventData", @@ -290,7 +290,7 @@ export const StorageBlobDeletedEventData: coreHttp.CompositeMapper = { } }; -export const StorageDirectoryCreatedEventData: coreHttp.CompositeMapper = { +export const StorageDirectoryCreatedEventData: CompositeMapper = { type: { name: "Composite", className: "StorageDirectoryCreatedEventData", @@ -347,7 +347,7 @@ export const StorageDirectoryCreatedEventData: coreHttp.CompositeMapper = { } }; -export const StorageDirectoryDeletedEventData: coreHttp.CompositeMapper = { +export const StorageDirectoryDeletedEventData: CompositeMapper = { type: { name: "Composite", className: "StorageDirectoryDeletedEventData", @@ -404,7 +404,7 @@ export const StorageDirectoryDeletedEventData: coreHttp.CompositeMapper = { } }; -export const StorageBlobRenamedEventData: coreHttp.CompositeMapper = { +export const StorageBlobRenamedEventData: CompositeMapper = { type: { name: "Composite", className: "StorageBlobRenamedEventData", @@ -461,7 +461,7 @@ export const StorageBlobRenamedEventData: coreHttp.CompositeMapper = { } }; -export const StorageDirectoryRenamedEventData: coreHttp.CompositeMapper = { +export const StorageDirectoryRenamedEventData: CompositeMapper = { type: { name: "Composite", className: "StorageDirectoryRenamedEventData", @@ -518,7 +518,7 @@ export const StorageDirectoryRenamedEventData: coreHttp.CompositeMapper = { } }; -export const StorageLifecyclePolicyCompletedEventData: coreHttp.CompositeMapper = { +export const StorageLifecyclePolicyCompletedEventData: CompositeMapper = { type: { name: "Composite", className: "StorageLifecyclePolicyCompletedEventData", @@ -554,7 +554,7 @@ export const StorageLifecyclePolicyCompletedEventData: coreHttp.CompositeMapper } }; -export const StorageLifecyclePolicyActionSummaryDetail: coreHttp.CompositeMapper = { +export const StorageLifecyclePolicyActionSummaryDetail: CompositeMapper = { type: { name: "Composite", className: "StorageLifecyclePolicyActionSummaryDetail", @@ -581,7 +581,7 @@ export const StorageLifecyclePolicyActionSummaryDetail: coreHttp.CompositeMapper } }; -export const EventHubCaptureFileCreatedEventData: coreHttp.CompositeMapper = { +export const EventHubCaptureFileCreatedEventData: CompositeMapper = { type: { name: "Composite", className: "EventHubCaptureFileCreatedEventData", @@ -644,7 +644,7 @@ export const EventHubCaptureFileCreatedEventData: coreHttp.CompositeMapper = { } }; -export const ResourceWriteSuccessEventData: coreHttp.CompositeMapper = { +export const ResourceWriteSuccessEventData: CompositeMapper = { type: { name: "Composite", className: "ResourceWriteSuccessEventData", @@ -719,7 +719,7 @@ export const ResourceWriteSuccessEventData: coreHttp.CompositeMapper = { } }; -export const ResourceWriteFailureEventData: coreHttp.CompositeMapper = { +export const ResourceWriteFailureEventData: CompositeMapper = { type: { name: "Composite", className: "ResourceWriteFailureEventData", @@ -794,7 +794,7 @@ export const ResourceWriteFailureEventData: coreHttp.CompositeMapper = { } }; -export const ResourceWriteCancelEventData: coreHttp.CompositeMapper = { +export const ResourceWriteCancelEventData: CompositeMapper = { type: { name: "Composite", className: "ResourceWriteCancelEventData", @@ -869,7 +869,7 @@ export const ResourceWriteCancelEventData: coreHttp.CompositeMapper = { } }; -export const ResourceDeleteSuccessEventData: coreHttp.CompositeMapper = { +export const ResourceDeleteSuccessEventData: CompositeMapper = { type: { name: "Composite", className: "ResourceDeleteSuccessEventData", @@ -944,7 +944,7 @@ export const ResourceDeleteSuccessEventData: coreHttp.CompositeMapper = { } }; -export const ResourceDeleteFailureEventData: coreHttp.CompositeMapper = { +export const ResourceDeleteFailureEventData: CompositeMapper = { type: { name: "Composite", className: "ResourceDeleteFailureEventData", @@ -1019,7 +1019,7 @@ export const ResourceDeleteFailureEventData: coreHttp.CompositeMapper = { } }; -export const ResourceDeleteCancelEventData: coreHttp.CompositeMapper = { +export const ResourceDeleteCancelEventData: CompositeMapper = { type: { name: "Composite", className: "ResourceDeleteCancelEventData", @@ -1094,7 +1094,7 @@ export const ResourceDeleteCancelEventData: coreHttp.CompositeMapper = { } }; -export const ResourceActionSuccessEventData: coreHttp.CompositeMapper = { +export const ResourceActionSuccessEventData: CompositeMapper = { type: { name: "Composite", className: "ResourceActionSuccessEventData", @@ -1169,7 +1169,7 @@ export const ResourceActionSuccessEventData: coreHttp.CompositeMapper = { } }; -export const ResourceActionFailureEventData: coreHttp.CompositeMapper = { +export const ResourceActionFailureEventData: CompositeMapper = { type: { name: "Composite", className: "ResourceActionFailureEventData", @@ -1244,7 +1244,7 @@ export const ResourceActionFailureEventData: coreHttp.CompositeMapper = { } }; -export const ResourceActionCancelEventData: coreHttp.CompositeMapper = { +export const ResourceActionCancelEventData: CompositeMapper = { type: { name: "Composite", className: "ResourceActionCancelEventData", @@ -1319,7 +1319,7 @@ export const ResourceActionCancelEventData: coreHttp.CompositeMapper = { } }; -export const SubscriptionValidationEventData: coreHttp.CompositeMapper = { +export const SubscriptionValidationEventData: CompositeMapper = { type: { name: "Composite", className: "SubscriptionValidationEventData", @@ -1342,7 +1342,7 @@ export const SubscriptionValidationEventData: coreHttp.CompositeMapper = { } }; -export const SubscriptionValidationResponse: coreHttp.CompositeMapper = { +export const SubscriptionValidationResponse: CompositeMapper = { type: { name: "Composite", className: "SubscriptionValidationResponse", @@ -1357,7 +1357,7 @@ export const SubscriptionValidationResponse: coreHttp.CompositeMapper = { } }; -export const SubscriptionDeletedEventData: coreHttp.CompositeMapper = { +export const SubscriptionDeletedEventData: CompositeMapper = { type: { name: "Composite", className: "SubscriptionDeletedEventData", @@ -1373,7 +1373,7 @@ export const SubscriptionDeletedEventData: coreHttp.CompositeMapper = { } }; -export const DeviceLifeCycleEventProperties: coreHttp.CompositeMapper = { +export const DeviceLifeCycleEventProperties: CompositeMapper = { type: { name: "Composite", className: "DeviceLifeCycleEventProperties", @@ -1401,7 +1401,7 @@ export const DeviceLifeCycleEventProperties: coreHttp.CompositeMapper = { } }; -export const DeviceTwinInfo: coreHttp.CompositeMapper = { +export const DeviceTwinInfo: CompositeMapper = { type: { name: "Composite", className: "DeviceTwinInfo", @@ -1478,7 +1478,7 @@ export const DeviceTwinInfo: coreHttp.CompositeMapper = { } }; -export const DeviceTwinInfoProperties: coreHttp.CompositeMapper = { +export const DeviceTwinInfoProperties: CompositeMapper = { type: { name: "Composite", className: "DeviceTwinInfoProperties", @@ -1501,7 +1501,7 @@ export const DeviceTwinInfoProperties: coreHttp.CompositeMapper = { } }; -export const DeviceTwinProperties: coreHttp.CompositeMapper = { +export const DeviceTwinProperties: CompositeMapper = { type: { name: "Composite", className: "DeviceTwinProperties", @@ -1523,7 +1523,7 @@ export const DeviceTwinProperties: coreHttp.CompositeMapper = { } }; -export const DeviceTwinMetadata: coreHttp.CompositeMapper = { +export const DeviceTwinMetadata: CompositeMapper = { type: { name: "Composite", className: "DeviceTwinMetadata", @@ -1538,7 +1538,7 @@ export const DeviceTwinMetadata: coreHttp.CompositeMapper = { } }; -export const DeviceTwinInfoX509Thumbprint: coreHttp.CompositeMapper = { +export const DeviceTwinInfoX509Thumbprint: CompositeMapper = { type: { name: "Composite", className: "DeviceTwinInfoX509Thumbprint", @@ -1559,7 +1559,7 @@ export const DeviceTwinInfoX509Thumbprint: coreHttp.CompositeMapper = { } }; -export const DeviceConnectionStateEventProperties: coreHttp.CompositeMapper = { +export const DeviceConnectionStateEventProperties: CompositeMapper = { type: { name: "Composite", className: "DeviceConnectionStateEventProperties", @@ -1593,7 +1593,7 @@ export const DeviceConnectionStateEventProperties: coreHttp.CompositeMapper = { } }; -export const DeviceConnectionStateEventInfo: coreHttp.CompositeMapper = { +export const DeviceConnectionStateEventInfo: CompositeMapper = { type: { name: "Composite", className: "DeviceConnectionStateEventInfo", @@ -1608,7 +1608,7 @@ export const DeviceConnectionStateEventInfo: coreHttp.CompositeMapper = { } }; -export const DeviceTelemetryEventProperties: coreHttp.CompositeMapper = { +export const DeviceTelemetryEventProperties: CompositeMapper = { type: { name: "Composite", className: "DeviceTelemetryEventProperties", @@ -1637,7 +1637,7 @@ export const DeviceTelemetryEventProperties: coreHttp.CompositeMapper = { } }; -export const ContainerRegistryEventData: coreHttp.CompositeMapper = { +export const ContainerRegistryEventData: CompositeMapper = { type: { name: "Composite", className: "ContainerRegistryEventData", @@ -1692,7 +1692,7 @@ export const ContainerRegistryEventData: coreHttp.CompositeMapper = { } }; -export const ContainerRegistryEventTarget: coreHttp.CompositeMapper = { +export const ContainerRegistryEventTarget: CompositeMapper = { type: { name: "Composite", className: "ContainerRegistryEventTarget", @@ -1743,7 +1743,7 @@ export const ContainerRegistryEventTarget: coreHttp.CompositeMapper = { } }; -export const ContainerRegistryEventRequest: coreHttp.CompositeMapper = { +export const ContainerRegistryEventRequest: CompositeMapper = { type: { name: "Composite", className: "ContainerRegistryEventRequest", @@ -1782,7 +1782,7 @@ export const ContainerRegistryEventRequest: coreHttp.CompositeMapper = { } }; -export const ContainerRegistryEventActor: coreHttp.CompositeMapper = { +export const ContainerRegistryEventActor: CompositeMapper = { type: { name: "Composite", className: "ContainerRegistryEventActor", @@ -1797,7 +1797,7 @@ export const ContainerRegistryEventActor: coreHttp.CompositeMapper = { } }; -export const ContainerRegistryEventSource: coreHttp.CompositeMapper = { +export const ContainerRegistryEventSource: CompositeMapper = { type: { name: "Composite", className: "ContainerRegistryEventSource", @@ -1818,7 +1818,7 @@ export const ContainerRegistryEventSource: coreHttp.CompositeMapper = { } }; -export const ContainerRegistryArtifactEventData: coreHttp.CompositeMapper = { +export const ContainerRegistryArtifactEventData: CompositeMapper = { type: { name: "Composite", className: "ContainerRegistryArtifactEventData", @@ -1852,7 +1852,7 @@ export const ContainerRegistryArtifactEventData: coreHttp.CompositeMapper = { } }; -export const ContainerRegistryArtifactEventTarget: coreHttp.CompositeMapper = { +export const ContainerRegistryArtifactEventTarget: CompositeMapper = { type: { name: "Composite", className: "ContainerRegistryArtifactEventTarget", @@ -1903,7 +1903,7 @@ export const ContainerRegistryArtifactEventTarget: coreHttp.CompositeMapper = { } }; -export const ServiceBusActiveMessagesAvailableWithNoListenersEventData: coreHttp.CompositeMapper = { +export const ServiceBusActiveMessagesAvailableWithNoListenersEventData: CompositeMapper = { type: { name: "Composite", className: "ServiceBusActiveMessagesAvailableWithNoListenersEventData", @@ -1948,7 +1948,7 @@ export const ServiceBusActiveMessagesAvailableWithNoListenersEventData: coreHttp } }; -export const ServiceBusDeadletterMessagesAvailableWithNoListenersEventData: coreHttp.CompositeMapper = { +export const ServiceBusDeadletterMessagesAvailableWithNoListenersEventData: CompositeMapper = { type: { name: "Composite", className: "ServiceBusDeadletterMessagesAvailableWithNoListenersEventData", @@ -1993,11 +1993,10 @@ export const ServiceBusDeadletterMessagesAvailableWithNoListenersEventData: core } }; -export const ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData: coreHttp.CompositeMapper = { +export const ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData: CompositeMapper = { type: { name: "Composite", - className: - "ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData", + className: "ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData", modelProperties: { namespaceName: { serializedName: "namespaceName", @@ -2039,11 +2038,10 @@ export const ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData: co } }; -export const ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData: coreHttp.CompositeMapper = { +export const ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData: CompositeMapper = { type: { name: "Composite", - className: - "ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData", + className: "ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData", modelProperties: { namespaceName: { serializedName: "namespaceName", @@ -2085,7 +2083,7 @@ export const ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData } }; -export const MediaJobStateChangeEventData: coreHttp.CompositeMapper = { +export const MediaJobStateChangeEventData: CompositeMapper = { type: { name: "Composite", className: "MediaJobStateChangeEventData", @@ -2133,7 +2131,7 @@ export const MediaJobStateChangeEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobError: coreHttp.CompositeMapper = { +export const MediaJobError: CompositeMapper = { type: { name: "Composite", className: "MediaJobError", @@ -2168,13 +2166,7 @@ export const MediaJobError: coreHttp.CompositeMapper = { readOnly: true, type: { name: "Enum", - allowedValues: [ - "Service", - "Download", - "Upload", - "Configuration", - "Content" - ] + allowedValues: ["Service", "Download", "Upload", "Configuration", "Content"] } }, retry: { @@ -2202,7 +2194,7 @@ export const MediaJobError: coreHttp.CompositeMapper = { } }; -export const MediaJobErrorDetail: coreHttp.CompositeMapper = { +export const MediaJobErrorDetail: CompositeMapper = { type: { name: "Composite", className: "MediaJobErrorDetail", @@ -2225,7 +2217,7 @@ export const MediaJobErrorDetail: coreHttp.CompositeMapper = { } }; -export const MediaJobOutput: coreHttp.CompositeMapper = { +export const MediaJobOutput: CompositeMapper = { type: { name: "Composite", className: "MediaJobOutput", @@ -2281,7 +2273,7 @@ export const MediaJobOutput: coreHttp.CompositeMapper = { } }; -export const MediaJobOutputProgressEventData: coreHttp.CompositeMapper = { +export const MediaJobOutputProgressEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobOutputProgress", type: { name: "Composite", @@ -2310,7 +2302,7 @@ export const MediaJobOutputProgressEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobOutputStateChangeEventData: coreHttp.CompositeMapper = { +export const MediaJobOutputStateChangeEventData: CompositeMapper = { type: { name: "Composite", className: "MediaJobOutputStateChangeEventData", @@ -2349,7 +2341,7 @@ export const MediaJobOutputStateChangeEventData: coreHttp.CompositeMapper = { } }; -export const MediaLiveEventEncoderConnectedEventData: coreHttp.CompositeMapper = { +export const MediaLiveEventEncoderConnectedEventData: CompositeMapper = { type: { name: "Composite", className: "MediaLiveEventEncoderConnectedEventData", @@ -2386,7 +2378,7 @@ export const MediaLiveEventEncoderConnectedEventData: coreHttp.CompositeMapper = } }; -export const MediaLiveEventConnectionRejectedEventData: coreHttp.CompositeMapper = { +export const MediaLiveEventConnectionRejectedEventData: CompositeMapper = { type: { name: "Composite", className: "MediaLiveEventConnectionRejectedEventData", @@ -2430,7 +2422,7 @@ export const MediaLiveEventConnectionRejectedEventData: coreHttp.CompositeMapper } }; -export const MediaLiveEventEncoderDisconnectedEventData: coreHttp.CompositeMapper = { +export const MediaLiveEventEncoderDisconnectedEventData: CompositeMapper = { type: { name: "Composite", className: "MediaLiveEventEncoderDisconnectedEventData", @@ -2474,7 +2466,7 @@ export const MediaLiveEventEncoderDisconnectedEventData: coreHttp.CompositeMappe } }; -export const MediaLiveEventIncomingStreamReceivedEventData: coreHttp.CompositeMapper = { +export const MediaLiveEventIncomingStreamReceivedEventData: CompositeMapper = { type: { name: "Composite", className: "MediaLiveEventIncomingStreamReceivedEventData", @@ -2546,7 +2538,7 @@ export const MediaLiveEventIncomingStreamReceivedEventData: coreHttp.CompositeMa } }; -export const MediaLiveEventIncomingStreamsOutOfSyncEventData: coreHttp.CompositeMapper = { +export const MediaLiveEventIncomingStreamsOutOfSyncEventData: CompositeMapper = { type: { name: "Composite", className: "MediaLiveEventIncomingStreamsOutOfSyncEventData", @@ -2597,7 +2589,7 @@ export const MediaLiveEventIncomingStreamsOutOfSyncEventData: coreHttp.Composite } }; -export const MediaLiveEventIncomingVideoStreamsOutOfSyncEventData: coreHttp.CompositeMapper = { +export const MediaLiveEventIncomingVideoStreamsOutOfSyncEventData: CompositeMapper = { type: { name: "Composite", className: "MediaLiveEventIncomingVideoStreamsOutOfSyncEventData", @@ -2641,7 +2633,7 @@ export const MediaLiveEventIncomingVideoStreamsOutOfSyncEventData: coreHttp.Comp } }; -export const MediaLiveEventIncomingDataChunkDroppedEventData: coreHttp.CompositeMapper = { +export const MediaLiveEventIncomingDataChunkDroppedEventData: CompositeMapper = { type: { name: "Composite", className: "MediaLiveEventIncomingDataChunkDroppedEventData", @@ -2692,7 +2684,7 @@ export const MediaLiveEventIncomingDataChunkDroppedEventData: coreHttp.Composite } }; -export const MediaLiveEventIngestHeartbeatEventData: coreHttp.CompositeMapper = { +export const MediaLiveEventIngestHeartbeatEventData: CompositeMapper = { type: { name: "Composite", className: "MediaLiveEventIngestHeartbeatEventData", @@ -2785,7 +2777,7 @@ export const MediaLiveEventIngestHeartbeatEventData: coreHttp.CompositeMapper = } }; -export const MediaLiveEventTrackDiscontinuityDetectedEventData: coreHttp.CompositeMapper = { +export const MediaLiveEventTrackDiscontinuityDetectedEventData: CompositeMapper = { type: { name: "Composite", className: "MediaLiveEventTrackDiscontinuityDetectedEventData", @@ -2843,7 +2835,7 @@ export const MediaLiveEventTrackDiscontinuityDetectedEventData: coreHttp.Composi } }; -export const MapsGeofenceEventProperties: coreHttp.CompositeMapper = { +export const MapsGeofenceEventProperties: CompositeMapper = { type: { name: "Composite", className: "MapsGeofenceEventProperties", @@ -2892,7 +2884,7 @@ export const MapsGeofenceEventProperties: coreHttp.CompositeMapper = { } }; -export const MapsGeofenceGeometry: coreHttp.CompositeMapper = { +export const MapsGeofenceGeometry: CompositeMapper = { type: { name: "Composite", className: "MapsGeofenceGeometry", @@ -2937,7 +2929,7 @@ export const MapsGeofenceGeometry: coreHttp.CompositeMapper = { } }; -export const AppConfigurationKeyValueModifiedEventData: coreHttp.CompositeMapper = { +export const AppConfigurationKeyValueModifiedEventData: CompositeMapper = { type: { name: "Composite", className: "AppConfigurationKeyValueModifiedEventData", @@ -2970,7 +2962,7 @@ export const AppConfigurationKeyValueModifiedEventData: coreHttp.CompositeMapper } }; -export const AppConfigurationKeyValueDeletedEventData: coreHttp.CompositeMapper = { +export const AppConfigurationKeyValueDeletedEventData: CompositeMapper = { type: { name: "Composite", className: "AppConfigurationKeyValueDeletedEventData", @@ -3003,7 +2995,7 @@ export const AppConfigurationKeyValueDeletedEventData: coreHttp.CompositeMapper } }; -export const SignalRServiceClientConnectionConnectedEventData: coreHttp.CompositeMapper = { +export const SignalRServiceClientConnectionConnectedEventData: CompositeMapper = { type: { name: "Composite", className: "SignalRServiceClientConnectionConnectedEventData", @@ -3036,7 +3028,7 @@ export const SignalRServiceClientConnectionConnectedEventData: coreHttp.Composit } }; -export const SignalRServiceClientConnectionDisconnectedEventData: coreHttp.CompositeMapper = { +export const SignalRServiceClientConnectionDisconnectedEventData: CompositeMapper = { type: { name: "Composite", className: "SignalRServiceClientConnectionDisconnectedEventData", @@ -3075,7 +3067,7 @@ export const SignalRServiceClientConnectionDisconnectedEventData: coreHttp.Compo } }; -export const KeyVaultCertificateNewVersionCreatedEventData: coreHttp.CompositeMapper = { +export const KeyVaultCertificateNewVersionCreatedEventData: CompositeMapper = { type: { name: "Composite", className: "KeyVaultCertificateNewVersionCreatedEventData", @@ -3126,7 +3118,7 @@ export const KeyVaultCertificateNewVersionCreatedEventData: coreHttp.CompositeMa } }; -export const KeyVaultCertificateNearExpiryEventData: coreHttp.CompositeMapper = { +export const KeyVaultCertificateNearExpiryEventData: CompositeMapper = { type: { name: "Composite", className: "KeyVaultCertificateNearExpiryEventData", @@ -3177,7 +3169,7 @@ export const KeyVaultCertificateNearExpiryEventData: coreHttp.CompositeMapper = } }; -export const KeyVaultCertificateExpiredEventData: coreHttp.CompositeMapper = { +export const KeyVaultCertificateExpiredEventData: CompositeMapper = { type: { name: "Composite", className: "KeyVaultCertificateExpiredEventData", @@ -3228,7 +3220,7 @@ export const KeyVaultCertificateExpiredEventData: coreHttp.CompositeMapper = { } }; -export const KeyVaultKeyNewVersionCreatedEventData: coreHttp.CompositeMapper = { +export const KeyVaultKeyNewVersionCreatedEventData: CompositeMapper = { type: { name: "Composite", className: "KeyVaultKeyNewVersionCreatedEventData", @@ -3279,7 +3271,7 @@ export const KeyVaultKeyNewVersionCreatedEventData: coreHttp.CompositeMapper = { } }; -export const KeyVaultKeyNearExpiryEventData: coreHttp.CompositeMapper = { +export const KeyVaultKeyNearExpiryEventData: CompositeMapper = { type: { name: "Composite", className: "KeyVaultKeyNearExpiryEventData", @@ -3330,7 +3322,7 @@ export const KeyVaultKeyNearExpiryEventData: coreHttp.CompositeMapper = { } }; -export const KeyVaultKeyExpiredEventData: coreHttp.CompositeMapper = { +export const KeyVaultKeyExpiredEventData: CompositeMapper = { type: { name: "Composite", className: "KeyVaultKeyExpiredEventData", @@ -3381,7 +3373,7 @@ export const KeyVaultKeyExpiredEventData: coreHttp.CompositeMapper = { } }; -export const KeyVaultSecretNewVersionCreatedEventData: coreHttp.CompositeMapper = { +export const KeyVaultSecretNewVersionCreatedEventData: CompositeMapper = { type: { name: "Composite", className: "KeyVaultSecretNewVersionCreatedEventData", @@ -3432,7 +3424,7 @@ export const KeyVaultSecretNewVersionCreatedEventData: coreHttp.CompositeMapper } }; -export const KeyVaultSecretNearExpiryEventData: coreHttp.CompositeMapper = { +export const KeyVaultSecretNearExpiryEventData: CompositeMapper = { type: { name: "Composite", className: "KeyVaultSecretNearExpiryEventData", @@ -3483,7 +3475,7 @@ export const KeyVaultSecretNearExpiryEventData: coreHttp.CompositeMapper = { } }; -export const KeyVaultSecretExpiredEventData: coreHttp.CompositeMapper = { +export const KeyVaultSecretExpiredEventData: CompositeMapper = { type: { name: "Composite", className: "KeyVaultSecretExpiredEventData", @@ -3534,7 +3526,7 @@ export const KeyVaultSecretExpiredEventData: coreHttp.CompositeMapper = { } }; -export const KeyVaultAccessPolicyChangedEventData: coreHttp.CompositeMapper = { +export const KeyVaultAccessPolicyChangedEventData: CompositeMapper = { type: { name: "Composite", className: "KeyVaultAccessPolicyChangedEventData", @@ -3585,7 +3577,7 @@ export const KeyVaultAccessPolicyChangedEventData: coreHttp.CompositeMapper = { } }; -export const MachineLearningServicesModelRegisteredEventData: coreHttp.CompositeMapper = { +export const MachineLearningServicesModelRegisteredEventData: CompositeMapper = { type: { name: "Composite", className: "MachineLearningServicesModelRegisteredEventData", @@ -3618,7 +3610,7 @@ export const MachineLearningServicesModelRegisteredEventData: coreHttp.Composite } }; -export const MachineLearningServicesModelDeployedEventData: coreHttp.CompositeMapper = { +export const MachineLearningServicesModelDeployedEventData: CompositeMapper = { type: { name: "Composite", className: "MachineLearningServicesModelDeployedEventData", @@ -3657,7 +3649,7 @@ export const MachineLearningServicesModelDeployedEventData: coreHttp.CompositeMa } }; -export const MachineLearningServicesRunCompletedEventData: coreHttp.CompositeMapper = { +export const MachineLearningServicesRunCompletedEventData: CompositeMapper = { type: { name: "Composite", className: "MachineLearningServicesRunCompletedEventData", @@ -3702,7 +3694,7 @@ export const MachineLearningServicesRunCompletedEventData: coreHttp.CompositeMap } }; -export const MachineLearningServicesDatasetDriftDetectedEventData: coreHttp.CompositeMapper = { +export const MachineLearningServicesDatasetDriftDetectedEventData: CompositeMapper = { type: { name: "Composite", className: "MachineLearningServicesDatasetDriftDetectedEventData", @@ -3759,7 +3751,7 @@ export const MachineLearningServicesDatasetDriftDetectedEventData: coreHttp.Comp } }; -export const MachineLearningServicesRunStatusChangedEventData: coreHttp.CompositeMapper = { +export const MachineLearningServicesRunStatusChangedEventData: CompositeMapper = { type: { name: "Composite", className: "MachineLearningServicesRunStatusChangedEventData", @@ -3810,7 +3802,7 @@ export const MachineLearningServicesRunStatusChangedEventData: coreHttp.Composit } }; -export const RedisPatchingCompletedEventData: coreHttp.CompositeMapper = { +export const RedisPatchingCompletedEventData: CompositeMapper = { type: { name: "Composite", className: "RedisPatchingCompletedEventData", @@ -3837,7 +3829,7 @@ export const RedisPatchingCompletedEventData: coreHttp.CompositeMapper = { } }; -export const RedisScalingCompletedEventData: coreHttp.CompositeMapper = { +export const RedisScalingCompletedEventData: CompositeMapper = { type: { name: "Composite", className: "RedisScalingCompletedEventData", @@ -3864,7 +3856,7 @@ export const RedisScalingCompletedEventData: coreHttp.CompositeMapper = { } }; -export const RedisExportRDBCompletedEventData: coreHttp.CompositeMapper = { +export const RedisExportRDBCompletedEventData: CompositeMapper = { type: { name: "Composite", className: "RedisExportRDBCompletedEventData", @@ -3891,7 +3883,7 @@ export const RedisExportRDBCompletedEventData: coreHttp.CompositeMapper = { } }; -export const RedisImportRDBCompletedEventData: coreHttp.CompositeMapper = { +export const RedisImportRDBCompletedEventData: CompositeMapper = { type: { name: "Composite", className: "RedisImportRDBCompletedEventData", @@ -3918,7 +3910,7 @@ export const RedisImportRDBCompletedEventData: coreHttp.CompositeMapper = { } }; -export const WebAppUpdatedEventData: coreHttp.CompositeMapper = { +export const WebAppUpdatedEventData: CompositeMapper = { type: { name: "Composite", className: "WebAppUpdatedEventData", @@ -3970,7 +3962,7 @@ export const WebAppUpdatedEventData: coreHttp.CompositeMapper = { } }; -export const AppEventTypeDetail: coreHttp.CompositeMapper = { +export const AppEventTypeDetail: CompositeMapper = { type: { name: "Composite", className: "AppEventTypeDetail", @@ -3985,7 +3977,7 @@ export const AppEventTypeDetail: coreHttp.CompositeMapper = { } }; -export const WebBackupOperationStartedEventData: coreHttp.CompositeMapper = { +export const WebBackupOperationStartedEventData: CompositeMapper = { type: { name: "Composite", className: "WebBackupOperationStartedEventData", @@ -4037,7 +4029,7 @@ export const WebBackupOperationStartedEventData: coreHttp.CompositeMapper = { } }; -export const WebBackupOperationCompletedEventData: coreHttp.CompositeMapper = { +export const WebBackupOperationCompletedEventData: CompositeMapper = { type: { name: "Composite", className: "WebBackupOperationCompletedEventData", @@ -4089,7 +4081,7 @@ export const WebBackupOperationCompletedEventData: coreHttp.CompositeMapper = { } }; -export const WebBackupOperationFailedEventData: coreHttp.CompositeMapper = { +export const WebBackupOperationFailedEventData: CompositeMapper = { type: { name: "Composite", className: "WebBackupOperationFailedEventData", @@ -4141,7 +4133,7 @@ export const WebBackupOperationFailedEventData: coreHttp.CompositeMapper = { } }; -export const WebRestoreOperationStartedEventData: coreHttp.CompositeMapper = { +export const WebRestoreOperationStartedEventData: CompositeMapper = { type: { name: "Composite", className: "WebRestoreOperationStartedEventData", @@ -4193,7 +4185,7 @@ export const WebRestoreOperationStartedEventData: coreHttp.CompositeMapper = { } }; -export const WebRestoreOperationCompletedEventData: coreHttp.CompositeMapper = { +export const WebRestoreOperationCompletedEventData: CompositeMapper = { type: { name: "Composite", className: "WebRestoreOperationCompletedEventData", @@ -4245,7 +4237,7 @@ export const WebRestoreOperationCompletedEventData: coreHttp.CompositeMapper = { } }; -export const WebRestoreOperationFailedEventData: coreHttp.CompositeMapper = { +export const WebRestoreOperationFailedEventData: CompositeMapper = { type: { name: "Composite", className: "WebRestoreOperationFailedEventData", @@ -4297,7 +4289,7 @@ export const WebRestoreOperationFailedEventData: coreHttp.CompositeMapper = { } }; -export const WebSlotSwapStartedEventData: coreHttp.CompositeMapper = { +export const WebSlotSwapStartedEventData: CompositeMapper = { type: { name: "Composite", className: "WebSlotSwapStartedEventData", @@ -4349,7 +4341,7 @@ export const WebSlotSwapStartedEventData: coreHttp.CompositeMapper = { } }; -export const WebSlotSwapCompletedEventData: coreHttp.CompositeMapper = { +export const WebSlotSwapCompletedEventData: CompositeMapper = { type: { name: "Composite", className: "WebSlotSwapCompletedEventData", @@ -4401,7 +4393,7 @@ export const WebSlotSwapCompletedEventData: coreHttp.CompositeMapper = { } }; -export const WebSlotSwapFailedEventData: coreHttp.CompositeMapper = { +export const WebSlotSwapFailedEventData: CompositeMapper = { type: { name: "Composite", className: "WebSlotSwapFailedEventData", @@ -4453,7 +4445,7 @@ export const WebSlotSwapFailedEventData: coreHttp.CompositeMapper = { } }; -export const WebSlotSwapWithPreviewStartedEventData: coreHttp.CompositeMapper = { +export const WebSlotSwapWithPreviewStartedEventData: CompositeMapper = { type: { name: "Composite", className: "WebSlotSwapWithPreviewStartedEventData", @@ -4505,7 +4497,7 @@ export const WebSlotSwapWithPreviewStartedEventData: coreHttp.CompositeMapper = } }; -export const WebSlotSwapWithPreviewCancelledEventData: coreHttp.CompositeMapper = { +export const WebSlotSwapWithPreviewCancelledEventData: CompositeMapper = { type: { name: "Composite", className: "WebSlotSwapWithPreviewCancelledEventData", @@ -4557,7 +4549,7 @@ export const WebSlotSwapWithPreviewCancelledEventData: coreHttp.CompositeMapper } }; -export const WebAppServicePlanUpdatedEventData: coreHttp.CompositeMapper = { +export const WebAppServicePlanUpdatedEventData: CompositeMapper = { type: { name: "Composite", className: "WebAppServicePlanUpdatedEventData", @@ -4616,7 +4608,7 @@ export const WebAppServicePlanUpdatedEventData: coreHttp.CompositeMapper = { } }; -export const AppServicePlanEventTypeDetail: coreHttp.CompositeMapper = { +export const AppServicePlanEventTypeDetail: CompositeMapper = { type: { name: "Composite", className: "AppServicePlanEventTypeDetail", @@ -4643,7 +4635,7 @@ export const AppServicePlanEventTypeDetail: coreHttp.CompositeMapper = { } }; -export const WebAppServicePlanUpdatedEventDataSku: coreHttp.CompositeMapper = { +export const WebAppServicePlanUpdatedEventDataSku: CompositeMapper = { type: { name: "Composite", className: "WebAppServicePlanUpdatedEventDataSku", @@ -4682,7 +4674,7 @@ export const WebAppServicePlanUpdatedEventDataSku: coreHttp.CompositeMapper = { } }; -export const ACSChatEventBase: coreHttp.CompositeMapper = { +export const ACSChatEventBase: CompositeMapper = { type: { name: "Composite", className: "ACSChatEventBase", @@ -4709,7 +4701,7 @@ export const ACSChatEventBase: coreHttp.CompositeMapper = { } }; -export const ACSChatThreadMember: coreHttp.CompositeMapper = { +export const ACSChatThreadMember: CompositeMapper = { type: { name: "Composite", className: "ACSChatThreadMember", @@ -4730,7 +4722,7 @@ export const ACSChatThreadMember: coreHttp.CompositeMapper = { } }; -export const AcsSmsDeliveryAttempt: coreHttp.CompositeMapper = { +export const AcsSmsDeliveryAttempt: CompositeMapper = { type: { name: "Composite", className: "AcsSmsDeliveryAttempt", @@ -4757,7 +4749,7 @@ export const AcsSmsDeliveryAttempt: coreHttp.CompositeMapper = { } }; -export const AcsSmsEventBase: coreHttp.CompositeMapper = { +export const AcsSmsEventBase: CompositeMapper = { type: { name: "Composite", className: "AcsSmsEventBase", @@ -4784,7 +4776,7 @@ export const AcsSmsEventBase: coreHttp.CompositeMapper = { } }; -export const IotHubDeviceCreatedEventData: coreHttp.CompositeMapper = { +export const IotHubDeviceCreatedEventData: CompositeMapper = { type: { name: "Composite", className: "IotHubDeviceCreatedEventData", @@ -4794,7 +4786,7 @@ export const IotHubDeviceCreatedEventData: coreHttp.CompositeMapper = { } }; -export const IotHubDeviceDeletedEventData: coreHttp.CompositeMapper = { +export const IotHubDeviceDeletedEventData: CompositeMapper = { type: { name: "Composite", className: "IotHubDeviceDeletedEventData", @@ -4804,7 +4796,7 @@ export const IotHubDeviceDeletedEventData: coreHttp.CompositeMapper = { } }; -export const IotHubDeviceConnectedEventData: coreHttp.CompositeMapper = { +export const IotHubDeviceConnectedEventData: CompositeMapper = { type: { name: "Composite", className: "IotHubDeviceConnectedEventData", @@ -4814,7 +4806,7 @@ export const IotHubDeviceConnectedEventData: coreHttp.CompositeMapper = { } }; -export const IotHubDeviceDisconnectedEventData: coreHttp.CompositeMapper = { +export const IotHubDeviceDisconnectedEventData: CompositeMapper = { type: { name: "Composite", className: "IotHubDeviceDisconnectedEventData", @@ -4824,7 +4816,7 @@ export const IotHubDeviceDisconnectedEventData: coreHttp.CompositeMapper = { } }; -export const IotHubDeviceTelemetryEventData: coreHttp.CompositeMapper = { +export const IotHubDeviceTelemetryEventData: CompositeMapper = { type: { name: "Composite", className: "IotHubDeviceTelemetryEventData", @@ -4834,7 +4826,7 @@ export const IotHubDeviceTelemetryEventData: coreHttp.CompositeMapper = { } }; -export const ContainerRegistryImagePushedEventData: coreHttp.CompositeMapper = { +export const ContainerRegistryImagePushedEventData: CompositeMapper = { type: { name: "Composite", className: "ContainerRegistryImagePushedEventData", @@ -4844,7 +4836,7 @@ export const ContainerRegistryImagePushedEventData: coreHttp.CompositeMapper = { } }; -export const ContainerRegistryImageDeletedEventData: coreHttp.CompositeMapper = { +export const ContainerRegistryImageDeletedEventData: CompositeMapper = { type: { name: "Composite", className: "ContainerRegistryImageDeletedEventData", @@ -4854,7 +4846,7 @@ export const ContainerRegistryImageDeletedEventData: coreHttp.CompositeMapper = } }; -export const ContainerRegistryChartPushedEventData: coreHttp.CompositeMapper = { +export const ContainerRegistryChartPushedEventData: CompositeMapper = { type: { name: "Composite", className: "ContainerRegistryChartPushedEventData", @@ -4864,7 +4856,7 @@ export const ContainerRegistryChartPushedEventData: coreHttp.CompositeMapper = { } }; -export const ContainerRegistryChartDeletedEventData: coreHttp.CompositeMapper = { +export const ContainerRegistryChartDeletedEventData: CompositeMapper = { type: { name: "Composite", className: "ContainerRegistryChartDeletedEventData", @@ -4874,7 +4866,7 @@ export const ContainerRegistryChartDeletedEventData: coreHttp.CompositeMapper = } }; -export const MediaJobScheduledEventData: coreHttp.CompositeMapper = { +export const MediaJobScheduledEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobScheduled", type: { name: "Composite", @@ -4885,7 +4877,7 @@ export const MediaJobScheduledEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobProcessingEventData: coreHttp.CompositeMapper = { +export const MediaJobProcessingEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobProcessing", type: { name: "Composite", @@ -4896,7 +4888,7 @@ export const MediaJobProcessingEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobCancelingEventData: coreHttp.CompositeMapper = { +export const MediaJobCancelingEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobCanceling", type: { name: "Composite", @@ -4907,7 +4899,7 @@ export const MediaJobCancelingEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobFinishedEventData: coreHttp.CompositeMapper = { +export const MediaJobFinishedEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobFinished", type: { name: "Composite", @@ -4930,7 +4922,7 @@ export const MediaJobFinishedEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobCanceledEventData: coreHttp.CompositeMapper = { +export const MediaJobCanceledEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobCanceled", type: { name: "Composite", @@ -4953,7 +4945,7 @@ export const MediaJobCanceledEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobErroredEventData: coreHttp.CompositeMapper = { +export const MediaJobErroredEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobErrored", type: { name: "Composite", @@ -4976,7 +4968,7 @@ export const MediaJobErroredEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobOutputAsset: coreHttp.CompositeMapper = { +export const MediaJobOutputAsset: CompositeMapper = { serializedName: "#Microsoft.Media.JobOutputAsset", type: { name: "Composite", @@ -4995,7 +4987,7 @@ export const MediaJobOutputAsset: coreHttp.CompositeMapper = { } }; -export const MediaJobOutputCanceledEventData: coreHttp.CompositeMapper = { +export const MediaJobOutputCanceledEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobOutputCanceled", type: { name: "Composite", @@ -5006,7 +4998,7 @@ export const MediaJobOutputCanceledEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobOutputCancelingEventData: coreHttp.CompositeMapper = { +export const MediaJobOutputCancelingEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobOutputCanceling", type: { name: "Composite", @@ -5017,7 +5009,7 @@ export const MediaJobOutputCancelingEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobOutputErroredEventData: coreHttp.CompositeMapper = { +export const MediaJobOutputErroredEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobOutputErrored", type: { name: "Composite", @@ -5028,7 +5020,7 @@ export const MediaJobOutputErroredEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobOutputFinishedEventData: coreHttp.CompositeMapper = { +export const MediaJobOutputFinishedEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobOutputFinished", type: { name: "Composite", @@ -5039,7 +5031,7 @@ export const MediaJobOutputFinishedEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobOutputProcessingEventData: coreHttp.CompositeMapper = { +export const MediaJobOutputProcessingEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobOutputProcessing", type: { name: "Composite", @@ -5050,7 +5042,7 @@ export const MediaJobOutputProcessingEventData: coreHttp.CompositeMapper = { } }; -export const MediaJobOutputScheduledEventData: coreHttp.CompositeMapper = { +export const MediaJobOutputScheduledEventData: CompositeMapper = { serializedName: "#Microsoft.Media.JobOutputScheduled", type: { name: "Composite", @@ -5061,7 +5053,7 @@ export const MediaJobOutputScheduledEventData: coreHttp.CompositeMapper = { } }; -export const MapsGeofenceEnteredEventData: coreHttp.CompositeMapper = { +export const MapsGeofenceEnteredEventData: CompositeMapper = { type: { name: "Composite", className: "MapsGeofenceEnteredEventData", @@ -5071,7 +5063,7 @@ export const MapsGeofenceEnteredEventData: coreHttp.CompositeMapper = { } }; -export const MapsGeofenceExitedEventData: coreHttp.CompositeMapper = { +export const MapsGeofenceExitedEventData: CompositeMapper = { type: { name: "Composite", className: "MapsGeofenceExitedEventData", @@ -5081,7 +5073,7 @@ export const MapsGeofenceExitedEventData: coreHttp.CompositeMapper = { } }; -export const MapsGeofenceResultEventData: coreHttp.CompositeMapper = { +export const MapsGeofenceResultEventData: CompositeMapper = { type: { name: "Composite", className: "MapsGeofenceResultEventData", @@ -5091,7 +5083,7 @@ export const MapsGeofenceResultEventData: coreHttp.CompositeMapper = { } }; -export const ACSChatMessageEventBase: coreHttp.CompositeMapper = { +export const ACSChatMessageEventBase: CompositeMapper = { type: { name: "Composite", className: "ACSChatMessageEventBase", @@ -5137,7 +5129,7 @@ export const ACSChatMessageEventBase: coreHttp.CompositeMapper = { } }; -export const ACSChatThreadEventBase: coreHttp.CompositeMapper = { +export const ACSChatThreadEventBase: CompositeMapper = { type: { name: "Composite", className: "ACSChatThreadEventBase", @@ -5159,7 +5151,7 @@ export const ACSChatThreadEventBase: coreHttp.CompositeMapper = { } }; -export const AcsSmsDeliveryReportReceivedEventData: coreHttp.CompositeMapper = { +export const AcsSmsDeliveryReportReceivedEventData: CompositeMapper = { type: { name: "Composite", className: "AcsSmsDeliveryReportReceivedEventData", @@ -5199,7 +5191,7 @@ export const AcsSmsDeliveryReportReceivedEventData: coreHttp.CompositeMapper = { } }; -export const AcsSmsReceivedEventData: coreHttp.CompositeMapper = { +export const AcsSmsReceivedEventData: CompositeMapper = { type: { name: "Composite", className: "AcsSmsReceivedEventData", @@ -5221,7 +5213,7 @@ export const AcsSmsReceivedEventData: coreHttp.CompositeMapper = { } }; -export const ACSChatMessageReceivedEventData: coreHttp.CompositeMapper = { +export const ACSChatMessageReceivedEventData: CompositeMapper = { type: { name: "Composite", className: "ACSChatMessageReceivedEventData", @@ -5237,7 +5229,7 @@ export const ACSChatMessageReceivedEventData: coreHttp.CompositeMapper = { } }; -export const ACSChatMessageEditedEventData: coreHttp.CompositeMapper = { +export const ACSChatMessageEditedEventData: CompositeMapper = { type: { name: "Composite", className: "ACSChatMessageEditedEventData", @@ -5259,7 +5251,7 @@ export const ACSChatMessageEditedEventData: coreHttp.CompositeMapper = { } }; -export const ACSChatMessageDeletedEventData: coreHttp.CompositeMapper = { +export const ACSChatMessageDeletedEventData: CompositeMapper = { type: { name: "Composite", className: "ACSChatMessageDeletedEventData", @@ -5275,7 +5267,7 @@ export const ACSChatMessageDeletedEventData: coreHttp.CompositeMapper = { } }; -export const ACSChatThreadCreatedWithUserEventData: coreHttp.CompositeMapper = { +export const ACSChatThreadCreatedWithUserEventData: CompositeMapper = { type: { name: "Composite", className: "ACSChatThreadCreatedWithUserEventData", @@ -5310,7 +5302,7 @@ export const ACSChatThreadCreatedWithUserEventData: coreHttp.CompositeMapper = { } }; -export const ACSChatThreadWithUserDeletedEventData: coreHttp.CompositeMapper = { +export const ACSChatThreadWithUserDeletedEventData: CompositeMapper = { type: { name: "Composite", className: "ACSChatThreadWithUserDeletedEventData", @@ -5332,7 +5324,7 @@ export const ACSChatThreadWithUserDeletedEventData: coreHttp.CompositeMapper = { } }; -export const ACSChatThreadPropertiesUpdatedPerUserEventData: coreHttp.CompositeMapper = { +export const ACSChatThreadPropertiesUpdatedPerUserEventData: CompositeMapper = { type: { name: "Composite", className: "ACSChatThreadPropertiesUpdatedPerUserEventData", @@ -5361,7 +5353,7 @@ export const ACSChatThreadPropertiesUpdatedPerUserEventData: coreHttp.CompositeM } }; -export const ACSChatMemberAddedToThreadWithUserEventData: coreHttp.CompositeMapper = { +export const ACSChatMemberAddedToThreadWithUserEventData: CompositeMapper = { type: { name: "Composite", className: "ACSChatMemberAddedToThreadWithUserEventData", @@ -5390,7 +5382,7 @@ export const ACSChatMemberAddedToThreadWithUserEventData: coreHttp.CompositeMapp } }; -export const ACSChatMemberRemovedFromThreadWithUserEventData: coreHttp.CompositeMapper = { +export const ACSChatMemberRemovedFromThreadWithUserEventData: CompositeMapper = { type: { name: "Composite", className: "ACSChatMemberRemovedFromThreadWithUserEventData", diff --git a/sdk/eventgrid/eventgrid/src/generated/models/parameters.ts b/sdk/eventgrid/eventgrid/src/generated/models/parameters.ts index 437a9b09e75d..9dc4de730f6a 100644 --- a/sdk/eventgrid/eventgrid/src/generated/models/parameters.ts +++ b/sdk/eventgrid/eventgrid/src/generated/models/parameters.ts @@ -10,7 +10,7 @@ import { OperationParameter, OperationURLParameter, OperationQueryParameter -} from "@azure/core-http"; +} from "@azure/core-client"; export const contentType: OperationParameter = { parameterPath: ["options", "contentType"], diff --git a/sdk/eventgrid/eventgrid/src/index.ts b/sdk/eventgrid/eventgrid/src/index.ts index 609d7c468a72..96cb2a059c7b 100644 --- a/sdk/eventgrid/eventgrid/src/index.ts +++ b/sdk/eventgrid/eventgrid/src/index.ts @@ -16,8 +16,7 @@ export { EventGridPublisherClientOptions, SendEventsOptions, SendCloudEventsOptions, - SendCustomSchemaEventsOptions, - SendEventsResponse + SendCustomSchemaEventsOptions } from "./eventGridClient"; export { diff --git a/sdk/eventgrid/eventgrid/src/systemEventDecoders.ts b/sdk/eventgrid/eventgrid/src/systemEventDecoders.ts index 747f5c7d885e..3b9bd6f46846 100644 --- a/sdk/eventgrid/eventgrid/src/systemEventDecoders.ts +++ b/sdk/eventgrid/eventgrid/src/systemEventDecoders.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -import { Mapper, Serializer } from "@azure/core-http"; +import { Mapper, createSerializer } from "@azure/core-client"; import { CustomEventDataDeserializer } from "./models"; import { ACSChatMessageReceivedEventData, @@ -141,7 +141,7 @@ import { WebSlotSwapWithPreviewStartedEventData } from "./generated/models/mappers"; -const serializer = new Serializer({ +const serializer = createSerializer({ ACSChatMessageReceivedEventData: ACSChatMessageReceivedEventData, ACSChatMessageEditedEventData: ACSChatMessageEditedEventData, ACSChatMessageDeletedEventData: ACSChatMessageDeletedEventData, diff --git a/sdk/eventgrid/eventgrid/src/tracing.ts b/sdk/eventgrid/eventgrid/src/tracing.ts index 6d028ef7de88..bd9e408400b4 100644 --- a/sdk/eventgrid/eventgrid/src/tracing.ts +++ b/sdk/eventgrid/eventgrid/src/tracing.ts @@ -3,7 +3,7 @@ import { getTracer } from "@azure/core-tracing"; import { Span, SpanOptions, SpanKind } from "@opentelemetry/api"; -import { OperationOptions } from "@azure/core-http"; +import { OperationOptions } from "@azure/core-client"; type OperationTracingOptions = OperationOptions["tracingOptions"]; diff --git a/sdk/eventgrid/eventgrid/test/cloudEventDistrubtedTracingEnricherPolicy.spec.ts b/sdk/eventgrid/eventgrid/test/cloudEventDistributedTracingEnricherPolicy.spec.ts similarity index 64% rename from sdk/eventgrid/eventgrid/test/cloudEventDistrubtedTracingEnricherPolicy.spec.ts rename to sdk/eventgrid/eventgrid/test/cloudEventDistributedTracingEnricherPolicy.spec.ts index bd67611ff825..647b38146bf2 100644 --- a/sdk/eventgrid/eventgrid/test/cloudEventDistrubtedTracingEnricherPolicy.spec.ts +++ b/sdk/eventgrid/eventgrid/test/cloudEventDistributedTracingEnricherPolicy.spec.ts @@ -2,21 +2,19 @@ // Licensed under the MIT license. import { assert } from "chai"; -import { CloudEventDistributedTracingEnricherPolicy } from "../src/cloudEventDistrubtedTracingEnricherPolicy"; +import { cloudEventDistributedTracingEnricherPolicy } from "../src/cloudEventDistrubtedTracingEnricherPolicy"; import { - RequestPolicy, - WebResource, - WebResourceLike, - HttpOperationResponse -} from "@azure/core-http"; + PipelineRequest, + PipelineResponse, + createPipelineRequest, + SendRequest +} from "@azure/core-https"; const CloudEventBatchContentType = "application/cloudevents-batch+json; charset=utf-8"; describe("CloudEventDistributedTracingEnricherPolicy", function() { - const emptyRequestPolicy: RequestPolicy = { - sendRequest(request: WebResourceLike): Promise { - return Promise.resolve({ request: request, status: 200, headers: request.headers }); - } + const emptyResponse: SendRequest = (request: PipelineRequest): Promise => { + return Promise.resolve({ request: request, status: 200, headers: request.headers }); }; const TraceParentHeaderValue = "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01"; @@ -24,16 +22,16 @@ describe("CloudEventDistributedTracingEnricherPolicy", function() { "rojo=00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01,congo=lZWRzIHRoNhcm5hbCBwbGVhc3VyZS4"; it("copies traceparent and tracestate as expected", async () => { - const policy = new CloudEventDistributedTracingEnricherPolicy(emptyRequestPolicy); + const policy = cloudEventDistributedTracingEnricherPolicy(); - const request = new WebResource(); + const request = createPipelineRequest({ url: "https://example.com" }); request.headers.set("content-type", CloudEventBatchContentType); request.headers.set("traceparent", TraceParentHeaderValue); request.headers.set("tracestate", TraceStateHeaderValue); request.body = JSON.stringify([{}, {}]); - const resp = await policy.sendRequest(request); - const parsedBody = JSON.parse(resp.request.body); + const resp = await policy.sendRequest(request, emptyResponse); + const parsedBody = JSON.parse(resp.request.body as string); assert.equal(parsedBody[0].traceparent, TraceParentHeaderValue); assert.equal(parsedBody[0].tracestate, TraceStateHeaderValue); @@ -42,14 +40,14 @@ describe("CloudEventDistributedTracingEnricherPolicy", function() { }); it("does nothing when no distributed tracing headers exists", async () => { - const policy = new CloudEventDistributedTracingEnricherPolicy(emptyRequestPolicy); + const policy = cloudEventDistributedTracingEnricherPolicy(); - const request = new WebResource(); + const request = createPipelineRequest({ url: "https://example.com" }); request.headers.set("content-type", CloudEventBatchContentType); request.body = JSON.stringify([{}, {}]); - const resp = await policy.sendRequest(request); - const parsedBody = JSON.parse(resp.request.body); + const resp = await policy.sendRequest(request, emptyResponse); + const parsedBody = JSON.parse(resp.request.body as string); assert.isUndefined(parsedBody[0].traceparent); assert.isUndefined(parsedBody[0].tracestate); @@ -58,13 +56,13 @@ describe("CloudEventDistributedTracingEnricherPolicy", function() { }); it("does not overwrite an existing traceparent or tracestate", async () => { - const policy = new CloudEventDistributedTracingEnricherPolicy(emptyRequestPolicy); + const policy = cloudEventDistributedTracingEnricherPolicy(); const traceparent = "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-01"; const tracestate = "rojo=00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-01,congo=lZWRzIHRoNhcm5hbCBwbGVhc3VyZS4"; - const request = new WebResource(); + const request = createPipelineRequest({ url: "https://example.com" }); request.headers.set("content-type", CloudEventBatchContentType); request.headers.set("traceparent", TraceParentHeaderValue); request.headers.set("tracestate", TraceStateHeaderValue); @@ -76,8 +74,8 @@ describe("CloudEventDistributedTracingEnricherPolicy", function() { {} ]); - const resp = await policy.sendRequest(request); - const parsedBody = JSON.parse(resp.request.body); + const resp = await policy.sendRequest(request, emptyResponse); + const parsedBody = JSON.parse(resp.request.body as string); // The first event already had some tracing information, and it shouldn't be overwritten assert.equal(parsedBody[0].traceparent, traceparent); @@ -90,32 +88,34 @@ describe("CloudEventDistributedTracingEnricherPolicy", function() { }); it("only enriches requests with the cloud event content type", async () => { - const policy = new CloudEventDistributedTracingEnricherPolicy(emptyRequestPolicy); + const policy = cloudEventDistributedTracingEnricherPolicy(); - const request = new WebResource(); + const request = createPipelineRequest({ url: "https://example.com" }); request.headers.set("content-type", "application/json"); request.headers.set("traceparent", TraceParentHeaderValue); request.headers.set("tracestate", TraceStateHeaderValue); request.body = JSON.stringify([{}, {}]); - const resp = await policy.sendRequest(request); + const resp = await policy.sendRequest(request, emptyResponse); - assert.isUndefined(resp.request.body[0].traceparent); - assert.isUndefined(resp.request.body[0].tracestate); - assert.isUndefined(resp.request.body[1].traceparent); - assert.isUndefined(resp.request.body[1].tracestate); + const parsedBody = JSON.parse(resp.request.body as string); + + assert.isUndefined(parsedBody[0].traceparent); + assert.isUndefined(parsedBody[0].tracestate); + assert.isUndefined(parsedBody[1].traceparent); + assert.isUndefined(parsedBody[1].tracestate); }); it("does not fail when there are no events", async () => { - const policy = new CloudEventDistributedTracingEnricherPolicy(emptyRequestPolicy); + const policy = cloudEventDistributedTracingEnricherPolicy(); - const request = new WebResource(); + const request = createPipelineRequest({ url: "https://example.com" }); request.headers.set("content-type", CloudEventBatchContentType); request.headers.set("traceparent", TraceParentHeaderValue); request.headers.set("tracestate", TraceStateHeaderValue); request.body = JSON.stringify([]); - const resp = await policy.sendRequest(request); + const resp = await policy.sendRequest(request, emptyResponse); assert.equal(resp.request.body, JSON.stringify([])); }); diff --git a/sdk/eventgrid/eventgrid/test/eventGridClient.spec.ts b/sdk/eventgrid/eventgrid/test/eventGridClient.spec.ts index 76341fd6d157..fb7e2e7dcd2a 100644 --- a/sdk/eventgrid/eventgrid/test/eventGridClient.spec.ts +++ b/sdk/eventgrid/eventgrid/test/eventGridClient.spec.ts @@ -16,13 +16,19 @@ import { convertEventGridEventToModelType, convertCloudEventToModelType } from "../src/eventGridClient"; +import { FullOperationResponse } from "@azure/core-client"; describe("EventGridPublisherClient", function() { let recorder: Recorder; let client: EventGridPublisherClient; + let res: FullOperationResponse | undefined; this.timeout(10000); + beforeEach(function() { + res = undefined; + }); + describe("#sendEvents", function() { beforeEach(function() { ({ client, recorder } = createRecordedClient( @@ -37,47 +43,53 @@ describe("EventGridPublisherClient", function() { }); it("sends a single event", async () => { - const res = await client.sendEvents([ - { - eventTime: recorder.newDate("singleEventDate"), - id: recorder.getUniqueName("singleEventId"), - eventType: "Azure.Sdk.TestEvent1", - subject: "Single 1", - dataVersion: "1.0", - data: { - hello: "world" + await client.sendEvents( + [ + { + eventTime: recorder.newDate("singleEventDate"), + id: recorder.getUniqueName("singleEventId"), + eventType: "Azure.Sdk.TestEvent1", + subject: "Single 1", + dataVersion: "1.0", + data: { + hello: "world" + } } - } - ]); + ], + { onResponse: (response) => (res = response) } + ); - assert.equal(res._response.status, 200); + assert.equal(res?.status, 200); }); it("sends multiple events", async () => { - const res = await client.sendEvents([ - { - eventTime: recorder.newDate("multiEventDate1"), - id: recorder.getUniqueName("multiEventId1"), - eventType: "Azure.Sdk.TestEvent1", - subject: "Multiple 1", - dataVersion: "1.0", - data: { - hello: "world" - } - }, - { - eventTime: recorder.newDate("multiEventDate2"), - id: recorder.getUniqueName("multiEventId2"), - eventType: "Azure.Sdk.TestEvent1", - subject: "Multiple 2", - dataVersion: "1.0", - data: { - hello: "world" + await client.sendEvents( + [ + { + eventTime: recorder.newDate("multiEventDate1"), + id: recorder.getUniqueName("multiEventId1"), + eventType: "Azure.Sdk.TestEvent1", + subject: "Multiple 1", + dataVersion: "1.0", + data: { + hello: "world" + } + }, + { + eventTime: recorder.newDate("multiEventDate2"), + id: recorder.getUniqueName("multiEventId2"), + eventType: "Azure.Sdk.TestEvent1", + subject: "Multiple 2", + dataVersion: "1.0", + data: { + hello: "world" + } } - } - ]); + ], + { onResponse: (response) => (res = response) } + ); - assert.equal(res._response.status, 200); + assert.equal(res?.status, 200); }); }); @@ -95,46 +107,52 @@ describe("EventGridPublisherClient", function() { }); it("sends a single event", async () => { - const res = await client.sendCloudEvents([ - { - type: "Azure.Sdk.TestEvent1", - id: recorder.getUniqueName("cloudSingleEventId"), - time: recorder.newDate("cloudSingleEventDate"), - source: "/earth/unitedstates/washington/kirkland/finnhill", - data: { - hello: "world" + await client.sendCloudEvents( + [ + { + type: "Azure.Sdk.TestEvent1", + id: recorder.getUniqueName("cloudSingleEventId"), + time: recorder.newDate("cloudSingleEventDate"), + source: "/earth/unitedstates/washington/kirkland/finnhill", + data: { + hello: "world" + } } - } - ]); + ], + { onResponse: (response) => (res = response) } + ); - assert.equal(res._response.status, 200); + assert.equal(res?.status, 200); }); it("sends multiple events", async () => { - const res = await client.sendCloudEvents([ - { - type: "Azure.Sdk.TestEvent1", - id: recorder.getUniqueName("cloudMultiEventId1"), - time: recorder.newDate("cloudMultiEventDate1"), - source: "/earth/unitedstates/washington/kirkland/finnhill", - subject: "Multiple 1", - data: { - hello: "world" - } - }, - { - type: "Azure.Sdk.TestEvent1", - id: recorder.getUniqueName("cloudMultiEventId2"), - time: recorder.newDate("cloudMultiEventDate2"), - source: "/earth/unitedstates/washington/kirkland/finnhill", - subject: "Multiple 2", - data: { - hello: "world" + await client.sendCloudEvents( + [ + { + type: "Azure.Sdk.TestEvent1", + id: recorder.getUniqueName("cloudMultiEventId1"), + time: recorder.newDate("cloudMultiEventDate1"), + source: "/earth/unitedstates/washington/kirkland/finnhill", + subject: "Multiple 1", + data: { + hello: "world" + } + }, + { + type: "Azure.Sdk.TestEvent1", + id: recorder.getUniqueName("cloudMultiEventId2"), + time: recorder.newDate("cloudMultiEventDate2"), + source: "/earth/unitedstates/washington/kirkland/finnhill", + subject: "Multiple 2", + data: { + hello: "world" + } } - } - ]); + ], + { onResponse: (response) => (res = response) } + ); - assert.equal(res._response.status, 200); + assert.equal(res?.status, 200); }); it("enriches events with distributed tracing information", async () => { @@ -142,7 +160,7 @@ describe("EventGridPublisherClient", function() { setTracer(tracer); const rootSpan = tracer.startSpan("root"); - const res = await client.sendCloudEvents( + await client.sendCloudEvents( [ { type: "Azure.Sdk.TestEvent1", @@ -160,13 +178,14 @@ describe("EventGridPublisherClient", function() { spanOptions: { parent: rootSpan.context() } - } + }, + onResponse: (response) => (res = response) } ); rootSpan.end(); - const parsedBody = JSON.parse(res._response.request.body); + const parsedBody = JSON.parse(res?.request.body as string); assert.isArray(parsedBody); assert.equal(parsedBody[0].traceparent, "00-1-3-00"); @@ -194,41 +213,47 @@ describe("EventGridPublisherClient", function() { }); it("sends a single event", async () => { - const res = await client.sendCustomSchemaEvents([ - { - ver: "1.0", - typ: "Azure.Sdk.TestEvent1", - sub: "Single", - payload: { - hello: "world" + await client.sendCustomSchemaEvents( + [ + { + ver: "1.0", + typ: "Azure.Sdk.TestEvent1", + sub: "Single", + payload: { + hello: "world" + } } - } - ]); + ], + { onResponse: (response) => (res = response) } + ); - assert.equal(res._response.status, 200); + assert.equal(res?.status, 200); }); it("sends multiple events", async () => { - const res = await client.sendCustomSchemaEvents([ - { - ver: "1.0", - typ: "Azure.Sdk.TestEvent1", - sub: "Multiple 1", - payload: { - hello: "world" - } - }, - { - ver: "1.0", - typ: "Azure.Sdk.TestEvent1", - sub: "Multiple 2", - payload: { - hello: "world" + await client.sendCustomSchemaEvents( + [ + { + ver: "1.0", + typ: "Azure.Sdk.TestEvent1", + sub: "Multiple 1", + payload: { + hello: "world" + } + }, + { + ver: "1.0", + typ: "Azure.Sdk.TestEvent1", + sub: "Multiple 2", + payload: { + hello: "world" + } } - } - ]); + ], + { onResponse: (response) => (res = response) } + ); - assert.equal(res._response.status, 200); + assert.equal(res?.status, 200); }); }); }); diff --git a/sdk/eventgrid/eventgrid/test/utils/recordedClient.ts b/sdk/eventgrid/eventgrid/test/utils/recordedClient.ts index 648f93134e7a..8480b5d156e4 100644 --- a/sdk/eventgrid/eventgrid/test/utils/recordedClient.ts +++ b/sdk/eventgrid/eventgrid/test/utils/recordedClient.ts @@ -5,7 +5,7 @@ import { Context } from "mocha"; import * as dotenv from "dotenv"; import { env, Recorder, record, RecorderEnvironmentSetup } from "@azure/test-utils-recorder"; -import { isNode } from "@azure/core-http"; +import { isNode } from "./testUtils"; import { EventGridPublisherClient } from "../../src/index"; import { KeyCredential } from "@azure/core-auth"; diff --git a/sdk/eventgrid/eventgrid/test/utils/testUtils.ts b/sdk/eventgrid/eventgrid/test/utils/testUtils.ts new file mode 100644 index 000000000000..1a6839a0cc42 --- /dev/null +++ b/sdk/eventgrid/eventgrid/test/utils/testUtils.ts @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. + +/** + * A constant that indicates whether the environment is node.js or browser based. + */ +export const isNode = + typeof process !== "undefined" && + !!process.version && + !!process.versions && + !!process.versions.node;