diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/tests/Azure.Messaging.EventGrid.Namespaces.Tests.csproj b/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/tests/Azure.Messaging.EventGrid.Namespaces.Tests.csproj
index 11abf28a3aa84..fbdca36f737dc 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/tests/Azure.Messaging.EventGrid.Namespaces.Tests.csproj
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/tests/Azure.Messaging.EventGrid.Namespaces.Tests.csproj
@@ -11,7 +11,7 @@
-
+
@@ -19,10 +19,6 @@
-
-
-
-
EventGridTestEnvironment.cs
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/assets.json b/sdk/eventgrid/Azure.Messaging.EventGrid/assets.json
index 8bf42accf0611..d4aaf097d0f1e 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid/assets.json
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid/assets.json
@@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "net",
"TagPrefix": "net/eventgrid/Azure.Messaging.EventGrid",
- "Tag": "net/eventgrid/Azure.Messaging.EventGrid_2bad09d27c"
+ "Tag": "net/eventgrid/Azure.Messaging.EventGrid_150c5bc81f"
}
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/tests/Infrastructure/EventGridTestEnvironment.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/tests/Infrastructure/EventGridTestEnvironment.cs
index 48e023abf6fa0..d4b939b47794a 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid/tests/Infrastructure/EventGridTestEnvironment.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid/tests/Infrastructure/EventGridTestEnvironment.cs
@@ -8,24 +8,24 @@ namespace Azure.Messaging.EventGrid.Tests
{
public class EventGridTestEnvironment : TestEnvironment
{
- public string TopicHost => GetRecordedVariable("EVENT_GRID_TOPIC_ENDPOINT");
- public string TopicKey => GetRecordedVariable("EVENT_GRID_TOPIC_KEY", options => options.IsSecret(SanitizedValue.Base64));
+ public string TopicHost => GetRecordedVariable("EVENTGRID_TOPIC_ENDPOINT");
+ public string TopicKey => GetRecordedVariable("EVENTGRID_TOPIC_KEY", options => options.IsSecret(SanitizedValue.Base64));
- public string DomainHost => GetRecordedVariable("EVENT_GRID_DOMAIN_ENDPOINT");
- public string DomainKey => GetRecordedVariable("EVENT_GRID_DOMAIN_KEY", options => options.IsSecret(SanitizedValue.Base64));
+ public string DomainHost => GetRecordedVariable("EVENTGRID_DOMAIN_ENDPOINT");
+ public string DomainKey => GetRecordedVariable("EVENTGRID_DOMAIN_KEY", options => options.IsSecret(SanitizedValue.Base64));
- public string CloudEventDomainHost => GetRecordedVariable("EVENT_GRID_CLOUD_EVENT_DOMAIN_ENDPOINT");
- public string CloudEventDomainKey => GetRecordedVariable("EVENT_GRID_CLOUD_EVENT_DOMAIN_KEY", options => options.IsSecret(SanitizedValue.Base64));
+ public string CloudEventDomainHost => GetRecordedVariable("EVENTGRID_CLOUD_EVENT_DOMAIN_ENDPOINT");
+ public string CloudEventDomainKey => GetRecordedVariable("EVENTGRID_CLOUD_EVENT_DOMAIN_KEY", options => options.IsSecret(SanitizedValue.Base64));
- public string CloudEventTopicHost => GetRecordedVariable("EVENT_GRID_CLOUD_EVENT_TOPIC_ENDPOINT");
- public string CloudEventTopicKey => GetRecordedVariable("EVENT_GRID_CLOUD_EVENT_TOPIC_KEY", options => options.IsSecret(SanitizedValue.Base64));
+ public string CloudEventTopicHost => GetRecordedVariable("EVENTGRID_CLOUD_EVENT_TOPIC_ENDPOINT");
+ public string CloudEventTopicKey => GetRecordedVariable("EVENTGRID_CLOUD_EVENT_TOPIC_KEY", options => options.IsSecret(SanitizedValue.Base64));
- public string CustomEventTopicHost => GetRecordedVariable("EVENT_GRID_CUSTOM_EVENT_TOPIC_ENDPOINT");
- public string CustomEventTopicKey => GetRecordedVariable("EVENT_GRID_CUSTOM_EVENT_TOPIC_KEY", options => options.IsSecret(SanitizedValue.Base64));
+ public string CustomEventTopicHost => GetRecordedVariable("EVENTGRID_CUSTOM_EVENT_TOPIC_ENDPOINT");
+ public string CustomEventTopicKey => GetRecordedVariable("EVENTGRID_CUSTOM_EVENT_TOPIC_KEY", options => options.IsSecret(SanitizedValue.Base64));
- public string PartnerNamespaceHost => GetRecordedVariable("EVENT_GRID_PARTNER_NAMESPACE_ENDPOINT");
- public string PartnerNamespaceKey => GetRecordedVariable("EVENT_GRID_PARTNER_NAMESPACE_KEY", options => options.IsSecret(SanitizedValue.Base64));
- public string PartnerChannelName => GetRecordedVariable("EVENT_GRID_PARTNER_CHANNEL_NAME");
+ public string PartnerNamespaceHost => GetRecordedVariable("EVENTGRID_PARTNER_NAMESPACE_TOPIC_ENDPOINT");
+ public string PartnerNamespaceKey => GetRecordedVariable("EVENTGRID_PARTNER_NAMESPACE_TOPIC_KEY", options => options.IsSecret(SanitizedValue.Base64));
+ public string PartnerChannelName => GetRecordedVariable("EVENTGRID_PARTNER_CHANNEL_NAME");
public string NamespaceKey => GetRecordedVariable("EVENTGRID_KEY", options => options.IsSecret(SanitizedValue.Base64));
public string NamespaceTopicHost => GetRecordedVariable("EVENTGRID_ENDPOINT");
diff --git a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/assets.json b/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/assets.json
new file mode 100644
index 0000000000000..a9835190b66ea
--- /dev/null
+++ b/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/assets.json
@@ -0,0 +1,6 @@
+{
+ "AssetsRepo": "Azure/azure-sdk-assets",
+ "AssetsRepoPrefixPath": "net",
+ "TagPrefix": "net/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents",
+ "Tag": "net/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents_84648fc55d"
+}
diff --git a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEvent.json b/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEvent.json
deleted file mode 100644
index 66ef1c928cb43..0000000000000
--- a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEvent.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "Entries": [
- {
- "RequestUri": "https://jolov-cloud.centralus-1.eventgrid.azure.net/api/events?api-version=2018-01-01",
- "RequestMethod": "POST",
- "RequestHeaders": {
- "aeg-sas-key": "Sanitized",
- "Content-Length": "1841",
- "Content-Type": "application/cloudevents-batch\u002Bjson; charset=utf-8",
- "traceparent": "00-87b5fc8c3a2d5145a7bdd568e71462a5-00b09a50bc139d4c-00",
- "User-Agent": [
- "azsdk-net-Messaging.EventGrid/4.4.0-alpha.20210614.1",
- "(.NET 5.0.7; Microsoft Windows 10.0.19043)"
- ],
- "x-ms-client-request-id": "0321e9b9eacbad983f9e70f28ef5998b",
- "x-ms-return-client-request-id": "true"
- },
- "RequestBody": "[{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u0022299650a5-2d8c-307e-1137-a085391db9b1\u0022,\u0022time\u0022:\u00222021-06-14T15:05:24.3945223-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:0}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u00221d75081d-5719-7a05-2fe6-631351199925\u0022,\u0022time\u0022:\u00222021-06-14T15:05:24.3945223-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:1}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u0022c146fcd0-efdf-5614-509a-c0a80073016c\u0022,\u0022time\u0022:\u00222021-06-14T15:05:24.3945223-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:2}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u0022601f0be2-b8d2-4e0f-4a1c-f9a5c96adff8\u0022,\u0022time\u0022:\u00222021-06-14T15:05:24.3945223-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:3}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u00223db47b9e-f7d6-2dd1-f31f-cd7f965d79bc\u0022,\u0022time\u0022:\u00222021-06-14T15:05:24.3945223-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:4}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u00224531f7e5-38fa-1852-edf8-77c2f56f8de5\u0022,\u0022time\u0022:\u00222021-06-14T15:05:24.3945223-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:5}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u00228409c8ba-c4be-ea95-3af1-6db3ea8fb8ec\u0022,\u0022time\u0022:\u00222021-06-14T15:05:24.3945223-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:6}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u0022d1bf3da2-9a39-65fe-299b-50de800f3884\u0022,\u0022time\u0022:\u00222021-06-14T15:05:24.3945223-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:7}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u0022cdc4e792-f454-21fd-6146-0b08cb9e2d5d\u0022,\u0022time\u0022:\u00222021-06-14T15:05:24.3945223-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:8}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u0022b8208a3f-bbaf-20ac-caa4-5b2274b7692a\u0022,\u0022time\u0022:\u00222021-06-14T15:05:24.3945223-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:9}}]",
- "StatusCode": 200,
- "ResponseHeaders": {
- "api-supported-versions": "2018-01-01",
- "Content-Length": "0",
- "Date": "Mon, 14 Jun 2021 22:05:24 GMT",
- "Server": "Microsoft-HTTPAPI/2.0",
- "Strict-Transport-Security": "max-age=31536000; includeSubDomains",
- "x-ms-request-id": "628db8d5-c9f4-45f8-a604-da397b766449"
- },
- "ResponseBody": []
- }
- ],
- "Variables": {
- "DateTimeOffsetNow": "2021-06-14T15:05:24.3945223-07:00",
- "EVENT_GRID_CLOUD_EVENT_TOPIC_ENDPOINT": "https://jolov-cloud.centralus-1.eventgrid.azure.net/api/events",
- "EVENT_GRID_CLOUD_EVENT_TOPIC_KEY": "Kg==",
- "RandomSeed": "1844326433"
- }
-}
\ No newline at end of file
diff --git a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEventAsync.json b/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEventAsync.json
deleted file mode 100644
index a85c882d4fa5e..0000000000000
--- a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEventAsync.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "Entries": [
- {
- "RequestUri": "https://jolov-cloud.centralus-1.eventgrid.azure.net/api/events?api-version=2018-01-01",
- "RequestMethod": "POST",
- "RequestHeaders": {
- "aeg-sas-key": "Sanitized",
- "Content-Length": "1841",
- "Content-Type": "application/cloudevents-batch\u002Bjson; charset=utf-8",
- "traceparent": "00-a2ab57f8708b1f4f8b93dffda23d01e4-06c5cb21da282343-00",
- "User-Agent": [
- "azsdk-net-Messaging.EventGrid/4.4.0-alpha.20210614.1",
- "(.NET 5.0.7; Microsoft Windows 10.0.19043)"
- ],
- "x-ms-client-request-id": "d477ae309ee47ce40be0b26663c0e67b",
- "x-ms-return-client-request-id": "true"
- },
- "RequestBody": "[{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u0022145e6f54-aa2d-c053-a4c3-301770ec52ee\u0022,\u0022time\u0022:\u00222021-06-14T15:05:25.3453718-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:0}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u0022284b2e88-19d2-a979-86eb-0df80b801106\u0022,\u0022time\u0022:\u00222021-06-14T15:05:25.3453718-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:1}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u00229c124e18-a907-8a2c-4107-3e866b82dd59\u0022,\u0022time\u0022:\u00222021-06-14T15:05:25.3453718-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:2}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u0022c8d3e3e5-bb0a-3b27-f5b5-8e419c5bb524\u0022,\u0022time\u0022:\u00222021-06-14T15:05:25.3453718-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:3}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u002221fe29b1-b5da-dfe6-02c0-e6cbdbf23d03\u0022,\u0022time\u0022:\u00222021-06-14T15:05:25.3453718-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:4}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u00222712b40e-48ac-5dfc-26d7-a7521aeaeee6\u0022,\u0022time\u0022:\u00222021-06-14T15:05:25.3453718-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:5}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u002242d51a52-bb84-307e-fdf4-c64ad55c5f02\u0022,\u0022time\u0022:\u00222021-06-14T15:05:25.3453718-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:6}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u0022e8338a77-8d49-6877-2da0-fb020d93c417\u0022,\u0022time\u0022:\u00222021-06-14T15:05:25.3453718-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:7}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u0022c17800d2-fb1d-527f-35e2-2ab782b187c9\u0022,\u0022time\u0022:\u00222021-06-14T15:05:25.3453718-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:8}},{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u00228fdba577-05b7-c49c-a26c-15e3c07b2269\u0022,\u0022time\u0022:\u00222021-06-14T15:05:25.3453718-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:9}}]",
- "StatusCode": 200,
- "ResponseHeaders": {
- "api-supported-versions": "2018-01-01",
- "Content-Length": "0",
- "Date": "Mon, 14 Jun 2021 22:05:24 GMT",
- "Server": "Microsoft-HTTPAPI/2.0",
- "Strict-Transport-Security": "max-age=31536000; includeSubDomains",
- "x-ms-request-id": "8a698f96-b538-486e-b570-b642f853e2b8"
- },
- "ResponseBody": []
- }
- ],
- "Variables": {
- "DateTimeOffsetNow": "2021-06-14T15:05:25.3453718-07:00",
- "EVENT_GRID_CLOUD_EVENT_TOPIC_ENDPOINT": "https://jolov-cloud.centralus-1.eventgrid.azure.net/api/events",
- "EVENT_GRID_CLOUD_EVENT_TOPIC_KEY": "Kg==",
- "RandomSeed": "966298239"
- }
-}
\ No newline at end of file
diff --git a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEventToDomain.json b/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEventToDomain.json
deleted file mode 100644
index fed2bccc8c2bd..0000000000000
--- a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEventToDomain.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "Entries": [
- {
- "RequestUri": "https://joloveventgridcloudevent-domain.westus2-1.eventgrid.azure.net/api/events?api-version=2018-01-01",
- "RequestMethod": "POST",
- "RequestHeaders": {
- "aeg-sas-key": "Sanitized",
- "Content-Length": "173",
- "Content-Type": "application/cloudevents-batch\u002Bjson; charset=utf-8",
- "traceparent": "00-584e2365a4b59e4c8a024715ba4bbacf-c60121d4fb824040-00",
- "User-Agent": "azsdk-net-Messaging.EventGrid/4.8.0-alpha.20211123.1 (.NET Framework 4.8.4420.0; Microsoft Windows 10.0.22000 )",
- "x-ms-client-request-id": "ffc1682f998586eb0d5e1ca13249247b",
- "x-ms-return-client-request-id": "true"
- },
- "RequestBody": "[{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022test\u0022,\u0022id\u0022:\u002292f0cd8f-bf1c-7745-fe6d-a9753328c9ac\u0022,\u0022time\u0022:\u00222021-11-23T20:44:19.2156348-08:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:0}}]",
- "StatusCode": 200,
- "ResponseHeaders": {
- "api-supported-versions": "2018-01-01",
- "Content-Length": "0",
- "Date": "Wed, 24 Nov 2021 04:44:20 GMT",
- "Server": "Microsoft-HTTPAPI/2.0",
- "Strict-Transport-Security": "max-age=31536000; includeSubDomains",
- "x-ms-request-id": "d91b752e-dd47-4a6b-beda-0ecb03930980"
- },
- "ResponseBody": []
- }
- ],
- "Variables": {
- "DateTimeOffsetNow": "2021-11-23T20:44:19.2156348-08:00",
- "EVENT_GRID_CLOUD_EVENT_DOMAIN_ENDPOINT": "https://joloveventgridcloudevent-domain.westus2-1.eventgrid.azure.net/api/events",
- "EVENT_GRID_CLOUD_EVENT_DOMAIN_KEY": "Kg==",
- "RandomSeed": "529761368"
- }
-}
\ No newline at end of file
diff --git a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEventToDomainAsync.json b/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEventToDomainAsync.json
deleted file mode 100644
index 5fee38b4f1498..0000000000000
--- a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishCloudEventToDomainAsync.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "Entries": [
- {
- "RequestUri": "https://joloveventgridcloudevent-domain.westus2-1.eventgrid.azure.net/api/events?api-version=2018-01-01",
- "RequestMethod": "POST",
- "RequestHeaders": {
- "aeg-sas-key": "Sanitized",
- "Content-Length": "173",
- "Content-Type": "application/cloudevents-batch\u002Bjson; charset=utf-8",
- "traceparent": "00-ca512298f4468544b7e03e42a528c1eb-bc5b9e1df4afec4f-00",
- "User-Agent": "azsdk-net-Messaging.EventGrid/4.8.0-alpha.20211123.1 (.NET Framework 4.8.4420.0; Microsoft Windows 10.0.22000 )",
- "x-ms-client-request-id": "6199b93394980e0a9f470624e9db8405",
- "x-ms-return-client-request-id": "true"
- },
- "RequestBody": "[{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022test\u0022,\u0022id\u0022:\u0022a53f8543-b400-ecb0-6db7-0e3b776e2fbc\u0022,\u0022time\u0022:\u00222021-11-23T20:44:21.4636148-08:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:0}}]",
- "StatusCode": 200,
- "ResponseHeaders": {
- "api-supported-versions": "2018-01-01",
- "Content-Length": "0",
- "Date": "Wed, 24 Nov 2021 04:44:21 GMT",
- "Server": "Microsoft-HTTPAPI/2.0",
- "Strict-Transport-Security": "max-age=31536000; includeSubDomains",
- "x-ms-request-id": "92dc1206-e069-4700-ad6c-542e53608c1e"
- },
- "ResponseBody": []
- }
- ],
- "Variables": {
- "DateTimeOffsetNow": "2021-11-23T20:44:21.4636148-08:00",
- "EVENT_GRID_CLOUD_EVENT_DOMAIN_ENDPOINT": "https://joloveventgridcloudevent-domain.westus2-1.eventgrid.azure.net/api/events",
- "EVENT_GRID_CLOUD_EVENT_DOMAIN_KEY": "Kg==",
- "RandomSeed": "164543837"
- }
-}
\ No newline at end of file
diff --git a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishSingleCloudEvent.json b/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishSingleCloudEvent.json
deleted file mode 100644
index 1db786ee2cc2e..0000000000000
--- a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishSingleCloudEvent.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "Entries": [
- {
- "RequestUri": "https://jolov-cloud.centralus-1.eventgrid.azure.net/api/events?api-version=2018-01-01",
- "RequestMethod": "POST",
- "RequestHeaders": {
- "aeg-sas-key": "Sanitized",
- "Content-Length": "185",
- "Content-Type": "application/cloudevents-batch\u002Bjson; charset=utf-8",
- "traceparent": "00-c2a79862ee1dc1418aa3940d6751a37e-f32e0476ae520948-00",
- "User-Agent": [
- "azsdk-net-Messaging.EventGrid/4.4.0-alpha.20210614.1",
- "(.NET 5.0.7; Microsoft Windows 10.0.19043)"
- ],
- "x-ms-client-request-id": "579cc65303851f222d91c295c095055e",
- "x-ms-return-client-request-id": "true"
- },
- "RequestBody": "[{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u00224c14d949-f197-829c-a72e-a882c679dd07\u0022,\u0022time\u0022:\u00222021-06-14T15:10:22.3103593-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:0}}]",
- "StatusCode": 200,
- "ResponseHeaders": {
- "api-supported-versions": "2018-01-01",
- "Content-Length": "0",
- "Date": "Mon, 14 Jun 2021 22:10:22 GMT",
- "Server": "Microsoft-HTTPAPI/2.0",
- "Strict-Transport-Security": "max-age=31536000; includeSubDomains",
- "x-ms-request-id": "627976b8-e4ce-4488-8b98-9e4145e30f69"
- },
- "ResponseBody": []
- }
- ],
- "Variables": {
- "DateTimeOffsetNow": "2021-06-14T15:10:22.3103593-07:00",
- "EVENT_GRID_CLOUD_EVENT_TOPIC_ENDPOINT": "https://jolov-cloud.centralus-1.eventgrid.azure.net/api/events",
- "EVENT_GRID_CLOUD_EVENT_TOPIC_KEY": "Kg==",
- "RandomSeed": "2129304520"
- }
-}
\ No newline at end of file
diff --git a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishSingleCloudEventAsync.json b/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishSingleCloudEventAsync.json
deleted file mode 100644
index e2cecdf407b97..0000000000000
--- a/sdk/eventgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/SessionRecords/CloudNativeLiveTests/CanPublishSingleCloudEventAsync.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "Entries": [
- {
- "RequestUri": "https://jolov-cloud.centralus-1.eventgrid.azure.net/api/events?api-version=2018-01-01",
- "RequestMethod": "POST",
- "RequestHeaders": {
- "aeg-sas-key": "Sanitized",
- "Content-Length": "185",
- "Content-Type": "application/cloudevents-batch\u002Bjson; charset=utf-8",
- "traceparent": "00-41f24db70120dd42b21f12a93e290268-0801b0ff97245e49-00",
- "User-Agent": [
- "azsdk-net-Messaging.EventGrid/4.4.0-alpha.20210614.1",
- "(.NET 5.0.7; Microsoft Windows 10.0.19043)"
- ],
- "x-ms-client-request-id": "9fe66f09b816bfbd09a5c825cbab37ca",
- "x-ms-return-client-request-id": "true"
- },
- "RequestBody": "[{\u0022specversion\u0022:\u00221.0\u0022,\u0022type\u0022:\u0022record\u0022,\u0022source\u0022:\u0022http://localHost\u0022,\u0022id\u0022:\u00227618ec70-015b-3658-cfe2-b076835bc799\u0022,\u0022time\u0022:\u00222021-06-14T15:10:23.2854261-07:00\u0022,\u0022data\u0022:{\u0022Name\u0022:\u0022name\u0022,\u0022Age\u0022:0}}]",
- "StatusCode": 200,
- "ResponseHeaders": {
- "api-supported-versions": "2018-01-01",
- "Content-Length": "0",
- "Date": "Mon, 14 Jun 2021 22:10:23 GMT",
- "Server": "Microsoft-HTTPAPI/2.0",
- "Strict-Transport-Security": "max-age=31536000; includeSubDomains",
- "x-ms-request-id": "dc3da411-3de2-41cc-9887-4168f690bd30"
- },
- "ResponseBody": []
- }
- ],
- "Variables": {
- "DateTimeOffsetNow": "2021-06-14T15:10:23.2854261-07:00",
- "EVENT_GRID_CLOUD_EVENT_TOPIC_ENDPOINT": "https://jolov-cloud.centralus-1.eventgrid.azure.net/api/events",
- "EVENT_GRID_CLOUD_EVENT_TOPIC_KEY": "Kg==",
- "RandomSeed": "1358944705"
- }
-}
\ No newline at end of file
diff --git a/sdk/eventgrid/test-resources.json b/sdk/eventgrid/test-resources.json
index 15a915e873ce7..917a200da2581 100644
--- a/sdk/eventgrid/test-resources.json
+++ b/sdk/eventgrid/test-resources.json
@@ -37,7 +37,8 @@
"partnerNamespaceName": "[concat(parameters('baseName'), 'partner-namespace')]",
"partnerChannelName": "[concat(parameters('baseName'), 'partner-channel')]",
"partnerTopicName": "[concat(parameters('baseName'), 'partner-topic')]",
- "eventGridDataSenderRoleId": "d5a91429-5739-47e2-a06b-3470a27159e7"
+ "eventGridDataSenderRoleId": "d5a91429-5739-47e2-a06b-3470a27159e7",
+ "eventGridDataContributorRoleId": "1d8c3fe3-8864-474b-8749-01e3783e8157"
},
"resources": [
{
@@ -218,8 +219,17 @@
"principalId": "[parameters('testApplicationOid')]",
"scope": "[resourceGroup().id]"
}
+ },
+ {
+ "type": "Microsoft.Authorization/roleAssignments",
+ "apiVersion": "2019-04-01-preview",
+ "name": "[guid(resourceGroup().id, parameters('testApplicationOid'), variables('eventGridDataContributorRoleId'))]",
+ "properties": {
+ "roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('eventGridDataContributorRoleId'))]",
+ "principalId": "[parameters('testApplicationOid')]",
+ "scope": "[resourceGroup().id]"
+ }
}
-
],
"outputs": {
"EVENTGRID_TOPIC_KEY": {
diff --git a/sdk/eventgrid/tests.yml b/sdk/eventgrid/tests.yml
index 896eefd902e12..14fa962b09536 100644
--- a/sdk/eventgrid/tests.yml
+++ b/sdk/eventgrid/tests.yml
@@ -5,3 +5,4 @@ extends:
parameters:
ServiceDirectory: eventgrid
SDKType: client
+ Location: eastus