@sap-ux/adp-tooling 0.18.97 → 0.18.98

package/dist/cf/services/api.js

@@ -329,7 +329,7 @@ async function getServiceInstance(params) {
 async function getOrCreateServiceKeys(serviceInstance, logger) {
     const serviceInstanceName = serviceInstance.name;
     try {
-        const credentials = await (0, cli_1.getServiceKeys)(serviceInstance.guid);
+        const credentials = await (0, cli_1.getServiceKeys)(serviceInstance.guid, 'updated_at', logger);
         if (credentials?.length > 0) {
             return credentials;
         }
@@ -337,7 +337,7 @@ async function getOrCreateServiceKeys(serviceInstance, logger) {
             const serviceKeyName = serviceInstanceName + '_key';
             logger?.log(`Creating service key '${serviceKeyName}' for service instance '${serviceInstanceName}'`);
             await (0, cli_1.createServiceKey)(serviceInstanceName, serviceKeyName);
-            return (0, cli_1.getServiceKeys)(serviceInstance.guid);
+            return (0, cli_1.getServiceKeys)(serviceInstance.guid, 'updated_at', logger);
         }
     }
     catch (e) {

package/dist/cf/services/cli.d.ts

@@ -1,5 +1,5 @@
 import type { ToolsLogger } from '@sap-ux/logger';
-import type { ServiceKeys } from '../../types';
+import type { ServiceKeys, ServiceKeySortField } from '../../types';
 /**
  * Checks if Cloud Foundry is installed.
  *
@@ -8,12 +8,14 @@ import type { ServiceKeys } from '../../types';
  */
 export declare function isCfInstalled(logger: ToolsLogger): Promise<boolean>;
 /**
- * Gets the service instance credentials.
+ * Gets the service instance credentials, sorted by the specified metadata field.
  *
- * @param {string} serviceInstanceGuid - The service instance GUID.
- * @returns {Promise<ServiceKeys[]>} The service instance credentials.
+ * @param serviceInstanceGuid - The service instance GUID.
+ * @param sortBy - The metadata field to sort by, defaults to 'updated_at'.
+ * @param logger - Optional logger.
+ * @returns The service instance credentials sorted by the specified field (newest first).
  */
-export declare function getServiceKeys(serviceInstanceGuid: string): Promise<ServiceKeys[]>;
+export declare function getServiceKeys(serviceInstanceGuid: string, sortBy?: ServiceKeySortField, logger?: ToolsLogger): Promise<ServiceKeys[]>;
 /**
  * Creates a service key.
  *

package/dist/cf/services/cli.js

@@ -27,14 +27,16 @@ async function isCfInstalled(logger) {
     }
 }
 /**
- * Gets the service instance credentials.
+ * Gets the service instance credentials, sorted by the specified metadata field.
  *
- * @param {string} serviceInstanceGuid - The service instance GUID.
- * @returns {Promise<ServiceKeys[]>} The service instance credentials.
+ * @param serviceInstanceGuid - The service instance GUID.
+ * @param sortBy - The metadata field to sort by, defaults to 'updated_at'.
+ * @param logger - Optional logger.
+ * @returns The service instance credentials sorted by the specified field (newest first).
  */
-async function getServiceKeys(serviceInstanceGuid) {
+async function getServiceKeys(serviceInstanceGuid, sortBy = 'updated_at', logger) {
     try {
-        return await (0, cf_tools_1.cfGetInstanceCredentials)({
+        const resources = await (0, cf_tools_1.cfGetServiceKeys)({
             filters: [
                 {
                     value: serviceInstanceGuid,
@@ -42,6 +44,36 @@ async function getServiceKeys(serviceInstanceGuid) {
                 }
             ]
         });
+        logger?.info(`Found ${resources.length} service key(s) for instance '${serviceInstanceGuid}'`);
+        const sorted = [...resources].sort((a, b) => {
+            const dateA = a[sortBy];
+            const dateB = b[sortBy];
+            if (!dateA && !dateB) {
+                return 0;
+            }
+            if (!dateA) {
+                return 1;
+            }
+            if (!dateB) {
+                return -1;
+            }
+            return new Date(dateB).getTime() - new Date(dateA).getTime();
+        });
+        if (sorted.length > 0) {
+            logger?.debug(`Service keys sorted by '${sortBy}', using key '${sorted[0].name}' as primary`);
+        }
+        const results = await Promise.all(sorted.map(async (resource) => {
+            try {
+                return await requestCfApi(`/v3/service_credential_bindings/${resource.guid}/details`);
+            }
+            catch (e) {
+                logger?.warn(`Failed to fetch credentials for service key '${resource.name}': ${e.message}`);
+                return undefined;
+            }
+        }));
+        const filtered = results.filter((r) => r !== undefined);
+        logger?.debug(`Retrieved credentials for ${filtered.length} of ${sorted.length} service key(s)`);
+        return filtered;
     }
     catch (e) {
         throw new Error((0, i18n_1.t)('error.cfGetInstanceCredentialsFailed', { serviceInstanceGuid, error: e.message }));

package/dist/types.d.ts

@@ -801,6 +801,7 @@ export interface CfAppParams {
 export interface AppParamsExtended extends CfAppParams {
     spaceGuid: string;
 }
+export type ServiceKeySortField = 'updated_at' | 'created_at';
 export interface ServiceKeys {
     credentials: {
         [key: string]: any;

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "0.18.97",
+  "version": "0.18.98",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",