OCPBUGS-10562: fix operator uninstall test

openshift · Oct 4, 2023 · 925abcc · 925abcc
1 parent d08018d
commit 925abcc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/...kages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-uninstall.cy.ts b/...kages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-uninstall.cy.ts
@@ -88,7 +88,7 @@ describe(`Testing uninstall of ${testOperator.name} Operator`, () => {
     modal.shouldBeClosed();
   });
 
-  xit(`attempts to uninstall the Operator, shows 'Error uninstalling Operator' alert`, () => {
+  it(`attempts to uninstall the Operator, shows 'Error uninstalling Operator' alert`, () => {
     // invalidate the request so operator doesn't get uninstalled
     cy.intercept(
       'DELETE',

diff --git a/...nd/packages/operator-lifecycle-manager/src/components/modals/uninstall-operator-modal.tsx b/...nd/packages/operator-lifecycle-manager/src/components/modals/uninstall-operator-modal.tsx
@@ -76,6 +76,7 @@ export const UninstallOperatorModal: React.FC<UninstallOperatorModalProps> = ({
   const [operandDeletionVerificationError, setOperandDeletionVerificationError] = React.useState(
     false,
   );
+  const [subscriptionExistsError, setSubscriptionExistsError] = React.useState('');
   const [clusterServiceVersionExistsError, setClusterServiceVersionExistsError] = React.useState(
     '',
   );
@@ -135,6 +136,21 @@ export const UninstallOperatorModal: React.FC<UninstallOperatorModalProps> = ({
       ? getPatchForRemovingPlugins(consoleOperatorConfig, enabledPlugins)
       : null;
 
+    const subscriptionExists = async () => {
+      try {
+        await k8sGetResource({
+          model: SubscriptionModel,
+          name: subscription?.metadata?.name,
+        });
+        return true;
+      } catch (err) {
+        if (err.response.status !== 404) {
+          setSubscriptionExistsError(err.message);
+        }
+        return false;
+      }
+    };
+
     const clusterServiceVersionExists = async () => {
       try {
         await k8sGetResource({
@@ -144,15 +160,17 @@ export const UninstallOperatorModal: React.FC<UninstallOperatorModalProps> = ({
         });
         return true;
       } catch (err) {
-        if (err.json.code !== 404) {
+        if (err.response.status !== 404) {
           setClusterServiceVersionExistsError(err.message);
         }
         return false;
       }
     };
 
     const operatorUninstallPromises = [
-      k8sKill(SubscriptionModel, subscription, {}, deleteOptions),
+      ...((await subscriptionExists())
+        ? [k8sKill(SubscriptionModel, subscription, {}, deleteOptions)]
+        : []),
       ...(subscription?.status?.installedCSV && (await clusterServiceVersionExists())
         ? [
             k8sKill(
@@ -363,6 +381,7 @@ export const UninstallOperatorModal: React.FC<UninstallOperatorModalProps> = ({
     <>
       <UninstallAlert
         errorMessage={
+          subscriptionExistsError ||
           clusterServiceVersionExistsError ||
           operatorUninstallErrorMessage ||
           (operandDeletionErrors.length