@webiny/project 0.0.0-unstable.7be00a75a9 → 0.0.0-unstable.9f53ea597d

package/services/PulumiGetStackOutputService/PulumiGetStackOutputService.js

@@ -1,36 +1,18 @@
 import { createImplementation } from "@webiny/di";
-import { GetProjectService, GetPulumiService, LoggerService, ProjectSdkParamsService, PulumiGetStackOutputService, PulumiSelectStackService } from "../../abstractions/index.js";
+import { GetPulumiService, LoggerService, PulumiGetStackOutputService, PulumiSelectStackService, StackOutputCacheService } from "../../abstractions/index.js";
 import { createEnvConfiguration, withPulumiConfigPassphrase } from "../../utils/env/index.js";
 import { mapStackOutput } from "./mapStackOutput.js";
-import promises from "fs/promises";
-import path from "path";
 class DefaultPulumiGetStackOutputService {
-    static{
-        this.DEFAULT_ENV = "dev";
-    }
-    static{
-        this.DEFAULT_REGION = "default";
-    }
-    static{
-        this.DEFAULT_VARIANT = "default";
-    }
-    constructor(getPulumiService, pulumiSelectStackService, loggerService, getProjectService, projectSdkParamsService){
+    constructor(getPulumiService, pulumiSelectStackService, loggerService, stackOutputCacheService){
         this.getPulumiService = getPulumiService;
         this.pulumiSelectStackService = pulumiSelectStackService;
         this.loggerService = loggerService;
-        this.getProjectService = getProjectService;
-        this.projectSdkParamsService = projectSdkParamsService;
+        this.stackOutputCacheService = stackOutputCacheService;
     }
     async execute(app, params) {
         if (!params?.skipCache) {
-            const cachedOutput = await this.readFromCache(app);
-            if (null !== cachedOutput) {
-                this.loggerService.debug({
-                    app: app.name,
-                    cacheKey: this.getCacheKey(app)
-                }, "Stack output read from cache");
-                return this.applyMapping(cachedOutput, params?.map);
-            }
+            const cachedOutput = await this.stackOutputCacheService.read(app);
+            if (null !== cachedOutput) return this.applyMapping(cachedOutput, params?.map);
         }
         const pulumi = await this.getPulumiService.execute({
             app
@@ -55,11 +37,7 @@ class DefaultPulumiGetStackOutputService {
         try {
             const stackOutputJson = JSON.parse(stackOutputString.stdout);
             if (!stackOutputJson) return null;
-            await this.writeToCache(app, stackOutputJson);
-            this.loggerService.debug("Stack output stored to cache", {
-                app: app.name,
-                cacheKey: this.getCacheKey(app)
-            });
+            await this.stackOutputCacheService.write(app, stackOutputJson);
             return this.applyMapping(stackOutputJson, params?.map);
         } catch  {
             this.loggerService.error("Could not parse stack output as JSON.", stackOutputString.stdout, app, params);
@@ -70,40 +48,6 @@ class DefaultPulumiGetStackOutputService {
         if (!map) return data;
         return mapStackOutput(data, map);
     }
-    getCacheKey(app) {
-        const sdkParams = this.projectSdkParamsService.get();
-        const env = sdkParams.env || DefaultPulumiGetStackOutputService.DEFAULT_ENV;
-        const region = sdkParams.region || DefaultPulumiGetStackOutputService.DEFAULT_REGION;
-        const variant = sdkParams.variant || DefaultPulumiGetStackOutputService.DEFAULT_VARIANT;
-        return `${app.name}-${env}-${region}-${variant}.json`;
-    }
-    getCachePath(app) {
-        const project = this.getProjectService.execute();
-        const cacheDir = project.paths.dotWebinyFolder.join("caches", "stack-output").toString();
-        const cacheKey = this.getCacheKey(app);
-        return path.join(cacheDir, cacheKey);
-    }
-    async readFromCache(app) {
-        const cachePath = this.getCachePath(app);
-        try {
-            const content = await promises.readFile(cachePath, "utf-8");
-            return JSON.parse(content);
-        } catch  {
-            return null;
-        }
-    }
-    async writeToCache(app, data) {
-        const cachePath = this.getCachePath(app);
-        const cacheDir = path.dirname(cachePath);
-        try {
-            await promises.mkdir(cacheDir, {
-                recursive: true
-            });
-            await promises.writeFile(cachePath, JSON.stringify(data, null, 2), "utf-8");
-        } catch (error) {
-            this.loggerService.error("Could not write to cache file.", cachePath, error);
-        }
-    }
 }
 const pulumiGetStackOutputService = createImplementation({
     abstraction: PulumiGetStackOutputService,
@@ -112,8 +56,7 @@ const pulumiGetStackOutputService = createImplementation({
         GetPulumiService,
         PulumiSelectStackService,
         LoggerService,
-        GetProjectService,
-        ProjectSdkParamsService
+        StackOutputCacheService
     ]
 });
 export { DefaultPulumiGetStackOutputService, pulumiGetStackOutputService };

package/services/PulumiGetStackOutputService/PulumiGetStackOutputService.js.map

@@ -1 +1 @@
-{"version":3,"file":"services/PulumiGetStackOutputService/PulumiGetStackOutputService.js","sources":["../../../src/services/PulumiGetStackOutputService/PulumiGetStackOutputService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport {\n    GetPulumiService,\n    GetProjectService,\n    LoggerService,\n    PulumiGetStackOutputService,\n    PulumiSelectStackService,\n    ProjectSdkParamsService\n} from \"~/abstractions/index.js\";\nimport { type AppModel } from \"~/models/index.js\";\nimport { createEnvConfiguration, withPulumiConfigPassphrase } from \"~/utils/env/index.js\";\nimport { mapStackOutput } from \"./mapStackOutput.js\";\nimport fs from \"fs/promises\";\nimport path from \"path\";\n\nexport class DefaultPulumiGetStackOutputService implements PulumiGetStackOutputService.Interface {\n    private static readonly DEFAULT_ENV = \"dev\";\n    private static readonly DEFAULT_REGION = \"default\";\n    private static readonly DEFAULT_VARIANT = \"default\";\n\n    constructor(\n        private getPulumiService: GetPulumiService.Interface,\n        private pulumiSelectStackService: PulumiSelectStackService.Interface,\n        private loggerService: LoggerService.Interface,\n        private getProjectService: GetProjectService.Interface,\n        private projectSdkParamsService: ProjectSdkParamsService.Interface\n    ) {}\n\n    async execute<TOutput extends Record<string, any> = Record<string, any>>(\n        app: AppModel,\n        params?: PulumiGetStackOutputService.Params\n    ): Promise<TOutput | null> {\n        // Try to read from cache if skipCache is not true\n        if (!params?.skipCache) {\n            const cachedOutput = await this.readFromCache(app);\n            if (cachedOutput !== null) {\n                this.loggerService.debug(\n                    { app: app.name, cacheKey: this.getCacheKey(app) },\n                    \"Stack output read from cache\"\n                );\n                return this.applyMapping(cachedOutput, params?.map) as TOutput;\n            }\n        }\n\n        const pulumi = await this.getPulumiService.execute({ app });\n\n        await this.pulumiSelectStackService.execute(app);\n\n        const stackOutputString = await pulumi.run({\n            command: [\"stack\", \"output\"],\n            args: {\n                json: true\n            },\n            execa: {\n                env: createEnvConfiguration({\n                    configurations: [withPulumiConfigPassphrase()]\n                })\n            }\n        });\n\n        try {\n            const stackOutputJson = JSON.parse(stackOutputString.stdout);\n            if (!stackOutputJson) {\n                return null;\n            }\n\n            // Write to cache\n            await this.writeToCache(app, stackOutputJson);\n            this.loggerService.debug(\"Stack output stored to cache\", {\n                app: app.name,\n                cacheKey: this.getCacheKey(app)\n            });\n\n            return this.applyMapping(stackOutputJson, params?.map) as TOutput;\n        } catch {\n            this.loggerService.error(\n                \"Could not parse stack output as JSON.\",\n                stackOutputString.stdout,\n                app,\n                params\n            );\n            return null;\n        }\n    }\n\n    private applyMapping(\n        data: Record<string, any>,\n        map?: Record<string, any>\n    ): Record<string, any> {\n        if (!map) {\n            return data;\n        }\n        // If a mapping is provided, we map the output to the specified structure.\n        return mapStackOutput(data, map);\n    }\n\n    private getCacheKey(app: AppModel): string {\n        const sdkParams = this.projectSdkParamsService.get();\n        const env = sdkParams.env || DefaultPulumiGetStackOutputService.DEFAULT_ENV;\n        const region = sdkParams.region || DefaultPulumiGetStackOutputService.DEFAULT_REGION;\n        const variant = sdkParams.variant || DefaultPulumiGetStackOutputService.DEFAULT_VARIANT;\n        return `${app.name}-${env}-${region}-${variant}.json`;\n    }\n\n    private getCachePath(app: AppModel): string {\n        const project = this.getProjectService.execute();\n        const cacheDir = project.paths.dotWebinyFolder.join(\"caches\", \"stack-output\").toString();\n        const cacheKey = this.getCacheKey(app);\n        return path.join(cacheDir, cacheKey);\n    }\n\n    private async readFromCache(app: AppModel): Promise<Record<string, any> | null> {\n        const cachePath = this.getCachePath(app);\n\n        try {\n            const content = await fs.readFile(cachePath, \"utf-8\");\n            return JSON.parse(content);\n        } catch {\n            // File doesn't exist or couldn't be read/parsed - this is expected on first run\n            return null;\n        }\n    }\n\n    private async writeToCache(app: AppModel, data: Record<string, any>): Promise<void> {\n        const cachePath = this.getCachePath(app);\n        const cacheDir = path.dirname(cachePath);\n\n        try {\n            // Create cache directory if it doesn't exist\n            await fs.mkdir(cacheDir, { recursive: true });\n            await fs.writeFile(cachePath, JSON.stringify(data, null, 2), \"utf-8\");\n        } catch (error) {\n            this.loggerService.error(\"Could not write to cache file.\", cachePath, error);\n        }\n    }\n}\n\nexport const pulumiGetStackOutputService = createImplementation({\n    abstraction: PulumiGetStackOutputService,\n    implementation: DefaultPulumiGetStackOutputService,\n    dependencies: [\n        GetPulumiService,\n        PulumiSelectStackService,\n        LoggerService,\n        GetProjectService,\n        ProjectSdkParamsService\n    ]\n});\n"],"names":["DefaultPulumiGetStackOutputService","getPulumiService","pulumiSelectStackService","loggerService","getProjectService","projectSdkParamsService","app","params","cachedOutput","pulumi","stackOutputString","createEnvConfiguration","withPulumiConfigPassphrase","stackOutputJson","JSON","data","map","mapStackOutput","sdkParams","env","region","variant","project","cacheDir","cacheKey","path","cachePath","content","fs","error","pulumiGetStackOutputService","createImplementation","PulumiGetStackOutputService","GetPulumiService","PulumiSelectStackService","LoggerService","GetProjectService","ProjectSdkParamsService"],"mappings":";;;;;;AAeO,MAAMA;;aACe,WAAW,GAAG;;;aACd,cAAc,GAAG;;;aACjB,eAAe,GAAG;;IAE1C,YACYC,gBAA4C,EAC5CC,wBAA4D,EAC5DC,aAAsC,EACtCC,iBAA8C,EAC9CC,uBAA0D,CACpE;aALUJ,gBAAgB,GAAhBA;aACAC,wBAAwB,GAAxBA;aACAC,aAAa,GAAbA;aACAC,iBAAiB,GAAjBA;aACAC,uBAAuB,GAAvBA;IACT;IAEH,MAAM,QACFC,GAAa,EACbC,MAA2C,EACpB;QAEvB,IAAI,CAACA,QAAQ,WAAW;YACpB,MAAMC,eAAe,MAAM,IAAI,CAAC,aAAa,CAACF;YAC9C,IAAIE,AAAiB,SAAjBA,cAAuB;gBACvB,IAAI,CAAC,aAAa,CAAC,KAAK,CACpB;oBAAE,KAAKF,IAAI,IAAI;oBAAE,UAAU,IAAI,CAAC,WAAW,CAACA;gBAAK,GACjD;gBAEJ,OAAO,IAAI,CAAC,YAAY,CAACE,cAAcD,QAAQ;YACnD;QACJ;QAEA,MAAME,SAAS,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAAEH;QAAI;QAEzD,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACA;QAE5C,MAAMI,oBAAoB,MAAMD,OAAO,GAAG,CAAC;YACvC,SAAS;gBAAC;gBAAS;aAAS;YAC5B,MAAM;gBACF,MAAM;YACV;YACA,OAAO;gBACH,KAAKE,uBAAuB;oBACxB,gBAAgB;wBAACC;qBAA6B;gBAClD;YACJ;QACJ;QAEA,IAAI;YACA,MAAMC,kBAAkBC,KAAK,KAAK,CAACJ,kBAAkB,MAAM;YAC3D,IAAI,CAACG,iBACD,OAAO;YAIX,MAAM,IAAI,CAAC,YAAY,CAACP,KAAKO;YAC7B,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,gCAAgC;gBACrD,KAAKP,IAAI,IAAI;gBACb,UAAU,IAAI,CAAC,WAAW,CAACA;YAC/B;YAEA,OAAO,IAAI,CAAC,YAAY,CAACO,iBAAiBN,QAAQ;QACtD,EAAE,OAAM;YACJ,IAAI,CAAC,aAAa,CAAC,KAAK,CACpB,yCACAG,kBAAkB,MAAM,EACxBJ,KACAC;YAEJ,OAAO;QACX;IACJ;IAEQ,aACJQ,IAAyB,EACzBC,GAAyB,EACN;QACnB,IAAI,CAACA,KACD,OAAOD;QAGX,OAAOE,eAAeF,MAAMC;IAChC;IAEQ,YAAYV,GAAa,EAAU;QACvC,MAAMY,YAAY,IAAI,CAAC,uBAAuB,CAAC,GAAG;QAClD,MAAMC,MAAMD,UAAU,GAAG,IAAIlB,mCAAmC,WAAW;QAC3E,MAAMoB,SAASF,UAAU,MAAM,IAAIlB,mCAAmC,cAAc;QACpF,MAAMqB,UAAUH,UAAU,OAAO,IAAIlB,mCAAmC,eAAe;QACvF,OAAO,GAAGM,IAAI,IAAI,CAAC,CAAC,EAAEa,IAAI,CAAC,EAAEC,OAAO,CAAC,EAAEC,QAAQ,KAAK,CAAC;IACzD;IAEQ,aAAaf,GAAa,EAAU;QACxC,MAAMgB,UAAU,IAAI,CAAC,iBAAiB,CAAC,OAAO;QAC9C,MAAMC,WAAWD,QAAQ,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,gBAAgB,QAAQ;QACtF,MAAME,WAAW,IAAI,CAAC,WAAW,CAAClB;QAClC,OAAOmB,KAAK,IAAI,CAACF,UAAUC;IAC/B;IAEA,MAAc,cAAclB,GAAa,EAAuC;QAC5E,MAAMoB,YAAY,IAAI,CAAC,YAAY,CAACpB;QAEpC,IAAI;YACA,MAAMqB,UAAU,MAAMC,SAAAA,QAAW,CAACF,WAAW;YAC7C,OAAOZ,KAAK,KAAK,CAACa;QACtB,EAAE,OAAM;YAEJ,OAAO;QACX;IACJ;IAEA,MAAc,aAAarB,GAAa,EAAES,IAAyB,EAAiB;QAChF,MAAMW,YAAY,IAAI,CAAC,YAAY,CAACpB;QACpC,MAAMiB,WAAWE,KAAK,OAAO,CAACC;QAE9B,IAAI;YAEA,MAAME,SAAAA,KAAQ,CAACL,UAAU;gBAAE,WAAW;YAAK;YAC3C,MAAMK,SAAAA,SAAY,CAACF,WAAWZ,KAAK,SAAS,CAACC,MAAM,MAAM,IAAI;QACjE,EAAE,OAAOc,OAAO;YACZ,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,kCAAkCH,WAAWG;QAC1E;IACJ;AACJ;AAEO,MAAMC,8BAA8BC,qBAAqB;IAC5D,aAAaC;IACb,gBAAgBhC;IAChB,cAAc;QACViC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"services/PulumiGetStackOutputService/PulumiGetStackOutputService.js","sources":["../../../src/services/PulumiGetStackOutputService/PulumiGetStackOutputService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport {\n    GetPulumiService,\n    LoggerService,\n    PulumiGetStackOutputService,\n    PulumiSelectStackService,\n    StackOutputCacheService\n} from \"~/abstractions/index.js\";\nimport { type AppModel } from \"~/models/index.js\";\nimport { createEnvConfiguration, withPulumiConfigPassphrase } from \"~/utils/env/index.js\";\nimport { mapStackOutput } from \"./mapStackOutput.js\";\n\nexport class DefaultPulumiGetStackOutputService implements PulumiGetStackOutputService.Interface {\n    constructor(\n        private getPulumiService: GetPulumiService.Interface,\n        private pulumiSelectStackService: PulumiSelectStackService.Interface,\n        private loggerService: LoggerService.Interface,\n        private stackOutputCacheService: StackOutputCacheService.Interface\n    ) {}\n\n    async execute<TOutput extends Record<string, any> = Record<string, any>>(\n        app: AppModel,\n        params?: PulumiGetStackOutputService.Params\n    ): Promise<TOutput | null> {\n        // Try to read from cache if skipCache is not true\n        if (!params?.skipCache) {\n            const cachedOutput = await this.stackOutputCacheService.read(app);\n            if (cachedOutput !== null) {\n                return this.applyMapping(cachedOutput, params?.map) as TOutput;\n            }\n        }\n\n        const pulumi = await this.getPulumiService.execute({ app });\n\n        await this.pulumiSelectStackService.execute(app);\n\n        const stackOutputString = await pulumi.run({\n            command: [\"stack\", \"output\"],\n            args: {\n                json: true\n            },\n            execa: {\n                env: createEnvConfiguration({\n                    configurations: [withPulumiConfigPassphrase()]\n                })\n            }\n        });\n\n        try {\n            const stackOutputJson = JSON.parse(stackOutputString.stdout);\n            if (!stackOutputJson) {\n                return null;\n            }\n\n            await this.stackOutputCacheService.write(app, stackOutputJson);\n\n            return this.applyMapping(stackOutputJson, params?.map) as TOutput;\n        } catch {\n            this.loggerService.error(\n                \"Could not parse stack output as JSON.\",\n                stackOutputString.stdout,\n                app,\n                params\n            );\n            return null;\n        }\n    }\n\n    private applyMapping(\n        data: Record<string, any>,\n        map?: Record<string, any>\n    ): Record<string, any> {\n        if (!map) {\n            return data;\n        }\n        // If a mapping is provided, we map the output to the specified structure.\n        return mapStackOutput(data, map);\n    }\n}\n\nexport const pulumiGetStackOutputService = createImplementation({\n    abstraction: PulumiGetStackOutputService,\n    implementation: DefaultPulumiGetStackOutputService,\n    dependencies: [\n        GetPulumiService,\n        PulumiSelectStackService,\n        LoggerService,\n        StackOutputCacheService\n    ]\n});\n"],"names":["DefaultPulumiGetStackOutputService","getPulumiService","pulumiSelectStackService","loggerService","stackOutputCacheService","app","params","cachedOutput","pulumi","stackOutputString","createEnvConfiguration","withPulumiConfigPassphrase","stackOutputJson","JSON","data","map","mapStackOutput","pulumiGetStackOutputService","createImplementation","PulumiGetStackOutputService","GetPulumiService","PulumiSelectStackService","LoggerService","StackOutputCacheService"],"mappings":";;;;AAYO,MAAMA;IACT,YACYC,gBAA4C,EAC5CC,wBAA4D,EAC5DC,aAAsC,EACtCC,uBAA0D,CACpE;aAJUH,gBAAgB,GAAhBA;aACAC,wBAAwB,GAAxBA;aACAC,aAAa,GAAbA;aACAC,uBAAuB,GAAvBA;IACT;IAEH,MAAM,QACFC,GAAa,EACbC,MAA2C,EACpB;QAEvB,IAAI,CAACA,QAAQ,WAAW;YACpB,MAAMC,eAAe,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAACF;YAC7D,IAAIE,AAAiB,SAAjBA,cACA,OAAO,IAAI,CAAC,YAAY,CAACA,cAAcD,QAAQ;QAEvD;QAEA,MAAME,SAAS,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAAEH;QAAI;QAEzD,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACA;QAE5C,MAAMI,oBAAoB,MAAMD,OAAO,GAAG,CAAC;YACvC,SAAS;gBAAC;gBAAS;aAAS;YAC5B,MAAM;gBACF,MAAM;YACV;YACA,OAAO;gBACH,KAAKE,uBAAuB;oBACxB,gBAAgB;wBAACC;qBAA6B;gBAClD;YACJ;QACJ;QAEA,IAAI;YACA,MAAMC,kBAAkBC,KAAK,KAAK,CAACJ,kBAAkB,MAAM;YAC3D,IAAI,CAACG,iBACD,OAAO;YAGX,MAAM,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAACP,KAAKO;YAE9C,OAAO,IAAI,CAAC,YAAY,CAACA,iBAAiBN,QAAQ;QACtD,EAAE,OAAM;YACJ,IAAI,CAAC,aAAa,CAAC,KAAK,CACpB,yCACAG,kBAAkB,MAAM,EACxBJ,KACAC;YAEJ,OAAO;QACX;IACJ;IAEQ,aACJQ,IAAyB,EACzBC,GAAyB,EACN;QACnB,IAAI,CAACA,KACD,OAAOD;QAGX,OAAOE,eAAeF,MAAMC;IAChC;AACJ;AAEO,MAAME,8BAA8BC,qBAAqB;IAC5D,aAAaC;IACb,gBAAgBnB;IAChB,cAAc;QACVoB;QACAC;QACAC;QACAC;KACH;AACL"}

package/services/PulumiLoginService/PulumiLoginService.js

@@ -17,7 +17,7 @@ class DefaultPulumiLoginService {
             app
         });
         const projectAppRelativePath = path.join("apps", app.name);
-        let loginUrl = process.env.WEBINY_PULUMI_BACKEND;
+        let loginUrl = process.env.WEBINY_CLI_PULUMI_BACKEND || process.env.WEBINY_PULUMI_BACKEND;
         if (loginUrl) {
             const selfManagedBackend = SELF_MANAGED_BACKEND.find((item)=>loginUrl.startsWith(item));
             if (selfManagedBackend) {

package/services/PulumiLoginService/PulumiLoginService.js.map

@@ -1 +1 @@
-{"version":3,"file":"services/PulumiLoginService/PulumiLoginService.js","sources":["../../../src/services/PulumiLoginService/PulumiLoginService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { GetPulumiService, PulumiLoginService } from \"~/abstractions/index.js\";\nimport { type AppModel } from \"~/models/index.js\";\nimport trimEnd from \"lodash/trimEnd.js\";\nimport fs from \"fs\";\nimport path from \"path\";\n\nconst SELF_MANAGED_BACKEND = [\"s3://\", \"azblob://\", \"gs://\"];\n\nexport class DefaultPulumiLoginService implements PulumiLoginService.Interface {\n    constructor(private getPulumiService: GetPulumiService.Interface) {}\n\n    async execute(app: AppModel) {\n        const pulumi = await this.getPulumiService.execute({ app });\n\n        const projectAppRelativePath = path.join(\"apps\", app.name);\n\n        // A couple of variations here, just to preserve backwards compatibility.\n        let loginUrl = process.env.WEBINY_PULUMI_BACKEND;\n\n        if (loginUrl) {\n            // If the user passed `s3://my-bucket`, we want to store files in `s3://my-bucket/{project-application-path}`\n            const selfManagedBackend = SELF_MANAGED_BACKEND.find(item =>\n                loginUrl!.startsWith(item)\n            );\n            if (selfManagedBackend) {\n                loginUrl = trimEnd(loginUrl, \"/\") + \"/\" + projectAppRelativePath;\n                loginUrl = loginUrl.replace(/\\\\/g, \"/\");\n            }\n        } else {\n            // By default, we use local file system as backend. All files are stored in project root's\n            // `.pulumi` folder, e.g. `.pulumi/apps/admin`.\n            const stateFilesFolder = app.paths.localPulumiStateFilesFolder.toString();\n\n            if (!fs.existsSync(stateFilesFolder)) {\n                fs.mkdirSync(stateFilesFolder, { recursive: true });\n            }\n\n            loginUrl = `file://${stateFilesFolder}`;\n        }\n\n        await pulumi.run({ command: [\"login\", loginUrl] });\n\n        return { login: loginUrl };\n    }\n}\n\nexport const pulumiLoginService = createImplementation({\n    abstraction: PulumiLoginService,\n    implementation: DefaultPulumiLoginService,\n    dependencies: [GetPulumiService]\n});\n"],"names":["SELF_MANAGED_BACKEND","DefaultPulumiLoginService","getPulumiService","app","pulumi","projectAppRelativePath","path","loginUrl","process","selfManagedBackend","item","trimEnd","stateFilesFolder","fs","pulumiLoginService","createImplementation","PulumiLoginService","GetPulumiService"],"mappings":";;;;;AAOA,MAAMA,uBAAuB;IAAC;IAAS;IAAa;CAAQ;AAErD,MAAMC;IACT,YAAoBC,gBAA4C,CAAE;aAA9CA,gBAAgB,GAAhBA;IAA+C;IAEnE,MAAM,QAAQC,GAAa,EAAE;QACzB,MAAMC,SAAS,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAAED;QAAI;QAEzD,MAAME,yBAAyBC,KAAK,IAAI,CAAC,QAAQH,IAAI,IAAI;QAGzD,IAAII,WAAWC,QAAQ,GAAG,CAAC,qBAAqB;QAEhD,IAAID,UAAU;YAEV,MAAME,qBAAqBT,qBAAqB,IAAI,CAACU,CAAAA,OACjDH,SAAU,UAAU,CAACG;YAEzB,IAAID,oBAAoB;gBACpBF,WAAWI,QAAQJ,UAAU,OAAO,MAAMF;gBAC1CE,WAAWA,SAAS,OAAO,CAAC,OAAO;YACvC;QACJ,OAAO;YAGH,MAAMK,mBAAmBT,IAAI,KAAK,CAAC,2BAA2B,CAAC,QAAQ;YAEvE,IAAI,CAACU,GAAG,UAAU,CAACD,mBACfC,GAAG,SAAS,CAACD,kBAAkB;gBAAE,WAAW;YAAK;YAGrDL,WAAW,CAAC,OAAO,EAAEK,kBAAkB;QAC3C;QAEA,MAAMR,OAAO,GAAG,CAAC;YAAE,SAAS;gBAAC;gBAASG;aAAS;QAAC;QAEhD,OAAO;YAAE,OAAOA;QAAS;IAC7B;AACJ;AAEO,MAAMO,qBAAqBC,qBAAqB;IACnD,aAAaC;IACb,gBAAgBf;IAChB,cAAc;QAACgB;KAAiB;AACpC"}
+{"version":3,"file":"services/PulumiLoginService/PulumiLoginService.js","sources":["../../../src/services/PulumiLoginService/PulumiLoginService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { GetPulumiService, PulumiLoginService } from \"~/abstractions/index.js\";\nimport { type AppModel } from \"~/models/index.js\";\nimport trimEnd from \"lodash/trimEnd.js\";\nimport fs from \"fs\";\nimport path from \"path\";\n\nconst SELF_MANAGED_BACKEND = [\"s3://\", \"azblob://\", \"gs://\"];\n\nexport class DefaultPulumiLoginService implements PulumiLoginService.Interface {\n    constructor(private getPulumiService: GetPulumiService.Interface) {}\n\n    async execute(app: AppModel) {\n        const pulumi = await this.getPulumiService.execute({ app });\n\n        const projectAppRelativePath = path.join(\"apps\", app.name);\n\n        // `WEBINY_CLI_PULUMI_BACKEND` is the canonical variable. We still read the legacy\n        // `WEBINY_PULUMI_BACKEND` as a fallback, to preserve backwards compatibility.\n        let loginUrl = process.env.WEBINY_CLI_PULUMI_BACKEND || process.env.WEBINY_PULUMI_BACKEND;\n\n        if (loginUrl) {\n            // If the user passed `s3://my-bucket`, we want to store files in `s3://my-bucket/{project-application-path}`\n            const selfManagedBackend = SELF_MANAGED_BACKEND.find(item =>\n                loginUrl!.startsWith(item)\n            );\n            if (selfManagedBackend) {\n                loginUrl = trimEnd(loginUrl, \"/\") + \"/\" + projectAppRelativePath;\n                loginUrl = loginUrl.replace(/\\\\/g, \"/\");\n            }\n        } else {\n            // By default, we use local file system as backend. All files are stored in project root's\n            // `.pulumi` folder, e.g. `.pulumi/apps/admin`.\n            const stateFilesFolder = app.paths.localPulumiStateFilesFolder.toString();\n\n            if (!fs.existsSync(stateFilesFolder)) {\n                fs.mkdirSync(stateFilesFolder, { recursive: true });\n            }\n\n            loginUrl = `file://${stateFilesFolder}`;\n        }\n\n        await pulumi.run({ command: [\"login\", loginUrl] });\n\n        return { login: loginUrl };\n    }\n}\n\nexport const pulumiLoginService = createImplementation({\n    abstraction: PulumiLoginService,\n    implementation: DefaultPulumiLoginService,\n    dependencies: [GetPulumiService]\n});\n"],"names":["SELF_MANAGED_BACKEND","DefaultPulumiLoginService","getPulumiService","app","pulumi","projectAppRelativePath","path","loginUrl","process","selfManagedBackend","item","trimEnd","stateFilesFolder","fs","pulumiLoginService","createImplementation","PulumiLoginService","GetPulumiService"],"mappings":";;;;;AAOA,MAAMA,uBAAuB;IAAC;IAAS;IAAa;CAAQ;AAErD,MAAMC;IACT,YAAoBC,gBAA4C,CAAE;aAA9CA,gBAAgB,GAAhBA;IAA+C;IAEnE,MAAM,QAAQC,GAAa,EAAE;QACzB,MAAMC,SAAS,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAAED;QAAI;QAEzD,MAAME,yBAAyBC,KAAK,IAAI,CAAC,QAAQH,IAAI,IAAI;QAIzD,IAAII,WAAWC,QAAQ,GAAG,CAAC,yBAAyB,IAAIA,QAAQ,GAAG,CAAC,qBAAqB;QAEzF,IAAID,UAAU;YAEV,MAAME,qBAAqBT,qBAAqB,IAAI,CAACU,CAAAA,OACjDH,SAAU,UAAU,CAACG;YAEzB,IAAID,oBAAoB;gBACpBF,WAAWI,QAAQJ,UAAU,OAAO,MAAMF;gBAC1CE,WAAWA,SAAS,OAAO,CAAC,OAAO;YACvC;QACJ,OAAO;YAGH,MAAMK,mBAAmBT,IAAI,KAAK,CAAC,2BAA2B,CAAC,QAAQ;YAEvE,IAAI,CAACU,GAAG,UAAU,CAACD,mBACfC,GAAG,SAAS,CAACD,kBAAkB;gBAAE,WAAW;YAAK;YAGrDL,WAAW,CAAC,OAAO,EAAEK,kBAAkB;QAC3C;QAEA,MAAMR,OAAO,GAAG,CAAC;YAAE,SAAS;gBAAC;gBAASG;aAAS;QAAC;QAEhD,OAAO;YAAE,OAAOA;QAAS;IAC7B;AACJ;AAEO,MAAMO,qBAAqBC,qBAAqB;IACnD,aAAaC;IACb,gBAAgBf;IAChB,cAAc;QAACgB;KAAiB;AACpC"}

package/services/StackOutputCacheService/StackOutputCacheService.d.ts

@@ -0,0 +1,18 @@
+import { GetProjectService, LoggerService, ProjectSdkParamsService, StackOutputCacheService } from "../../abstractions/index.js";
+import { type AppModel } from "../../models/index.js";
+export declare class DefaultStackOutputCacheService implements StackOutputCacheService.Interface {
+    private getProjectService;
+    private projectSdkParamsService;
+    private loggerService;
+    private static readonly DEFAULT_ENV;
+    private static readonly DEFAULT_REGION;
+    private static readonly DEFAULT_VARIANT;
+    constructor(getProjectService: GetProjectService.Interface, projectSdkParamsService: ProjectSdkParamsService.Interface, loggerService: LoggerService.Interface);
+    read(app: AppModel): Promise<Record<string, any> | null>;
+    write(app: AppModel, data: Record<string, any>): Promise<void>;
+    delete(app: AppModel): Promise<void>;
+    private getCacheKey;
+    private getCacheDir;
+    private getCachePath;
+}
+export declare const stackOutputCacheService: import("@webiny/di").Implementation<typeof DefaultStackOutputCacheService>;

package/services/StackOutputCacheService/StackOutputCacheService.js

@@ -0,0 +1,89 @@
+import { createImplementation } from "@webiny/di";
+import { GetProjectService, LoggerService, ProjectSdkParamsService, StackOutputCacheService } from "../../abstractions/index.js";
+import promises from "fs/promises";
+class DefaultStackOutputCacheService {
+    static{
+        this.DEFAULT_ENV = "dev";
+    }
+    static{
+        this.DEFAULT_REGION = "default";
+    }
+    static{
+        this.DEFAULT_VARIANT = "default";
+    }
+    constructor(getProjectService, projectSdkParamsService, loggerService){
+        this.getProjectService = getProjectService;
+        this.projectSdkParamsService = projectSdkParamsService;
+        this.loggerService = loggerService;
+    }
+    async read(app) {
+        const cachePath = this.getCachePath(app);
+        try {
+            const content = await promises.readFile(cachePath, "utf-8");
+            const data = JSON.parse(content);
+            this.loggerService.debug({
+                app: app.name,
+                cacheKey: this.getCacheKey(app)
+            }, "Stack output read from cache");
+            return data;
+        } catch  {
+            return null;
+        }
+    }
+    async write(app, data) {
+        const cachePath = this.getCachePath(app);
+        const cacheDir = this.getCacheDir().toString();
+        try {
+            await promises.mkdir(cacheDir, {
+                recursive: true
+            });
+            await promises.writeFile(cachePath, JSON.stringify(data, null, 2), "utf-8");
+            this.loggerService.debug("Stack output stored to cache", {
+                app: app.name,
+                cacheKey: this.getCacheKey(app)
+            });
+        } catch (error) {
+            this.loggerService.error("Could not write to cache file.", cachePath, error);
+        }
+    }
+    async delete(app) {
+        const cachePath = this.getCachePath(app);
+        try {
+            await promises.rm(cachePath, {
+                force: true
+            });
+            this.loggerService.debug("Stack output cache deleted.", {
+                app: app.name,
+                cacheKey: this.getCacheKey(app)
+            });
+        } catch (error) {
+            this.loggerService.error("Could not delete stack output cache file.", cachePath, error);
+        }
+    }
+    getCacheKey(app) {
+        const sdkParams = this.projectSdkParamsService.get();
+        const env = sdkParams.env || DefaultStackOutputCacheService.DEFAULT_ENV;
+        const region = sdkParams.region || DefaultStackOutputCacheService.DEFAULT_REGION;
+        const variant = sdkParams.variant || DefaultStackOutputCacheService.DEFAULT_VARIANT;
+        return `${app.name}-${env}-${region}-${variant}.json`;
+    }
+    getCacheDir() {
+        const project = this.getProjectService.execute();
+        return project.paths.dotWebinyFolder.join("caches", "stack-output");
+    }
+    getCachePath(app) {
+        return this.getCacheDir().join(this.getCacheKey(app)).toString();
+    }
+}
+const stackOutputCacheService = createImplementation({
+    abstraction: StackOutputCacheService,
+    implementation: DefaultStackOutputCacheService,
+    dependencies: [
+        GetProjectService,
+        ProjectSdkParamsService,
+        LoggerService
+    ]
+});
+export { DefaultStackOutputCacheService, stackOutputCacheService };
+
+//# sourceMappingURL=StackOutputCacheService.js.map

package/services/StackOutputCacheService/StackOutputCacheService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"services/StackOutputCacheService/StackOutputCacheService.js","sources":["../../../src/services/StackOutputCacheService/StackOutputCacheService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport {\n    GetProjectService,\n    LoggerService,\n    ProjectSdkParamsService,\n    StackOutputCacheService\n} from \"~/abstractions/index.js\";\nimport { type AppModel } from \"~/models/index.js\";\nimport fs from \"fs/promises\";\n\nexport class DefaultStackOutputCacheService implements StackOutputCacheService.Interface {\n    private static readonly DEFAULT_ENV = \"dev\";\n    private static readonly DEFAULT_REGION = \"default\";\n    private static readonly DEFAULT_VARIANT = \"default\";\n\n    constructor(\n        private getProjectService: GetProjectService.Interface,\n        private projectSdkParamsService: ProjectSdkParamsService.Interface,\n        private loggerService: LoggerService.Interface\n    ) {}\n\n    async read(app: AppModel): Promise<Record<string, any> | null> {\n        const cachePath = this.getCachePath(app);\n\n        try {\n            const content = await fs.readFile(cachePath, \"utf-8\");\n            const data = JSON.parse(content);\n            this.loggerService.debug(\n                { app: app.name, cacheKey: this.getCacheKey(app) },\n                \"Stack output read from cache\"\n            );\n            return data;\n        } catch {\n            // File doesn't exist or couldn't be read/parsed - this is expected on first run.\n            return null;\n        }\n    }\n\n    async write(app: AppModel, data: Record<string, any>): Promise<void> {\n        const cachePath = this.getCachePath(app);\n        const cacheDir = this.getCacheDir().toString();\n\n        try {\n            // Create cache directory if it doesn't exist.\n            await fs.mkdir(cacheDir, { recursive: true });\n            await fs.writeFile(cachePath, JSON.stringify(data, null, 2), \"utf-8\");\n            this.loggerService.debug(\"Stack output stored to cache\", {\n                app: app.name,\n                cacheKey: this.getCacheKey(app)\n            });\n        } catch (error) {\n            this.loggerService.error(\"Could not write to cache file.\", cachePath, error);\n        }\n    }\n\n    async delete(app: AppModel): Promise<void> {\n        const cachePath = this.getCachePath(app);\n\n        try {\n            // `force: true` makes this a no-op if the cache file doesn't exist.\n            await fs.rm(cachePath, { force: true });\n            this.loggerService.debug(\"Stack output cache deleted.\", {\n                app: app.name,\n                cacheKey: this.getCacheKey(app)\n            });\n        } catch (error) {\n            this.loggerService.error(\"Could not delete stack output cache file.\", cachePath, error);\n        }\n    }\n\n    private getCacheKey(app: AppModel): string {\n        const sdkParams = this.projectSdkParamsService.get();\n        const env = sdkParams.env || DefaultStackOutputCacheService.DEFAULT_ENV;\n        const region = sdkParams.region || DefaultStackOutputCacheService.DEFAULT_REGION;\n        const variant = sdkParams.variant || DefaultStackOutputCacheService.DEFAULT_VARIANT;\n        return `${app.name}-${env}-${region}-${variant}.json`;\n    }\n\n    private getCacheDir() {\n        const project = this.getProjectService.execute();\n        return project.paths.dotWebinyFolder.join(\"caches\", \"stack-output\");\n    }\n\n    private getCachePath(app: AppModel): string {\n        return this.getCacheDir().join(this.getCacheKey(app)).toString();\n    }\n}\n\nexport const stackOutputCacheService = createImplementation({\n    abstraction: StackOutputCacheService,\n    implementation: DefaultStackOutputCacheService,\n    dependencies: [GetProjectService, ProjectSdkParamsService, LoggerService]\n});\n"],"names":["DefaultStackOutputCacheService","getProjectService","projectSdkParamsService","loggerService","app","cachePath","content","fs","data","JSON","cacheDir","error","sdkParams","env","region","variant","project","stackOutputCacheService","createImplementation","StackOutputCacheService","GetProjectService","ProjectSdkParamsService","LoggerService"],"mappings":";;;AAUO,MAAMA;;aACe,WAAW,GAAG;;;aACd,cAAc,GAAG;;;aACjB,eAAe,GAAG;;IAE1C,YACYC,iBAA8C,EAC9CC,uBAA0D,EAC1DC,aAAsC,CAChD;aAHUF,iBAAiB,GAAjBA;aACAC,uBAAuB,GAAvBA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,KAAKC,GAAa,EAAuC;QAC3D,MAAMC,YAAY,IAAI,CAAC,YAAY,CAACD;QAEpC,IAAI;YACA,MAAME,UAAU,MAAMC,SAAAA,QAAW,CAACF,WAAW;YAC7C,MAAMG,OAAOC,KAAK,KAAK,CAACH;YACxB,IAAI,CAAC,aAAa,CAAC,KAAK,CACpB;gBAAE,KAAKF,IAAI,IAAI;gBAAE,UAAU,IAAI,CAAC,WAAW,CAACA;YAAK,GACjD;YAEJ,OAAOI;QACX,EAAE,OAAM;YAEJ,OAAO;QACX;IACJ;IAEA,MAAM,MAAMJ,GAAa,EAAEI,IAAyB,EAAiB;QACjE,MAAMH,YAAY,IAAI,CAAC,YAAY,CAACD;QACpC,MAAMM,WAAW,IAAI,CAAC,WAAW,GAAG,QAAQ;QAE5C,IAAI;YAEA,MAAMH,SAAAA,KAAQ,CAACG,UAAU;gBAAE,WAAW;YAAK;YAC3C,MAAMH,SAAAA,SAAY,CAACF,WAAWI,KAAK,SAAS,CAACD,MAAM,MAAM,IAAI;YAC7D,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,gCAAgC;gBACrD,KAAKJ,IAAI,IAAI;gBACb,UAAU,IAAI,CAAC,WAAW,CAACA;YAC/B;QACJ,EAAE,OAAOO,OAAO;YACZ,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,kCAAkCN,WAAWM;QAC1E;IACJ;IAEA,MAAM,OAAOP,GAAa,EAAiB;QACvC,MAAMC,YAAY,IAAI,CAAC,YAAY,CAACD;QAEpC,IAAI;YAEA,MAAMG,SAAAA,EAAK,CAACF,WAAW;gBAAE,OAAO;YAAK;YACrC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,+BAA+B;gBACpD,KAAKD,IAAI,IAAI;gBACb,UAAU,IAAI,CAAC,WAAW,CAACA;YAC/B;QACJ,EAAE,OAAOO,OAAO;YACZ,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,6CAA6CN,WAAWM;QACrF;IACJ;IAEQ,YAAYP,GAAa,EAAU;QACvC,MAAMQ,YAAY,IAAI,CAAC,uBAAuB,CAAC,GAAG;QAClD,MAAMC,MAAMD,UAAU,GAAG,IAAIZ,+BAA+B,WAAW;QACvE,MAAMc,SAASF,UAAU,MAAM,IAAIZ,+BAA+B,cAAc;QAChF,MAAMe,UAAUH,UAAU,OAAO,IAAIZ,+BAA+B,eAAe;QACnF,OAAO,GAAGI,IAAI,IAAI,CAAC,CAAC,EAAES,IAAI,CAAC,EAAEC,OAAO,CAAC,EAAEC,QAAQ,KAAK,CAAC;IACzD;IAEQ,cAAc;QAClB,MAAMC,UAAU,IAAI,CAAC,iBAAiB,CAAC,OAAO;QAC9C,OAAOA,QAAQ,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU;IACxD;IAEQ,aAAaZ,GAAa,EAAU;QACxC,OAAO,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAACA,MAAM,QAAQ;IAClE;AACJ;AAEO,MAAMa,0BAA0BC,qBAAqB;IACxD,aAAaC;IACb,gBAAgBnB;IAChB,cAAc;QAACoB;QAAmBC;QAAyBC;KAAc;AAC7E"}

package/services/StackOutputCacheService/index.d.ts

@@ -0,0 +1 @@
+export * from "./StackOutputCacheService.js";

package/services/StackOutputCacheService/index.js

@@ -0,0 +1 @@
+export * from "./StackOutputCacheService.js";

package/services/index.d.ts

@@ -6,6 +6,7 @@ export * from "./GetCwdService/index.js";
 export * from "./GetProjectConfigService/index.js";
 export * from "./GetProjectIdService/index.js";
 export * from "./GetProjectService/index.js";
+export * from "./GetProjectInstallationIdService/index.js";
 export * from "./GetProjectVersionService/index.js";
 export * from "./GetPulumiService/index.js";
 export * from "./InitProjectSdkService/index.js";
@@ -28,6 +29,7 @@ export * from "./PulumiGetStackOutputService/index.js";
 export * from "./PulumiLoginService/index.js";
 export * from "./PulumiSelectStackService/index.js";
 export * from "./SetProjectIdService/index.js";
+export * from "./StackOutputCacheService/index.js";
 export * from "./StdioService/index.js";
 export * from "./UiService/index.js";
 export * from "./ValidateProjectConfigService/index.js";

package/services/index.js

@@ -6,6 +6,7 @@ export * from "./GetCwdService/index.js";
 export * from "./GetProjectConfigService/index.js";
 export * from "./GetProjectIdService/index.js";
 export * from "./GetProjectService/index.js";
+export * from "./GetProjectInstallationIdService/index.js";
 export * from "./GetProjectVersionService/index.js";
 export * from "./GetPulumiService/index.js";
 export * from "./InitProjectSdkService/index.js";
@@ -28,6 +29,7 @@ export * from "./PulumiGetStackOutputService/index.js";
 export * from "./PulumiLoginService/index.js";
 export * from "./PulumiSelectStackService/index.js";
 export * from "./SetProjectIdService/index.js";
+export * from "./StackOutputCacheService/index.js";
 export * from "./StdioService/index.js";
 export * from "./UiService/index.js";
 export * from "./ValidateProjectConfigService/index.js";