Make steveapi tests more flexible

The steveapi integration tests try to be precise about the desired output of API calls. This was causing a problem when run on k8s 1.23 which has default token secrets in every namespace and so was adding extra resources to the response output. This change adds a label to the secrets created in TestList so that they can easily be identified on a live cluster and so unlabeled secrets can be ignored.
anupama2501 · May 4, 2023 · 5f78652 · 5f78652
1 parent 52fb79f
commit 5f78652
Show file tree

Hide file tree

Showing 82 changed files with 908 additions and 297 deletions.
diff --git a/tests/v2/integration/steveapi/json/user-a_none_fieldSelector=metadata.name=test1.json b/tests/v2/integration/steveapi/json/user-a_none_fieldSelector=metadata.name=test1.json
@@ -17,6 +17,9 @@
         "view": "https://rancherurl/api/v1/namespaces/test-ns-1/secrets/test1"
       },
       "metadata": {
+        "labels": {
+          "test.cattle.io/steveapi": "true"
+        },
         "name": "test1",
         "namespace": "test-ns-1",
         "resourceVersion": "1000",
@@ -39,6 +42,9 @@
         "view": "https://rancherurl/api/v1/namespaces/test-ns-2/secrets/test1"
       },
       "metadata": {
+        "labels": {
+          "test.cattle.io/steveapi": "true"
+        },
         "name": "test1",
         "namespace": "test-ns-2",
         "resourceVersion": "1000",
@@ -61,6 +67,9 @@
         "view": "https://rancherurl/api/v1/namespaces/test-ns-3/secrets/test1"
       },
       "metadata": {
+        "labels": {
+          "test.cattle.io/steveapi": "true"
+        },
         "name": "test1",
         "namespace": "test-ns-3",
         "resourceVersion": "1000",
@@ -83,6 +92,9 @@
         "view": "https://rancherurl/api/v1/namespaces/test-ns-4/secrets/test1"
       },
       "metadata": {
+        "labels": {
+          "test.cattle.io/steveapi": "true"
+        },
         "name": "test1",
         "namespace": "test-ns-4",
         "resourceVersion": "1000",
@@ -105,6 +117,9 @@
         "view": "https://rancherurl/api/v1/namespaces/test-ns-5/secrets/test1"
       },
       "metadata": {
+        "labels": {
+          "test.cattle.io/steveapi": "true"
+        },
         "name": "test1",
         "namespace": "test-ns-5",
         "resourceVersion": "1000",

diff --git a/.../v2/integration/steveapi/json/user-a_none_fieldSelector=metadata.namespace=test-ns-1.json b/.../v2/integration/steveapi/json/user-a_none_fieldSelector=metadata.namespace=test-ns-1.json
@@ -17,6 +17,9 @@
         "view": "https://rancherurl/api/v1/namespaces/test-ns-1/secrets/test1"
       },
       "metadata": {
+        "labels": {
+          "test.cattle.io/steveapi": "true"
+        },
         "name": "test1",
         "namespace": "test-ns-1",
         "resourceVersion": "1000",
@@ -40,7 +43,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label": "2"
+          "test-label": "2",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test2",
         "namespace": "test-ns-1",
@@ -65,7 +69,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test3",
         "namespace": "test-ns-1",
@@ -90,7 +95,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test4",
         "namespace": "test-ns-1",
@@ -115,7 +121,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test5",
         "namespace": "test-ns-1",

diff --git a/...none_filter=metadata.labels.test-label-gte=3&sort=-metadata.name&pagesize=6&limit=20.json b/...none_filter=metadata.labels.test-label-gte=3&sort=-metadata.name&pagesize=6&limit=20.json
@@ -19,7 +19,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test5",
         "namespace": "test-ns-1",
@@ -44,7 +45,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test5",
         "namespace": "test-ns-2",
@@ -69,7 +71,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test5",
         "namespace": "test-ns-3",
@@ -94,7 +97,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test5",
         "namespace": "test-ns-4",
@@ -119,7 +123,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test4",
         "namespace": "test-ns-1",
@@ -144,7 +149,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test4",
         "namespace": "test-ns-2",
@@ -163,7 +169,7 @@
   "pages": 2,
   "pagination": {
     "first": "https://rancherurl/v1/secrets",
-    "next": "https://rancherurl/v1/secrets?continue=nondeterministictoken\u0026filter=metadata.labels.test-label-gte%3D3\u0026limit=20\u0026pagesize=6\u0026sort=-metadata.name",
+    "next": "https://rancherurl/v1/secrets?continue=nondeterministictoken\u0026filter=metadata.labels.test-label-gte%3D3\u0026labelSelector=test.cattle.io%2Fsteveapi%3Dtrue\u0026limit=20\u0026pagesize=6\u0026sort=-metadata.name",
     "partial": true
   },
   "resourceType": "secret",

diff --git a/...-gte=3&sort=-metadata.name&pagesize=6&page=1&limit=20&continue=nondeterministictoken.json b/...-gte=3&sort=-metadata.name&pagesize=6&page=1&limit=20&continue=nondeterministictoken.json
@@ -18,7 +18,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test5",
         "namespace": "test-ns-5",
@@ -43,7 +44,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test4",
         "namespace": "test-ns-5",
@@ -68,7 +70,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test3",
         "namespace": "test-ns-5",

diff --git a/...el-gte=3&sort=-metadata.name&pagesize=6&page=2&revision=nondeterministicint&limit=20.json b/...el-gte=3&sort=-metadata.name&pagesize=6&page=2&revision=nondeterministicint&limit=20.json
@@ -19,7 +19,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test4",
         "namespace": "test-ns-3",
@@ -44,7 +45,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test4",
         "namespace": "test-ns-4",
@@ -69,7 +71,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test3",
         "namespace": "test-ns-1",
@@ -94,7 +97,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test3",
         "namespace": "test-ns-2",
@@ -119,7 +123,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test3",
         "namespace": "test-ns-3",
@@ -144,7 +149,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label-gte": "3"
+          "test-label-gte": "3",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test3",
         "namespace": "test-ns-4",
@@ -163,7 +169,7 @@
   "pages": 2,
   "pagination": {
     "first": "https://rancherurl/v1/secrets",
-    "next": "https://rancherurl/v1/secrets?continue=nondeterministictoken\u0026filter=metadata.labels.test-label-gte%3D3\u0026limit=20\u0026page=2\u0026pagesize=6\u0026revision=nondeterministicint\u0026sort=-metadata.name",
+    "next": "https://rancherurl/v1/secrets?continue=nondeterministictoken\u0026filter=metadata.labels.test-label-gte%3D3\u0026labelSelector=test.cattle.io%2Fsteveapi%3Dtrue\u0026limit=20\u0026page=2\u0026pagesize=6\u0026revision=nondeterministicint\u0026sort=-metadata.name",
     "partial": true
   },
   "resourceType": "secret",

diff --git a/tests/v2/integration/steveapi/json/user-a_none_filter=metadata.name=test1.json b/tests/v2/integration/steveapi/json/user-a_none_filter=metadata.name=test1.json
@@ -17,6 +17,9 @@
         "view": "https://rancherurl/api/v1/namespaces/test-ns-1/secrets/test1"
       },
       "metadata": {
+        "labels": {
+          "test.cattle.io/steveapi": "true"
+        },
         "name": "test1",
         "namespace": "test-ns-1",
         "resourceVersion": "1000",
@@ -39,6 +42,9 @@
         "view": "https://rancherurl/api/v1/namespaces/test-ns-2/secrets/test1"
       },
       "metadata": {
+        "labels": {
+          "test.cattle.io/steveapi": "true"
+        },
         "name": "test1",
         "namespace": "test-ns-2",
         "resourceVersion": "1000",
@@ -61,6 +67,9 @@
         "view": "https://rancherurl/api/v1/namespaces/test-ns-3/secrets/test1"
       },
       "metadata": {
+        "labels": {
+          "test.cattle.io/steveapi": "true"
+        },
         "name": "test1",
         "namespace": "test-ns-3",
         "resourceVersion": "1000",
@@ -83,6 +92,9 @@
         "view": "https://rancherurl/api/v1/namespaces/test-ns-4/secrets/test1"
       },
       "metadata": {
+        "labels": {
+          "test.cattle.io/steveapi": "true"
+        },
         "name": "test1",
         "namespace": "test-ns-4",
         "resourceVersion": "1000",
@@ -105,6 +117,9 @@
         "view": "https://rancherurl/api/v1/namespaces/test-ns-5/secrets/test1"
       },
       "metadata": {
+        "labels": {
+          "test.cattle.io/steveapi": "true"
+        },
         "name": "test1",
         "namespace": "test-ns-5",
         "resourceVersion": "1000",

diff --git a/tests/v2/integration/steveapi/json/user-a_none_labelSelector=test-label=2.json b/tests/v2/integration/steveapi/json/user-a_none_labelSelector=test-label=2.json
@@ -18,7 +18,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label": "2"
+          "test-label": "2",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test2",
         "namespace": "test-ns-1",
@@ -43,7 +44,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label": "2"
+          "test-label": "2",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test2",
         "namespace": "test-ns-2",
@@ -68,7 +70,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label": "2"
+          "test-label": "2",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test2",
         "namespace": "test-ns-3",
@@ -93,7 +96,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label": "2"
+          "test-label": "2",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test2",
         "namespace": "test-ns-4",
@@ -118,7 +122,8 @@
       },
       "metadata": {
         "labels": {
-          "test-label": "2"
+          "test-label": "2",
+          "test.cattle.io/steveapi": "true"
         },
         "name": "test2",
         "namespace": "test-ns-5",