@pulumi/pulumi 3.102.0 → 3.103.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pulumi/pulumi",
-    "version": "3.102.0",
+    "version": "3.103.1",
     "description": "Pulumi's Node.js SDK",
     "license": "Apache-2.0",
     "repository": {
@@ -21,8 +21,11 @@
         "@opentelemetry/semantic-conventions": "^1.6.0",
         "@pulumi/query": "^0.3.0",
         "@types/google-protobuf": "^3.15.5",
+        "@types/semver": "^7.5.6",
+        "@types/tmp": "^0.2.6",
         "execa": "^5.1.0",
         "google-protobuf": "^3.5.0",
+        "got": "^11.8.6",
         "ini": "^2.0.0",
         "js-yaml": "^3.14.0",
         "minimist": "^1.2.6",
@@ -32,6 +35,7 @@
         "require-from-string": "^2.0.1",
         "semver": "^7.5.2",
         "source-map-support": "^0.5.6",
+        "tmp": "^0.2.1",
         "ts-node": "^7.0.1",
         "typescript": "~3.8.3",
         "upath": "^1.1.0"
@@ -44,7 +48,6 @@
         "@types/node": "14.18.3",
         "@types/normalize-package-data": "^2.4.0",
         "@types/read-package-tree": "^5.2.0",
-        "@types/semver": "^5.5.0",
         "@types/sinon": "^10.0.13",
         "@types/split2": "^2.1.6",
         "@types/uuid": "^9.0.7",

package/proto/converter_pb.d.ts

@@ -46,6 +46,12 @@ export class ResourceImport extends jspb.Message {
     setVersion(value: string): ResourceImport;
     getPlugindownloadurl(): string;
     setPlugindownloadurl(value: string): ResourceImport;
+    getLogicalName(): string;
+    setLogicalName(value: string): ResourceImport;
+    getIsComponent(): boolean;
+    setIsComponent(value: boolean): ResourceImport;
+    getIsRemote(): boolean;
+    setIsRemote(value: boolean): ResourceImport;
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): ResourceImport.AsObject;
@@ -64,6 +70,9 @@ export namespace ResourceImport {
         id: string,
         version: string,
         plugindownloadurl: string,
+        logicalName: string,
+        isComponent: boolean,
+        isRemote: boolean,
     }
 }
 

package/proto/converter_pb.js

@@ -355,7 +355,10 @@ proto.pulumirpc.ResourceImport.toObject = function(includeInstance, msg) {
     name: jspb.Message.getFieldWithDefault(msg, 2, ""),
     id: jspb.Message.getFieldWithDefault(msg, 3, ""),
     version: jspb.Message.getFieldWithDefault(msg, 4, ""),
-    plugindownloadurl: jspb.Message.getFieldWithDefault(msg, 5, "")
+    plugindownloadurl: jspb.Message.getFieldWithDefault(msg, 5, ""),
+    logicalName: jspb.Message.getFieldWithDefault(msg, 6, ""),
+    isComponent: jspb.Message.getBooleanFieldWithDefault(msg, 7, false),
+    isRemote: jspb.Message.getBooleanFieldWithDefault(msg, 8, false)
   };
 
   if (includeInstance) {
@@ -412,6 +415,18 @@ proto.pulumirpc.ResourceImport.deserializeBinaryFromReader = function(msg, reade
       var value = /** @type {string} */ (reader.readString());
       msg.setPlugindownloadurl(value);
       break;
+    case 6:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setLogicalName(value);
+      break;
+    case 7:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setIsComponent(value);
+      break;
+    case 8:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setIsRemote(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -476,6 +491,27 @@ proto.pulumirpc.ResourceImport.serializeBinaryToWriter = function(message, write
       f
     );
   }
+  f = message.getLogicalName();
+  if (f.length > 0) {
+    writer.writeString(
+      6,
+      f
+    );
+  }
+  f = message.getIsComponent();
+  if (f) {
+    writer.writeBool(
+      7,
+      f
+    );
+  }
+  f = message.getIsRemote();
+  if (f) {
+    writer.writeBool(
+      8,
+      f
+    );
+  }
 };
 
 
@@ -569,6 +605,60 @@ proto.pulumirpc.ResourceImport.prototype.setPlugindownloadurl = function(value)
 };
 
 
+/**
+ * optional string logical_name = 6;
+ * @return {string}
+ */
+proto.pulumirpc.ResourceImport.prototype.getLogicalName = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.pulumirpc.ResourceImport} returns this
+ */
+proto.pulumirpc.ResourceImport.prototype.setLogicalName = function(value) {
+  return jspb.Message.setProto3StringField(this, 6, value);
+};
+
+
+/**
+ * optional bool is_component = 7;
+ * @return {boolean}
+ */
+proto.pulumirpc.ResourceImport.prototype.getIsComponent = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 7, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.pulumirpc.ResourceImport} returns this
+ */
+proto.pulumirpc.ResourceImport.prototype.setIsComponent = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 7, value);
+};
+
+
+/**
+ * optional bool is_remote = 8;
+ * @return {boolean}
+ */
+proto.pulumirpc.ResourceImport.prototype.getIsRemote = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 8, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.pulumirpc.ResourceImport} returns this
+ */
+proto.pulumirpc.ResourceImport.prototype.setIsRemote = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 8, value);
+};
+
+
 
 /**
  * List of repeated fields within this message type.

package/tests/automation/cmd.spec.js

@@ -30,12 +30,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const assert = __importStar(require("assert"));
+const fs = __importStar(require("fs"));
+const semver = __importStar(require("semver"));
+const os = __importStar(require("os"));
+const tmp = __importStar(require("tmp"));
+const upath = __importStar(require("upath"));
 const automation_1 = require("../../automation");
 describe("automation/cmd", () => {
     it("calls onOutput when provided to runPulumiCmd", () => __awaiter(void 0, void 0, void 0, function* () {
         let output = "";
         let numCalls = 0;
-        yield automation_1.runPulumiCmd(["--help"], ".", {}, (data) => {
+        const pulumi = yield automation_1.PulumiCommand.get();
+        yield pulumi.run(["--help"], ".", {}, (data) => {
             output += data;
             numCalls += 1;
         });
@@ -43,5 +49,137 @@ describe("automation/cmd", () => {
         assert.match(output, new RegExp("Usage[:]"));
         assert.match(output, new RegExp("[-][-]verbose"));
     }));
+    describe("CLI installation", () => {
+        it("installs the requested version", () => __awaiter(void 0, void 0, void 0, function* () {
+            const tmpDir = tmp.dirSync({ prefix: "automation-test-", unsafeCleanup: true });
+            try {
+                const cmd = yield automation_1.PulumiCommand.install({ root: tmpDir.name, version: new semver.SemVer("3.97.0") });
+                assert.doesNotThrow(() => fs.statSync(upath.join(tmpDir.name, "bin", "pulumi")));
+                const { stdout } = yield cmd.run(["version"], ".", {});
+                assert.strictEqual(stdout.trim(), "3.97.0");
+            }
+            finally {
+                tmpDir.removeCallback();
+            }
+        }));
+        it("does not re-install the version if it already exists", () => __awaiter(void 0, void 0, void 0, function* () {
+            const tmpDir = tmp.dirSync({ prefix: "automation-test-", unsafeCleanup: true });
+            try {
+                yield automation_1.PulumiCommand.install({ root: tmpDir.name, version: new semver.SemVer("3.97.0") });
+                const binary1 = fs.statSync(upath.join(tmpDir.name, "bin", "pulumi"));
+                yield automation_1.PulumiCommand.install({ root: tmpDir.name, version: new semver.SemVer("3.97.0") });
+                const binary2 = fs.statSync(upath.join(tmpDir.name, "bin", "pulumi"));
+                assert.strictEqual(binary1.ino, binary2.ino);
+            }
+            finally {
+                tmpDir.removeCallback();
+            }
+        }));
+        it("defaults to $HOME/.pulumi/versions/$VERSION if no root is provided", () => __awaiter(void 0, void 0, void 0, function* () {
+            const version = new semver.SemVer("3.97.0");
+            const cmd = yield automation_1.PulumiCommand.install({ version });
+            assert.doesNotThrow(() => fs.statSync(upath.join(os.homedir(), ".pulumi", "versions", `${version}`, "bin", "pulumi")));
+            const { stdout } = yield cmd.run(["version"], ".", {});
+            assert.strictEqual(stdout.trim(), `${version}`);
+        }));
+        it("throws if the found version is not compatible with the requested version", () => __awaiter(void 0, void 0, void 0, function* () {
+            const installedVersion = new semver.SemVer("3.97.0");
+            yield automation_1.PulumiCommand.install({ version: installedVersion });
+            const requestedVersion = new semver.SemVer("3.98.0");
+            assert.rejects(automation_1.PulumiCommand.get({ version: requestedVersion }));
+        }));
+    });
+    describe(`checkVersionIsValid`, () => {
+        const MAJOR = /Major version mismatch./;
+        const MINIMUM = /Minimum version requirement failed./;
+        const PARSE = /Failed to parse/;
+        const versionTests = [
+            {
+                name: "higher_major",
+                currentVersion: "100.0.0",
+                expectError: MAJOR,
+                optOut: false,
+            },
+            {
+                name: "lower_major",
+                currentVersion: "1.0.0",
+                expectError: MINIMUM,
+                optOut: false,
+            },
+            {
+                name: "higher_minor",
+                currentVersion: "v2.22.0",
+                expectError: null,
+                optOut: false,
+            },
+            {
+                name: "lower_minor",
+                currentVersion: "v2.1.0",
+                expectError: MINIMUM,
+                optOut: false,
+            },
+            {
+                name: "equal_minor_higher_patch",
+                currentVersion: "v2.21.2",
+                expectError: null,
+                optOut: false,
+            },
+            {
+                name: "equal_minor_equal_patch",
+                currentVersion: "v2.21.1",
+                expectError: null,
+                optOut: false,
+            },
+            {
+                name: "equal_minor_lower_patch",
+                currentVersion: "v2.21.0",
+                expectError: MINIMUM,
+                optOut: false,
+            },
+            {
+                name: "equal_minor_equal_patch_prerelease",
+                // Note that prerelease < release so this case will error
+                currentVersion: "v2.21.1-alpha.1234",
+                expectError: MINIMUM,
+                optOut: false,
+            },
+            {
+                name: "opt_out_of_check_would_fail_otherwise",
+                currentVersion: "v2.20.0",
+                expectError: null,
+                optOut: true,
+            },
+            {
+                name: "opt_out_of_check_would_succeed_otherwise",
+                currentVersion: "v2.22.0",
+                expectError: null,
+                optOut: true,
+            },
+            {
+                name: "invalid_version",
+                currentVersion: "invalid",
+                expectError: PARSE,
+                optOut: false,
+            },
+            {
+                name: "invalid_version_opt_out",
+                currentVersion: "invalid",
+                expectError: null,
+                optOut: true,
+            },
+        ];
+        const minVersion = new semver.SemVer("v2.21.1");
+        versionTests.forEach((test) => {
+            it(`validates ${test.name} (${test.currentVersion})`, () => {
+                const validate = () => automation_1.parseAndValidatePulumiVersion(minVersion, test.currentVersion, test.optOut);
+                if (test.expectError) {
+                    assert.throws(validate, test.expectError);
+                }
+                else {
+                    assert.doesNotThrow(validate);
+                }
+            });
+        });
+    });
 });
 //# 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,+CAAiC;AACjC,iDAAgD;AAEhD,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,8CAA8C,EAAE,GAAS,EAAE;QAC1D,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;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"cmd.spec.js","sourceRoot":"","sources":["../../../tests/automation/cmd.spec.ts"],"names":[],"mappings":"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"}

package/tests/automation/localWorkspace.spec.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const assert_1 = __importDefault(require("assert"));
 const semver = __importStar(require("semver"));
+const tmp = __importStar(require("tmp"));
 const upath = __importStar(require("upath"));
 const automation_1 = require("../../automation");
 const index_1 = require("../../index");
@@ -929,6 +930,59 @@ describe("LocalWorkspace", () => {
         assert_1.default(ws.pulumiVersion);
         assert_1.default.strictEqual(versionRegex.test(ws.pulumiVersion), true);
     }));
+    it("sets pulumi version when using a custom CLI instance", () => __awaiter(void 0, void 0, void 0, function* () {
+        const tmpDir = tmp.dirSync({ prefix: "automation-test-", unsafeCleanup: true });
+        try {
+            const cmd = yield automation_1.PulumiCommand.get();
+            const ws = yield automation_1.LocalWorkspace.create({ pulumiCommand: cmd });
+            assert_1.default.strictEqual(versionRegex.test(ws.pulumiVersion), true);
+        }
+        finally {
+            tmpDir.removeCallback();
+        }
+    }));
+    it("throws when attempting to retrieve an invalid pulumi version", () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockWithNoVersion = {
+            command: "pulumi",
+            version: null,
+            run: () => __awaiter(void 0, void 0, void 0, function* () { return new automation_1.CommandResult("some output", "", 0); }),
+        };
+        const ws = yield automation_1.LocalWorkspace.create({
+            pulumiCommand: mockWithNoVersion,
+            envVars: {
+                PULUMI_AUTOMATION_API_SKIP_VERSION_CHECK: "true",
+            },
+        });
+        assert_1.default.throws(() => ws.pulumiVersion);
+    }));
+    it("fails creation if remote operation is not supported", () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockWithNoRemoteSupport = {
+            command: "pulumi",
+            version: new semver.SemVer("2.0.0"),
+            // We inspect the output of `pulumi preview --help` to determine
+            // if the CLI supports remote operations, see
+            // `LocalWorkspace.checkRemoteSupport`.
+            run: () => __awaiter(void 0, void 0, void 0, function* () { return new automation_1.CommandResult("some output", "", 0); }),
+        };
+        yield assert_1.default.rejects(automation_1.LocalWorkspace.create({ pulumiCommand: mockWithNoRemoteSupport, remote: true }));
+    }));
+    it("bypasses remote support check", () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockWithNoRemoteSupport = {
+            command: "pulumi",
+            version: new semver.SemVer("2.0.0"),
+            // We inspect the output of `pulumi preview --help` to determine
+            // if the CLI supports remote operations, see
+            // `LocalWorkspace.checkRemoteSupport`.
+            run: () => __awaiter(void 0, void 0, void 0, function* () { return new automation_1.CommandResult("some output", "", 0); }),
+        };
+        yield assert_1.default.doesNotReject(automation_1.LocalWorkspace.create({
+            pulumiCommand: mockWithNoRemoteSupport,
+            remote: true,
+            envVars: {
+                PULUMI_AUTOMATION_API_SKIP_VERSION_CHECK: "true",
+            },
+        }));
+    }));
     it(`respects existing project settings`, () => __awaiter(void 0, void 0, void 0, function* () {
         const projectName = "correct_project";
         const stackName = automation_1.fullyQualifiedStackName(util_1.getTestOrg(), projectName, `int_test${util_1.getTestSuffix()}`);
@@ -984,98 +1038,6 @@ describe("LocalWorkspace", () => {
         }
     }));
 });
-const MAJOR = /Major version mismatch./;
-const MINIMUM = /Minimum version requirement failed./;
-const PARSE = /Failed to parse/;
-describe(`checkVersionIsValid`, () => {
-    const versionTests = [
-        {
-            name: "higher_major",
-            currentVersion: "100.0.0",
-            expectError: MAJOR,
-            optOut: false,
-        },
-        {
-            name: "lower_major",
-            currentVersion: "1.0.0",
-            expectError: MINIMUM,
-            optOut: false,
-        },
-        {
-            name: "higher_minor",
-            currentVersion: "v2.22.0",
-            expectError: null,
-            optOut: false,
-        },
-        {
-            name: "lower_minor",
-            currentVersion: "v2.1.0",
-            expectError: MINIMUM,
-            optOut: false,
-        },
-        {
-            name: "equal_minor_higher_patch",
-            currentVersion: "v2.21.2",
-            expectError: null,
-            optOut: false,
-        },
-        {
-            name: "equal_minor_equal_patch",
-            currentVersion: "v2.21.1",
-            expectError: null,
-            optOut: false,
-        },
-        {
-            name: "equal_minor_lower_patch",
-            currentVersion: "v2.21.0",
-            expectError: MINIMUM,
-            optOut: false,
-        },
-        {
-            name: "equal_minor_equal_patch_prerelease",
-            // Note that prerelease < release so this case will error
-            currentVersion: "v2.21.1-alpha.1234",
-            expectError: MINIMUM,
-            optOut: false,
-        },
-        {
-            name: "opt_out_of_check_would_fail_otherwise",
-            currentVersion: "v2.20.0",
-            expectError: null,
-            optOut: true,
-        },
-        {
-            name: "opt_out_of_check_would_succeed_otherwise",
-            currentVersion: "v2.22.0",
-            expectError: null,
-            optOut: true,
-        },
-        {
-            name: "invalid_version",
-            currentVersion: "invalid",
-            expectError: PARSE,
-            optOut: false,
-        },
-        {
-            name: "invalid_version_opt_out",
-            currentVersion: "invalid",
-            expectError: null,
-            optOut: true,
-        },
-    ];
-    const minVersion = new semver.SemVer("v2.21.1");
-    versionTests.forEach((test) => {
-        it(`validates ${test.name} (${test.currentVersion})`, () => {
-            const validate = () => automation_1.parseAndValidatePulumiVersion(minVersion, test.currentVersion, test.optOut);
-            if (test.expectError) {
-                assert_1.default.throws(validate, test.expectError);
-            }
-            else {
-                assert_1.default.doesNotThrow(validate);
-            }
-        });
-    });
-});
 const normalizeConfigKey = (key, projectName) => {
     const parts = key.split(":");
     if (parts.length < 2) {