simple event source integration test

csviri · csviri · commit 8d1172813125 · 2020-11-30T16:23:20.000+01:00
diff --git a/operator-framework/src/main/java/io/javaoperatorsdk/operator/ControllerToCustomResourceMappingsProvider.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/ControllerToCustomResourceMappingsProvider.java
@@ -15,7 +15,7 @@
 
 
 class ControllerToCustomResourceMappingsProvider {
-    private static final Logger log = LoggerFactory.getLogger(ControllerUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(ControllerToCustomResourceMappingsProvider.class);
 
     static Map<Class<? extends ResourceController>, Class<? extends CustomResource>> provide(final String resourcePath) {
         Map<Class<? extends ResourceController>, Class<? extends CustomResource>> controllerToCustomResourceMappings = new HashMap();
diff --git a/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java
@@ -61,15 +61,18 @@ public void handleEvent(Event<? extends EventSource> event) {
     }
 
     private void executeBufferedEvents(String customResourceUid) {
-        if (!isControllerUnderExecution(customResourceUid) && eventBuffer.containsEvents(customResourceUid)) {
+        boolean newEventForResourceId = eventBuffer.containsEvents(customResourceUid);
+        boolean controllerUnderExecution = isControllerUnderExecution(customResourceUid);
+        if (!controllerUnderExecution && newEventForResourceId) {
             setUnderExecutionProcessing(customResourceUid);
             ExecutionScope executionScope = new ExecutionScope(
                     eventBuffer.getAndRemoveEventsForExecution(customResourceUid),
                     resourceCache.getLatestResource(customResourceUid).get());
             log.debug("Executing events for custom resource. Scope: {}", executionScope);
             executor.execute(new ExecutionConsumer(executionScope, eventDispatcher, this));
         } else {
-            log.debug("Skipping executing controller for {}, since currently under execution.", customResourceUid);
+            log.debug("Skipping executing controller for resource id: {}. Events in queue: {}. Controller in execution: {}"
+                    , customResourceUid, newEventForResourceId, controllerUnderExecution);
         }
     }
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java
@@ -1,10 +1,10 @@
 package io.javaoperatorsdk.operator;
 
-import io.javaoperatorsdk.operator.sample.TestCustomResource;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.javaoperatorsdk.operator.sample.TestCustomResourceController;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResourceController;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java
@@ -1,18 +1,13 @@
 package io.javaoperatorsdk.operator;
 
-import io.javaoperatorsdk.operator.sample.TestCustomResource;
-import io.javaoperatorsdk.operator.sample.TestCustomResourceController;
-import io.javaoperatorsdk.operator.sample.TestCustomResourceSpec;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResourceController;
 import io.fabric8.kubernetes.api.model.ConfigMap;
-import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
 import static io.javaoperatorsdk.operator.TestUtils.TEST_CUSTOM_RESOURCE_NAME;
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerUtilsTest.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerUtilsTest.java
@@ -2,8 +2,8 @@
 
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import io.javaoperatorsdk.operator.api.*;
-import io.javaoperatorsdk.operator.sample.TestCustomResource;
-import io.javaoperatorsdk.operator.sample.TestCustomResourceController;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResourceController;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/EventSourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/EventSourceIT.java
@@ -0,0 +1,57 @@
+package io.javaoperatorsdk.operator;
+
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.operator.sample.event.EventSourceTestCustomResource;
+import io.javaoperatorsdk.operator.sample.event.EventSourceTestCustomResourceController;
+import io.javaoperatorsdk.operator.sample.event.EventSourceTestCustomResourceSpec;
+import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceController;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import static io.javaoperatorsdk.operator.IntegrationTestSupport.TEST_NAMESPACE;
+import static io.javaoperatorsdk.operator.sample.event.EventSourceTestCustomResourceController.*;
+import static org.assertj.core.api.Assertions.assertThat;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class EventSourceIT {
+
+    public static final int EXPECTED_TIMER_EVENT_COUNT = 3;
+    private IntegrationTestSupport integrationTestSupport = new IntegrationTestSupport();
+
+    @BeforeEach
+    public void initAndCleanup() {
+        KubernetesClient k8sClient = new DefaultKubernetesClient();
+        integrationTestSupport.initialize(k8sClient, new EventSourceTestCustomResourceController(),
+                "eventsource-test-crd.yaml");
+        integrationTestSupport.cleanup();
+    }
+
+    @Test
+    public void receivingPeriodicEvents() {
+        integrationTestSupport.teardownIfSuccess(() -> {
+            EventSourceTestCustomResource resource = createTestCustomResource("1");
+            integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).create(resource);
+
+            Thread.sleep(TIMER_DELAY + EXPECTED_TIMER_EVENT_COUNT * TIMER_PERIOD);
+
+            assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(EXPECTED_TIMER_EVENT_COUNT + 1);
+        });
+    }
+
+    public EventSourceTestCustomResource createTestCustomResource(String id) {
+        EventSourceTestCustomResource resource = new EventSourceTestCustomResource();
+        resource.setMetadata(new ObjectMetaBuilder()
+                .withName("subresource-" + id)
+                .withNamespace(TEST_NAMESPACE)
+                .withFinalizers(FINALIZER_NAME)
+                .build());
+        resource.setKind("Eventsourcesample");
+        resource.setSpec(new EventSourceTestCustomResourceSpec());
+        resource.getSpec().setValue(id);
+        return resource;
+    }
+
+}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java
@@ -1,8 +1,8 @@
 package io.javaoperatorsdk.operator;
 
 import io.javaoperatorsdk.operator.api.ResourceController;
-import io.javaoperatorsdk.operator.sample.TestCustomResource;
-import io.javaoperatorsdk.operator.sample.TestCustomResourceSpec;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResourceSpec;
 import io.fabric8.kubernetes.api.model.Namespace;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/TestUtils.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/TestUtils.java
@@ -1,8 +1,8 @@
 package io.javaoperatorsdk.operator;
 
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
-import io.javaoperatorsdk.operator.sample.TestCustomResource;
-import io.javaoperatorsdk.operator.sample.TestCustomResourceSpec;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResourceSpec;
 
 import java.util.HashMap;
 import java.util.UUID;
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/DefaultEventHandlerTest.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/DefaultEventHandlerTest.java
@@ -5,7 +5,7 @@
 import io.javaoperatorsdk.operator.processing.event.Event;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
 import io.javaoperatorsdk.operator.processing.event.internal.TimerEvent;
-import io.javaoperatorsdk.operator.sample.TestCustomResource;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomResource.java
@@ -0,0 +1,35 @@
+package io.javaoperatorsdk.operator.sample.event;
+
+import io.fabric8.kubernetes.client.CustomResource;
+
+public class EventSourceTestCustomResource extends CustomResource {
+
+    private EventSourceTestCustomResourceSpec spec;
+
+    private EventSourceTestCustomResourceStatus status;
+
+    public EventSourceTestCustomResourceSpec getSpec() {
+        return spec;
+    }
+
+    public void setSpec(EventSourceTestCustomResourceSpec spec) {
+        this.spec = spec;
+    }
+
+    public EventSourceTestCustomResourceStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(EventSourceTestCustomResourceStatus status) {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return "TestCustomResource{" +
+                "spec=" + spec +
+                ", status=" + status +
+                ", extendedFrom=" + super.toString() +
+                '}';
+    }
+}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomResourceController.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomResourceController.java
@@ -0,0 +1,57 @@
+package io.javaoperatorsdk.operator.sample.event;
+
+import io.javaoperatorsdk.operator.TestExecutionInfoProvider;
+import io.javaoperatorsdk.operator.api.*;
+import io.javaoperatorsdk.operator.processing.event.internal.TimerEventSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Controller(
+        crdName = EventSourceTestCustomResourceController.CRD_NAME)
+public class EventSourceTestCustomResourceController implements ResourceController<EventSourceTestCustomResource>,
+        TestExecutionInfoProvider {
+
+    public static final String CRD_NAME = "eventsourcesamples.sample.javaoperatorsdk";
+    public static final String FINALIZER_NAME = CRD_NAME + "/finalizer";
+    private static final Logger log = LoggerFactory.getLogger(EventSourceTestCustomResourceController.class);
+    public static final int TIMER_DELAY = 300;
+    public static final int TIMER_PERIOD = 500;
+    private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
+    private final TimerEventSource timerEventSource = new TimerEventSource();
+
+    @Override
+    public DeleteControl deleteResource(EventSourceTestCustomResource resource, Context<EventSourceTestCustomResource> context) {
+        return DeleteControl.DEFAULT_DELETE;
+    }
+
+    @Override
+    public UpdateControl<EventSourceTestCustomResource> createOrUpdateResource(EventSourceTestCustomResource resource,
+                                                                               Context<EventSourceTestCustomResource> context) {
+
+        context.getEventSourceManager().registerEventSourceIfNotRegistered(resource, "Timer", () -> {
+            timerEventSource.schedule(resource, TIMER_DELAY, TIMER_PERIOD);
+            return timerEventSource;
+        });
+
+        log.info("Events:: " + context.getEvents());
+        numberOfExecutions.addAndGet(1);
+        ensureStatusExists(resource);
+        resource.getStatus().setState(EventSourceTestCustomResourceStatus.State.SUCCESS);
+
+        return UpdateControl.updateStatusSubResource(resource);
+    }
+
+    private void ensureStatusExists(EventSourceTestCustomResource resource) {
+        EventSourceTestCustomResourceStatus status = resource.getStatus();
+        if (status == null) {
+            status = new EventSourceTestCustomResourceStatus();
+            resource.setStatus(status);
+        }
+    }
+
+    public int getNumberOfExecutions() {
+        return numberOfExecutions.get();
+    }
+}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomResourceSpec.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomResourceSpec.java
@@ -0,0 +1,15 @@
+package io.javaoperatorsdk.operator.sample.event;
+
+public class EventSourceTestCustomResourceSpec {
+
+    private String value;
+
+    public String getValue() {
+        return value;
+    }
+
+    public EventSourceTestCustomResourceSpec setValue(String value) {
+        this.value = value;
+        return this;
+    }
+}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomResourceStatus.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomResourceStatus.java
@@ -0,0 +1,21 @@
+package io.javaoperatorsdk.operator.sample.event;
+
+public class EventSourceTestCustomResourceStatus {
+
+    private State state;
+
+    public State getState() {
+        return state;
+    }
+
+    public EventSourceTestCustomResourceStatus setState(State state) {
+        this.state = state;
+        return this;
+    }
+
+    public enum State {
+        SUCCESS,
+        ERROR
+    }
+
+}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResource.java
@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.sample;
+package io.javaoperatorsdk.operator.sample.simple;
 
 import io.fabric8.kubernetes.client.CustomResource;
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResourceController.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResourceController.java
@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.sample;
+package io.javaoperatorsdk.operator.sample.simple;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResourceSpec.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResourceSpec.java
@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.sample;
+package io.javaoperatorsdk.operator.sample.simple;
 
 public class TestCustomResourceSpec {
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResourceStatus.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResourceStatus.java
@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.sample;
+package io.javaoperatorsdk.operator.sample.simple;
 
 public class TestCustomResourceStatus {
 
diff --git a/operator-framework/src/test/resources/io/javaoperatorsdk/operator/eventsource-test-crd.yaml b/operator-framework/src/test/resources/io/javaoperatorsdk/operator/eventsource-test-crd.yaml
@@ -0,0 +1,16 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: eventsourcesamples.sample.javaoperatorsdk
+spec:
+  group: sample.javaoperatorsdk
+  version: v1
+  subresources:
+    status: {}
+  scope: Namespaced
+  names:
+    plural: eventsourcesamples
+    singular: eventsourcesample
+    kind: Eventsourcesample
+    shortNames:
+      - es

Original file line number	Diff line number	Diff line change
`@@ -61,15 +61,18 @@ public void handleEvent(Event<? extends EventSource> event) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`private void executeBufferedEvents(String customResourceUid) {`
`64`		`- if (!isControllerUnderExecution(customResourceUid) && eventBuffer.containsEvents(customResourceUid)) {`
	`64`	`+ boolean newEventForResourceId = eventBuffer.containsEvents(customResourceUid);`
	`65`	`+ boolean controllerUnderExecution = isControllerUnderExecution(customResourceUid);`
	`66`	`+ if (!controllerUnderExecution && newEventForResourceId) {`
`65`	`67`	`setUnderExecutionProcessing(customResourceUid);`
`66`	`68`	`ExecutionScope executionScope = new ExecutionScope(`
`67`	`69`	`eventBuffer.getAndRemoveEventsForExecution(customResourceUid),`
`68`	`70`	`resourceCache.getLatestResource(customResourceUid).get());`
`69`	`71`	`log.debug("Executing events for custom resource. Scope: {}", executionScope);`
`70`	`72`	`executor.execute(new ExecutionConsumer(executionScope, eventDispatcher, this));`
`71`	`73`	`} else {`
`72`		`- log.debug("Skipping executing controller for {}, since currently under execution.", customResourceUid);`
	`74`	`+ log.debug("Skipping executing controller for resource id: {}. Events in queue: {}. Controller in execution: {}"`
	`75`	`+ , customResourceUid, newEventForResourceId, controllerUnderExecution);`
`73`	`76`	`}`
`74`	`77`	`}`
`75`	`78`