Merge branch 'Azure:main' into feature-neonpostgres

Author: almasak

linter_exclusions.yml

@@ -401,6 +401,12 @@ containerapp github-action add:
     service_principal_tenant_id:
       rule_exclusions:
       - option_length_too_long
+containerapp label-history show:
+  rule_exclusions:
+  -  missing_command_test_coverage
+containerapp label-history list:
+  rule_exclusions:
+  -  missing_command_test_coverage
 costmanagement export create:
   parameters:
     definition_dataset_configuration:

src/amg/HISTORY.rst

@@ -127,3 +127,7 @@ Release History
 ++++++
 * `az grafana dashboard import`: fix issue with JSON file validation
 * `az grafana folder update`: fix issue with overwrite setting
+
+2.5.5
+++++++
+* `az grafana notification-channel test`: fix issue with test output parsing

src/amg/azext_amg/custom.py

@@ -535,7 +535,7 @@ def test_notification_channel(cmd, grafana_name, notification_channel, resource_
                                       api_key_or_token=api_key_or_token)
     response = _send_request(cmd, resource_group_name, grafana_name, "post", "/api/alert-notifications/test",
                              data, api_key_or_token=api_key_or_token)
-    return response
+    return json.loads(response.content)
 
 
 def create_folder(cmd, grafana_name, title, resource_group_name=None, api_key_or_token=None, subscription=None):

src/amg/setup.py

@@ -16,7 +16,7 @@
 
 # TODO: Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
-VERSION = '2.5.4'
+VERSION = '2.5.5'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers

src/apic-extension/HISTORY.rst

@@ -3,6 +3,27 @@
 Release History
 ===============
 
+1.2.0b1
+++++++++++++++++++
+
+**New Features:**
+
+* Added new command ``az apic integration create`` to manage integrations in Azure API Center.
+  * Added ``az apic integration create apim`` to manage Azure API Management integrations as an API source.
+  * Added ``az apic integration create aws`` to manage Amazon API Gateway as an API source.
+* Added new command ``az apic import aws`` to import an API from an Amazon API Gateway instance.
+* Added url option for ``--api-location`` parameter in ``az apic api register`` command.
+
+**Updates:**
+
+* Added examples for using ``@filename`` syntax in several commands' help documentations.
+* Improved error messages for the ``az apic api register`` command.
+
+**Fixes:**
+
+* Corrected the example for ``az apic update`` command.
+* Fixed an expired link in ``az apic api definition import-specification`` command's help documentation.
+
 1.1.0
 ++++++++++++++++++
 

src/apic-extension/azext_apic_extension/_help.py

@@ -31,4 +31,8 @@
         text: |
           az apic api register -g api-center-test -n contosoeuap --api-location "examples/cli-examples/spec-examples/openai.json" --environment-id public
           az apic api register -g api-center-test -n contosoeuap --api-location "examples/cli-examples/spec-examples/openai.yml" --environment-id public
+      - name: Register api by providing spec url.
+        text: |
+          az apic api register -g api-center-test -n contosoeuap --api-location "https://petstore.swagger.io/v2/swagger.json" --environment-id public
+          az apic api register -g api-center-test -n contosoeuap --api-location "https://petstore.swagger.io/v2/swagger.yaml" --environment-id public
 """

src/apic-extension/azext_apic_extension/aaz/latest/apic/__init__.py

@@ -11,6 +11,7 @@
 from .__cmd_group import *
 from ._create import *
 from ._delete import *
+from ._import import *
 from ._import_from_apim import *
 from ._list import *
 from ._show import *