Use lodash chaining to resolve secretbinding quotas

gardener · Dec 2, 2024 · 2e1afb0 · 2e1afb0
1 parent 36bc5ed
commit 2e1afb0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/backend/lib/services/cloudProviderCredentials.js b/backend/lib/services/cloudProviderCredentials.js
@@ -23,16 +23,21 @@ exports.list = async function ({ user, params }) {
     client.core.secrets.list(secretBindingNamespace, { labelSelector: 'reference.gardener.cloud/secretbinding=true' }),
   ])
 
-  const quotas = _.flatMap(secretBindings, secretBinding => {
-    const bindingQuotas = resolveQuotas(secretBinding)
-    const clusterLifetimeQuotas = _.filter(bindingQuotas, 'spec.clusterLifetimeDays')
-    return _.flatMap(clusterLifetimeQuotas, ({ metadata, spec }) => {
-      return {
-        metadata: _.pick(metadata, ['name', 'namespace', 'uid']),
-        spec: _.pick(spec, ['clusterLifetimeDays', 'scope']),
-      }
-    })
-  })
+  const pickQuotaProperties = _.partialRight(_.pick, [
+    'apiVersion',
+    'kind',
+    'metadata.name',
+    'metadata.namespace',
+    'spec.scope',
+    'spec.clusterLifetimeDays',
+  ])
+
+  const quotas = _
+    .chain(secretBindings)
+    .flatMap(secretBinding => resolveQuotas(secretBinding))
+    .filter('spec.clusterLifetimeDays')
+    .map(pickQuotaProperties)
+    .value()
 
   return {
     secretBindings,

diff --git a/backend/test/acceptance/__snapshots__/api.cloudProviderCredentials.spec.js.snap b/backend/test/acceptance/__snapshots__/api.cloudProviderCredentials.spec.js.snap
@@ -443,7 +443,6 @@ exports[`api cloudproviderCredentials should return three cloudProvider credenti
       "metadata": {
         "name": "foo-quota1",
         "namespace": "garden-foo",
-        "uid": 2,
       },
       "spec": {
         "clusterLifetimeDays": 14,
@@ -457,7 +456,6 @@ exports[`api cloudproviderCredentials should return three cloudProvider credenti
       "metadata": {
         "name": "foo-quota2",
         "namespace": "garden-foo",
-        "uid": 3,
       },
       "spec": {
         "clusterLifetimeDays": 14,
@@ -471,7 +469,6 @@ exports[`api cloudproviderCredentials should return three cloudProvider credenti
       "metadata": {
         "name": "foo-quota1",
         "namespace": "garden-foo",
-        "uid": 2,
       },
       "spec": {
         "clusterLifetimeDays": 14,
@@ -485,7 +482,6 @@ exports[`api cloudproviderCredentials should return three cloudProvider credenti
       "metadata": {
         "name": "foo-quota2",
         "namespace": "garden-foo",
-        "uid": 3,
       },
       "spec": {
         "clusterLifetimeDays": 14,
@@ -499,7 +495,6 @@ exports[`api cloudproviderCredentials should return three cloudProvider credenti
       "metadata": {
         "name": "foo-quota1",
         "namespace": "garden-foo",
-        "uid": 2,
       },
       "spec": {
         "clusterLifetimeDays": 14,
@@ -513,7 +508,6 @@ exports[`api cloudproviderCredentials should return three cloudProvider credenti
       "metadata": {
         "name": "foo-quota2",
         "namespace": "garden-foo",
-        "uid": 3,
       },
       "spec": {
         "clusterLifetimeDays": 14,
@@ -527,7 +521,6 @@ exports[`api cloudproviderCredentials should return three cloudProvider credenti
       "metadata": {
         "name": "foo-quota1",
         "namespace": "garden-foo",
-        "uid": 2,
       },
       "spec": {
         "clusterLifetimeDays": 14,
@@ -541,7 +534,6 @@ exports[`api cloudproviderCredentials should return three cloudProvider credenti
       "metadata": {
         "name": "foo-quota2",
         "namespace": "garden-foo",
-        "uid": 3,
       },
       "spec": {
         "clusterLifetimeDays": 14,