fix: Updates atlas-serverless-basic example. (#210)

Author: marcosuma

examples/l3-resources/atlas-serverless-basic.ts

@@ -8,26 +8,30 @@ interface AtlasStackProps {
   readonly profile: string;
   readonly region: string;
   readonly ip: string;
-  readonly continuousBackupEnabled: string;
-  readonly terminationProtectionEnabled: string;
+  readonly instanceName: string;
+  readonly projectName: string;
+  readonly continuousBackupEnabled: boolean;
+  readonly terminationProtectionEnabled: boolean;
 }
 
 export class CdkTestingStack extends cdk.Stack {
   constructor(scope: Construct, id: string, props?: cdk.StackProps) {
     super(scope, id, props);
 
     const atlasProps = this.getContextProps();
-    const atlasBasic = new AtlasServerlessBasic(this, 'AtlasServerlessBasic', {
-        serverlessProps: { 
-          projectId: atlasProps.orgId,
+    new AtlasServerlessBasic(this, 'AtlasServerlessBasic', {
+        serverlessProps: {
+          name: atlasProps.instanceName,
           profile:  atlasProps.profile,
           continuousBackupEnabled: atlasProps.continuousBackupEnabled,
           providerSettings: {
-            providerName: ServerlessInstanceProviderSettingsProviderName.SERVERLESS
+            providerName: ServerlessInstanceProviderSettingsProviderName.SERVERLESS,
+            regionName: atlasProps.region
           },
           terminationProtectionEnabled: atlasProps.terminationProtectionEnabled
         },
         projectProps: {
+          name: atlasProps.projectName,
           orgId: atlasProps.orgId,
         },
 
@@ -50,6 +54,8 @@ export class CdkTestingStack extends cdk.Stack {
     const terminationProtectionEnabled = this.node.tryGetContext('terminationProtectionEnabled');
     const continuousBackupEnabled = this.node.tryGetContext('continuousBackupEnabled');
     const region = this.node.tryGetContext('region') ?? "US_EAST_1";
+    const instanceName = this.node.tryGetContext('instanceName');
+    const projectName = this.node.tryGetContext('projectName');
     const ip = this.node.tryGetContext('ip');
     if (!ip){
       throw "No context value specified for ip. Please specify via the cdk context."
@@ -61,7 +67,9 @@ export class CdkTestingStack extends cdk.Stack {
       continuousBackupEnabled,
       profile,
       region,
-      ip
+      ip,
+      instanceName,
+      projectName
     }
   }
 }

src/l3-resources/atlas-serverless-basic/index.ts

@@ -16,14 +16,6 @@ import { Construct } from "constructs";
 import * as atlas from "../../index";
 import { AtlasServerlessBasicProps } from "../common/props";
 
-/** @type {*} */
-const projectDefaults = {
-  projectName: "atlas-project-",
-};
-/** @type {*} */
-const serverlessDefaults = {
-  serverlessName: "atlas-serverless-",
-};
 /** @type {*} */
 const dbDefaults = {
   dbName: "admin",
@@ -81,9 +73,7 @@ export class AtlasServerlessBasic extends Construct {
     //Create a new MongoDB Atlas Project
     this.mProject = new atlas.CfnProject(this, "project-".concat(id), {
       profile: props.profile,
-      name:
-        props.projectProps.name ||
-        projectDefaults.projectName.concat(String(randomNumber())),
+      name: props.projectProps.name ?? `project-${id}`,
       ...props.projectProps,
     });
     // Create a new serverless Instance and pass project ID
@@ -92,18 +82,10 @@ export class AtlasServerlessBasic extends Construct {
       "serverless-".concat(id),
       {
         projectId: this.mProject.attrId,
-        name:
-          props.serverlessProps.name ||
-          serverlessDefaults.serverlessName.concat(String(randomNumber())),
-        providerSettings: {
-          providerName:
-            atlas.ServerlessInstanceProviderSettingsProviderName.SERVERLESS,
-          regionName: "us-east-1",
-        },
+        name: props.serverlessProps.name ?? `serverless-${id}`,
+        providerSettings: props.serverlessProps.providerSettings,
         profile: props.profile,
-        continuousBackupEnabled: this.node.tryGetContext(
-          "continuousBackupEnabled"
-        ),
+        continuousBackupEnabled: props.serverlessProps.continuousBackupEnabled,
         ...props.serverlessProps,
       }
     );
@@ -133,9 +115,3 @@ export class AtlasServerlessBasic extends Construct {
     this.ipAccessList.addDependency(this.mProject);
   }
 }
-
-function randomNumber() {
-  const min = 10;
-  const max = 9999999;
-  return Math.floor(Math.random() * (max - min + 1) + min);
-}