@mstuercke/pulumi-modules 0.0.17 → 0.0.19

package/dist/auth0/Auth0.d.ts

@@ -25,6 +25,6 @@ export interface Auth0Args {
 export declare class Auth0 extends ComponentResource {
     domain: string;
     clientId: Output<string>;
-    constructor(id: string, args: Auth0Args, opts?: ComponentResourceOptions);
+    constructor(name: string, args: Auth0Args, opts?: ComponentResourceOptions);
 }
 //# sourceMappingURL=Auth0.d.ts.map

package/dist/auth0/Auth0.js

@@ -3,11 +3,11 @@ import { Client, ClientCredentials, Connection, ConnectionClient, Provider, Tena
 export class Auth0 extends ComponentResource {
     domain;
     clientId;
-    constructor(id, args, opts) {
-        super('mstuercke:auth0:Auth0', id, undefined, opts);
+    constructor(name, args, opts) {
+        super('mstuercke:auth0:Auth0', name, undefined, opts);
         const { projectId, environmentName, tenantDisplayName, clientDisplayName, domain, m2mClientId, allowedUrls, allowedLoginCallbackUrls, allowedLogoutCallbackUrls, nativeAppId, defaultUsers = [], disableSignup = false, } = args;
         new Provider('provider', {}, { parent: this });
-        new Tenant('tenant', {
+        new Tenant(name, {
             friendlyName: tenantDisplayName,
             flags: {
                 enableClientConnections: false,
@@ -19,7 +19,7 @@ export class Auth0 extends ComponentResource {
                 `${nativeAppId}.auth0://${domain}/android/${nativeAppId}/callback`,
             ]
             : [];
-        const client = new Client('client', {
+        const client = new Client(name, {
             name: clientDisplayName,
             appType: 'spa',
             callbacks: [...(allowedLoginCallbackUrls || allowedUrls), ...nativeAppCallbackUrls],
@@ -30,7 +30,7 @@ export class Auth0 extends ComponentResource {
             },
             addons: {},
         }, { parent: this });
-        const connection = new Connection('password-authentication', {
+        const connection = new Connection(name, {
             name: `${projectId}-${environmentName}`,
             strategy: 'auth0',
             options: {
@@ -38,11 +38,11 @@ export class Auth0 extends ComponentResource {
                 bruteForceProtection: true,
             },
         }, { parent: this });
-        const m2mClientConnection = new ConnectionClient('password-authentication-m2m-client', {
+        const m2mClientConnection = new ConnectionClient(`${name}-m2m`, {
             clientId: m2mClientId,
             connectionId: connection.id,
         }, { parent: client });
-        const clientConnection = new ConnectionClient('password-authentication-client', {
+        const clientConnection = new ConnectionClient(name, {
             clientId: client.id,
             connectionId: connection.id,
         }, { parent: client });
@@ -50,14 +50,14 @@ export class Auth0 extends ComponentResource {
         // // disable google-oauth2 on all clients
         // const googleOauth2Connection = output(getConnection({name: 'google-oauth2'}))
         // new ConnectionClients(
-        //   'google-oauth2-clien',
+        //   'google-oauth2-client',
         //   {
         //     connectionId: googleOauth2Connection.id,
         //     enabledClients: [],
         //   },
         //   {parent: client, dependsOn: [client]},
         // )
-        new ClientCredentials('credentials', {
+        new ClientCredentials(name, {
             clientId: client.id,
             authenticationMethod: 'none',
         }, { parent: this });

package/dist/lambda/LambdaCronTrigger.d.ts

@@ -12,6 +12,6 @@ export type LambdaCronTriggerArgs = {
 export declare class LambdaCronTrigger extends ComponentResource {
     ruleName: string;
     ruleArn: Output<string>;
-    constructor(args: LambdaCronTriggerArgs, opts?: ComponentResourceOptions);
+    constructor(resourceName: string, args: LambdaCronTriggerArgs, opts?: ComponentResourceOptions);
 }
 //# sourceMappingURL=LambdaCronTrigger.d.ts.map

package/dist/lambda/LambdaCronTrigger.js

@@ -3,23 +3,23 @@ import { cloudwatch, lambda } from '@pulumi/aws';
 export class LambdaCronTrigger extends ComponentResource {
     ruleName;
     ruleArn;
-    constructor(args, opts) {
-        super('mstuercke:lambda:LambdaCronTrigger', args.name, undefined, opts);
+    constructor(resourceName, args, opts) {
+        super('mstuercke:lambda:LambdaCronTrigger', resourceName, undefined, opts);
         const { name, lambdaFunction, cronExpression, lambdaExecutionInput, projectId } = args;
-        const trigger = new cloudwatch.EventRule('trigger', {
+        const trigger = new cloudwatch.EventRule(resourceName, {
             name,
             scheduleExpression: cronExpression,
             tags: {
                 project: projectId,
             },
         }, { parent: this });
-        new cloudwatch.EventTarget('target', {
+        new cloudwatch.EventTarget(resourceName, {
             targetId: lambdaFunction.name,
             rule: trigger.name,
             arn: lambdaFunction.arn,
             input: JSON.stringify(lambdaExecutionInput),
         }, { parent: this });
-        new lambda.Permission('execute-lambda-permission', {
+        new lambda.Permission(resourceName, {
             action: 'lambda:InvokeFunction',
             principal: 'events.amazonaws.com',
             function: lambdaFunction.name,

package/dist/lambda/NodeLambdaFunction.js

@@ -28,11 +28,11 @@ export class NodeLambdaFunction extends ComponentResource {
         role.id.apply((roleId) => {
             new SimpleIamRolePolicy(roleId, {
                 type: 'custom',
-                name: 'logging',
+                name: `${name}-logging`,
                 statements: [
                     {
                         Effect: 'Allow',
-                        Action: ['logs:CreateLogGroup', 'logs:CreateLogStream', 'logs:PutLogEven'],
+                        Action: ['logs:CreateLogGroup', 'logs:CreateLogStream', 'logs:PutLogEvents'],
                         Resource: '*',
                     },
                 ],

package/dist/mongodb/MongoDBCustomInstance.js

@@ -7,18 +7,18 @@ export class MongoDBCustomInstance extends ComponentResource {
     constructor(name, args, opts) {
         const { organizationId, projectId, environmentName } = args;
         super('mstuercke:mongodb:MongoDBCustomInstance', name, undefined, opts);
-        const mongoProject = new Project('project', {
+        const mongoProject = new Project(name, {
             orgId: organizationId,
             name: `${projectId}-${environmentName}`,
             tags: {
                 project: projectId,
             },
         }, { parent: this });
-        new ProjectIpAccessList('network-access', {
+        new ProjectIpAccessList(name, {
             projectId: mongoProject.id,
             cidrBlock: '0.0.0.0/0',
         }, { parent: this });
-        const mongoInstance = new ServerlessInstance('database', {
+        const mongoInstance = new ServerlessInstance(name, {
             projectId: mongoProject.id,
             name: `${projectId}-${environmentName}`,
             providerSettingsBackingProviderName: 'AWS',

package/dist/rest/RestApi.d.ts

@@ -15,6 +15,6 @@ export interface RestApiArgs {
 }
 export declare class RestApi extends aws.apigateway.RestApi {
     readonly url: string;
-    constructor(id: string, args: RestApiArgs, opts?: ComponentResourceOptions);
+    constructor(resourceName: string, args: RestApiArgs, opts?: ComponentResourceOptions);
 }
 //# sourceMappingURL=RestApi.d.ts.map

package/dist/rest/RestApi.js

@@ -4,27 +4,27 @@ import { Record } from '@pulumi/aws/route53';
 import { BasePathMapping, DomainName } from '@pulumi/aws/apigateway';
 export class RestApi extends aws.apigateway.RestApi {
     url;
-    constructor(id, args, opts) {
+    constructor(resourceName, args, opts) {
         const { name, projectId, stageName = 'v1', domain } = args;
-        super(id, {
+        super(resourceName, {
             name,
             tags: {
                 project: projectId,
             },
         }, opts);
         const { lambdaFunction, timeoutSeconds = 29 } = args;
-        const proxyResource = new apigateway.Resource(`proxy`, {
+        const proxyResource = new apigateway.Resource(`${resourceName}-proxy`, {
             restApi: this.id,
             parentId: this.rootResourceId,
             pathPart: '{proxy+}',
         }, { parent: this });
-        const proxyMethod = new apigateway.Method(`proxy`, {
+        const proxyMethod = new apigateway.Method(`${resourceName}-proxy`, {
             restApi: this.id,
             resourceId: proxyResource.id,
             httpMethod: 'ANY',
             authorization: 'NONE',
         }, { parent: proxyResource });
-        const lambdaIntegration = new apigateway.Integration(`proxy`, {
+        const lambdaIntegration = new apigateway.Integration(`${resourceName}-proxy`, {
             restApi: this.id,
             resourceId: proxyResource.id,
             httpMethod: proxyMethod.httpMethod,
@@ -33,13 +33,13 @@ export class RestApi extends aws.apigateway.RestApi {
             uri: lambdaFunction.invokeArn,
             timeoutMilliseconds: timeoutSeconds * 1000,
         }, { parent: proxyMethod });
-        const proxyOptionsMethod = new apigateway.Method(`options`, {
+        const proxyOptionsMethod = new apigateway.Method(`${resourceName}-options`, {
             restApi: this.id,
             resourceId: proxyResource.id,
             httpMethod: 'OPTIONS',
             authorization: 'NONE',
         }, { parent: proxyResource });
-        const lambdaIntegrationOptions = new apigateway.Integration(`options`, {
+        const lambdaIntegrationOptions = new apigateway.Integration(`${resourceName}-options`, {
             restApi: this.id,
             resourceId: proxyResource.id,
             httpMethod: proxyOptionsMethod.httpMethod,
@@ -48,13 +48,13 @@ export class RestApi extends aws.apigateway.RestApi {
             uri: lambdaFunction.invokeArn,
             timeoutMilliseconds: timeoutSeconds * 1000,
         }, { parent: proxyOptionsMethod });
-        const proxyRootMethod = new apigateway.Method(`proxy-root`, {
+        const proxyRootMethod = new apigateway.Method(`${resourceName}-proxy-root`, {
             restApi: this.id,
             resourceId: this.rootResourceId,
             httpMethod: 'ANY',
             authorization: 'NONE',
         }, { parent: this });
-        const lambdaRootIntegration = new apigateway.Integration(`proxy-root`, {
+        const lambdaRootIntegration = new apigateway.Integration(`${resourceName}-proxy-root`, {
             restApi: this.id,
             resourceId: proxyRootMethod.resourceId,
             httpMethod: proxyRootMethod.httpMethod,
@@ -63,13 +63,13 @@ export class RestApi extends aws.apigateway.RestApi {
             uri: lambdaFunction.invokeArn,
             timeoutMilliseconds: timeoutSeconds * 1000,
         }, { parent: proxyRootMethod });
-        const proxyRootOptionsMethod = new apigateway.Method(`proxy-root-options`, {
+        const proxyRootOptionsMethod = new apigateway.Method(`${resourceName}-proxy-root-options`, {
             restApi: this.id,
             resourceId: this.rootResourceId,
             httpMethod: 'OPTIONS',
             authorization: 'NONE',
         }, { parent: this });
-        const lambdaRootIntegrationOptions = new apigateway.Integration(`proxy-root-options`, {
+        const lambdaRootIntegrationOptions = new apigateway.Integration(`${resourceName}-proxy-root-options`, {
             restApi: this.id,
             resourceId: proxyRootOptionsMethod.resourceId,
             httpMethod: proxyRootOptionsMethod.httpMethod,
@@ -78,14 +78,14 @@ export class RestApi extends aws.apigateway.RestApi {
             uri: lambdaFunction.invokeArn,
             timeoutMilliseconds: timeoutSeconds * 1000,
         }, { parent: proxyRootOptionsMethod });
-        new lambda.Permission(`rest-api`, {
+        new lambda.Permission(resourceName, {
             statementId: 'AllowRestApiInvoke',
             action: 'lambda:InvokeFunction',
             function: lambdaFunction.name,
             principal: 'apigateway.amazonaws.com',
             sourceArn: this.executionArn.apply((executionArn) => `${executionArn}/*`),
         }, { parent: lambdaFunction });
-        const deployment = new apigateway.Deployment(stageName, { restApi: this.id }, {
+        const deployment = new apigateway.Deployment(`${resourceName}-${stageName}`, { restApi: this.id }, {
             dependsOn: [
                 proxyMethod,
                 lambdaIntegration,
@@ -96,17 +96,17 @@ export class RestApi extends aws.apigateway.RestApi {
             ],
             parent: this,
         });
-        const stage = new apigateway.Stage(stageName, {
+        const stage = new apigateway.Stage(`${resourceName}-${stageName}`, {
             restApi: this.id,
             stageName: stageName,
             deployment: deployment.id,
             tags: { project: projectId },
         }, { parent: deployment });
-        const domainName = new DomainName('domain', {
+        const domainName = new DomainName(resourceName, {
             domainName: domain.fullName,
             certificateArn: domain.usEast1CertificateArn,
         }, { parent: this });
-        new Record('redirect', {
+        new Record(resourceName, {
             zoneId: domain.zoneId,
             name: domain.fullName,
             type: 'A',
@@ -119,7 +119,7 @@ export class RestApi extends aws.apigateway.RestApi {
             ],
             allowOverwrite: true,
         }, { parent: domainName });
-        new BasePathMapping('root', {
+        new BasePathMapping(resourceName, {
             restApi: this.id,
             stageName: stage.stageName,
             domainName: domainName.domainName,

package/dist/website/StaticWebsite.d.ts

@@ -13,6 +13,6 @@ export interface StaticWebsiteArgs {
 export declare class StaticWebsite extends ComponentResource {
     url: string;
     bucket: PublicS3Bucket;
-    constructor(id: string, args: StaticWebsiteArgs, opts?: ComponentResourceOptions);
+    constructor(name: string, args: StaticWebsiteArgs, opts?: ComponentResourceOptions);
 }
 //# sourceMappingURL=StaticWebsite.d.ts.map

package/dist/website/StaticWebsite.js

@@ -7,10 +7,10 @@ import { readFilesRecursive } from "./readFilesRecursive.js";
 export class StaticWebsite extends ComponentResource {
     url;
     bucket;
-    constructor(id, args, opts) {
-        super('mstuercke:website:StaticWebsite', id, undefined, opts);
+    constructor(name, args, opts) {
+        super('mstuercke:website:StaticWebsite', name, undefined, opts);
         const { projectId, environmentName, filesPath, customDomain } = args;
-        const bucket = new s3.PublicS3Bucket('bucket', {
+        const bucket = new s3.PublicS3Bucket(name, {
             name: `${projectId}-web-${environmentName}`,
             allowPresignedPost: false,
             tags: {
@@ -18,7 +18,7 @@ export class StaticWebsite extends ComponentResource {
             },
         }, { parent: this });
         for (const file of readFilesRecursive(filesPath)) {
-            new BucketObject(file.relativePath, {
+            new BucketObject(`${name}-${file.relativePath}`, {
                 key: file.relativePath,
                 bucket: bucket.id,
                 source: file.absolutePath,
@@ -29,7 +29,7 @@ export class StaticWebsite extends ComponentResource {
                 },
             }, { parent: bucket });
         }
-        const cloudfront = new Distribution(`website`, {
+        const cloudfront = new Distribution(name, {
             enabled: true,
             comment: `${projectId} (${environmentName})`,
             defaultRootObject: 'index.html',
@@ -109,7 +109,7 @@ export class StaticWebsite extends ComponentResource {
             },
         }, { parent: this });
         if (customDomain) {
-            new Record('redirect', {
+            new Record(name, {
                 zoneId: customDomain?.zoneId,
                 name: customDomain?.fullName,
                 type: 'A',

package/dist/websocket/WebsocketApi.d.ts

@@ -18,6 +18,6 @@ export interface WebsocketApiArgs {
 export declare class WebsocketApi extends ComponentResource {
     id: Output<string>;
     url: string;
-    constructor(id: string, args: WebsocketApiArgs, opts?: ComponentResourceOptions);
+    constructor(resourceName: string, args: WebsocketApiArgs, opts?: ComponentResourceOptions);
 }
 //# sourceMappingURL=WebsocketApi.d.ts.map

package/dist/websocket/WebsocketApi.js

@@ -5,10 +5,10 @@ import { Record } from '@pulumi/aws/route53';
 export class WebsocketApi extends ComponentResource {
     id;
     url;
-    constructor(id, args, opts) {
-        super('mstuercke:websocket:WebsocketApi', id, undefined, opts);
+    constructor(resourceName, args, opts) {
+        super('mstuercke:websocket:WebsocketApi', resourceName, undefined, opts);
         const { name, lambdaFunction, routeThrottling, stageName = 'v1', domain, projectId } = args;
-        const api = new Api('api', {
+        const api = new Api(resourceName, {
             name,
             protocolType: 'WEBSOCKET',
             routeSelectionExpression: '\\$default',
@@ -16,7 +16,7 @@ export class WebsocketApi extends ComponentResource {
                 project: projectId,
             },
         }, { parent: this });
-        const executeLambdaPolicy = new Policy('execute-lambda', {
+        const executeLambdaPolicy = new Policy(resourceName, {
             name: `${name}-execute-lambda`,
             path: '/',
             policy: {
@@ -33,7 +33,7 @@ export class WebsocketApi extends ComponentResource {
                 project: projectId,
             },
         }, { parent: api });
-        const wsApiRole = new Role('role', {
+        const wsApiRole = new Role(resourceName, {
             name: `${name}-role`,
             assumeRolePolicy: JSON.stringify({
                 Version: '2012-10-17',
@@ -50,7 +50,7 @@ export class WebsocketApi extends ComponentResource {
             },
             managedPolicyArns: [executeLambdaPolicy.arn],
         }, { parent: api });
-        const wsLambdaIntegration = new Integration('lambda-integration', {
+        const wsLambdaIntegration = new Integration(resourceName, {
             apiId: api.id,
             integrationType: 'AWS_PROXY',
             integrationUri: lambdaFunction.invokeArn,
@@ -58,7 +58,7 @@ export class WebsocketApi extends ComponentResource {
             contentHandlingStrategy: 'CONVERT_TO_TEXT',
             passthroughBehavior: 'WHEN_NO_MATCH',
         }, { parent: this });
-        new IntegrationResponse('lambda-integration-response', {
+        new IntegrationResponse(resourceName, {
             apiId: api.id,
             integrationId: wsLambdaIntegration.id,
             integrationResponseKey: '/200/',
@@ -66,7 +66,7 @@ export class WebsocketApi extends ComponentResource {
         const routes = [];
         const routeKeys = ['$connect', '$default', '$disconnect'];
         for (const routeKey of routeKeys) {
-            const route = new Route(`${routeKey}-route`, {
+            const route = new Route(`${resourceName}-${routeKey}-route`, {
                 apiId: api.id,
                 routeKey: routeKey,
                 target: wsLambdaIntegration.id.apply((id) => `integrations/${id}`),
@@ -74,13 +74,13 @@ export class WebsocketApi extends ComponentResource {
             }, { parent: wsLambdaIntegration });
             routes.push(route);
         }
-        const deployment = new Deployment('deployment', {
+        const deployment = new Deployment(resourceName, {
             apiId: api.id,
         }, {
             dependsOn: [wsLambdaIntegration, ...routes],
             parent: api,
         });
-        const stage = new Stage('stage', {
+        const stage = new Stage(resourceName, {
             apiId: api.id,
             name: stageName,
             deploymentId: deployment.id,
@@ -92,7 +92,7 @@ export class WebsocketApi extends ComponentResource {
                 project: projectId,
             },
         }, { parent: deployment });
-        const domainName = new DomainName('domain', {
+        const domainName = new DomainName(resourceName, {
             domainName: domain.fullName,
             domainNameConfiguration: {
                 certificateArn: domain.euCentral1CertificateArn,
@@ -100,7 +100,7 @@ export class WebsocketApi extends ComponentResource {
                 securityPolicy: 'TLS_1_2',
             },
         }, { parent: api });
-        new Record('redirect', {
+        new Record(resourceName, {
             zoneId: domain.zoneId,
             name: domain.fullName,
             type: 'A',
@@ -113,12 +113,12 @@ export class WebsocketApi extends ComponentResource {
             ],
             allowOverwrite: true,
         }, { parent: api });
-        new ApiMapping('root', {
+        new ApiMapping(`${resourceName}-root`, {
             apiId: api.id,
             domainName: domainName.id,
             stage: stage.name,
         }, { parent: api });
-        new ApiMapping('stage', {
+        new ApiMapping(`${resourceName}-stage`, {
             apiId: api.id,
             domainName: domainName.id,
             stage: stage.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mstuercke/pulumi-modules",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "files": [
     "dist/**/!(*.test|*.fixture){.d.ts,.js}",
     "README.md"