Merge pull request #11476 from jerolimov/tojson-cache-improvements-4.9

[release-4.9] Bug 2084028: Improve Firehose cache, so that it does not return unexpected data also if isList differs on two concurrent calls
openshift · May 17, 2022 · bd45974 · bd45974
2 parents 437ecea + d859458
commit bd45974
Show file tree

Hide file tree

Showing 10 changed files with 812 additions and 66 deletions.
diff --git a/frontend/packages/dev-console/src/components/import/git/SourceSecretSelector.tsx b/frontend/packages/dev-console/src/components/import/git/SourceSecretSelector.tsx
@@ -21,13 +21,17 @@ const SourceSecretSelector: React.FC<{
   const { values, setFieldValue } = useFormikContext<FormikValues>();
   const namespace: string = _.get(values, `${fieldPrefix}project.name`);
   const secret: string = _.get(values, `${fieldPrefix}git.secret`);
-  const [data, loaded, loadError] = useK8sWatchResource({
-    kind: SecretModel.kind,
-    namespace,
-    name: secret,
-    optional: true,
-    isList: false,
-  });
+  const [data, loaded, loadError] = useK8sWatchResource(
+    namespace && secret
+      ? {
+          kind: SecretModel.kind,
+          namespace,
+          name: secret,
+          optional: true,
+          isList: false,
+        }
+      : null,
+  );
 
   const handleSave = (name: string) => {
     setFieldValue(`${fieldPrefix}git.secret`, name);

diff --git a/frontend/public/components/utils/__tests__/firehose.data.tsx b/frontend/public/components/utils/__tests__/firehose.data.tsx
@@ -7,7 +7,7 @@ export const podData = {
   kind: 'Pod',
   metadata: {
     name: 'my-pod',
-    namespace: 'default',
+    namespace: 'my-namespace',
     resourceVersion: '123',
   },
 };
@@ -20,7 +20,7 @@ export const podList = {
     kind: 'Pod',
     metadata: {
       name,
-      namespace: 'default',
+      namespace: 'my-namespace',
       resourceVersion: '123',
     },
   })),