Fix array bug (#104)

* Fix array bug

* Change to json recordings because yaml serializer broken

Author: bgklein

HISTORY.rst

@@ -3,6 +3,11 @@
 SDK Release History
 ===================
 
+5.0.5 (2019-02-25)
+------------------
+
+* Fix bug in blobSource conversion to httpUrl
+
 5.0.4 (2019-02-25)
 ------------------
 

azext/batch/_template_utils.py

@@ -1203,6 +1203,11 @@ def validate_json_object(json_obj, obj):
 
 
 def convert_blob_source_to_http_url(obj):
+    if isinstance(obj, list):
+        out = []
+        for i in obj:
+            out.append(convert_blob_source_to_http_url(i))
+        return out
     if isinstance(obj, dict):
         for key in obj:
             if key in ['resourceFiles', 'commonResourceFiles']:

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.4"
+VERSION = "5.0.5"

batch-cli-extensions/azext_batch/commands.py

@@ -13,9 +13,9 @@
 
 
 logger = get_logger(__name__)
-SUPPORTED_BATCH_VERSION = "5.2"
-SUPPORTED_BMGMT_VERSION = "5.1"
-SUPPORTED_BATCH_EXT_VERSION = "4.1"
+SUPPORTED_BATCH_VERSION = "6.0"
+SUPPORTED_BMGMT_VERSION = "6.0"
+SUPPORTED_BATCH_EXT_VERSION = "5.0"
 
 
 def confirm_version(current, supported, package):

tests/data/batch.job.resourcefile-legacy.json

@@ -0,0 +1,45 @@
+{
+  "job": {
+    "type": "Microsoft.Batch/batchAccounts/jobs",
+    "apiVersion": "2018-12-01",
+    "properties": {
+      "id": "job123",
+      "onAllTasksComplete": "terminateJob",
+      "poolInfo": {
+        "autoPoolSpecification": {
+          "autoPoolIdPrefix": "pool123",
+          "poolLifetimeOption": "job",
+          "keepAlive": false,
+          "pool": {
+            "vmSize": "STANDARD_D1_V2",
+            "virtualMachineConfiguration": {
+              "imageReference": {
+                "publisher": "Canonical",
+                "offer": "UbuntuServer",
+                "sku": "16.04.0-LTS",
+                "version": "latest"
+              },
+              "nodeAgentSKUId": "batch.node.ubuntu 16.04"
+            },
+            "targetDedicatedNodes": "1"
+          }
+        }
+      },
+      "taskFactory": {
+        "type": "taskCollection",
+        "tasks": [
+          {
+            "id": "1",
+            "commandLine": "/bin/bash -c 'cat {fileName}'",
+            "resourceFiles": [
+              {
+                "httpUrl": "fake.url",
+                "filePath": "location"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  }
+}

tests/recordings/test_batch_extensions_live.yaml

@@ -441,6 +441,11 @@ def body(self):
         self.wait_for_pool_steady(pool_param.id, 5 * 60)
         self.batch_client.pool.delete(pool_param.id)
 
+        # Batch simple legacy task factory
+        self.cmd("batch job create --template '{}'".format(os.path.join(
+            self.data_dir,
+            'batch.job.resourcefile-legacy.json')))
+
         # Merge Task
         self.cmd("batch file upload --file-group 'in' --local-path '{}'".format(self.data_dir))
         self.cmd("batch job create --template '{}'".format(os.path.join(

tests/recordings/test_batch_upload_live.yaml

@@ -277,7 +277,8 @@ def __init__(self, test_file, test_name, run_live=False, debug=False, debug_vcr=
             cassette_library_dir=self.recording_dir,
             before_record_request=self._before_record_request,
             before_record_response=self._before_record_response,
-            decode_compressed_response=True
+            decode_compressed_response=True,
+            serializer='json'
         )
         self.my_vcr.register_matcher('custom', _custom_request_matcher)
         self.my_vcr.match_on = ['custom']
@@ -325,7 +326,6 @@ def _scrub_body_parameters(value):
                 response['body'][key] = bytes(value, 'utf-8')
             except TypeError:
                 response['body'][key] = value.encode('utf-8')
-
         return response
 
     @mock.patch('azure.cli.core.util.handle_exception', _mock_handle_exceptions)