Update CLI

bgklein · bgklein · commit df84dd504d78 · 2020-06-15T12:29:03.000-07:00
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,7 +3,7 @@
 SDK Release History
 ===================
 
-8.0.0 (2020-04-??)
+8.0.0 (2020-06-15)
 ------------------
 
 * Update to match latest Python SDK taking associated breaking changes.
diff --git a/azext/batch/_file_utils.py b/azext/batch/_file_utils.py
@@ -344,11 +344,7 @@ def resolve_resource_file(self, resource_file):
             blobs = self.list_container_contents(resource_file.source, container, storage_client)
             return convert_blobs_to_resource_files(blobs, resource_file)
         if resource_file.source.container_url:
-            # Input data storage in arbitrary container
-            uri = urlsplit(resource_file.source.container_url)
-            container = uri.pathname.split('/')[1]
-            blobs = self.list_container_contents(resource_file.source, container, storage_client)
-            return convert_blobs_to_resource_files(blobs, resource_file)
+            return resource_file.source.container_url
         if resource_file.source.url:
             # TODO: Input data from an arbitrary HTTP GET source
             raise ValueError('Not implemented')
diff --git a/batch-cli-extensions/HISTORY.rst b/batch-cli-extensions/HISTORY.rst
@@ -3,7 +3,7 @@
 Release History
 ===============
 
-6.0.0 (2020-04-??)
+6.0.0 (2020-06-15)
 ------------------
 
 * Update SDK dependency to get latest models and defaults
diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@
 DEPENDENCIES = [
     'msrestazure>=0.4.14,<1',
     'azure-batch>=9.0,<10',
-    'azure-mgmt-batch>=7.0,<8',
+    'azure-mgmt-batch>=9.0,<10',
     'azure-storage-blob>=1.1.0,<2',
     'azure-mgmt-storage>=2.0,<3'
 ]
diff --git a/tests/recordings/test_batch_extensions_live.yaml b/tests/recordings/test_batch_extensions_live.yaml
diff --git a/tests/recordings/test_batch_upload_live.yaml b/tests/recordings/test_batch_upload_live.yaml

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`DEPENDENCIES = [`
`30`	`30`	`'msrestazure>=0.4.14,<1',`
`31`	`31`	`'azure-batch>=9.0,<10',`
`32`		`- 'azure-mgmt-batch>=7.0,<8',`
	`32`	`+ 'azure-mgmt-batch>=9.0,<10',`
`33`	`33`	`'azure-storage-blob>=1.1.0,<2',`
`34`	`34`	`'azure-mgmt-storage>=2.0,<3'`
`35`	`35`	`]`