Fix bug where dictionary was accessed directly

Azure · Feb 15, 2019 · b263506 · b263506
1 parent c71701c
commit b263506
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,11 @@
 SDK Release History
 ===================
 
+5.0.2 (2019-02-15)
+------------------
+
+* Fix bug where apiVersion became required
+
 5.0.1 (2019-02-15)
 ------------------
 

diff --git a/azext/batch/operations/job_operations.py b/azext/batch/operations/job_operations.py
@@ -76,7 +76,7 @@ def jobparameter_from_json(json_data):
         result = 'JobTemplate' if json_data.get('properties') else 'ExtendedJobParameter'
         try:
             if result == 'JobTemplate':
-                if json_data['apiVersion']:
+                if json_data.get('apiVersion'):
                     max_datetime = dt.strptime(KnownTemplateVersion.Dec2018.value, "%Y-%m-%d")
                     specified_datetime = dt.strptime(json_data['apiVersion'], "%Y-%m-%d")
                     if max_datetime < specified_datetime:

diff --git a/azext/batch/operations/pool_operations.py b/azext/batch/operations/pool_operations.py
@@ -56,7 +56,7 @@ def poolparameter_from_json(json_data):
         result = 'PoolTemplate' if json_data.get('properties') else 'ExtendedPoolParameter'
         try:
             if result == 'PoolTemplate':
-                if json_data['apiVersion']:
+                if json_data.get('apiVersion'):
                     max_datetime = dt.strptime(KnownTemplateVersion.Dec2018.value, "%Y-%m-%d")
                     specified_datetime = dt.strptime(json_data['apiVersion'], "%Y-%m-%d")
                     if max_datetime < specified_datetime:

diff --git a/azext/batch/version.py b/azext/batch/version.py
@@ -3,4 +3,4 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-VERSION = "5.0.1"
+VERSION = "5.0.2"
diff --git a/tests/data/batch.job.simple.json b/tests/data/batch.job.simple.json
@@ -16,7 +16,6 @@
     },
     "job": {
         "type": "Microsoft.Batch/batchAccounts/jobs",
-        "apiVersion": "2018-12-01",
         "properties": {
             "id": "[parameters('jobId')]",
             "poolInfo": {

diff --git a/tests/data/batch.pool.simple.json b/tests/data/batch.pool.simple.json
@@ -42,7 +42,6 @@
     }, 
     "pool": {
         "type": "Microsoft.Batch/batchAccounts/pools",
-        "apiVersion": "2018-12-01",
         "properties": {
             "id": "[parameters('poolName')]",
             "virtualMachineConfiguration": {