@mstuercke/pulumi-modules 0.0.3 → 0.0.5

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@mstuercke/pulumi-modules",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "files": [
     "src/**/!(*.test|*.fixture).ts",
     "tsconfig.json",
     "README.md"
   ],
-  "main": "src/index.ts",
-  "type": "commonjs",
+  "exports": "./src/index.ts",
+  "type": "module",
   "scripts": {
     "typeCheck": "tsc --noEmit",
     "bump:major": "npm version major --git-tag-version false",
@@ -16,20 +16,20 @@
     "release": "bun run --tsconfig-override ./tsconfig.scripts.json scripts/release.ts"
   },
   "dependencies": {
-    "@pulumi/archive": "^0.2.2",
+    "@pulumi/archive": "^0.3.0",
     "@pulumi/auth0": "^3.8.1",
     "@pulumi/aws": "^6.56.1",
     "@pulumi/mongodbatlas": "^3.20.2",
     "@pulumi/pulumi": "^3.137.0",
     "@pulumi/random": "^4.16.7",
-    "@pulumiverse/sentry": "^0.0.8",
+    "@pulumiverse/sentry": "^0.0.9",
     "@types/mime": "^3.0.4",
-    "glob": "^11.0.0",
+    "glob": "11.0.1",
     "mime": "^3.0.0"
   },
   "devDependencies": {
     "@mstuercke/bun-utils": "7.0.6",
-    "@types/bun": "1.1.12",
-    "typescript": "5.6.3"
+    "@types/bun": "1.2.2",
+    "typescript": "5.7.3"
   }
 }

package/src/auth0/index.ts

@@ -1,6 +1,6 @@
-import {Auth0} from './Auth0'
+import {Auth0} from './Auth0.ts'
 
-export * from './Auth0'
+export * from './Auth0.ts'
 
 export const auth0 = {
   Auth0,

package/src/domain/index.ts

@@ -1,6 +1,6 @@
-import {getDomain} from './getDomain'
+import {getDomain} from './getDomain.ts'
 
-export * from './getDomain'
+export * from './getDomain.ts'
 
 export const domain = {
   getDomain,

package/src/iam/SimpleIamRolePolicy.ts

@@ -1,8 +1,7 @@
 import {iam} from '@pulumi/aws'
-import type {SimpleIamRolePolicyConfig} from './SimpleIamRolePolicyConfig'
-import type {CustomResourceOptions, Input} from '@pulumi/pulumi'
-import type {RolePolicyArgs} from '@pulumi/aws/iam'
-import type {PolicyStatement} from '@pulumi/aws/iam/documents'
+import type {SimpleIamRolePolicyConfig} from './SimpleIamRolePolicyConfig.js'
+import {type CustomResourceOptions, type Input, output} from '@pulumi/pulumi'
+import type {PolicyStatement, RolePolicyArgs} from '@pulumi/aws/iam'
 
 export class SimpleIamRolePolicy extends iam.RolePolicy {
   constructor(iamRoleId: string, config: SimpleIamRolePolicyConfig, opts?: CustomResourceOptions) {
@@ -19,7 +18,7 @@ export class SimpleIamRolePolicy extends iam.RolePolicy {
             {
               Action: ['dynamodb:*'],
               Effect: 'Allow',
-              Resource: [`${config.tableArn}`, `${config.tableArn}/*`],
+              Resource: output(config.tableArn).apply((tableArn) => [`${tableArn}`, `${tableArn}/*`]),
             },
           ]),
           opts,
@@ -56,7 +55,7 @@ export class SimpleIamRolePolicy extends iam.RolePolicy {
             {
               Action: ['s3:*'],
               Effect: 'Allow',
-              Resource: [`${config.bucketArn}`, `${config.bucketArn}/*`],
+              Resource: output(config.bucketArn).apply((bucketArn) => [`${bucketArn}`, `${bucketArn}/*`]),
             },
           ]),
           opts,

package/src/iam/SimpleIamRolePolicyConfig.ts

@@ -1,5 +1,5 @@
 import type {Input} from '@pulumi/pulumi'
-import type {PolicyStatement} from '@pulumi/aws/iam/documents'
+import type {PolicyStatement} from '@pulumi/aws/iam'
 
 export type SimpleIamRolePolicyConfig =
   | CustomPolicyConfig

package/src/iam/index.ts

@@ -1,7 +1,7 @@
-import {SimpleIamRolePolicy} from './SimpleIamRolePolicy'
+import {SimpleIamRolePolicy} from './SimpleIamRolePolicy.ts'
 
-export * from './SimpleIamRolePolicy'
-export * from './SimpleIamRolePolicyConfig'
+export * from './SimpleIamRolePolicy.ts'
+export * from './SimpleIamRolePolicyConfig.ts'
 
 export const iam = {
   SimpleIamRolePolicy,

package/src/index.ts

@@ -1,22 +1,22 @@
-import {auth0} from './auth0'
-import {domain} from './domain'
-import {iam} from './iam'
-import {rest} from './rest'
-import {lambda} from './lambda'
-import {mongodb} from './mongodb'
-import {s3} from './s3'
-import {website} from './website'
-import {websocket} from './websocket'
+import {auth0} from './auth0/index.ts'
+import {domain} from './domain/index.ts'
+import {iam} from './iam/index.ts'
+import {rest} from './rest/index.ts'
+import {lambda} from './lambda/index.ts'
+import {mongodb} from './mongodb/index.ts'
+import {s3} from './s3/index.ts'
+import {website} from './website/index.ts'
+import {websocket} from './websocket/index.ts'
 
-export * from './auth0'
-export * from './domain'
-export * from './iam'
-export * from './lambda'
-export * from './mongodb'
-export * from './rest'
-export * from './s3'
-export * from './website'
-export * from './websocket'
+export * from './auth0/index.ts'
+export * from './domain/index.ts'
+export * from './iam/index.ts'
+export * from './lambda/index.ts'
+export * from './mongodb/index.ts'
+export * from './rest/index.ts'
+export * from './s3/index.ts'
+export * from './website/index.ts'
+export * from './websocket/index.ts'
 
 export const mstuercke = {
   auth0,
@@ -27,5 +27,5 @@ export const mstuercke = {
   rest,
   s3,
   website,
-  websocket,
+  websocket: websocket,
 }

package/src/lambda/NodeLambdaFunction.ts

@@ -2,9 +2,8 @@ import {iam, lambda} from '@pulumi/aws'
 import {getFile} from '@pulumi/archive'
 import {asset, type CustomResourceOptions, type Output, Resource} from '@pulumi/pulumi'
 
-import type {SimpleIamRolePolicyConfig} from '../iam'
-import type {WithInputs} from './WithInputs'
-import {mstuercke} from '../index'
+import {SimpleIamRolePolicy, type SimpleIamRolePolicyConfig} from '../iam/index.ts'
+import type {WithInputs} from './WithInputs.js'
 
 export type NodeLambdaFunctionArgs<EnvironmentVariables> = {
   name: string
@@ -31,7 +30,7 @@ export class NodeLambdaFunction<
       name,
       additionalIamRolePolicies = [],
       environmentVariables = undefined,
-      runtime = 'nodejs20.x',
+      runtime = 'nodejs22.x',
       functionHandler = 'lambdaFunction.lambdaHandler',
       memorySize = 128,
       timeoutSeconds = 30,
@@ -60,7 +59,7 @@ export class NodeLambdaFunction<
     )
 
     role.id.apply((roleId) => {
-      new mstuercke.iam.SimpleIamRolePolicy(
+      new SimpleIamRolePolicy(
         roleId,
         {
           type: 'custom',
@@ -77,7 +76,7 @@ export class NodeLambdaFunction<
       )
 
       for (const config of additionalIamRolePolicies) {
-        new mstuercke.iam.SimpleIamRolePolicy(roleId, config, {parent: this})
+        new SimpleIamRolePolicy(roleId, config, {parent: this})
       }
     })
 

package/src/lambda/index.ts

@@ -1,6 +1,6 @@
-import {NodeLambdaFunction} from './NodeLambdaFunction'
+import {NodeLambdaFunction} from './NodeLambdaFunction.ts'
 
-export * from './NodeLambdaFunction'
+export * from './NodeLambdaFunction.ts'
 
 export const lambda = {
   NodeLambdaFunction,

package/src/mongodb/MongoDBCustomInstance.ts

@@ -0,0 +1,56 @@
+import {type CustomResourceOptions, type Output, Resource} from '@pulumi/pulumi'
+import {Project, ProjectIpAccessList, ServerlessInstance} from '@pulumi/mongodbatlas'
+
+export type MongoDBCustomInstanceArgs = {
+  organizationId: string
+  projectId: string
+  environmentName: string
+}
+
+export class MongoDBCustomInstance extends Resource {
+  readonly mongoProjectId: Output<string>
+  readonly connectionString: Output<string>
+  readonly databaseName: string
+
+  constructor(args: MongoDBCustomInstanceArgs, opts?: CustomResourceOptions) {
+    const {organizationId, projectId, environmentName} = args
+    super('mstuercke:mongodb:MongoDBCustomInstance', organizationId, false, undefined, opts)
+
+    const mongoProject = new Project(
+      'project',
+      {
+        orgId: organizationId,
+        name: `${projectId}-${environmentName}`,
+        tags: {
+          project: projectId,
+        },
+      },
+      {parent: this},
+    )
+
+    new ProjectIpAccessList(
+      'network-access',
+      {
+        projectId: mongoProject.id,
+        cidrBlock: '0.0.0.0/0',
+      },
+      {parent: this},
+    )
+
+    const mongoInstance = new ServerlessInstance(
+      'database',
+      {
+        projectId: mongoProject.id,
+        name: `${projectId}-${environmentName}`,
+        providerSettingsBackingProviderName: 'AWS',
+        providerSettingsProviderName: 'SERVERLESS',
+        providerSettingsRegionName: 'EU_WEST_1', // Ireland
+      },
+      {parent: this},
+    )
+
+    this.mongoProjectId = mongoProject.id
+    this.connectionString = mongoInstance.connectionStringsStandardSrv
+    this.databaseName = `${projectId}-${environmentName}`
+  }
+}

package/src/mongodb/MongoDBDefaultInstance.ts

@@ -0,0 +1,34 @@
+import {type CustomResourceOptions, output, type Output, Resource} from '@pulumi/pulumi'
+import {getProject, getServerlessInstance} from '@pulumi/mongodbatlas'
+
+export type MongoDBDefaultInstanceArgs = {
+  organizationId: string
+  projectId: string
+  environmentName: string
+}
+
+export class MongoDBDefaultInstance extends Resource {
+  readonly mongoProjectId: Output<string>
+  readonly connectionString: Output<string>
+  readonly databaseName: string
+
+  constructor(args: MongoDBDefaultInstanceArgs, opts?: CustomResourceOptions) {
+    const {organizationId, projectId, environmentName} = args
+    super('mstuercke:mongodb:MongoDBDefaultInstance', organizationId, false, undefined, opts)
+
+    const mongoProject = output(getProject({name: 'default'}))
+
+    const mongoInstance = mongoProject.id.apply((mongoProjectId) =>
+      output(
+        getServerlessInstance({
+          projectId: mongoProjectId,
+          name: 'default',
+        }),
+      ),
+    )
+
+    this.mongoProjectId = mongoProject.id
+    this.connectionString = mongoInstance.connectionStringsStandardSrv
+    this.databaseName = `${projectId}-${environmentName}`
+  }
+}

package/src/mongodb/MongoDBUser.ts

@@ -0,0 +1,48 @@
+import {type CustomResourceOptions, type Input, type Output, Resource} from '@pulumi/pulumi'
+import {RandomPassword} from '@pulumi/random'
+import {DatabaseUser} from '@pulumi/mongodbatlas'
+
+export type MongoDBUserArgs = {
+  mongoProjectId: Input<string>
+  databaseName: string
+  projectId: string
+  environmentName: string
+}
+
+export class MongoDBUser extends Resource {
+  readonly username: string
+  readonly password: Output<string>
+
+  constructor(args: MongoDBUserArgs, opts?: CustomResourceOptions) {
+    const {mongoProjectId, databaseName, projectId, environmentName} = args
+    const username = `${projectId}-${environmentName}`
+    super('mstuercke:mongodb:MongoDBUser', username, false, undefined, opts)
+
+    const password = new RandomPassword(
+      'password',
+      {
+        length: 32,
+        special: false,
+      },
+      {parent: this},
+    )
+
+    new DatabaseUser(
+      'user',
+      {
+        projectId: mongoProjectId,
+        username,
+        password: password.result,
+        authDatabaseName: 'admin',
+        roles: [
+          {roleName: 'dbAdmin', databaseName},
+          {roleName: 'readWrite', databaseName},
+        ],
+      },
+      {parent: this},
+    )
+
+    this.username = username
+    this.password = password.result
+  }
+}

package/src/mongodb/index.ts

@@ -1,9 +1,13 @@
-export * from './MongoDB'
+import {MongoDBCustomInstance} from './MongoDBCustomInstance.ts'
+import {MongoDBDefaultInstance} from './MongoDBDefaultInstance.ts'
+import {MongoDBUser} from './MongoDBUser.ts'
 
-import {MongoDB} from './MongoDB'
-
-export * from './MongoDB'
+export * from './MongoDBCustomInstance.ts'
+export * from './MongoDBDefaultInstance.ts'
+export * from './MongoDBUser.ts'
 
 export const mongodb = {
-  MongoDB,
+  MongoDBCustomInstance,
+  MongoDBDefaultInstance,
+  MongoDBUser,
 }

package/src/rest/RestApi.ts

@@ -3,7 +3,7 @@ import {apigateway, lambda} from '@pulumi/aws'
 import type {CustomResourceOptions, Input} from '@pulumi/pulumi'
 import {Record} from '@pulumi/aws/route53'
 import {BasePathMapping, DomainName} from '@pulumi/aws/apigateway'
-import type {NodeLambdaFunction} from '../lambda'
+import type {NodeLambdaFunction} from '../lambda/index.ts'
 
 export interface RestApiArgs {
   name: string
@@ -180,6 +180,7 @@ export class RestApi extends aws.apigateway.RestApi {
         restApi: this.id,
         stageName: stageName,
         deployment: deployment.id,
+        tags: {project: projectId},
       },
       {parent: deployment},
     )

package/src/rest/index.ts

@@ -1,6 +1,6 @@
-import {RestApi} from './RestApi'
+import {RestApi} from './RestApi.ts'
 
-export * from './RestApi'
+export * from './RestApi.ts'
 
 export const rest = {
   RestApi,

package/src/s3/index.ts

@@ -1,6 +1,6 @@
-import {PublicS3Bucket} from './PublicS3Bucket'
+import {PublicS3Bucket} from './PublicS3Bucket.ts'
 
-export * from './PublicS3Bucket'
+export * from './PublicS3Bucket.ts'
 
 export const s3 = {
   PublicS3Bucket,

package/src/website/StaticWebsite.ts

@@ -1,9 +1,9 @@
 import {type CustomResourceOptions, type Input, Resource} from '@pulumi/pulumi'
-import {type PublicS3Bucket, s3} from '../s3'
+import {type PublicS3Bucket, s3} from '../s3/index.ts'
 import {BucketObject} from '@pulumi/aws/s3'
 import {Distribution} from '@pulumi/aws/cloudfront'
 import {Record} from '@pulumi/aws/route53'
-import {readFilesRecursive} from './readFilesRecursive'
+import {readFilesRecursive} from './readFilesRecursive.js'
 
 export interface StaticWebsiteArgs {
   projectId: string
@@ -92,6 +92,22 @@ export class StaticWebsite extends Resource {
             defaultTtl: 0,
             maxTtl: 0,
 
+            forwardedValues: {
+              queryString: false,
+              cookies: {
+                forward: 'none',
+              },
+            },
+          },
+          {
+            pathPattern: 'config.json',
+            allowedMethods: ['GET', 'HEAD', 'OPTIONS'],
+            cachedMethods: ['GET', 'HEAD'],
+            targetOriginId: bucket.id,
+            viewerProtocolPolicy: 'redirect-to-https',
+            defaultTtl: 0,
+            maxTtl: 0,
+
             forwardedValues: {
               queryString: false,
               cookies: {

package/src/website/index.ts

@@ -1,6 +1,6 @@
-import {StaticWebsite} from './StaticWebsite'
+import {StaticWebsite} from './StaticWebsite.ts'
 
-export * from './StaticWebsite'
+export * from './StaticWebsite.ts'
 
 export const website = {
   StaticWebsite,

package/src/website/readFilesRecursive.ts

@@ -1,6 +1,6 @@
 import {createHash} from 'crypto'
-import * as fs from 'fs'
-import * as mime from 'mime'
+import fs from 'fs'
+import mime from 'mime'
 import {globSync} from 'glob'
 
 interface File {

package/src/websocket/WebsocketApi.ts

@@ -11,7 +11,7 @@ import {
 } from '@pulumi/aws/apigatewayv2'
 import {Policy, Role} from '@pulumi/aws/iam'
 import {Record} from '@pulumi/aws/route53'
-import type {NodeLambdaFunction} from '../lambda'
+import type {NodeLambdaFunction} from '../lambda/index.ts'
 
 export interface WebsocketApiArgs {
   name: string

package/src/websocket/index.ts

@@ -1,6 +1,6 @@
-import {WebsocketApi} from './WebsocketApi'
+import {WebsocketApi} from './WebsocketApi.ts'
 
-export * from './WebsocketApi'
+export * from './WebsocketApi.ts'
 
 export const websocket = {
   WebsocketApi,

package/tsconfig.json

@@ -1,19 +1,6 @@
 {
-    "compilerOptions": {
-        "strict": true,
-        "outDir": "dist",
-        "target": "ESNext",
-        "module": "CommonJS",
-        "moduleResolution": "node",
-        "sourceMap": true,
-        "experimentalDecorators": true,
-        "pretty": true,
-        "noFallthroughCasesInSwitch": true,
-        "noImplicitReturns": true,
-        "forceConsistentCasingInFileNames": true,
-        "skipLibCheck": true
-    },
-    "files": [
-        "src/index.ts"
+    "extends": "@mstuercke/typescript-config/pulumi/tsconfig.json",
+    "include": [
+        "src",
     ]
 }