@storm-software/pulumi-tools 0.10.2 → 0.11.1

package/dist/src/executors/up/executor.js

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkXCMHF3SOjs = require('../../../chunk-XCMHF3SO.js');
-require('../../../chunk-LPXQTX6R.js');
-require('../../../chunk-6537GKN5.js');
+var _chunkEWECYCTEjs = require('../../../chunk-EWECYCTE.js');
+require('../../../chunk-DFGSDTGO.js');
+require('../../../chunk-ENOW7DUM.js');
 require('../../../chunk-3RG5ZIWI.js');
 
 
-exports.default = _chunkXCMHF3SOjs.executor_default;
+exports.default = _chunkEWECYCTEjs.executor_default;

package/dist/src/executors/up/executor.mjs

@@ -1,8 +1,8 @@
 import {
   executor_default
-} from "../../../chunk-UWD6HQGL.mjs";
-import "../../../chunk-SV6O36JV.mjs";
-import "../../../chunk-LM56PRM3.mjs";
+} from "../../../chunk-7SRRHU3C.mjs";
+import "../../../chunk-SA5AEUUC.mjs";
+import "../../../chunk-4O2PMSOY.mjs";
 import "../../../chunk-IEZKYJSF.mjs";
 export {
   executor_default as default

package/dist/src/generators/init/generator.js

@@ -1,11 +1,11 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkT27SI2SKjs = require('../../../chunk-T27SI2SK.js');
+var _chunkFOPJOETCjs = require('../../../chunk-FOPJOETC.js');
 require('../../../chunk-HUKXHFCA.js');
-require('../../../chunk-6537GKN5.js');
+require('../../../chunk-ENOW7DUM.js');
 require('../../../chunk-3RG5ZIWI.js');
 
 
 
-exports.default = _chunkT27SI2SKjs.generator_default; exports.initGeneratorFn = _chunkT27SI2SKjs.initGeneratorFn;
+exports.default = _chunkFOPJOETCjs.generator_default; exports.initGeneratorFn = _chunkFOPJOETCjs.initGeneratorFn;

package/dist/src/generators/init/generator.mjs

@@ -1,9 +1,9 @@
 import {
   generator_default,
   initGeneratorFn
-} from "../../../chunk-63OFHFSN.mjs";
+} from "../../../chunk-OPWCK5QZ.mjs";
 import "../../../chunk-KPFHCT4A.mjs";
-import "../../../chunk-LM56PRM3.mjs";
+import "../../../chunk-4O2PMSOY.mjs";
 import "../../../chunk-IEZKYJSF.mjs";
 export {
   generator_default as default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/pulumi-tools",
-  "version": "0.10.2",
+  "version": "0.11.1",
   "type": "commonjs",
   "description": "Tools for managing Pulumi infrastructure within a Nx workspace.",
   "repository": {
@@ -32,28 +32,16 @@
         "types": "./dist/index.d.mts",
         "default": "./dist/index.mjs"
       },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      },
-      "default": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "require": { "types": "./dist/index.d.ts", "default": "./dist/index.js" },
+      "default": { "types": "./dist/index.d.ts", "default": "./dist/index.js" }
     },
     "./index": {
       "import": {
         "types": "./dist/index.d.mts",
         "default": "./dist/index.mjs"
       },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      },
-      "default": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "require": { "types": "./dist/index.d.ts", "default": "./dist/index.js" },
+      "default": { "types": "./dist/index.d.ts", "default": "./dist/index.js" }
     },
     "./executors": {
       "import": {
@@ -133,20 +121,11 @@
     "tsup": "8.4.0"
   },
   "peerDependenciesMeta": {
-    "@nx/devkit": {
-      "optional": false
-    },
-    "@pulumi/pulumi": {
-      "optional": false
-    },
-    "nx": {
-      "optional": false
-    }
-  },
-  "dependencies": {
-    "@nx/devkit": "20.8.0",
-    "shelljs": "^0.8.5"
+    "@nx/devkit": { "optional": false },
+    "@pulumi/pulumi": { "optional": false },
+    "nx": { "optional": false }
   },
+  "dependencies": { "@nx/devkit": "20.8.0", "shelljs": "^0.8.5" },
   "devDependencies": {
     "@nx/devkit": "20.8.0",
     "@types/node": "^22.10.2",
@@ -154,9 +133,7 @@
     "tsup": "8.4.0",
     "untyped": "^1.5.2"
   },
-  "publishConfig": {
-    "access": "public"
-  },
+  "publishConfig": { "access": "public" },
   "executors": "./executors.json",
   "generators": "./generators.json"
-}
+}

package/.eslintrc.json

@@ -1,40 +0,0 @@
-{
-  "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "parserOptions": {
-        "project": ["packages/pulumi-tools/tsconfig.*?.json"]
-      },
-      "rules": {}
-    },
-    {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.json"],
-      "parser": "jsonc-eslint-parser",
-      "rules": {
-        "@nx/dependency-checks": [
-          "error",
-          {
-            "ignoredFiles": ["{projectRoot}/eslint.config.{js,cjs,mjs}"]
-          }
-        ]
-      }
-    },
-    {
-      "files": ["./package.json", "./executors.json", "./generators.json"],
-      "parser": "jsonc-eslint-parser",
-      "rules": {
-        "@nx/nx-plugin-checks": "error"
-      }
-    }
-  ]
-}

package/executors.ts

@@ -1,10 +0,0 @@
-export * from "./src/executors/config/executor";
-export { type ConfigExecutorSchema } from "./src/executors/config/schema.d";
-export * from "./src/executors/import/executor";
-export { type ImportExecutorSchema } from "./src/executors/import/schema.d";
-export * from "./src/executors/preview/executor";
-export { type PreviewExecutorSchema } from "./src/executors/preview/schema.d";
-export * from "./src/executors/refresh/executor";
-export { type RefreshExecutorSchema } from "./src/executors/refresh/schema.d";
-export * from "./src/executors/up/executor";
-export { type UpExecutorSchema } from "./src/executors/up/schema.d";

package/generators.ts

@@ -1,2 +0,0 @@
-export * from "./src/generators/init/generator";
-export { type InitGeneratorSchema } from "./src/generators/init/schema.d";

package/index.ts

@@ -1,3 +0,0 @@
-export * from "./executors";
-export * from "./generators";
-export * from "./src/base";

package/project.json

@@ -1,57 +0,0 @@
-{
-  "name": "pulumi-tools",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "packages/pulumi-tools/src",
-  "projectType": "library",
-  "implicitDependencies": ["workspace-tools", "config-tools", "config"],
-  "targets": {
-    "build-untyped": {
-      "executor": "nx:run-commands",
-      "dependsOn": ["clean", "^build"],
-      "inputs": [
-        "{projectRoot}/src/**/untyped.ts",
-        "{projectRoot}/src/**/*.untyped.ts"
-      ],
-      "outputs": [
-        "{projectRoot}/src/**/schema.d.ts",
-        "{projectRoot}/src/**/*.schema.d.ts",
-        "{projectRoot}/src/**/schema.md",
-        "{projectRoot}/src/**/*.schema.md",
-        "{projectRoot}/src/**/schema.json",
-        "{projectRoot}/src/**/*.schema.json"
-      ],
-      "options": {
-        "commands": [
-          "node dist/packages/untyped/bin/untyped.cjs generate --entry=\"packages/pulumi-tools/**/{untyped.ts,*.untyped.ts}\" "
-        ]
-      }
-    },
-    "build-base": {
-      "executor": "nx:run-commands",
-      "dependsOn": ["build-untyped", "clean", "^build"],
-      "options": {
-        "command": "tsup-node --config=tsup.config.ts",
-        "cwd": "{projectRoot}"
-      }
-    },
-    "build": {
-      "executor": "nx:run-commands",
-      "dependsOn": ["build-base", "build-untyped"],
-      "options": {
-        "commands": [
-          "pnpm copyfiles LICENSE dist/packages/pulumi-tools",
-          "pnpm copyfiles --up=2 ./packages/pulumi-tools/*.md ./packages/pulumi-tools/executors.json ./packages/pulumi-tools/generators.json ./packages/pulumi-tools/package.json dist/packages/pulumi-tools",
-          "pnpm copyfiles --up=3 \"./packages/pulumi-tools/dist/**/*\" dist/packages/pulumi-tools/dist",
-          "pnpm copyfiles --up=3 \"./packages/pulumi-tools/src/**/*schema.d.ts\" dist/packages/pulumi-tools/dist/src",
-          "pnpm copyfiles --up=3 \"./packages/pulumi-tools/src/**/*schema.json\" dist/packages/pulumi-tools/dist/src",
-          "pnpm copyfiles --up=3 \"./packages/pulumi-tools/src/**/*.md\" dist/packages/pulumi-tools/docs/api",
-          "pnpm copyfiles --up=4 \"./packages/pulumi-tools/src/generators/*/files/**/*\" dist/packages/pulumi-tools/dist/src/generators"
-        ]
-      }
-    },
-
-    "nx-release-publish": {
-      "executor": "@storm-software/workspace-tools:npm-publish"
-    }
-  }
-}

package/src/base/base-executor.ts

@@ -1,77 +0,0 @@
-import type { ExecutorContext } from "@nx/devkit";
-import { StormWorkspaceConfig } from "@storm-software/config";
-import { ProjectTokenizerOptions, run } from "@storm-software/config-tools";
-import type { BaseExecutorOptions } from "@storm-software/workspace-tools";
-import { withRunExecutor } from "@storm-software/workspace-tools";
-import { BaseExecutorSchema } from "@storm-software/workspace-tools/base/base-executor.schema.d";
-import { join } from "node:path";
-import { which } from "shelljs";
-
-export interface PulumiCommandOptions {
-  stack?: string;
-  root?: string;
-  parent?: string;
-  name?: string;
-}
-
-export type PulumiExecutorSchema = BaseExecutorSchema &
-  Partial<PulumiCommandOptions>;
-
-export type NormalizedPulumiExecutorOptions<
-  TExecutorSchema extends PulumiExecutorSchema = PulumiExecutorSchema
-> = ProjectTokenizerOptions & TExecutorSchema;
-
-export const withPulumiExecutor =
-  <TExecutorSchema extends PulumiExecutorSchema = PulumiExecutorSchema>(
-    command: string,
-    argsMapper: (
-      options: NormalizedPulumiExecutorOptions<TExecutorSchema>
-    ) => Array<string | false | undefined>,
-    executorOptions: BaseExecutorOptions<TExecutorSchema> = {}
-  ) =>
-  async (
-    _options: TExecutorSchema,
-    context: ExecutorContext
-  ): Promise<{ success: boolean }> => {
-    return withRunExecutor<TExecutorSchema>(
-      `Pulumi \`${command}\` Command Executor`,
-      async (
-        options: NormalizedPulumiExecutorOptions<TExecutorSchema>,
-        context: ExecutorContext,
-        config: StormWorkspaceConfig
-      ) => {
-        if (!which("pulumi")) {
-          throw new Error(
-            "Pulumi is not installed. Please install it before running this executor."
-          );
-        }
-
-        if (
-          !context.projectsConfigurations?.projects ||
-          !context.projectName ||
-          !context.projectsConfigurations.projects[context.projectName]
-        ) {
-          throw new Error(
-            "The Build process failed because the context is not valid. Please run this command from a workspace."
-          );
-        }
-
-        const { sourceRoot } =
-          context.projectsConfigurations.projects[context.projectName]!;
-
-        run(
-          config,
-          ["pulumi", command, ...argsMapper(options)].filter(Boolean).join(" "),
-          join(config.workspaceRoot, (options.root || sourceRoot)!),
-          "inherit",
-          {
-            ...process.env,
-            PULUMI_EXPERIMENTAL: "true"
-          }
-        );
-
-        return null;
-      },
-      executorOptions
-    )(_options, context);
-  };

package/src/base/index.ts

@@ -1,2 +0,0 @@
-export * from "./base-executor";
-export * from "./providers";

package/src/base/providers.ts

@@ -1,9 +0,0 @@
-export enum Provider {
-  AWS = "aws",
-  AZURE = "azure",
-  GOOGLE_CLOUD_PLATFORM = "gcp",
-}
-
-export function getCloudTemplateName(cloudProvider: string) {
-  return `${cloudProvider}-typescript`;
-}

package/src/executors/config/executor.ts

@@ -1,11 +0,0 @@
-import { withPulumiExecutor } from "../../base/base-executor";
-import { ConfigExecutorSchema } from "./schema";
-
-export default withPulumiExecutor<ConfigExecutorSchema>("config", (options) => [
-  options.action,
-  options.showSecrets && `--show-secrets`,
-  options.secret && `--secret`,
-  options.path && `--path`,
-  options.name && options.value && `"${options.name}" "${options.value}"`,
-  options.stack && `--stack=${options.stack}`,
-]);

package/src/executors/import/executor.ts

@@ -1,10 +0,0 @@
-import { withPulumiExecutor } from "../../base/base-executor";
-import { ImportExecutorSchema } from "./schema";
-
-export default withPulumiExecutor<ImportExecutorSchema>("import", (options) => [
-  options.target,
-  options.name,
-  options.id,
-  options.parent && `--parent 'parent=${options.parent}'`,
-  options.stack && `--stack=${options.stack}`,
-]);

package/src/executors/preview/executor.ts

@@ -1,10 +0,0 @@
-import { withPulumiExecutor } from "../../base/base-executor";
-import { PreviewExecutorSchema } from "./schema.d";
-
-export default withPulumiExecutor<PreviewExecutorSchema>(
-  "preview",
-  (options) => [
-    options.stack && `--stack=${options.stack}`,
-    options.expectNoChanges && "--expect-no-changes",
-  ],
-);

package/src/executors/refresh/executor.ts

@@ -1,12 +0,0 @@
-import { withPulumiExecutor } from "../../base/base-executor";
-import { RefreshExecutorSchema } from "./schema";
-
-export default withPulumiExecutor<RefreshExecutorSchema>(
-  "refresh",
-  (options) => [
-    "--suppress-progress",
-    options.stack && `--stack=${options.stack}`,
-    options.skipPreview && "--skip-preview",
-    options.yes && "--yes",
-  ],
-);

package/src/executors/up/executor.ts

@@ -1,12 +0,0 @@
-import { withPulumiExecutor } from "../../base/base-executor";
-import { UpExecutorSchema } from "./schema";
-
-export default withPulumiExecutor<UpExecutorSchema>("up", (options) => [
-  "--suppress-progress",
-  options.stack && `--stack=${options.stack}`,
-  options.skipPreview && "--skip-preview",
-  options.yes && "--yes",
-  options.suppressOutputs && "--suppress-outputs",
-  options.debug && "--debug",
-  options.json && "--json",
-]);

package/src/generators/init/generator.ts

@@ -1,167 +0,0 @@
-import {
-  addDependenciesToPackageJson,
-  addProjectConfiguration,
-  formatFiles,
-  GeneratorCallback,
-  readJsonFile,
-  runTasksInSerial,
-  type Tree
-} from "@nx/devkit";
-import { StormWorkspaceConfig } from "@storm-software/config";
-import { run } from "@storm-software/config-tools";
-import {
-  initGenerator as baseInitGenerator,
-  withRunGenerator
-} from "@storm-software/workspace-tools";
-import { readFileSync, unlinkSync } from "node:fs";
-import { join } from "node:path";
-import { getCloudTemplateName } from "../../base/providers";
-import type { InitGeneratorSchema } from "./schema";
-
-export async function initGeneratorFn(
-  tree: Tree,
-  options: InitGeneratorSchema,
-  config: StormWorkspaceConfig
-) {
-  const task = baseInitGenerator(tree, options);
-
-  addProjectConfiguration(tree, options.name || "deployment", {
-    root: options.directory || "./deployment",
-    projectType: "application",
-    sourceRoot: options.directory || "./deployment",
-    targets: {
-      up: {
-        executor: "@nx-extend/pulumi:up",
-        options: {}
-      },
-      preview: {
-        executor: "@nx-extend/pulumi:preview",
-        options: {}
-      },
-      refresh: {
-        executor: "@nx-extend/pulumi:refresh",
-        options: {}
-      },
-      import: {
-        executor: "@nx-extend/pulumi:import",
-        options: {}
-      }
-    },
-    tags: ["infra:pulumi"]
-  });
-
-  await runTasksInSerial(
-    generateNewPulumiProject(tree, options, config),
-    loginToPulumi(tree, options, config),
-    addPulumiDeps(tree, options),
-    cleanupProject(tree, options)
-  )();
-
-  if (!options.skipFormat) {
-    await formatFiles(tree);
-  }
-
-  return task;
-}
-
-export default withRunGenerator<InitGeneratorSchema>(
-  "Initialize Storm Pulumi workspace",
-  initGeneratorFn
-);
-
-function generateNewPulumiProject(
-  tree: Tree,
-  options: InitGeneratorSchema,
-  config: StormWorkspaceConfig
-): GeneratorCallback {
-  return () => {
-    const template = getCloudTemplateName(options.provider);
-
-    run(
-      config,
-      [
-        `pulumi new ${template}`,
-        `--name=${options.name || "deployment"}`,
-        `--dir=${options.directory || "./deployment"}`,
-        options.secretsProvider &&
-          `--secrets-provider=${options.secretsProvider}`,
-        "--generate-only",
-        "--yes",
-        "--force"
-      ]
-        .filter(Boolean)
-        .join(" "),
-      join(config.workspaceRoot, options.directory || "./deployment"),
-      "inherit"
-    );
-  };
-}
-
-function loginToPulumi(
-  tree: Tree,
-  options: InitGeneratorSchema,
-  config: StormWorkspaceConfig
-): GeneratorCallback {
-  return () => {
-    if (!options.login) {
-      return;
-    }
-
-    if (options.login.startsWith("file://")) {
-      options.login = `file://${tree.root}/${
-        options.directory || "./deployment"
-      }/${options.login.replace("file://", "")}`;
-    }
-
-    run(
-      config,
-      ["pulumi login", options.login].filter(Boolean).join(" "),
-      join(config.workspaceRoot, options.directory || "./deployment"),
-      "inherit",
-      {
-        ...process.env,
-        PULUMI_EXPERIMENTAL: "true"
-      }
-    );
-  };
-}
-
-function addPulumiDeps(
-  tree: Tree,
-  options: InitGeneratorSchema
-): GeneratorCallback {
-  return () => {
-    const packageJson = readJsonFile(`${options.directory}/package.json`);
-
-    if (packageJson) {
-      addDependenciesToPackageJson(tree, {}, packageJson.dependencies || {})();
-    }
-  };
-}
-
-function cleanupProject(
-  tree: Tree,
-  options: InitGeneratorSchema
-): GeneratorCallback {
-  return () => {
-    const indexTsLocation = join(
-      tree.root,
-      `${options.directory || "./deployment"}/index.ts`
-    );
-    tree.write(
-      `${options.directory}/pulumi.ts`,
-      readFileSync(indexTsLocation).toString()
-    );
-
-    // Remove the unneeded files
-    unlinkSync(
-      join(tree.root, `${options.directory || "./deployment"}/.gitignore`)
-    );
-    unlinkSync(
-      join(tree.root, `${options.directory || "./deployment"}/package.json`)
-    );
-    unlinkSync(
-      join(tree.root, `${options.directory || "./deployment"}/tsconfig.json`)
-    );
-  };
-}

package/tsconfig.json

@@ -1,31 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "rootDir": "../..",
-    "target": "ESNext",
-    "module": "ESNext",
-    "lib": ["ESNext"],
-    "skipLibCheck": true,
-    "skipDefaultLibCheck": true,
-    "moduleResolution": "Bundler",
-    "moduleDetection": "force",
-    "types": ["node"]
-  },
-  "include": [
-    "executors.ts",
-    "generators.ts",
-    "index.ts",
-    "src/**/*.ts",
-    "src/**/*.d.ts",
-    "src/**/*.json",
-    "tsup.config.ts"
-  ],
-  "exclude": [
-    "jest.config.ts",
-    "src/generators/**/files/**/*",
-    "src/**/untyped.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.ts"
-  ]
-}

package/tsup.config.ts

@@ -1,24 +0,0 @@
-import { defineConfig } from "tsup";
-
-export default defineConfig([
-  {
-    name: "pulumi-tools",
-    target: "node22",
-    entryPoints: [
-      "./*.ts",
-      "./src/base/*.ts",
-      "./src/executors/*/executor.ts",
-      "./src/generators/*/generator.ts",
-    ],
-    outDir: "dist",
-    format: ["cjs", "esm"],
-    platform: "node",
-    splitting: true,
-    clean: true,
-    dts: true,
-    sourcemap: false,
-    shims: true,
-    tsconfig: "./tsconfig.json",
-    external: ["@storm-software/workspace-tools"],
-  },
-]);