[Container] Hotfix: Fix #18276: az container create fails with `Att…

…ributeError: 'ResourcesOperations' object has no attribute 'create_or_update'` (#18326) * Fix the method signature for resource track2 client * upgrade version * Update src/azure-cli/HISTORY.rst
Azure · Jun 2, 2021 · 5975b23 · 5975b23
1 parent df55f99
commit 5975b23
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 11 deletions.
diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.24.2
+++++++
+* No changes
+
 2.24.1
 ++++++
 * No changes

diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py
@@ -4,7 +4,7 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
 
-__version__ = "2.24.1"
+__version__ = "2.24.2"
 
 import os
 import sys

diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = "2.24.1"
+VERSION = "2.24.2"
 
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
@@ -3,6 +3,13 @@
 Release History
 ===============
 
+2.24.2
+++++++
+
+**Container**
+
+* Hotfix: Fix #18276: `az container create` fails with `AttributeError: 'ResourcesOperations' object has no attribute 'create_or_update'`
+
 2.24.1
 ++++++
 

diff --git a/src/azure-cli/azure/cli/__main__.py b/src/azure-cli/azure/cli/__main__.py
@@ -17,7 +17,7 @@
 from knack.log import get_logger
 
 __author__ = "Microsoft Corporation <[email protected]>"
-__version__ = "2.24.1"
+__version__ = "2.24.2"
 
 
 # A workaround for https://bugs.python.org/issue32502 (https://github.com/Azure/azure-cli/issues/5184)

diff --git a/src/azure-cli/azure/cli/command_modules/container/custom.py b/src/azure-cli/azure/cli/command_modules/container/custom.py
@@ -404,7 +404,7 @@ def _create_update_from_file(cli_ctx, resource_group_name, name, location, file,
     api_version = cg_defintion.get('apiVersion', None) or container_group_client.api_version
 
     return sdk_no_wait(no_wait,
-                       resource_client.resources.create_or_update,
+                       resource_client.resources.begin_create_or_update,
                        resource_group_name,
                        "Microsoft.ContainerInstance",
                        '',

diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt
@@ -5,9 +5,9 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli-core==2.24.1
+azure-cli-core==2.24.2
 azure-cli-telemetry==1.0.6
-azure-cli==2.24.1
+azure-cli==2.24.2
 azure-common==1.1.22
 azure-core==1.13.0
 azure-cosmos==3.2.0

diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt
@@ -5,9 +5,9 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli-core==2.24.1
+azure-cli-core==2.24.2
 azure-cli-telemetry==1.0.6
-azure-cli==2.24.1
+azure-cli==2.24.2
 azure-common==1.1.22
 azure-core==1.13.0
 azure-cosmos==3.2.0

diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt
@@ -5,9 +5,9 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli-core==2.24.1
+azure-cli-core==2.24.2
 azure-cli-telemetry==1.0.6
-azure-cli==2.24.1
+azure-cli==2.24.2
 azure-common==1.1.22
 azure-core==1.13.0
 azure-cosmos==3.2.0

diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
@@ -17,7 +17,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.24.1"
+VERSION = "2.24.2"
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
 try: