From 65924b1ae841deb682c42db90657b830b5e38c4c Mon Sep 17 00:00:00 2001 From: "J. Kalyana Sundaram" Date: Tue, 1 May 2018 00:31:44 -0700 Subject: [PATCH 01/10] Added eventgrid preview extension to index.json. --- .../azext_eventgrid/azext_metadata.json | 1 + src/index.json | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/src/eventgrid/azext_eventgrid/azext_metadata.json b/src/eventgrid/azext_eventgrid/azext_metadata.json index a2f37531f6a..0805b25d581 100644 --- a/src/eventgrid/azext_eventgrid/azext_metadata.json +++ b/src/eventgrid/azext_eventgrid/azext_metadata.json @@ -1,3 +1,4 @@ { + "azext.minCliCoreVersion": "2.0.24", "azext.isPreview": true } \ No newline at end of file diff --git a/src/index.json b/src/index.json index 9ac83cd6809..f67bc7b3783 100644 --- a/src/index.json +++ b/src/index.json @@ -698,6 +698,52 @@ "version": "0.1.2" } } + ], + "eventgrid": [ + { + "filename": "eventgrid-0.2.0-py2.py3-none-any.whl", + "sha256Digest": "15A8925FAED0037DB8EFE6EBD531D94EA38715EF8B9CCEE5D648F1BF1360F560", + "downloadUrl": "https://eventgridcliextension.blob.core.windows.net/cli/eventgrid-0.2.0-py2.py3-none-any.whl", + "metadata": { + "azext.isPreview": true, + "classifiers": [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "Programming Language :: Python", + "Programming Language :: Python :: 2", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "License :: OSI Approved :: MIT License" + ], + "extensions": { + "python.details": { + "contacts": [ + { + "email": "askgrid@microsoft.com", + "name": "Azure Event Grid", + "role": "author" + } + ], + "document_names": { + "description": "DESCRIPTION.rst" + }, + "project_urls": { + "Home": "https://github.com/Azure/azure-cli-extensions" + } + } + }, + "generator": "bdist_wheel (0.30.0)", + "license": "MIT", + "metadata_version": "2.0", + "name": "eventgrid", + "summary": "Preview for Azure Event Grid features introduced in 2018-05-01-preview API version.", + "version": "0.2.0" + } + } ] } } \ No newline at end of file From 564d68cc1bd27cf2f4dd5f15a167f423c241d6ef Mon Sep 17 00:00:00 2001 From: "J. Kalyana Sundaram" Date: Tue, 1 May 2018 09:54:12 -0700 Subject: [PATCH 02/10] Made the hash lowercase. --- src/index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.json b/src/index.json index f67bc7b3783..e5c43f25385 100644 --- a/src/index.json +++ b/src/index.json @@ -702,7 +702,7 @@ "eventgrid": [ { "filename": "eventgrid-0.2.0-py2.py3-none-any.whl", - "sha256Digest": "15A8925FAED0037DB8EFE6EBD531D94EA38715EF8B9CCEE5D648F1BF1360F560", + "sha256Digest": "15a8925faed0037db8efe6ebd531d94ea38715ef8b9ccee5d648f1bf1360f560", "downloadUrl": "https://eventgridcliextension.blob.core.windows.net/cli/eventgrid-0.2.0-py2.py3-none-any.whl", "metadata": { "azext.isPreview": true, From 50d7984b4ca45dbc97f5b56d9b772f7cbcb70d03 Mon Sep 17 00:00:00 2001 From: "J. Kalyana Sundaram" Date: Tue, 1 May 2018 10:24:39 -0700 Subject: [PATCH 03/10] Regenerated using Wheel 0.30 --- src/index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.json b/src/index.json index e5c43f25385..98ab8fcdfdd 100644 --- a/src/index.json +++ b/src/index.json @@ -702,7 +702,7 @@ "eventgrid": [ { "filename": "eventgrid-0.2.0-py2.py3-none-any.whl", - "sha256Digest": "15a8925faed0037db8efe6ebd531d94ea38715ef8b9ccee5d648f1bf1360f560", + "sha256Digest": "c26ee3b5bc9e8f109b370ec20b25697d71fc9d4e8700f5f03e452b66c9eaedb2", "downloadUrl": "https://eventgridcliextension.blob.core.windows.net/cli/eventgrid-0.2.0-py2.py3-none-any.whl", "metadata": { "azext.isPreview": true, From 570d2f4dc384b12e2db219a43ae992d42146dbc2 Mon Sep 17 00:00:00 2001 From: "J. Kalyana Sundaram" Date: Tue, 1 May 2018 10:39:34 -0700 Subject: [PATCH 04/10] Updating index metadata to match with what's in the package. --- src/index.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.json b/src/index.json index 98ab8fcdfdd..ac69c7fd3a5 100644 --- a/src/index.json +++ b/src/index.json @@ -723,8 +723,8 @@ "python.details": { "contacts": [ { - "email": "askgrid@microsoft.com", - "name": "Azure Event Grid", + "email": "kalyanaj@microsoft.com", + "name": "J. Kalyana Sundaram", "role": "author" } ], From 2e4329d3f6aa1ec2f7a59b7571d54258766e39c7 Mon Sep 17 00:00:00 2001 From: "J. Kalyana Sundaram" Date: Tue, 1 May 2018 10:54:02 -0700 Subject: [PATCH 05/10] Updated the description to match what's in the package. --- src/index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.json b/src/index.json index ac69c7fd3a5..b21597ff757 100644 --- a/src/index.json +++ b/src/index.json @@ -740,7 +740,7 @@ "license": "MIT", "metadata_version": "2.0", "name": "eventgrid", - "summary": "Preview for Azure Event Grid features introduced in 2018-05-01-preview API version.", + "summary": "Support for Azure EventGrid 2018-05-01-preview features", "version": "0.2.0" } } From a53d8794c990fcf0045254ebb32f499af97d6b7a Mon Sep 17 00:00:00 2001 From: "J. Kalyana Sundaram" Date: Tue, 1 May 2018 11:27:35 -0700 Subject: [PATCH 06/10] Added minCliCoreVersion in index.json to match with the metadata in the package. --- src/index.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.json b/src/index.json index b21597ff757..39f509f46e5 100644 --- a/src/index.json +++ b/src/index.json @@ -705,6 +705,7 @@ "sha256Digest": "c26ee3b5bc9e8f109b370ec20b25697d71fc9d4e8700f5f03e452b66c9eaedb2", "downloadUrl": "https://eventgridcliextension.blob.core.windows.net/cli/eventgrid-0.2.0-py2.py3-none-any.whl", "metadata": { + "azext.minCliCoreVersion": "2.0.24", "azext.isPreview": true, "classifiers": [ "Development Status :: 4 - Beta", From 95d8714d0c155c98d80a74ede24ff4e71acd3937 Mon Sep 17 00:00:00 2001 From: "J. Kalyana Sundaram" Date: Mon, 21 May 2018 18:34:06 -0700 Subject: [PATCH 07/10] Changed the default value for eventdeliveryschema parameter to match the input event schema. --- src/eventgrid/azext_eventgrid/_params.py | 2 +- src/eventgrid/setup.py | 2 +- src/index.json | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/eventgrid/azext_eventgrid/_params.py b/src/eventgrid/azext_eventgrid/_params.py index 4e42694dba5..8b6402b36f1 100644 --- a/src/eventgrid/azext_eventgrid/_params.py +++ b/src/eventgrid/azext_eventgrid/_params.py @@ -53,7 +53,7 @@ def load_arguments(self, _): with self.argument_context('eventgrid event-subscription') as c: c.argument('topic_name', help='Name of the Event Grid topic', options_list=['--topic-name'], completer=get_resource_name_completion_list('Microsoft.EventGrid/topics')) c.argument('event_subscription_name', arg_type=name_type, help='Name of the event subscription') - c.argument('event_delivery_schema', arg_type=get_enum_type(['eventgridschema', 'inputeventschema', 'cloudeventv01schema'], default='eventgridschema'), help='Schema in which events should be delivered for this event subscription. By default, events are delivered in the eventgridschema. To make EventGrid deliver events in the same schema as the published event schema, use customeventschema as the value for this parameter. To make EventGrid deliver events in the Cloud Events V0.1 schema, use cloudeventv01schema as the value for this parameter.') + c.argument('event_delivery_schema', arg_type=get_enum_type(['eventgridschema', 'inputeventschema', 'cloudeventv01schema'], default='inputeventschema'), help='The schema in which events should be delivered for this event subscription. By default, events are delivered in the same schema in which they are published (inputeventschema).') c.argument('max_delivery_attempts', help="Maximum number of delivery attempts. Must be a number between 1 and 30.") c.argument('event_ttl', help="Event time to live (in minutes). Must be a number between 1 and 1440.") c.argument('deadletter_endpoint', help="The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.") diff --git a/src/eventgrid/setup.py b/src/eventgrid/setup.py index 12a7ef59458..a7fb4d75d0a 100644 --- a/src/eventgrid/setup.py +++ b/src/eventgrid/setup.py @@ -8,7 +8,7 @@ from codecs import open from setuptools import setup, find_packages -VERSION = "0.2.0" +VERSION = "0.2.1" CLASSIFIERS = [ 'Development Status :: 4 - Beta', diff --git a/src/index.json b/src/index.json index b512142120f..a212158023c 100644 --- a/src/index.json +++ b/src/index.json @@ -745,9 +745,9 @@ ], "eventgrid": [ { - "filename": "eventgrid-0.2.0-py2.py3-none-any.whl", - "sha256Digest": "c26ee3b5bc9e8f109b370ec20b25697d71fc9d4e8700f5f03e452b66c9eaedb2", - "downloadUrl": "https://eventgridcliextension.blob.core.windows.net/cli/eventgrid-0.2.0-py2.py3-none-any.whl", + "filename": "eventgrid-0.2.1-py2.py3-none-any.whl", + "sha256Digest": "088AA556289F302EDE4C5560647B673FEE34743221FF8D09CC1EB52127BC9F31", + "downloadUrl": "https://eventgridcliextension.blob.core.windows.net/cli/eventgrid-0.2.1-py2.py3-none-any.whl", "metadata": { "azext.minCliCoreVersion": "2.0.24", "azext.isPreview": true, From a4bace3c8861bcae3dd4c1a3d66acaed381b4870 Mon Sep 17 00:00:00 2001 From: "J. Kalyana Sundaram" Date: Thu, 24 May 2018 11:25:44 -0700 Subject: [PATCH 08/10] Updated version in index.json and fixed the default in the function argument list. --- src/eventgrid/azext_eventgrid/custom.py | 2 +- src/index.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/eventgrid/azext_eventgrid/custom.py b/src/eventgrid/azext_eventgrid/custom.py index 4bee6c2bf0e..c4bdc2d6bb3 100644 --- a/src/eventgrid/azext_eventgrid/custom.py +++ b/src/eventgrid/azext_eventgrid/custom.py @@ -119,7 +119,7 @@ def cli_eventgrid_event_subscription_create( is_subject_case_sensitive=False, max_delivery_attempts=30, event_ttl=1440, - event_delivery_schema=EVENTGRID_SCHEMA, + event_delivery_schema=INPUT_EVENT_SCHEMA, deadletter_endpoint=None, labels=None): # Construct RetryPolicy based on max_delivery_attempts and event_ttl diff --git a/src/index.json b/src/index.json index 40a6277da75..1b1f1b1448e 100644 --- a/src/index.json +++ b/src/index.json @@ -749,7 +749,7 @@ "eventgrid": [ { "filename": "eventgrid-0.2.1-py2.py3-none-any.whl", - "sha256Digest": "088AA556289F302EDE4C5560647B673FEE34743221FF8D09CC1EB52127BC9F31", + "sha256Digest": "76950FE6728881481763BB65B8C91692D9136C7A5BB0AA71A00D76AA83298382", "downloadUrl": "https://eventgridcliextension.blob.core.windows.net/cli/eventgrid-0.2.1-py2.py3-none-any.whl", "metadata": { "azext.minCliCoreVersion": "2.0.24", @@ -789,7 +789,7 @@ "metadata_version": "2.0", "name": "eventgrid", "summary": "Support for Azure EventGrid 2018-05-01-preview features", - "version": "0.2.0" + "version": "0.2.1" } } ], From c2ea87dda118cfaa433974d080e4067caa2ed96e Mon Sep 17 00:00:00 2001 From: "J. Kalyana Sundaram" Date: Thu, 24 May 2018 11:40:26 -0700 Subject: [PATCH 09/10] Changing SHA256digest to lower case. --- src/index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.json b/src/index.json index 078efbb45c4..1eb7a2d6998 100644 --- a/src/index.json +++ b/src/index.json @@ -794,7 +794,7 @@ "eventgrid": [ { "filename": "eventgrid-0.2.1-py2.py3-none-any.whl", - "sha256Digest": "76950FE6728881481763BB65B8C91692D9136C7A5BB0AA71A00D76AA83298382", + "sha256Digest": "76950fe6728881481763bb65b8c91692d9136c7a5bb0aa71a00d76aa83298382", "downloadUrl": "https://eventgridcliextension.blob.core.windows.net/cli/eventgrid-0.2.1-py2.py3-none-any.whl", "metadata": { "azext.minCliCoreVersion": "2.0.24", From 074990bab2531d3144453c3f1880e21e00f0288d Mon Sep 17 00:00:00 2001 From: "J. Kalyana Sundaram" Date: Thu, 24 May 2018 12:14:16 -0700 Subject: [PATCH 10/10] Regenerated extension with 0.30.0 of wheel to resolve CI errors. --- src/index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.json b/src/index.json index 1eb7a2d6998..cc0c320060c 100644 --- a/src/index.json +++ b/src/index.json @@ -794,7 +794,7 @@ "eventgrid": [ { "filename": "eventgrid-0.2.1-py2.py3-none-any.whl", - "sha256Digest": "76950fe6728881481763bb65b8c91692d9136c7a5bb0aa71a00d76aa83298382", + "sha256Digest": "e7acf947b1d7ab307a21897a8a9cb859575fe880c84fe04e191a5e00d7e4814a", "downloadUrl": "https://eventgridcliextension.blob.core.windows.net/cli/eventgrid-0.2.1-py2.py3-none-any.whl", "metadata": { "azext.minCliCoreVersion": "2.0.24",