Azure: allow configure to receive multiple resources

This commit updates `AzureService.configure` endpoint to receive a list
of resources instead of a single resource.

It aligns the public endpoint with the Azure API as well as allows
multiple resources to be configured in a single request.

Refers to SPSTRAT-604

Signed-off-by: Jonathan Gangi <[email protected]>

Author: JAVGan

cloudpub/ms_azure/service.py

@@ -185,19 +185,19 @@ def _wait_for_job_completion(self, job_id: str) -> ConfigureStatus:
             log.debug("Job %s succeeded", job_id)
         return job_details
 
-    def configure(self, resource: AzureResource) -> ConfigureStatus:
+    def configure(self, resources: List[AzureResource]) -> ConfigureStatus:
         """
         Create or update a resource and wait until it's done.
 
         Args:
-            resource (AzureResource):
-                The resource to create/modify in Azure.
+            resources (List[AzureResource]):
+                The list of resources to create/modify in Azure.
         Returns:
             dict: The result of job execution
         """
         data = {
             "$schema": self.CONFIGURE_SCHEMA.format(AZURE_API_VERSION=self.AZURE_API_VERSION),
-            "resources": [resource.to_json()],
+            "resources": [x.to_json() for x in resources],
         }
         if log.isEnabledFor(logging.DEBUG):
             log.debug("Data to configure: %s", json.dumps(data, indent=2))
@@ -448,7 +448,7 @@ def submit_to_status(self, product_id: str, status: str) -> ConfigureStatus:
         submission.target.targetType = status
         log.debug("Set the status \"%s\" to submission.", status)
 
-        return self.configure(resource=submission)
+        return self.configure(resources=[submission])
 
     @retry(
         wait=wait_fixed(300),
@@ -685,7 +685,7 @@ def publish(self, metadata: AzurePublishingMetadata) -> None:
                 metadata.destination,
                 tgt,
             )
-            self.configure(resource=tech_config)
+            self.configure(resources=[tech_config])
 
         # 5. Proceed to publishing if it was requested.
         # Note: The publishing will only occur if it made changes in disk_version.

tests/ms_azure/test_service.py

@@ -263,7 +263,7 @@ def test_configure(
         }
 
         with caplog.at_level(logging.DEBUG):
-            azure_service.configure(submission_obj)
+            azure_service.configure([submission_obj])
 
         mock_configure.assert_called_once_with(data=expected_data)
         mock_wait_completion.assert_called_once_with(job_id=job_id)
@@ -700,7 +700,7 @@ def test_submit_to_status(
         azure_service.submit_to_status(product_obj.id, final_status)
 
         mock_getsubst.assert_called_once_with(product_id=product_obj.id, state=prev_status)
-        mock_configure.assert_called_once_with(resource=submission_obj)
+        mock_configure.assert_called_once_with(resources=[submission_obj])
 
     @mock.patch("cloudpub.ms_azure.AzureService.configure")
     @mock.patch("cloudpub.ms_azure.AzureService.get_submission_state")
@@ -1023,7 +1023,7 @@ def test_publish_overwrite(
             plan_name="plan-1",
             old_skus=expected_tech_config.skus,
         )
-        mock_configure.assert_called_once_with(resource=technical_config_obj)
+        mock_configure.assert_called_once_with(resources=[technical_config_obj])
         mock_submit.assert_not_called()
 
     @mock.patch("cloudpub.ms_azure.AzureService.configure")
@@ -1090,7 +1090,7 @@ def test_publish_nodiskversion(
             old_skus=expected_tech_config.skus,
         )
         mock_disk_scratch.assert_called_once_with(metadata_azure_obj, expected_source)
-        mock_configure.assert_called_once_with(resource=expected_tech_config)
+        mock_configure.assert_called_once_with(resources=[expected_tech_config])
         mock_submit.assert_not_called()
 
     @pytest.mark.parametrize("keepdraft", [True, False], ids=["nochannel", "push"])
@@ -1219,7 +1219,7 @@ def test_publish_novmimages(
         )
         mock_prep_img.assert_not_called()
         mock_disk_scratch.assert_not_called()
-        mock_configure.assert_called_once_with(resource=expected_tech_config)
+        mock_configure.assert_called_once_with(resources=[expected_tech_config])
         mock_submit.assert_not_called()
 
     @mock.patch("cloudpub.ms_azure.AzureService.configure")
@@ -1290,7 +1290,7 @@ def test_publish_disk_has_images(
             source=expected_source,
         )
         mock_disk_scratch.assert_not_called()
-        mock_configure.assert_called_once_with(resource=technical_config_obj)
+        mock_configure.assert_called_once_with(resources=[technical_config_obj])
         mock_submit.assert_not_called()
 
     def test_is_submission_in_preview(
@@ -1415,7 +1415,7 @@ def test_publish_live_x64_only(
         )
         mock_disk_scratch.assert_not_called()
         mock_diff_offer.assert_called_once_with(product_obj)
-        mock_configure.assert_called_once_with(resource=technical_config_obj)
+        mock_configure.assert_called_once_with(resources=[technical_config_obj])
         submit_calls = [
             mock.call(product_id=product_obj.id, status="preview"),
             mock.call(product_id=product_obj.id, status="live"),
@@ -1507,7 +1507,7 @@ def test_publish_live_arm64_only(
         )
         mock_disk_scratch.assert_not_called()
         mock_diff_offer.assert_called_once_with(product_obj)
-        mock_configure.assert_called_once_with(resource=technical_config_obj)
+        mock_configure.assert_called_once_with(resources=[technical_config_obj])
         submit_calls = [
             mock.call(product_id=product_obj.id, status="preview"),
             mock.call(product_id=product_obj.id, status="live"),