Azure: fix bug preventing pushing preview offers live

This commit fixes a bug which did prevent `AzureService` to push live
offers which were in the `preview` state with the SAS URI already
attached.

It basically adds a new condition on step 5 of `publish` to check
whether the offer state is preview.

Refers to SPSTRAT-583

Signed-off-by: Jonathan Gangi <jgangi@redhat.com>

Author: JAVGan

cloudpub/ms_azure/service.py

@@ -669,15 +669,24 @@ def publish(self, metadata: AzurePublishingMetadata) -> None:
 
         # 5. Proceed to publishing if it was requested.
         # Note: The publishing will only occur if it made changes in disk_version.
-        if disk_version and not metadata.keepdraft:
-            log.info(
-                "Publishing the new changes for \"%s\" on plan \"%s\"", product_name, plan_name
-            )
-            logdiff(self.diff_offer(product))
-            self.ensure_can_publish(product.id)
+        if not metadata.keepdraft:
+            # Get the submission state
+            submission: ProductSubmission = cast(
+                List[ProductSubmission],
+                self.filter_product_resources(product=product, resource="submission"),
+            )[0]
+
+            # We should only publish if there are new changes OR
+            # the existing offer was already in preview
+            if disk_version or self._is_submission_in_preview(submission):
+                log.info(
+                    "Publishing the new changes for \"%s\" on plan \"%s\"", product_name, plan_name
+                )
+                logdiff(self.diff_offer(product))
+                self.ensure_can_publish(product.id)
 
-            self._publish_preview(product, product_name)
-            self._publish_live(product, product_name)
+                self._publish_preview(product, product_name)
+                self._publish_live(product, product_name)
 
         log.info(
             "Finished publishing the image \"%s\" to \"%s\"",

tests/ms_azure/test_service.py

@@ -1093,6 +1093,7 @@ def test_publish_nodiskversion(
 
     @pytest.mark.parametrize("keepdraft", [True, False], ids=["nochannel", "push"])
     @mock.patch("cloudpub.ms_azure.AzureService.configure")
+    @mock.patch("cloudpub.ms_azure.AzureService._is_submission_in_preview")
     @mock.patch("cloudpub.ms_azure.AzureService.submit_to_status")
     @mock.patch("cloudpub.ms_azure.service.update_skus")
     @mock.patch("cloudpub.ms_azure.utils.prepare_vm_images")
@@ -1109,6 +1110,7 @@ def test_publish_saspresent(
         mock_prep_img: mock.MagicMock,
         mock_upd_sku: mock.MagicMock,
         mock_submit: mock.MagicMock,
+        mock_is_preview: mock.MagicMock,
         mock_configure: mock.MagicMock,
         keepdraft: bool,
         product_obj: Product,
@@ -1127,12 +1129,17 @@ def test_publish_saspresent(
         mock_is_sas.return_value = True
         mock_disk_scratch.return_value = disk_version_obj
         mock_upd_sku.return_value = technical_config_obj
+        mock_is_preview.return_value = False
 
         azure_service.publish(metadata_azure_obj)
 
         mock_getprpl_name.assert_called_once_with("example-product", "plan-1")
-        mock_filter.assert_called_once_with(
-            product=product_obj, resource="virtual-machine-plan-technical-configuration"
+        mock_filter.assert_has_calls(
+            [
+                mock.call(
+                    product=product_obj, resource="virtual-machine-plan-technical-configuration"
+                )
+            ]
         )
         mock_is_sas.assert_called_once_with(
             technical_config_obj,
@@ -1362,6 +1369,7 @@ def test_publish_live_x64_only(
         mock_filter.side_effect = [
             [technical_config_obj],
             [submission_obj],
+            [submission_obj],
         ]
         mock_getsubst.side_effect = ["preview", "live"]
         mock_res_preview = mock.MagicMock()
@@ -1454,6 +1462,7 @@ def test_publish_live_arm64_only(
         mock_filter.side_effect = [
             [technical_config_obj],
             [submission_obj],
+            [submission_obj],
         ]
         mock_getsubst.side_effect = ["preview", "live"]
         mock_res_preview = mock.MagicMock()