Skip to content

Commit

Permalink
[Hub Generated] Public private branch 'add-ingressStartAt' (#13932)
Browse files Browse the repository at this point in the history
* add ingressStartAt

* prettier

* add a new example

* Delete .npmrc

remove .npmrc

* fix prettier

fix prettier

* put readonly back for kind

* Adding descriptin to ingressStartAt

* fix failure for python track2

* Removing readonly from kind

Co-authored-by: Go Blue <zth@umich.edu>
Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com>
  • Loading branch information
3 people authored Jun 15, 2021
1 parent 08faf32 commit 7355875
Show file tree
Hide file tree
Showing 6 changed files with 135 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
"eventHubName": "ehn",
"keyName": "managementKey",
"sharedAccessKey": "someSecretvalue",
"timestampPropertyName": "someTimestampProperty"
"timestampPropertyName": "someTimestampProperty",
"ingressStartAt": {
"type": "EarliestAvailable"
}
}
},
"api-version": "2020-05-15"
Expand All @@ -35,7 +38,10 @@
"eventHubName": "ehn",
"keyName": "managementKey",
"provisioningState": "Succeeded",
"creationTime": "2017-04-18T19:20:33.2288820Z"
"creationTime": "2017-04-18T19:20:33.2288820Z",
"ingressStartAt": {
"type": "EarliestAvailable"
}
}
}
},
Expand All @@ -54,7 +60,10 @@
"eventHubName": "ehn",
"keyName": "managementKey",
"provisioningState": "Succeeded",
"creationTime": "2017-04-18T19:20:33.2288820Z"
"creationTime": "2017-04-18T19:20:33.2288820Z",
"ingressStartAt": {
"type": "EarliestAvailable"
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"environmentName": "env1",
"eventSourceName": "es1",
"parameters": {
"location": "West US",
"kind": "Microsoft.EventHub",
"properties": {
"eventSourceResourceId": "somePathInArm",
"serviceBusNamespace": "sbn",
"consumerGroupName": "cgn",
"eventHubName": "ehn",
"keyName": "managementKey",
"sharedAccessKey": "someSecretvalue",
"timestampPropertyName": "someTimestampProperty",
"ingressStartAt": {
"type": "CustomEnqueuedTime",
"time": "2017-04-01T19:20:33.2288820Z"
}
}
},
"api-version": "2020-05-15"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.TimeSeriesInsights/Environments/env1/eventSources/es1",
"location": "West US",
"name": "es1",
"type": "Microsoft.TimeSeriesInsights/Environments/EventSources",
"tags": {},
"kind": "Microsoft.EventHub",
"properties": {
"eventSourceResourceId": "somePathInArm",
"serviceBusNamespace": "sbn",
"consumerGroupName": "cgn",
"eventHubName": "ehn",
"keyName": "managementKey",
"provisioningState": "Succeeded",
"creationTime": "2017-04-18T19:20:33.2288820Z",
"ingressStartAt": {
"type": "CustomEnqueuedTime",
"time": "2017-04-01T19:20:33.2288820Z"
}
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.TimeSeriesInsights/Environments/env1/eventSources/es1",
"location": "West US",
"name": "es1",
"type": "Microsoft.TimeSeriesInsights/Environments/EventSources",
"tags": {},
"kind": "Microsoft.EventHub",
"properties": {
"eventSourceResourceId": "somePathInArm",
"serviceBusNamespace": "sbn",
"consumerGroupName": "cgn",
"eventHubName": "ehn",
"keyName": "managementKey",
"provisioningState": "Succeeded",
"creationTime": "2017-04-18T19:20:33.2288820Z",
"ingressStartAt": {
"type": "CustomEnqueuedTime",
"time": "2017-04-01T19:20:33.2288820Z"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
"eventHubName": "ehn",
"keyName": "managementKey",
"provisioningState": "Succeeded",
"creationTime": "2017-04-18T19:20:33.2288820Z"
"creationTime": "2017-04-18T19:20:33.2288820Z",
"ingressStartAt": {
"type": "EarliestAvailable"
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
"eventHubName": "ehn",
"keyName": "managementKey",
"provisioningState": "Succeeded",
"creationTime": "2017-04-18T19:20:33.2288820Z"
"creationTime": "2017-04-18T19:20:33.2288820Z",
"ingressStartAt": {
"type": "EarliestAvailable"
}
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@
"keyName": "managementKey",
"provisioningState": "Succeeded",
"creationTime": "2017-04-18T19:20:33.2288820Z",
"timestampPropertyName": "someOtherTimestampProperty"
"timestampPropertyName": "someOtherTimestampProperty",
"ingressStartAt": {
"type": "EarliestAvailable"
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,9 @@
"x-ms-examples": {
"CreateEventHubEventSource": {
"$ref": "./examples/EventSourcesCreateEventHub.json"
},
"EventSourcesCreateEventHubWithCustomEnquedTime": {
"$ref": "./examples/EventSourcesCreateEventHubWithCustomEnquedTime.json"
}
},
"description": "Create or update an event source under the specified environment.",
Expand Down Expand Up @@ -1410,7 +1413,6 @@
"properties": {
"kind": {
"type": "string",
"readOnly": true,
"description": "The kind of the environment.",
"enum": [
"Gen1",
Expand All @@ -1429,6 +1431,9 @@
"description": "Key-value pairs of additional properties for the environment."
}
},
"required": [
"kind"
],
"description": "Parameters supplied to the Update Environment operation."
},
"Gen1EnvironmentUpdateParameters": {
Expand Down Expand Up @@ -1843,6 +1848,29 @@
}
}
},
"IngressStartAtProperties": {
"type": "object",
"description": "An object that contains the details about the starting point in time to ingest events.",
"properties": {
"type": {
"type": "string",
"description": "The type of the ingressStartAt, It can be \"EarliestAvailable\", \"EventSourceCreationTime\", \"CustomEnqueuedTime\".",
"enum": [
"EarliestAvailable",
"EventSourceCreationTime",
"CustomEnqueuedTime"
],
"x-ms-enum": {
"name": "IngressStartAtType",
"modelAsString": true
}
},
"time": {
"type": "string",
"description": "ISO8601 UTC datetime with seconds precision (milliseconds are optional), specifying the date and time that will be the starting point for Events to be consumed."
}
}
},
"EventSourceCreateOrUpdateParameters": {
"discriminator": "kind",
"properties": {
Expand Down Expand Up @@ -1915,7 +1943,6 @@
"properties": {
"kind": {
"type": "string",
"readOnly": true,
"description": "The kind of the event source.",
"enum": [
"Microsoft.EventHub",
Expand All @@ -1934,6 +1961,9 @@
"description": "Key-value pairs of additional properties for the event source."
}
},
"required": [
"kind"
],
"description": "Parameters supplied to the Update Event Source operation."
},
"EventHubEventSourceUpdateParameters": {
Expand Down Expand Up @@ -2046,6 +2076,11 @@
"timestampPropertyName": {
"type": "string",
"description": "The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used."
},
"ingressStartAt": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/IngressStartAtProperties",
"description": "An object that contains the details about the starting point in time to ingest events."
}
},
"allOf": [
Expand Down

0 comments on commit 7355875

Please sign in to comment.