test: Refactores Auth specific Integration Tests

Author: manusa

tests/src/test/java/com/marcnuri/yakc/AuthIT.java

@@ -24,10 +24,7 @@
 import com.marcnuri.yakc.model.io.k8s.api.core.v1.Secret;
 import com.marcnuri.yakc.model.io.k8s.api.core.v1.ServiceAccount;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
-import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.io.IOException;
@@ -38,68 +35,54 @@
 /**
  * Created by Marc Nuri on 2020-05-02.
  */
-@TestMethodOrder(OrderAnnotation.class)
 @ExtendWith(KubernetesClientExtension.class)
 class AuthIT {
 
   private static final String NAMESPACE = "default";
 
-  private static String secretName;
-  private static String caData;
-  private static String token;
+  private static String nodeName;
 
   @BeforeAll
-  static void setUp() {
-    secretName = null;
-    caData = null;
-    token = null;
-  }
-
-  @Test
-  @Order(1)
-  void retrieveServiceAccount() throws IOException {
-    // When
-    final ServiceAccount sa = KC.create(CoreV1Api.class).listNamespacedServiceAccount(NAMESPACE)
-      .stream().findFirst().orElse(null);
-    // Then
-    assertThat(sa).isNotNull();
-    secretName = sa.getSecrets().stream().findFirst().map(ObjectReference::getName).orElse(null);
-  }
-
-  @Test
-  @Order(2)
-  void retrieveSecretForServiceAccount() throws IOException {
-    // When
-    final Secret secret = KC.create(CoreV1Api.class).listNamespacedSecret(NAMESPACE)
-      .stream()
-      .filter(s -> s.getType().equals("kubernetes.io/service-account-token"))
-      .filter(s -> s.getMetadata().getName().equals(secretName))
-      .findAny().orElse(null);
-    // Then
-    assertThat(secret).isNotNull();
-    assertThat(secret.getData()).containsKeys("ca.crt", "token");
-    caData = secret.getData().get("ca.crt");
-    token = secret.getData().get("token");
+  static void setUp() throws IOException {
+    nodeName = KC.create(CoreV1Api.class).listNode().stream().findFirst()
+      .orElseThrow(() -> new IllegalStateException("Node not accessible with default client"))
+      .getMetadata().getName();
   }
 
   @Test
-  @Order(3)
   void performTokenAuthInNewClient() throws IOException {
     // Given
+    final Secret secret = retrieveSecretForServiceAccount(retrieveServiceAccountSecret());
     final Configuration configuration = Configuration.builder()
       .server(KC.getConfiguration().getServer())
-      .certificateAuthorityData(caData)
-      .token(token)
+      .certificateAuthorityData(secret.getData().get("ca.crt"))
+      .token(secret.getData().get("token"))
       .build();
-    final KubernetesClient tokenClient = new KubernetesClient(configuration);
-    final String accessibleTokenName = KC.create(CoreV1Api.class).listNode().stream().findFirst()
-      .orElseThrow(() -> new IllegalStateException("Node not accessible with default client"))
-      .getMetadata().getName();
     // When
-    final Node node = tokenClient.create(CoreV1Api.class).listNode().stream().findFirst()
+    final Node node = new KubernetesClient(configuration).create(CoreV1Api.class)
+      .listNode().stream().findFirst()
       .orElse(null);
     // Then
-    assertThat(node).isNotNull();
-    assertThat(node.getMetadata().getName()).isEqualTo(accessibleTokenName);
+    assertThat(node)
+      .isNotNull()
+      .hasFieldOrPropertyWithValue("metadata.name", nodeName);
+  }
+
+  private String retrieveServiceAccountSecret() throws IOException {
+    return KC.create(CoreV1Api.class).listNamespacedServiceAccount(NAMESPACE)
+      .stream().findFirst()
+      .map(ServiceAccount::getSecrets)
+      .flatMap(secrets -> secrets.stream().findFirst().map(ObjectReference::getName))
+      .orElseThrow(() -> new AssertionError("No Service Account found"));
   }
+
+  private Secret retrieveSecretForServiceAccount(String secretName) throws IOException {
+    return KC.create(CoreV1Api.class).listNamespacedSecret(NAMESPACE)
+      .stream()
+      .filter(s -> s.getType().equals("kubernetes.io/service-account-token"))
+      .filter(s -> s.getMetadata().getName().equals(secretName))
+      .findAny()
+      .orElseThrow(() -> new AssertionError(String.format("Secret %s doesn't exist", secretName)));
+  }
+
 }

tests/src/test/java/com/marcnuri/yakc/NetworkPolicyIT.java

@@ -29,9 +29,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.io.IOException;
@@ -43,7 +41,6 @@
 /**
  * Created by Marc Nuri on 2020-05-02.
  */
-@TestMethodOrder(OrderAnnotation.class)
 @ExtendWith(KubernetesClientExtension.class)
 class NetworkPolicyIT {
 
@@ -82,7 +79,7 @@ void createNamespacedNetworkPolicy() {
   void listNamespacedNetworkPolicy() throws IOException {
     // When
     final boolean result = KC.create(NetworkingV1Api.class).listNamespacedNetworkPolicy(NAMESPACE)
-      .stream().anyMatch(pod -> pod.getMetadata().getName().equals(networkPolicyName));
+      .stream().anyMatch(np -> np.getMetadata().getName().equals(networkPolicyName));
     // Then
     assertThat(result).as("Created NetworkPolicy was not found").isTrue();
   }

tests/src/test/java/com/marcnuri/yakc/PodIT.java

@@ -28,6 +28,7 @@
 import com.marcnuri.yakc.model.io.k8s.api.core.v1.Container;
 import com.marcnuri.yakc.model.io.k8s.api.core.v1.Pod;
 import com.marcnuri.yakc.model.io.k8s.api.core.v1.PodSpec;
+import com.marcnuri.yakc.model.io.k8s.apimachinery.pkg.apis.meta.v1.DeleteOptions;
 import com.marcnuri.yakc.model.io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta;
 import io.reactivex.disposables.Disposable;
 import org.assertj.core.api.InstanceOfAssertFactories;
@@ -273,7 +274,8 @@ private Pod createPodForTest() throws IOException {
 
   private void deletePodForTest() throws IOException {
     try {
-      KC.create(CoreV1Api.class).deleteNamespacedPod(podName, NAMESPACE).get();
+      KC.create(CoreV1Api.class)
+        .deleteNamespacedPod(podName, NAMESPACE, DeleteOptions.builder().gracePeriodSeconds(0).build()).get();
     } catch (NotFoundException ex) {
       // Ignore, this is only clean up. Resource may have been deleted by delete test
     }

tests/src/test/java/com/marcnuri/yakc/ServiceAccountIT.java

@@ -40,6 +40,7 @@
  */
 @ExtendWith(KubernetesClientExtension.class)
 class ServiceAccountIT {
+
   private static final String NAMESPACE = "default";
 
   private String serviceAccountName;