@pulumi/pulumi 3.39.3 → 3.39.4

package/automation/cmd.js

@@ -52,14 +52,20 @@ function runPulumiCmd(args, cwd, additionalEnv, onOutput) {
         }
         const env = Object.assign(Object.assign({}, process.env), additionalEnv);
         try {
-            const { stdout, stderr, exitCode } = yield execa("pulumi", args, { env, cwd });
+            const proc = execa("pulumi", args, { env, cwd });
+            if (onOutput && proc.stdout) {
+                proc.stdout.on("data", (data) => {
+                    if (data && data.toString) {
+                        data = data.toString();
+                    }
+                    onOutput(data);
+                });
+            }
+            const { stdout, stderr, exitCode } = yield proc;
             const commandResult = new CommandResult(stdout, stderr, exitCode);
             if (exitCode !== 0) {
                 throw errors_1.createCommandError(commandResult);
             }
-            if (onOutput) {
-                onOutput(stdout);
-            }
             return commandResult;
         }
         catch (err) {

package/automation/cmd.js.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../automation/cmd.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;;;;;;;;;AAEjC,+BAA+B;AAE/B,qCAA8C;AAE9C,gBAAgB;AAChB,MAAa,aAAa;IAKtB,YAAY,MAAc,EAAE,MAAc,EAAE,IAAY,EAAE,GAAW;QACjE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IACD,QAAQ;QACJ,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,IAAI,CAAC,GAAG,EAAE;YACV,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;SAChC;QACD,OAAO,SAAS,IAAI,CAAC,IAAI,cAAc,IAAI,CAAC,MAAM,cAAc,IAAI,CAAC,MAAM,YAAY,MAAM,IAAI,CAAC;IACtG,CAAC;CACJ;AAlBD,sCAkBC;AAED,MAAM,cAAc,GAAG,CAAC,CAAC,CAAC;AAE1B,gBAAgB;AAChB,SAAsB,YAAY,CAC9B,IAAc,EACd,GAAW,EACX,aAAwC,EACxC,QAAiC;;QAEjC,sDAAsD;QACtD,+FAA+F;QAE/F,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;YACrC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAClC;QAED,MAAM,GAAG,mCAAQ,OAAO,CAAC,GAAG,GAAK,aAAa,CAAE,CAAC;QAEjD,IAAI;YACA,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YAC/E,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAClE,IAAI,QAAQ,KAAK,CAAC,EAAE;gBAChB,MAAM,2BAAkB,CAAC,aAAa,CAAC,CAAC;aAC3C;YACD,IAAI,QAAQ,EAAE;gBACV,QAAQ,CAAC,MAAM,CAAC,CAAC;aACpB;YACD,OAAO,aAAa,CAAC;SACxB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,KAAK,GAAG,GAAY,CAAC;YAC3B,MAAM,2BAAkB,CAAC,IAAI,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC;SACzF;IACL,CAAC;CAAA;AA7BD,oCA6BC"}
+{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../automation/cmd.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;;;;;;;;;AAEjC,+BAA+B;AAE/B,qCAA8C;AAE9C,gBAAgB;AAChB,MAAa,aAAa;IAKtB,YAAY,MAAc,EAAE,MAAc,EAAE,IAAY,EAAE,GAAW;QACjE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IACD,QAAQ;QACJ,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,IAAI,CAAC,GAAG,EAAE;YACV,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;SAChC;QACD,OAAO,SAAS,IAAI,CAAC,IAAI,cAAc,IAAI,CAAC,MAAM,cAAc,IAAI,CAAC,MAAM,YAAY,MAAM,IAAI,CAAC;IACtG,CAAC;CACJ;AAlBD,sCAkBC;AAED,MAAM,cAAc,GAAG,CAAC,CAAC,CAAC;AAE1B,gBAAgB;AAChB,SAAsB,YAAY,CAC9B,IAAc,EACd,GAAW,EACX,aAAwC,EACxC,QAAiC;;QAEjC,sDAAsD;QACtD,+FAA+F;QAE/F,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;YACrC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAClC;QAED,MAAM,GAAG,mCAAQ,OAAO,CAAC,GAAG,GAAK,aAAa,CAAE,CAAC;QAEjD,IAAI;YACA,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YAEjD,IAAI,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE;gBACzB,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAS,EAAE,EAAE;oBAClC,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;wBACvB,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;qBAC1B;oBACD,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACnB,CAAC,CAAC,CAAC;aACN;YAED,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC;YAChD,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAClE,IAAI,QAAQ,KAAK,CAAC,EAAE;gBAChB,MAAM,2BAAkB,CAAC,aAAa,CAAC,CAAC;aAC3C;YAED,OAAO,aAAa,CAAC;SACxB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,KAAK,GAAG,GAAY,CAAC;YAC3B,MAAM,2BAAkB,CAAC,IAAI,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC;SACzF;IACL,CAAC;CAAA;AAtCD,oCAsCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pulumi/pulumi",
-    "version": "3.39.3",
+    "version": "3.39.4",
     "description": "Pulumi's Node.js SDK",
     "license": "Apache-2.0",
     "repository": {

package/tests/automation/cmd.spec.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2016-2021, Pulumi Corporation.
+// Copyright 2016-2022, Pulumi Corporation.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,15 +23,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const assert = require("assert");
-const sinon = require("sinon");
 const automation_1 = require("../../automation");
 const util_1 = require("../util");
 describe("automation/cmd", () => {
     it("calls onOutput when provided to runPulumiCmd", util_1.asyncTest(() => __awaiter(void 0, void 0, void 0, function* () {
-        const spy = sinon.spy();
-        yield automation_1.runPulumiCmd(["version"], ".", {}, spy);
-        assert.ok(spy.calledOnce);
-        assert.strictEqual(spy.firstCall.firstArg, spy.lastCall.lastArg);
+        let output = "";
+        let numCalls = 0;
+        yield automation_1.runPulumiCmd(["--help"], ".", {}, (data) => {
+            output += data;
+            numCalls += 1;
+        });
+        assert.ok(numCalls > 0, `expected numCalls > 0, got ${numCalls}`);
+        assert.match(output, new RegExp("Usage[:]"));
+        assert.match(output, new RegExp("[-][-]verbose"));
     })));
 });
 //# sourceMappingURL=cmd.spec.js.map

package/tests/automation/cmd.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.spec.js","sourceRoot":"","sources":["../../../tests/automation/cmd.spec.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;;;;;;;;;AAEjC,iCAAiC;AACjC,+BAA+B;AAC/B,iDAAgD;AAChD,kCAAoC;AAEpC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,8CAA8C,EAAE,gBAAS,CAAC,GAAS,EAAE;QACpE,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QACxB,MAAM,yBAAY,CAAC,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QAE9C,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC1B,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACrE,CAAC,CAAA,CAAC,CAAC,CAAC;AACR,CAAC,CAAC,CAAC"}
+{"version":3,"file":"cmd.spec.js","sourceRoot":"","sources":["../../../tests/automation/cmd.spec.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;;;;;;;;;AAEjC,iCAAiC;AACjC,iDAAgD;AAChD,kCAAoC;AAEpC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,8CAA8C,EAAE,gBAAS,CAAC,GAAS,EAAE;QACpE,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,yBAAY,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,IAAY,EAAE,EAAE;YACrD,MAAM,IAAI,IAAI,CAAC;YACf,QAAQ,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,QAAQ,GAAG,CAAC,EAAE,8BAA8B,QAAQ,EAAE,CAAC,CAAC;QAClE,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC;IACtD,CAAC,CAAA,CAAC,CAAC,CAAC;AACR,CAAC,CAAC,CAAC"}

package/version.js

@@ -13,5 +13,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = "3.39.3";
+exports.version = "3.39.4";
 //# sourceMappingURL=version.js.map