fix: tests dealing with PATCH

Signed-off-by: Marc Nuri <[email protected]>

Author: manusa

junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherPatchTest.java

@@ -324,8 +324,7 @@ void replaceStatusCrIgnoreAllChangesExceptStatus() {
   class ResourceVersion {
 
     @Test
-    @DisplayName("JSON patch, with different resource version, should patch the resource ---->" +
-        "Invalid Client behavior which removes the resource version from the list of operations")
+    @DisplayName("JSON patch, with different resource version, should throw conflict exception")
     void differentResourceVersionConflictEdit() {
       // Given
       client.resource(new ConfigMapBuilder()
@@ -339,15 +338,15 @@ void differentResourceVersionConflictEdit() {
           .addToData("key", "changed")
           .build());
       // Then
-      assertThatThrownBy(() -> patchedCmOp.patch())
+      assertThatThrownBy(patchedCmOp::patch)
           .asInstanceOf(InstanceOfAssertFactories.type(KubernetesClientException.class))
           .hasFieldOrPropertyWithValue("code", 409)
           .extracting(KubernetesClientException::getMessage).asString()
           .contains("the object has been modified;");
     }
 
     @Test
-    @DisplayName("JSON patch, with different resource version, should throw conflict exception")
+    @DisplayName("JSON patch (list of operations), with different resource version, should throw conflict exception")
     void differentResourceVersionConflict() {
       // Given
       client.resource(new ConfigMapBuilder()

kubernetes-itests/src/test/java/io/fabric8/kubernetes/APIServiceIT.java

@@ -63,7 +63,7 @@ void list() {
   void update() {
     APIService result = client.apiServices().withName("v1.tests.example.com")
         .edit(c -> new APIServiceBuilder(c)
-            .editOrNewMetadata().addToAnnotations("foo", "bar").endMetadata()
+            .editOrNewMetadata().withResourceVersion(null).addToAnnotations("foo", "bar").endMetadata()
             .build());
     assertThat(result)
         .hasFieldOrPropertyWithValue("metadata.annotations.foo", "bar")

kubernetes-itests/src/test/java/io/fabric8/kubernetes/ClusterRoleBindingIT.java

@@ -111,6 +111,7 @@ void update() {
 
     ClusterRoleBinding clusterRoleBinding = client.rbac().clusterRoleBindings().withName("read-nodes-update")
         .edit(c -> new ClusterRoleBindingBuilder(c)
+            .editMetadata().withResourceVersion(null).endMetadata()
             .editSubject(0).withName("jane-new").endSubject().build());
 
     assertNotNull(clusterRoleBinding);

kubernetes-itests/src/test/java/io/fabric8/kubernetes/ClusterRoleIT.java

@@ -123,6 +123,7 @@ void list() {
   void update() {
 
     ClusterRole clusterRole = client.rbac().clusterRoles().withName("node-reader-update").edit(c -> new ClusterRoleBuilder(c)
+        .editMetadata().withResourceVersion(null).endMetadata()
         .editRule(0).addToApiGroups(1, "extensions").endRule().build());
 
     assertNotNull(clusterRole);

kubernetes-itests/src/test/java/io/fabric8/kubernetes/ConfigMapIT.java

@@ -56,6 +56,7 @@ void list() {
   @Test
   void update() {
     ConfigMap configMap = client.configMaps().withName("configmap-update").edit(c -> new ConfigMapBuilder(c)
+        .editMetadata().withResourceVersion(null).endMetadata()
         .addToData("MSSQL", "Microsoft Database").build());
 
     assertNotNull(configMap);

kubernetes-itests/src/test/java/io/fabric8/kubernetes/CronJobIT.java

@@ -59,9 +59,8 @@ void list() {
   void update() {
     CronJob cronJob1 = client.batch().v1beta1().cronjobs().withName("hello-update")
         .edit(c -> new CronJobBuilder(c)
-            .editSpec()
-            .withSchedule("*/1 * * * *")
-            .endSpec()
+            .editMetadata().withResourceVersion(null).endMetadata()
+            .editSpec().withSchedule("*/1 * * * *").endSpec()
             .build());
     assertEquals("*/1 * * * *", cronJob1.getSpec().getSchedule());
   }

kubernetes-itests/src/test/java/io/fabric8/kubernetes/CustomResourceDefinitionIT.java

@@ -99,6 +99,7 @@ void update() {
     // When
     final CustomResourceDefinition result = client.apiextensions().v1().customResourceDefinitions()
         .withName(name).edit(c -> new CustomResourceDefinitionBuilder(c)
+            .editMetadata().withResourceVersion(null).endMetadata()
             .editSpec().editOrNewNames().addToShortNames("its").endNames().endSpec().build());
     // Then
     assertThat(result.getSpec().getNames().getShortNames())

kubernetes-itests/src/test/java/io/fabric8/kubernetes/DaemonSetIT.java

@@ -50,6 +50,7 @@ void list() {
   @Test
   void update() {
     DaemonSet daemonSet = client.apps().daemonSets().withName("daemonset-update").edit(c -> new DaemonSetBuilder(c)
+        .editMetadata().withResourceVersion(null).endMetadata()
         .editSpec().editTemplate().editSpec().editContainer(0)
         .withImage("quay.io/fluentd_elasticsearch/fluentd:v3.0.0")
         .endContainer().endSpec().endTemplate().endSpec()

kubernetes-itests/src/test/java/io/fabric8/kubernetes/DeploymentIT.java

@@ -65,7 +65,8 @@ void list() {
   @Test
   void update() {
     Deployment deployment1 = client.apps().deployments().withName("deployment-standard")
-        .edit(d -> new DeploymentBuilder(d).editMetadata().addToAnnotations("updated", "true").endMetadata().build());
+        .edit(d -> new DeploymentBuilder(d)
+            .editMetadata().withResourceVersion(null).addToAnnotations("updated", "true").endMetadata().build());
     assertThat(deployment1).isNotNull();
     assertEquals("true", deployment1.getMetadata().getAnnotations().get("updated"));
   }

kubernetes-itests/src/test/java/io/fabric8/kubernetes/IngressIT.java

@@ -58,7 +58,7 @@ void list() {
   @Test
   void update() {
     Ingress ingress = client.network().v1().ingresses().withName("ingress-update").edit(i -> new IngressBuilder(i)
-        .editOrNewMetadata().addToAnnotations("foo", "bar").endMetadata().build());
+        .editMetadata().withResourceVersion(null).addToAnnotations("foo", "bar").endMetadata().build());
 
     assertNotNull(ingress);
     assertEquals("bar", ingress.getMetadata().getAnnotations().get("foo"));