update cert search

buildalon · Oct 31, 2024 · 02a8c0b · 02a8c0b
1 parent bb5e9d2
commit 02a8c0b
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 23 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -30656,18 +30656,26 @@ const main = async () => {
 main();
 async function getCertificatePath(projectPath) {
     let certificatePath = core.getInput(`certificate-path`) || `${projectPath}/**/*.pfx`;
-    const certificateGlobber = await glob.create(certificatePath);
-    const certificateFiles = await certificateGlobber.glob();
-    switch (certificateFiles.length) {
-        case 0:
-            throw new Error(`No certificate file found. Please set the 'certificate-path' input.`);
-        default:
-            if (certificateFiles.length > 1) {
-                core.warning(`More than one certificate file found, using the first one found:\n${certificateFiles.join(`\n`)}`);
-            }
-            certificatePath = certificateFiles[0];
+    core.info(`certificatePath: "${certificatePath}"`);
+    if (!certificatePath.endsWith(`**/*.pfx`)) {
+        certificatePath = path.join(certificatePath, `**/*.pfx`);
+    }
+    if (certificatePath.includes(`*`)) {
+        const certificateGlobber = await glob.create(certificatePath);
+        const certificateFiles = await certificateGlobber.glob();
+        core.info(`Found certificate files:`);
+        certificateFiles.forEach(file => core.info(`  - "${file}"`));
+        if (certificateFiles.length === 0) {
+            throw new Error(`No certificate file found: "${certificatePath}"`);
+        }
+        certificatePath = certificateFiles[0];
+    }
+    try {
+        await fs.promises.access(certificatePath, fs.constants.R_OK);
+    }
+    catch (error) {
+        throw new Error(`Certificate file not found: "${certificatePath}"`);
     }
-    await fs.promises.access(certificatePath, fs.constants.R_OK);
     return certificatePath;
 }
 async function getCertificateThumbprint(certificatePath) {

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/index.ts b/src/index.ts
@@ -119,18 +119,25 @@ main();
 
 async function getCertificatePath(projectPath: string): Promise<string> {
     let certificatePath = core.getInput(`certificate-path`) || `${projectPath}/**/*.pfx`;
-    const certificateGlobber = await glob.create(certificatePath);
-    const certificateFiles = await certificateGlobber.glob();
-    switch (certificateFiles.length) {
-        case 0:
-            throw new Error(`No certificate file found. Please set the 'certificate-path' input.`);
-        default:
-            if (certificateFiles.length > 1) {
-                core.warning(`More than one certificate file found, using the first one found:\n${certificateFiles.join(`\n`)}`);
-            }
-            certificatePath = certificateFiles[0];
+    core.info(`certificatePath: "${certificatePath}"`);
+    if (!certificatePath.endsWith(`**/*.pfx`)) {
+        certificatePath = path.join(certificatePath, `**/*.pfx`);
+    }
+    if (certificatePath.includes(`*`)) {
+        const certificateGlobber = await glob.create(certificatePath);
+        const certificateFiles = await certificateGlobber.glob();
+        core.info(`Found certificate files:`);
+        certificateFiles.forEach(file => core.info(`  - "${file}"`));
+        if (certificateFiles.length === 0) {
+            throw new Error(`No certificate file found: "${certificatePath}"`);
+        }
+        certificatePath = certificateFiles[0];
+    }
+    try {
+        await fs.promises.access(certificatePath, fs.constants.R_OK);
+    } catch (error) {
+        throw new Error(`Certificate file not found: "${certificatePath}"`);
     }
-    await fs.promises.access(certificatePath, fs.constants.R_OK);
     return certificatePath;
 }