Delete key using primary key ID not subkey ID

crazy-max · Feb 28, 2022 · a7fb0ed · a7fb0ed
1 parent 2724049
commit a7fb0ed
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/main.ts b/src/main.ts
@@ -38,6 +38,7 @@ async function run(): Promise<void> {
       fingerprint = inputs.fingerprint;
     }
     stateHelper.setFingerprint(fingerprint);
+    stateHelper.setKeyID(privateKey.keyID);
     await core.group(`Fingerprint to use`, async () => {
       core.info(fingerprint);
     });
@@ -131,7 +132,7 @@ async function cleanup(): Promise<void> {
   }
   try {
     core.info('Removing keys');
-    await gpg.deleteKey(stateHelper.fingerprint);
+    await gpg.deleteKey(stateHelper.keyId);
 
     core.info('Killing GnuPG agent');
     await gpg.killAgent();

diff --git a/src/state-helper.ts b/src/state-helper.ts
@@ -2,11 +2,16 @@ import * as core from '@actions/core';
 
 export const IsPost = !!process.env['STATE_isPost'];
 export const fingerprint = process.env['STATE_fingerprint'] || '';
+export const keyId = process.env['STATE_keyId'] || '';
 
 export function setFingerprint(fingerprint: string) {
   core.saveState('fingerprint', fingerprint);
 }
 
+export function setKeyID(keyID: string) {
+  core.saveState('keyId', keyID);
+}
+
 if (!IsPost) {
   core.saveState('isPost', 'true');
 }