Merge pull request #3025 from yue9944882/add-secret-patch

Fixes secret deep-compare issue and track the change by patches

Author: k8s-ci-robot

kubernetes/src/main/java/io/kubernetes/client/custom/MapUtils.java

@@ -0,0 +1,35 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package io.kubernetes.client.custom;
+
+import java.util.Arrays;
+import java.util.Map;
+
+public class MapUtils {
+    public static boolean equals(Map<String, byte[]> map1, Map<String, byte[]> map2) {
+        if (map1 == map2) {
+            return true; // Both pointing to the same instance
+        }
+        if (map1 == null || map2 == null || map1.size() != map2.size()) {
+            return false; // One is null or their sizes are different
+        }
+        for (String key : map1.keySet()) {
+            if (!map2.containsKey(key) || !Arrays.equals(map1.get(key), map2.get(key))) {
+                // Key doesn't exist in map2 or the byte arrays are not equal
+                return false;
+            }
+        }
+        // All keys matched and their corresponding byte arrays are equal
+        return true;
+    }
+}

kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java

@@ -19,6 +19,7 @@
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import io.kubernetes.client.custom.MapUtils;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import java.io.IOException;
 import java.util.HashMap;
@@ -259,7 +260,7 @@ public boolean equals(Object o) {
     }
     V1Secret v1Secret = (V1Secret) o;
     return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
-        Objects.equals(this.data, v1Secret.data) &&
+        MapUtils.equals(this.data, v1Secret.data) &&
         Objects.equals(this.immutable, v1Secret.immutable) &&
         Objects.equals(this.kind, v1Secret.kind) &&
         Objects.equals(this.metadata, v1Secret.metadata) &&

kubernetes/src/test/java/io/kubernetes/client/custom/MapUtilsTest.java

@@ -0,0 +1,45 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package io.kubernetes.client.custom;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class MapUtilsTest {
+    @Test
+    public void testEquals() {
+        Map<String, byte[]> left = new HashMap<String, byte[]>() {{
+            put("foo", "bar".getBytes());
+        }};
+        Map<String, byte[]> right = new HashMap<String, byte[]>() {{
+            put("foo", "bar".getBytes());
+        }};
+        assertTrue(MapUtils.equals(left, right));
+    }
+
+    @Test
+    public void testNotEquals() {
+        Map<String, byte[]> left = new HashMap<String, byte[]>() {{
+            put("foo", "baz".getBytes());
+        }};
+        Map<String, byte[]> right = new HashMap<String, byte[]>() {{
+            put("foo", "bar".getBytes());
+        }};
+        assertFalse(MapUtils.equals(left, right));
+    }
+}

kubernetes/src/test/java/io/kubernetes/client/openapi/V1SecretTest.java

@@ -0,0 +1,35 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package io.kubernetes.client.openapi;
+
+import io.kubernetes.client.openapi.models.V1Secret;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.HashMap;
+
+public class V1SecretTest {
+    @Test
+    public void testV1SecretEquality() {
+        V1Secret left = new V1Secret()
+                .data(new HashMap<String, byte[]>() {{
+                    put("foo", "bar".getBytes());
+                }});
+        V1Secret right = new V1Secret()
+                .data(new HashMap<String, byte[]>() {{
+                    put("foo", "bar".getBytes());
+                }});
+        assertEquals(left, right);
+    }
+}

scripts/patches/secret.diff

@@ -0,0 +1,21 @@
+diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java
+index 8fdadaac6..5fe296242 100644
+--- a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java
++++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java
+@@ -19,6 +19,7 @@ import com.google.gson.annotations.JsonAdapter;
+ import com.google.gson.annotations.SerializedName;
+ import com.google.gson.stream.JsonReader;
+ import com.google.gson.stream.JsonWriter;
++import io.kubernetes.client.custom.MapUtils;
+ import io.kubernetes.client.openapi.models.V1ObjectMeta;
+ import java.io.IOException;
+ import java.util.HashMap;
+@@ -259,7 +260,7 @@ public class V1Secret implements io.kubernetes.client.common.KubernetesObject {
+     }
+     V1Secret v1Secret = (V1Secret) o;
+     return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
+-        Objects.equals(this.data, v1Secret.data) &&
++        MapUtils.equals(this.data, v1Secret.data) &&
+         Objects.equals(this.immutable, v1Secret.immutable) &&
+         Objects.equals(this.kind, v1Secret.kind) &&
+         Objects.equals(this.metadata, v1Secret.metadata) &&