Separate provisioning script execution: fixes (MID-5921)

Evolveum · Nov 28, 2019 · 08cff3d · 08cff3d
1 parent e469089
commit 08cff3d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 15 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java
@@ -80,6 +80,10 @@ private static CriticalityType getCriticality(CriticalityType value, Criticality
         }
     }
 
+    public static boolean isFatalCriticality(CriticalityType value, CriticalityType defaultValue) {
+        return getCriticality(value,defaultValue) == CriticalityType.FATAL;
+    }
+
     public static LocalizableMessage getUserFriendlyMessage(Throwable cause) {
         while (cause != null) {
             if (cause instanceof CommonException) {

diff --git a/...intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java b/...intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
@@ -1284,6 +1284,7 @@ public void test528UnassignResourceEbony() throws Exception {
 
         // THEN
         displayThen(TEST_NAME);
+        display("Result", result);
         assertPartialError(result);
 
         String shadowOid = assertUserAfter(USER_GUYBRUSH_OID)

diff --git a/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java b/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
@@ -30,10 +30,7 @@
 import com.evolveum.midpoint.schema.internals.InternalsConfig;
 import com.evolveum.midpoint.schema.processor.*;
 import com.evolveum.midpoint.schema.result.*;
-import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
-import com.evolveum.midpoint.schema.util.ResourceTypeUtil;
-import com.evolveum.midpoint.schema.util.SchemaDebugUtil;
-import com.evolveum.midpoint.schema.util.ShadowUtil;
+import com.evolveum.midpoint.schema.util.*;
 import com.evolveum.midpoint.task.api.RunningTask;
 import com.evolveum.midpoint.task.api.StateReporter;
 import com.evolveum.midpoint.task.api.Task;
@@ -390,11 +387,11 @@ public AsynchronousOperationResult deleteResourceObject(ProvisioningContext ctx,
             throw e;
         }
 
+        executeProvisioningScripts(ctx, ProvisioningOperationTypeType.DELETE, BeforeAfterType.BEFORE, scripts, result);
+
         // Execute entitlement modification on other objects (if needed)
         executeEntitlementChangesDelete(ctx, shadow, scripts, connOptions, result);
 
-        executeProvisioningScripts(ctx, ProvisioningOperationTypeType.DELETE, BeforeAfterType.BEFORE, scripts, result);
-
         ConnectorInstance connector = ctx.getConnector(DeleteCapabilityType.class, result);
         AsynchronousOperationResult connectorAsyncOpRet = null;
         try {
@@ -414,9 +411,6 @@ public AsynchronousOperationResult deleteResourceObject(ProvisioningContext ctx,
 
             connectorAsyncOpRet = connector.deleteObject(ctx.getObjectClassDefinition(), shadow, identifiers, ctx, result);
 
-            computeResultStatus(result);
-            LOGGER.debug("PROVISIONING DELETE: {}", result.getStatus());
-
         } catch (ObjectNotFoundException ex) {
             result.recordFatalError("Can't delete object " + shadow
                     + ". Reason: " + ex.getMessage(), ex);
@@ -449,6 +443,9 @@ public AsynchronousOperationResult deleteResourceObject(ProvisioningContext ctx,
 
         executeProvisioningScripts(ctx, ProvisioningOperationTypeType.DELETE, BeforeAfterType.AFTER, scripts, result);
 
+        computeResultStatus(result);
+        LOGGER.debug("PROVISIONING DELETE result: {}", result.getStatus());
+
         AsynchronousOperationResult aResult = AsynchronousOperationResult.wrap(result);
         updateQuantum(ctx, connector, aResult, parentResult);
         if (connectorAsyncOpRet != null) {
@@ -2541,13 +2538,29 @@ private void executeProvisioningScripts(ProvisioningContext ctx, ProvisioningOpe
                 }
 
             } catch (CommunicationException ex) {
-                result.recordFatalError(
-                        "Could not execute provisioning script. Error communicating with the connector " + connector + ": " + ex.getMessage(), ex);
-                throw new CommunicationException("Error communicating with the connector " + connector + ": "
-                        + ex.getMessage(), ex);
+                String message = "Could not execute provisioning script. Error communicating with the connector " + connector + ": " + ex.getMessage();
+                if (ExceptionUtil.isFatalCriticality(operation.getCriticality(), CriticalityType.FATAL)) {
+                    result.recordFatalError(message, ex);
+                    throw new CommunicationException(message, ex);
+                } else {
+                    LOGGER.warn("{}", message);
+                }
             } catch (GenericFrameworkException ex) {
-                result.recordFatalError("Could not execute provisioning script. Generic error in connector: " + ex.getMessage(), ex);
-                throw new GenericConnectorException("Generic error in connector: " + ex.getMessage(), ex);
+                String message = "Could not execute provisioning script. Generic error in connector: " + ex.getMessage();
+                if (ExceptionUtil.isFatalCriticality(operation.getCriticality(), CriticalityType.FATAL)) {
+                    result.recordFatalError(message, ex);
+                    throw new GenericConnectorException(message, ex);
+                } else {
+                    LOGGER.warn("{}", message);
+                }
+            } catch (Throwable t) {
+                String message = "Could not execute provisioning script. Unexpected error in connector: " +t.getClass().getSimpleName() + ": " + t.getMessage();
+                if (ExceptionUtil.isFatalCriticality(operation.getCriticality(), CriticalityType.FATAL)) {
+                    result.recordFatalError(message, t);
+                    throw t;
+                } else {
+                    LOGGER.warn("{}", message);
+                }
             }
 
         }