Required params must be positional (Azure#16194)

* Rquired positional param

* data req

* add test

* oops

Author: Rakshith Bhyravabhotla

sdk/eventgrid/azure-eventgrid/CHANGELOG.md

@@ -4,6 +4,9 @@
 
   **Breaking Changes**
   - `EventGridSharedAccessSignatureCredential` is deprecated in favor of `AzureSasCredential`.
+  
+  **Bug Fixes**
+  - `EventGridEvent` has two additional required positional parameters namely, `data` and `data_version`.
 
 ## 2.0.0b4 (2020-11-11)
 

sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py

@@ -136,14 +136,17 @@ class EventGridEvent(InternalEventGridEvent, EventMixin):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param topic: The resource path of the event source. If not provided, Event Grid will stamp onto the event.
-    :type topic: str
     :param subject: Required. A resource path relative to the topic path.
     :type subject: str
-    :param data: Event data specific to the event type.
-    :type data: object
     :param event_type: Required. The type of the event that occurred.
     :type event_type: str
+    :param data: Required. Event data specific to the event type.
+    :type data: object
+    :param data_version: Required. The schema version of the data object.
+        If not provided, will be stamped with an empty value.
+    :type data_version: str
+    :param topic: The resource path of the event source. If not provided, Event Grid will stamp onto the event.
+    :type topic: str
     :ivar metadata_version: The schema version of the event metadata. If provided, must match Event Grid Schema exactly.
         If not provided, EventGrid will stamp onto event.
     :vartype metadata_version: str
@@ -177,13 +180,14 @@ class EventGridEvent(InternalEventGridEvent, EventMixin):
         'data_version': {'key': 'dataVersion', 'type': 'str'},
     }
 
-    def __init__(self, subject, event_type, **kwargs):
-        # type: (str, str, Any) -> None
+    def __init__(self, subject, event_type, data, data_version, **kwargs):
+        # type: (str, str, object, str, Any) -> None
         kwargs.setdefault('id', uuid.uuid4())
         kwargs.setdefault('subject', subject)
         kwargs.setdefault("event_type", event_type)
         kwargs.setdefault('event_time', dt.datetime.now(UTC()).isoformat())
-        kwargs.setdefault('data', None)
+        kwargs.setdefault('data', data)
+        kwargs.setdefault('data_version', data_version)
 
         super(EventGridEvent, self).__init__(**kwargs)
 

sdk/eventgrid/azure-eventgrid/tests/test_serialization.py

@@ -14,7 +14,7 @@
 
 from devtools_testutils import AzureMgmtTestCase
 from msrest.serialization import UTC
-from azure.eventgrid import CloudEvent
+from azure.eventgrid import CloudEvent, EventGridEvent
 from azure.eventgrid import models
 from azure.eventgrid._generated import models as internal_models
 from _mocks import (
@@ -109,3 +109,11 @@ def test_models_exist_in_namespace(self):
 
         diff = {m for m in list(set(generated) - set(exposed)) if not m.startswith('_')}
         assert diff == {'CloudEvent', 'EventGridEvent'}
+
+    def test_event_grid_event_raises_on_no_data(self):
+        with pytest.raises(TypeError):
+            eg_event = EventGridEvent(
+                    subject="sample",
+                    event_type="Sample.EventGrid.Event",
+                    data_version="2.0"
+                    )