diff --git a/test-frame-common/src/main/java/io/skodjob/testframe/listeners/ResourceManagerCleanerExtension.java b/test-frame-common/src/main/java/io/skodjob/testframe/listeners/ResourceManagerCleanerExtension.java index 1000112..7a2d1dd 100644 --- a/test-frame-common/src/main/java/io/skodjob/testframe/listeners/ResourceManagerCleanerExtension.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/listeners/ResourceManagerCleanerExtension.java @@ -4,7 +4,7 @@ */ package io.skodjob.testframe.listeners; -import io.skodjob.testframe.resources.ResourceManager; +import io.skodjob.testframe.resources.KubeResourceManager; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; @@ -17,13 +17,13 @@ public class ResourceManagerCleanerExtension @Override public void afterAll(ExtensionContext extensionContext) { - ResourceManager.setTestContext(extensionContext); - ResourceManager.getInstance().deleteResources(); + KubeResourceManager.setTestContext(extensionContext); + KubeResourceManager.getInstance().deleteResources(); } @Override public void afterEach(ExtensionContext extensionContext) { - ResourceManager.setTestContext(extensionContext); - ResourceManager.getInstance().deleteResources(); + KubeResourceManager.setTestContext(extensionContext); + KubeResourceManager.getInstance().deleteResources(); } } diff --git a/test-frame-common/src/main/java/io/skodjob/testframe/listeners/ResourceManagerExtension.java b/test-frame-common/src/main/java/io/skodjob/testframe/listeners/ResourceManagerExtension.java index 6f267cd..9a3aa8e 100644 --- a/test-frame-common/src/main/java/io/skodjob/testframe/listeners/ResourceManagerExtension.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/listeners/ResourceManagerExtension.java @@ -4,7 +4,7 @@ */ package io.skodjob.testframe.listeners; -import io.skodjob.testframe.resources.ResourceManager; +import io.skodjob.testframe.resources.KubeResourceManager; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; @@ -19,22 +19,22 @@ public class ResourceManagerExtension @Override public void beforeAll(ExtensionContext extensionContext) { - ResourceManager.getInstance(); - ResourceManager.setTestContext(extensionContext); + KubeResourceManager.getInstance(); + KubeResourceManager.setTestContext(extensionContext); } @Override public void beforeEach(ExtensionContext extensionContext) { - ResourceManager.setTestContext(extensionContext); + KubeResourceManager.setTestContext(extensionContext); } @Override public void afterAll(ExtensionContext extensionContext) { - ResourceManager.setTestContext(extensionContext); + KubeResourceManager.setTestContext(extensionContext); } @Override public void afterEach(ExtensionContext extensionContext) { - ResourceManager.setTestContext(extensionContext); + KubeResourceManager.setTestContext(extensionContext); } } diff --git a/test-frame-common/src/main/java/io/skodjob/testframe/resources/ResourceManager.java b/test-frame-common/src/main/java/io/skodjob/testframe/resources/KubeResourceManager.java similarity index 98% rename from test-frame-common/src/main/java/io/skodjob/testframe/resources/ResourceManager.java rename to test-frame-common/src/main/java/io/skodjob/testframe/resources/KubeResourceManager.java index cd9e66a..3065ac5 100644 --- a/test-frame-common/src/main/java/io/skodjob/testframe/resources/ResourceManager.java +++ b/test-frame-common/src/main/java/io/skodjob/testframe/resources/KubeResourceManager.java @@ -26,10 +26,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -public class ResourceManager { - private static final Logger LOGGER = LoggerFactory.getLogger(ResourceManager.class); +public class KubeResourceManager { + private static final Logger LOGGER = LoggerFactory.getLogger(KubeResourceManager.class); - private static ResourceManager instance; + private static KubeResourceManager instance; private static KubeClient client; private static KubeCmdClient kubeCmdClient; @@ -37,9 +37,9 @@ public class ResourceManager { private static final Map> STORED_RESOURCES = new LinkedHashMap<>(); - public static synchronized ResourceManager getInstance() { + public static synchronized KubeResourceManager getInstance() { if (instance == null) { - instance = new ResourceManager(); + instance = new KubeResourceManager(); instance.resourceTypes = new ResourceType[]{}; client = new KubeClient(); if (TestFrameEnv.CLIENT_TYPE.equals(TestFrameConstants.KUBERNETES_CLIENT)) { diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleBindingResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleBindingResource.java index f0ecf15..8c5c9b2 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleBindingResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleBindingResource.java @@ -18,7 +18,7 @@ public class ClusterRoleBindingResource implements ResourceType> client; public ClusterRoleBindingResource() { - this.client = ResourceManager.getKubeClient().getClient().rbac().clusterRoleBindings(); + this.client = KubeResourceManager.getKubeClient().getClient().rbac().clusterRoleBindings(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleResource.java index ad9ba31..d3dd7d5 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ClusterRoleResource.java @@ -17,7 +17,7 @@ public class ClusterRoleResource implements ResourceType { private final NonNamespaceOperation> client; public ClusterRoleResource() { - this.client = ResourceManager.getKubeClient().getClient().rbac().clusterRoles(); + this.client = KubeResourceManager.getKubeClient().getClient().rbac().clusterRoles(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ConfigMapResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ConfigMapResource.java index 403036c..3247fd2 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ConfigMapResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ConfigMapResource.java @@ -16,7 +16,7 @@ public class ConfigMapResource implements NamespacedResourceType { private final MixedOperation> client; public ConfigMapResource() { - this.client = ResourceManager.getKubeClient().getClient().configMaps(); + this.client = KubeResourceManager.getKubeClient().getClient().configMaps(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/CustomResourceDefinitionResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/CustomResourceDefinitionResource.java index 1a7c00f..e5cb368 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/CustomResourceDefinitionResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/CustomResourceDefinitionResource.java @@ -18,7 +18,7 @@ public class CustomResourceDefinitionResource implements ResourceType> client; public CustomResourceDefinitionResource() { - this.client = ResourceManager.getKubeClient().getClient().apiextensions().v1().customResourceDefinitions(); + this.client = KubeResourceManager.getKubeClient().getClient().apiextensions().v1().customResourceDefinitions(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/DeploymentResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/DeploymentResource.java index fb5a063..43eb7a1 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/DeploymentResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/DeploymentResource.java @@ -17,7 +17,7 @@ public class DeploymentResource implements NamespacedResourceType { private final MixedOperation> client; public DeploymentResource() { - this.client = ResourceManager.getKubeClient().getClient().apps().deployments(); + this.client = KubeResourceManager.getKubeClient().getClient().apps().deployments(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/JobResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/JobResource.java index ce65161..152c11e 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/JobResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/JobResource.java @@ -17,7 +17,7 @@ public class JobResource implements NamespacedResourceType { private final MixedOperation> client; public JobResource() { - this.client = ResourceManager.getKubeClient().getClient().batch().v1().jobs(); + this.client = KubeResourceManager.getKubeClient().getClient().batch().v1().jobs(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/LeaseResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/LeaseResource.java index 5268893..cf804a9 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/LeaseResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/LeaseResource.java @@ -17,7 +17,7 @@ public class LeaseResource implements NamespacedResourceType { private MixedOperation> client; public LeaseResource() { - this.client = ResourceManager.getKubeClient().getClient().leases(); + this.client = KubeResourceManager.getKubeClient().getClient().leases(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NamespaceResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NamespaceResource.java index 659d206..758dd8a 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NamespaceResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NamespaceResource.java @@ -18,7 +18,7 @@ public class NamespaceResource implements ResourceType { private final NonNamespaceOperation> client; public NamespaceResource() { - this.client = ResourceManager.getKubeClient().getClient().namespaces(); + this.client = KubeResourceManager.getKubeClient().getClient().namespaces(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NetworkPolicyResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NetworkPolicyResource.java index 6826ee9..06469bd 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NetworkPolicyResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/NetworkPolicyResource.java @@ -17,7 +17,7 @@ public class NetworkPolicyResource implements NamespacedResourceType> client; public NetworkPolicyResource() { - this.client = ResourceManager.getKubeClient().getClient().network().networkPolicies(); + this.client = KubeResourceManager.getKubeClient().getClient().network().networkPolicies(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleBindingResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleBindingResource.java index 06626ba..866d4a9 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleBindingResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleBindingResource.java @@ -17,7 +17,7 @@ public class RoleBindingResource implements NamespacedResourceType private final MixedOperation> client; public RoleBindingResource() { - this.client = ResourceManager.getKubeClient().getClient().rbac().roleBindings(); + this.client = KubeResourceManager.getKubeClient().getClient().rbac().roleBindings(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleResource.java index 3124af9..3d77763 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/RoleResource.java @@ -17,7 +17,7 @@ public class RoleResource implements NamespacedResourceType { private final MixedOperation> client; public RoleResource() { - this.client = ResourceManager.getKubeClient().getClient().rbac().roles(); + this.client = KubeResourceManager.getKubeClient().getClient().rbac().roles(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/SecretResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/SecretResource.java index ca4e145..1b43a36 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/SecretResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/SecretResource.java @@ -17,7 +17,7 @@ public class SecretResource implements NamespacedResourceType { private final MixedOperation> client; public SecretResource() { - this.client = ResourceManager.getKubeClient().getClient().secrets(); + this.client = KubeResourceManager.getKubeClient().getClient().secrets(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceAccountResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceAccountResource.java index 8d9df06..dcdfa82 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceAccountResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceAccountResource.java @@ -17,7 +17,7 @@ public class ServiceAccountResource implements NamespacedResourceType client; public ServiceAccountResource() { - this.client = ResourceManager.getKubeClient().getClient().serviceAccounts(); + this.client = KubeResourceManager.getKubeClient().getClient().serviceAccounts(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceResource.java index 318e8af..e821902 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ServiceResource.java @@ -17,7 +17,7 @@ public class ServiceResource implements NamespacedResourceType { io.fabric8.kubernetes.client.dsl.ServiceResource> client; public ServiceResource() { - this.client = ResourceManager.getKubeClient().getClient().services(); + this.client = KubeResourceManager.getKubeClient().getClient().services(); } /** diff --git a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ValidatingWebhookConfigurationResource.java b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ValidatingWebhookConfigurationResource.java index e357f7a..110548b 100644 --- a/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ValidatingWebhookConfigurationResource.java +++ b/test-frame-kubernetes/src/main/java/io/skodjob/testframe/resources/ValidatingWebhookConfigurationResource.java @@ -19,7 +19,7 @@ public class ValidatingWebhookConfigurationResource implements ResourceType> client; public ValidatingWebhookConfigurationResource() { - this.client = ResourceManager.getKubeClient().getClient() + this.client = KubeResourceManager.getKubeClient().getClient() .admissionRegistration() .v1() .validatingWebhookConfigurations(); diff --git a/test-frame-openshift/src/main/java/io/skodjob/testframe/resources/OperatorGroupResource.java b/test-frame-openshift/src/main/java/io/skodjob/testframe/resources/OperatorGroupResource.java index 4865153..5c954f0 100644 --- a/test-frame-openshift/src/main/java/io/skodjob/testframe/resources/OperatorGroupResource.java +++ b/test-frame-openshift/src/main/java/io/skodjob/testframe/resources/OperatorGroupResource.java @@ -17,7 +17,7 @@ public class OperatorGroupResource implements NamespacedResourceType> client; public OperatorGroupResource() { - this.client = ResourceManager.getKubeClient().getOpenShiftClient().operatorHub().operatorGroups(); + this.client = KubeResourceManager.getKubeClient().getOpenShiftClient().operatorHub().operatorGroups(); } /** diff --git a/test-frame-openshift/src/main/java/io/skodjob/testframe/resources/SubscriptionResource.java b/test-frame-openshift/src/main/java/io/skodjob/testframe/resources/SubscriptionResource.java index 7040375..6394d75 100644 --- a/test-frame-openshift/src/main/java/io/skodjob/testframe/resources/SubscriptionResource.java +++ b/test-frame-openshift/src/main/java/io/skodjob/testframe/resources/SubscriptionResource.java @@ -17,7 +17,7 @@ public class SubscriptionResource implements NamespacedResourceType> client; public SubscriptionResource() { - this.client = ResourceManager.getKubeClient().getOpenShiftClient().operatorHub().subscriptions(); + this.client = KubeResourceManager.getKubeClient().getOpenShiftClient().operatorHub().subscriptions(); } /** diff --git a/test-frame-test/src/test/java/io/skodjob/testframe/test/integration/ResourceManagerIT.java b/test-frame-test/src/test/java/io/skodjob/testframe/test/integration/KubeResourceManagerIT.java similarity index 54% rename from test-frame-test/src/test/java/io/skodjob/testframe/test/integration/ResourceManagerIT.java rename to test-frame-test/src/test/java/io/skodjob/testframe/test/integration/KubeResourceManagerIT.java index d992a99..52f7e5c 100644 --- a/test-frame-test/src/test/java/io/skodjob/testframe/test/integration/ResourceManagerIT.java +++ b/test-frame-test/src/test/java/io/skodjob/testframe/test/integration/KubeResourceManagerIT.java @@ -5,9 +5,10 @@ package io.skodjob.testframe.test.integration; import io.fabric8.kubernetes.api.model.NamespaceBuilder; +import io.skodjob.testframe.annotations.ResourceManager; import io.skodjob.testframe.annotations.TestVisualSeparator; import io.skodjob.testframe.clients.KubeClusterException; -import io.skodjob.testframe.resources.ResourceManager; +import io.skodjob.testframe.resources.KubeResourceManager; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -18,46 +19,46 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -@io.skodjob.testframe.annotations.ResourceManager +@ResourceManager @TestVisualSeparator @TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class ResourceManagerIT { +public class KubeResourceManagerIT { @BeforeAll void setupAll() { - ResourceManager.getInstance().createResourceWithWait( + KubeResourceManager.getInstance().createResourceWithWait( new NamespaceBuilder().withNewMetadata().withName("test").endMetadata().build()); } @BeforeEach void setupEach() { - ResourceManager.getInstance().createResourceWithWait( + KubeResourceManager.getInstance().createResourceWithWait( new NamespaceBuilder().withNewMetadata().withName("test2").endMetadata().build()); } @AfterAll void afterAll() { - assertNull(ResourceManager.getKubeClient().getClient().namespaces().withName("test2").get()); - assertNull(ResourceManager.getKubeClient().getClient().namespaces().withName("test3").get()); + assertNull(KubeResourceManager.getKubeClient().getClient().namespaces().withName("test2").get()); + assertNull(KubeResourceManager.getKubeClient().getClient().namespaces().withName("test3").get()); } @Test void createResource() { - ResourceManager.getInstance().createResourceWithWait( + KubeResourceManager.getInstance().createResourceWithWait( new NamespaceBuilder().withNewMetadata().withName("test3").endMetadata().build()); } @Test void testKubeClientNamespacesExists() { - assertNotNull(ResourceManager.getKubeClient().getClient().namespaces().withName("test").get()); - assertNotNull(ResourceManager.getKubeClient().getClient().namespaces().withName("test2").get()); - assertNull(ResourceManager.getKubeClient().getClient().namespaces().withName("test3").get()); + assertNotNull(KubeResourceManager.getKubeClient().getClient().namespaces().withName("test").get()); + assertNotNull(KubeResourceManager.getKubeClient().getClient().namespaces().withName("test2").get()); + assertNull(KubeResourceManager.getKubeClient().getClient().namespaces().withName("test3").get()); } @Test void testKubeCmdClientNamespacesExists() { - assertNotNull(ResourceManager.getKubeCmdClient().get("namespace", "test")); - assertNotNull(ResourceManager.getKubeCmdClient().get("namespace", "test2")); - assertThrows(KubeClusterException.class, () -> ResourceManager.getKubeCmdClient().get("namespace", "test3")); + assertNotNull(KubeResourceManager.getKubeCmdClient().get("namespace", "test")); + assertNotNull(KubeResourceManager.getKubeCmdClient().get("namespace", "test2")); + assertThrows(KubeClusterException.class, () -> KubeResourceManager.getKubeCmdClient().get("namespace", "test3")); } }