@webiny/pulumi-sdk 5.24.0 → 5.25.0-beta.2

package/downloadBinaries.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (downloadFolder: string, beforeInstall?: () => void, afterInstall?: () => void) => Promise<boolean>;
+declare const _default: (downloadFolder: string, beforeInstall?: (() => void) | undefined, afterInstall?: (() => void) | undefined) => Promise<boolean>;
 export default _default;

package/downloadBinaries.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["downloadBinaries.ts"],"names":["os","require","tar","fs","download","path","decompress","semver","getPulumiVersion","version","clean","downloadFolder","beforeInstall","afterInstall","existsSync","platform","setupDarwin","setupLinux","setupWindows","Error","filename","downloadUrl","extract","cwd","file","join","unlinkSync","archive","destination","strip"],"mappings":"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","sourcesContent":["const os = require(\"os\");\nconst tar = require(\"tar\");\nconst fs = require(\"fs\");\nconst download = require(\"download\");\nconst path = require(\"path\");\nconst decompress = require(\"decompress\");\nconst semver = require(\"semver\");\n\n// We gotta sanitize the package version, since on a few occasions, we've detected the Pulumi version\n// can look like the following: \"2.25.2+dirty\". We want to ensure only \"2.25.2\" is returned.\n// @see https://github.com/pulumi/pulumi/issues/6847\nconst getPulumiVersion = () => {\n    const { version } = require(\"@pulumi/pulumi/package.json\");\n    return semver.clean(version);\n};\n\nexport default async (\n    downloadFolder: string,\n    beforeInstall?: () => void,\n    afterInstall?: () => void\n) => {\n    if (fs.existsSync(downloadFolder)) {\n        return false;\n    }\n\n    if (typeof beforeInstall === \"function\") {\n        await beforeInstall();\n    }\n\n    const platform = os.platform();\n    switch (platform) {\n        case \"darwin\":\n            await setupDarwin(downloadFolder);\n            break;\n        case \"linux\":\n            await setupLinux(downloadFolder);\n            break;\n        case \"win32\":\n            await setupWindows(downloadFolder);\n            break;\n        default:\n            throw Error(\n                `Cannot download Pulumi binaries - platform \"${platform}\" not supported. Supported ones are \"darwin\", \"linux\", and \"win32\"`\n            );\n    }\n\n    if (typeof afterInstall === \"function\") {\n        await afterInstall();\n    }\n\n    return true;\n};\n\nasync function setupDarwin(downloadFolder: string) {\n    const version = getPulumiVersion();\n    const filename = `pulumi-v${version}-darwin-x64.tar.gz`;\n    const downloadUrl = \"https://get.pulumi.com/releases/sdk/\" + filename;\n\n    await download(downloadUrl, downloadFolder);\n\n    await tar.extract({\n        cwd: downloadFolder,\n        file: path.join(downloadFolder, filename)\n    });\n\n    fs.unlinkSync(path.join(downloadFolder, filename));\n}\n\nasync function setupWindows(downloadFolder: string) {\n    const version = getPulumiVersion();\n    const filename = `pulumi-v${version}-windows-x64.zip`;\n    const downloadUrl = \"https://get.pulumi.com/releases/sdk/\" + filename;\n\n    await download(downloadUrl, downloadFolder);\n\n    const archive = path.join(downloadFolder, filename);\n    const destination = path.join(downloadFolder, \"pulumi\");\n    await decompress(archive, destination, { strip: 2 });\n\n    fs.unlinkSync(path.join(downloadFolder, filename));\n}\n\nasync function setupLinux(downloadFolder: string) {\n    const version = getPulumiVersion();\n    const filename = `pulumi-v${version}-linux-x64.tar.gz`;\n    const downloadUrl = \"https://get.pulumi.com/releases/sdk/\" + filename;\n\n    await download(downloadUrl, downloadFolder);\n\n    await tar.extract({\n        cwd: downloadFolder,\n        file: path.join(downloadFolder, filename)\n    });\n\n    fs.unlinkSync(path.join(downloadFolder, filename));\n}\n"]}

package/index.d.ts

@@ -1,29 +1,32 @@
 import execa from "execa";
 declare type Command = string | string[];
-declare type PulumiArgs = {
+interface PulumiArgs {
     [key: string]: string | boolean;
-};
-declare type ExecaArgs = {
+}
+interface ExecaArgs {
+    env?: {
+        [key: string]: string | undefined;
+    };
     [key: string]: any;
-};
-declare type Options = {
+}
+interface Options {
     args?: PulumiArgs;
     execa?: ExecaArgs;
     beforePulumiInstall?: () => any;
     afterPulumiInstall?: () => any;
     pulumiFolder?: string;
-};
-declare type RunArgs = {
+}
+interface RunArgs {
     command: Command;
     args?: PulumiArgs;
     execa?: ExecaArgs;
     beforePulumiInstall?: () => any;
     afterPulumiInstall?: () => any;
-};
-declare type InstallArgs = {
+}
+interface InstallArgs {
     beforePulumiInstall?: () => any;
     afterPulumiInstall?: () => any;
-};
+}
 export declare const FLAG_NON_INTERACTIVE = "--non-interactive";
 export declare class Pulumi {
     options: Options;

package/index.js

@@ -77,6 +77,10 @@ class Pulumi {
       }
 
       finalArgs.push(`--${(0, _kebabCase2.default)(key)}`, value);
+    }
+
+    if (!args.execa) {
+      args.execa = {};
     } // Prepare execa args.
 
 

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["index.ts"],"names":["FLAG_NON_INTERACTIVE","Pulumi","constructor","options","pulumiDownloadFolder","path","join","pulumiFolder","process","cwd","os","platform","pulumiBinaryPath","run","rawArgs","args","Array","isArray","command","finalArgs","key","value","i","length","push","execa","PATH_SEPARATOR","execaArgs","env","PATH","flags","includes","install","installed","beforePulumiInstall","afterPulumiInstall","version","require","stdio","PULUMI_HOME","PULUMI_SKIP_UPDATE_CHECK"],"mappings":"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","sourcesContent":["import os from \"os\";\nimport execa from \"execa\";\nimport * as path from \"path\";\nimport { merge, kebabCase, set } from \"lodash\";\nimport downloadBinaries from \"./downloadBinaries\";\n\ntype Command = string | string[];\ninterface PulumiArgs {\n    [key: string]: string | boolean;\n}\ninterface ExecaArgs {\n    env?: {\n        [key: string]: string | undefined;\n    };\n    [key: string]: any;\n}\n\ninterface Options {\n    args?: PulumiArgs;\n    execa?: ExecaArgs;\n    beforePulumiInstall?: () => any;\n    afterPulumiInstall?: () => any;\n\n    // A folder into which the Pulumi CLI, along with all of its meta data and config files, will be set up.\n    // It's recommended this folder is not checked in into a code repository, since the Pulumi CLI can store\n    // sensitive information here, for example - user's Pulumi Service credentials.\n    pulumiFolder?: string;\n}\n\ninterface RunArgs {\n    command: Command;\n    args?: PulumiArgs;\n    execa?: ExecaArgs;\n    beforePulumiInstall?: () => any;\n    afterPulumiInstall?: () => any;\n}\n\ninterface InstallArgs {\n    beforePulumiInstall?: () => any;\n    afterPulumiInstall?: () => any;\n}\n\nexport const FLAG_NON_INTERACTIVE = \"--non-interactive\";\n\nexport class Pulumi {\n    options: Options;\n    pulumiFolder: string;\n    pulumiDownloadFolder: string;\n    pulumiBinaryPath: string;\n    constructor(options: Options = {}) {\n        this.options = options;\n\n        this.pulumiDownloadFolder = path.join(\n            options.pulumiFolder || process.cwd(),\n            \"pulumi-cli\",\n            os.platform()\n        );\n\n        this.pulumiFolder = path.join(this.pulumiDownloadFolder, \"pulumi\");\n        this.pulumiBinaryPath = path.join(this.pulumiFolder, \"pulumi\");\n    }\n\n    run(rawArgs: RunArgs) {\n        const args: Options & RunArgs = merge({}, this.options, rawArgs);\n\n        if (!Array.isArray(args.command)) {\n            args.command = [args.command];\n        }\n\n        // 1. Prepare Pulumi args.\n        const finalArgs = [];\n        for (const key in args.args) {\n            const value = args.args[key];\n            if (!value) {\n                continue;\n            }\n\n            if (Array.isArray(value)) {\n                for (let i = 0; i < value.length; i++) {\n                    finalArgs.push(`--${kebabCase(key)}`, value[i]);\n                }\n                continue;\n            }\n\n            if (typeof value === \"boolean\") {\n                finalArgs.push(`--${kebabCase(key)}`);\n                continue;\n            }\n\n            finalArgs.push(`--${kebabCase(key)}`, value);\n        }\n\n        if (!args.execa) {\n            args.execa = {};\n        }\n        // Prepare execa args.\n        set(args.execa, \"env.PULUMI_SKIP_UPDATE_CHECK\", \"true\");\n        set(args.execa, \"env.PULUMI_HOME\", this.pulumiFolder);\n\n        // Use \";\" when on Windows. For Mac and Linux, use \":\".\n        const PATH_SEPARATOR = os.platform() === \"win32\" ? \";\" : \":\";\n\n        const execaArgs = {\n            ...args.execa,\n            env: {\n                ...(args.execa.env || {}),\n                /**\n                 * Due to an issue with Pulumi https://github.com/pulumi/pulumi/issues/8374, and even though this\n                 * commit suggests it should already work like that https://github.com/pulumi/pulumi/commit/c878916901a997a9c0ffcbed23560e19e224a6f1,\n                 * we need to specify the exact location of our Pulumi binaries, using the PATH environment variable, so it can correctly resolve\n                 * plugins necessary for custom resources and dynamic providers to work.\n                 */\n                PATH: process.env.PATH + PATH_SEPARATOR + this.pulumiFolder\n            }\n        };\n\n        // We want to keep the \"interactive\" output format of the Pulumi command when `--preview` flag is passed in.\n        const flags =\n            args.command && args.command.includes(\"preview\") ? [] : [FLAG_NON_INTERACTIVE];\n\n        return execa(this.pulumiBinaryPath, [...args.command, ...finalArgs, ...flags], execaArgs);\n    }\n\n    async install(rawArgs?: InstallArgs): Promise<boolean> {\n        const args = merge({}, this.options, rawArgs);\n\n        const installed = await downloadBinaries(\n            this.pulumiDownloadFolder,\n            args.beforePulumiInstall,\n            args.afterPulumiInstall\n        );\n\n        if (installed) {\n            const { version } = require(\"@pulumi/aws/package.json\");\n            await execa(this.pulumiBinaryPath, [\"plugin\", \"install\", \"resource\", \"aws\", version], {\n                stdio: \"inherit\",\n                env: {\n                    PULUMI_HOME: this.pulumiFolder,\n                    PULUMI_SKIP_UPDATE_CHECK: \"true\"\n                }\n            });\n        }\n\n        return installed;\n    }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/pulumi-sdk",
-	"version": "5.24.0",
+	"version": "5.25.0-beta.2",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -28,10 +28,10 @@
 		"@babel/core": "^7.16.0",
 		"@types/lodash": "^4.14.178",
 		"@types/node": "^10.0.0",
-		"@webiny/cli": "^5.24.0",
-		"@webiny/project-utils": "^5.24.0",
+		"@webiny/cli": "^5.25.0-beta.2",
+		"@webiny/project-utils": "^5.25.0-beta.2",
 		"rimraf": "^3.0.2",
-		"typescript": "^4.1.3"
+		"typescript": "4.5.5"
 	},
 	"adio": {
 		"ignore": {
@@ -45,5 +45,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "be0cbfcaa9247c658c44179af7943cc5d6d71bc7"
+	"gitHead": "ed2f22976af47aea0b6b5d638f8afdc39951b014"
 }