@codemowers/oidc-key-manager 0.2.0 → 0.2.2

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @codemowers/oidc-key-manager
 $ key-manager COMMAND
 running command...
 $ key-manager (--version)
-@codemowers/oidc-key-manager/0.2.0 linux-x64 node-v16.17.0
+@codemowers/oidc-key-manager/0.2.2 linux-x64 node-v16.17.0
 $ key-manager --help [COMMAND]
 USAGE
   $ key-manager COMMAND
@@ -57,7 +57,7 @@ EXAMPLES
   $ key-manager initialize --namespace <kube namespace> --secret <secret name> --recreate
 ```
 
-_See code: [dist/commands/initialize.ts](https://github.com/codemowers/oidc-key-manager/blob/v0.2.0/dist/commands/initialize.ts)_
+_See code: [dist/commands/initialize.ts](https://github.com/codemowers/oidc-key-manager/blob/v0.2.2/dist/commands/initialize.ts)_
 
 ## `key-manager rotate`
 
@@ -89,5 +89,5 @@ EXAMPLES
   $ key-manager rotate
 ```
 
-_See code: [dist/commands/rotate.ts](https://github.com/codemowers/oidc-key-manager/blob/v0.2.0/dist/commands/rotate.ts)_
+_See code: [dist/commands/rotate.ts](https://github.com/codemowers/oidc-key-manager/blob/v0.2.2/dist/commands/rotate.ts)_
 <!-- commandsstop -->

package/dist/commands/rotate.js

@@ -24,8 +24,16 @@ class Rotate extends core_1.Command {
             secret.appendCookieKey(flags['max-number-of-cookie-keys']);
         }
         await kubeApiService.replaceSecret(secret);
+        let restarted = false;
         if (flags['restart-deployment']) {
-            await kubeApiService.restartDeployment(flags['restart-deployment'], flags['restart-deployment-backoff']);
+            try {
+                await kubeApiService.restartDeployment(flags['restart-deployment'], flags['restart-deployment-backoff']);
+                restarted = true;
+            }
+            catch (error) {
+                this.log('Restarting deployment failed', error);
+                restarted = false;
+            }
         }
         if (flags.both || flags.jwks) {
             secret.rotateJWKs();
@@ -35,8 +43,16 @@ class Rotate extends core_1.Command {
         }
         await kubeApiService.replaceSecret(secret);
         if (flags['restart-deployment']) {
-            await kubeApiService.restartDeployment(flags['restart-deployment'], flags['restart-deployment-backoff']);
+            try {
+                await kubeApiService.restartDeployment(flags['restart-deployment'], flags['restart-deployment-backoff']);
+                restarted = true;
+            }
+            catch (error) {
+                this.log('Restarting deployment failed, proceeding', error);
+                restarted = false;
+            }
         }
+        this.log('Keys rotated' + (restarted ? '' : ', but deployment not restarted'));
     }
 }
 exports.default = Rotate;

package/dist/helpers/kube-api-service.js

@@ -49,9 +49,9 @@ class KubeApiService {
             const listFn = () => this.appsV1Api.listNamespacedDeployment(this.namespace);
             const informer = (0, client_node_1.makeInformer)(this.kc, `/apis/apps/v1/namespaces/${this.namespace}/deployments/`, listFn);
             informer.on('update', (obj) => {
-                var _a;
+                var _a, _b;
                 const conditions = (_a = obj === null || obj === void 0 ? void 0 : obj.status) === null || _a === void 0 ? void 0 : _a.conditions;
-                if (conditions) {
+                if (conditions && ((_b = obj === null || obj === void 0 ? void 0 : obj.metadata) === null || _b === void 0 ? void 0 : _b.name) === deploymentName) {
                     const progressingCondition = conditions.find((c) => c.type === 'Progressing');
                     if ((progressingCondition === null || progressingCondition === void 0 ? void 0 : progressingCondition.reason) === 'NewReplicaSetAvailable') {
                         this.command.log('Deployment finished restarting');

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.0",
+  "version": "0.2.2",
   "commands": {
     "initialize": {
       "id": "initialize",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemowers/oidc-key-manager",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "CLI to manage secret keys required by oidc-gateway",
   "author": "Erki Aas",
   "bin": {
@@ -35,7 +35,7 @@
     "eslint-config-oclif-typescript": "^1.0.3",
     "mocha": "^9",
     "oclif": "^3",
-    "shx": "^0.3.3",
+    "shx": "^0.3.4",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
     "typescript": "^4.9.5"