@izara_project/izara-core-generate-service-code 1.0.67 → 1.0.68

package/src/emit/resource/templates/ResourceYaml.ejs

@@ -1,54 +1,54 @@
 ##===== [Create topic in]
-  In<%- queueName %>:
-    Type: AWS::SNS::Topic
-    Properties:
-      DisplayName: "SNS Message in"
-      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_In
+In<%- queueName %>:
+  Type: AWS::SNS::Topic
+  Properties:
+    DisplayName: 'SNS Message in'
+    TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_In
 
-  ##===== [SNS Subscription - Topic In]
-  SubscriptionIn<%- queueName %>:
-    Type: AWS::SNS::Subscription
-    Properties:
-      TopicArn: !Ref In<%- queueName %>
-      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs"
-      Protocol: "sqs"
+##===== [SNS Subscription - Topic In]
+SubscriptionIn<%- queueName %>:
+  Type: AWS::SNS::Subscription
+  Properties:
+    TopicArn: !Ref In<%- queueName %>
+    Endpoint: 'arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs'
+    Protocol: 'sqs'
 
-  ##===== [Queue]
-  <%- queueName %>HdrSqs:
-    Type: "AWS::SQS::Queue"
-    Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
-      RedrivePolicy:
-        deadLetterTargetArn:
-          Fn::GetAtt:
-            - <%- queueName %>HdrSqsDLQ
-            - Arn
-        maxReceiveCount: 3
-      VisibilityTimeout: 120
+##===== [Queue]
+<%- queueName %>HdrSqs:
+  Type: 'AWS::SQS::Queue'
+  Properties:
+    QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
+    RedrivePolicy:
+      deadLetterTargetArn:
+        Fn::GetAtt:
+          - <%- queueName %>HdrSqsDLQ
+          - Arn
+      maxReceiveCount: 3
+    VisibilityTimeout: 120
 
-  ##===== [Queue DLQ]
-  <%- queueName %>HdrSqsDLQ:
-    Type: AWS::SQS::Queue
-    Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
+##===== [Queue DLQ]
+<%- queueName %>HdrSqsDLQ:
+  Type: AWS::SQS::Queue
+  Properties:
+    QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
 
-  ##===== [Queue Policy]
-  <%- queueName %>HdrSqsPolicy:
-    Type: AWS::SQS::QueuePolicy
-    Properties:
-      PolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Sid: "allow-sns-messages"
-            Effect: Allow
-            Principal: "*"
-            Resource:
-              Fn::GetAtt:
-                - <%- queueName %>HdrSqs
-                - Arn
-            Action: "SQS:SendMessage"
-      Queues:
-        - Ref: <%- queueName %>HdrSqs
+##===== [Queue Policy]
+<%- queueName %>HdrSqsPolicy:
+  Type: AWS::SQS::QueuePolicy
+  Properties:
+    PolicyDocument:
+      Version: '2012-10-17'
+      Statement:
+        - Sid: 'allow-sns-messages'
+          Effect: Allow
+          Principal: '*'
+          Resource:
+            Fn::GetAtt:
+              - <%- queueName %>HdrSqs
+              - Arn
+          Action: 'SQS:SendMessage'
+    Queues:
+      - Ref: <%- queueName %>HdrSqs
 
-  #<#<%- queueName %>QueueSetting#>
-  #<#/<%- queueName %>QueueSetting#>
+#<#<%- queueName %>QueueSetting#>
+#<#/<%- queueName %>QueueSetting#>

package/src/emit/resource/templates/S3Bucket_Yaml.ejs

@@ -0,0 +1,19 @@
+##===== [S3 Bucket: <%- bucketName %>]
+<%- bucketName %>S3Bucket:
+  Type: AWS::S3::Bucket
+  Properties:
+    BucketName: <%- bucketName %>
+    CorsConfiguration:
+      CorsRules:
+        - AllowedHeaders:
+            - '*'
+          AllowedMethods:
+            - GET
+            - PUT
+            - POST
+            - DELETE
+            - HEAD
+          AllowedOrigins:
+            - '*'
+          MaxAge: 3000
+

package/src/emit/resource/templates/SharedResource_Yaml.ejs

@@ -1,15 +1,15 @@
 Resources:
-<% roles.forEach(({ roleName, statements }) => { -%>
+  <% roles.forEach(({ roleName, statements }) => { -%>
   <%- roleName %>:
     Type: AWS::IAM::Role
     Properties:
       RoleName: ${self:custom.iz_resourcePrefix}<%- roleName %>
       AssumeRolePolicyDocument:
-        Version: "2012-10-17"
+        Version: '2012-10-17'
         Statement:
           - Effect: Allow
             Principal:
-              Service: "lambda.amazonaws.com"
+              Service: 'lambda.amazonaws.com'
             Action: sts:AssumeRole
           #<#<%- roleName %>AssumeRoleStatementHookCode#>
           #<#/<%- roleName %>AssumeRoleStatementHookCode#>
@@ -20,20 +20,20 @@ Resources:
       Policies:
         - PolicyName: ${self:custom.iz_resourcePrefix}<%- roleName.replace(/role$/i, '') %>Policy
           PolicyDocument:
-            Version: "2012-10-17"
+            Version: '2012-10-17'
             Statement:
-<% statements.forEach((stmt) => { -%>
+              <% statements.forEach((stmt) => { -%>
               - Effect: Allow
                 Action:
-<% stmt.action.forEach((a) => { -%>
+                  <% stmt.action.forEach((a) => { -%>
                   - <%- a %>
-<% }) -%>
+                <% }) -%>
                 Resource:
-<% stmt.resource.forEach((r) => { -%>
-                  - "<%- r %>"
+                  <% stmt.resource.forEach((r) => { -%>
+                  - '<%- r %>'
 <% }) -%>
 <% }) -%>
-              #<#<%- roleName %>StatementHookCode#>
-              #<#/<%- roleName %>StatementHookCode#>
+#<#<%- roleName %>StatementHookCode#>
+#<#/<%- roleName %>StatementHookCode#>
 
 <% }) -%>

package/src/emit/resource/templates/SystemDynamoDB_Yaml.ejs

@@ -1,202 +1,202 @@
 Resources:
   WebSocketTaskTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}WebSocketTask
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: taskKey
-        AttributeType: S
-      - AttributeName: connectionId
-        AttributeType: S
+        - AttributeName: taskKey
+          AttributeType: S
+        - AttributeName: connectionId
+          AttributeType: S
       KeySchema:
-      - AttributeName: taskKey
-        KeyType: HASH
-      - AttributeName: connectionId
-        KeyType: RANGE
+        - AttributeName: taskKey
+          KeyType: HASH
+        - AttributeName: connectionId
+          KeyType: RANGE
       TimeToLiveSpecification:
         AttributeName: expirationTime
         Enabled: true
 
   UserUploadRecordsTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}UserUploadRecords
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: connectionId
-        AttributeType: S
+        - AttributeName: connectionId
+          AttributeType: S
       KeySchema:
-      - AttributeName: connectionId
-        KeyType: HASH
+        - AttributeName: connectionId
+          KeyType: HASH
       TimeToLiveSpecification:
         AttributeName: expirationTime
         Enabled: true
 
   RegisterRecordsTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}RegisterRecords
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: identifiersTask
-        AttributeType: S
-      - AttributeName: connectionId
-        AttributeType: S
+        - AttributeName: identifiersTask
+          AttributeType: S
+        - AttributeName: connectionId
+          AttributeType: S
       KeySchema:
-      - AttributeName: identifiersTask
-        KeyType: HASH
-      - AttributeName: connectionId
-        KeyType: RANGE
+        - AttributeName: identifiersTask
+          KeyType: HASH
+        - AttributeName: connectionId
+          KeyType: RANGE
 
   AwaitingMultipleStepsTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}AwaitingMultipleSteps
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: awaitingStepId
-        AttributeType: S
-      - AttributeName: pendingStepId
-        AttributeType: S
+        - AttributeName: awaitingStepId
+          AttributeType: S
+        - AttributeName: pendingStepId
+          AttributeType: S
       KeySchema:
-      - AttributeName: awaitingStepId
-        KeyType: HASH
-      - AttributeName: pendingStepId
-        KeyType: RANGE
+        - AttributeName: awaitingStepId
+          KeyType: HASH
+        - AttributeName: pendingStepId
+          KeyType: RANGE
 
   AwaitingMultipleStepByPendingTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}AwaitingMultipleStepByPending
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: pendingStepId
-        AttributeType: S
-      - AttributeName: awaitingStepId
-        AttributeType: S
+        - AttributeName: pendingStepId
+          AttributeType: S
+        - AttributeName: awaitingStepId
+          AttributeType: S
       KeySchema:
-      - AttributeName: pendingStepId
-        KeyType: HASH
-      - AttributeName: awaitingStepId
-        KeyType: RANGE
+        - AttributeName: pendingStepId
+          KeyType: HASH
+        - AttributeName: awaitingStepId
+          KeyType: RANGE
 
   FindDataMainTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}FindDataMain
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: findDataId
-        AttributeType: S
+        - AttributeName: findDataId
+          AttributeType: S
       KeySchema:
-      - AttributeName: findDataId
-        KeyType: HASH
+        - AttributeName: findDataId
+          KeyType: HASH
 
   LogicalResultsMainTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}LogicalResultsMain
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: logicalResultId
-        AttributeType: S
+        - AttributeName: logicalResultId
+          AttributeType: S
       KeySchema:
-      - AttributeName: logicalResultId
-        KeyType: HASH
+        - AttributeName: logicalResultId
+          KeyType: HASH
 
   LogicalResultsDataTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}LogicalResultsData
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: logicalResultId
-        AttributeType: S
-      - AttributeName: identifiersId
-        AttributeType: S
+        - AttributeName: logicalResultId
+          AttributeType: S
+        - AttributeName: identifiersId
+          AttributeType: S
       KeySchema:
-      - AttributeName: logicalResultId
-        KeyType: HASH
-      - AttributeName: identifiersId
-        KeyType: RANGE
+        - AttributeName: logicalResultId
+          KeyType: HASH
+        - AttributeName: identifiersId
+          KeyType: RANGE
 
   AwaitingStepTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}AwaitingStep
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: awaitingStepId
-        AttributeType: S
-      - AttributeName: pendingStepId
-        AttributeType: S
+        - AttributeName: awaitingStepId
+          AttributeType: S
+        - AttributeName: pendingStepId
+          AttributeType: S
       KeySchema:
-      - AttributeName: awaitingStepId
-        KeyType: HASH
-      - AttributeName: pendingStepId
-        KeyType: RANGE
+        - AttributeName: awaitingStepId
+          KeyType: HASH
+        - AttributeName: pendingStepId
+          KeyType: RANGE
 
   TargetRolesTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}TargetRoles
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: targetId
-        AttributeType: S
-      - AttributeName: roleIdKey
-        AttributeType: S
+        - AttributeName: targetId
+          AttributeType: S
+        - AttributeName: roleIdKey
+          AttributeType: S
       KeySchema:
-      - AttributeName: targetId
-        KeyType: HASH
-      - AttributeName: roleIdKey
-        KeyType: RANGE
+        - AttributeName: targetId
+          KeyType: HASH
+        - AttributeName: roleIdKey
+          KeyType: RANGE
 
   RolePermissionsTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}RolePermissions
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: roleIdKey
-        AttributeType: S
-      - AttributeName: flowTypeConcat
-        AttributeType: S
+        - AttributeName: roleIdKey
+          AttributeType: S
+        - AttributeName: flowTypeConcat
+          AttributeType: S
       KeySchema:
-      - AttributeName: roleIdKey
-        KeyType: HASH
-      - AttributeName: flowTypeConcat
-        KeyType: RANGE
+        - AttributeName: roleIdKey
+          KeyType: HASH
+        - AttributeName: flowTypeConcat
+          KeyType: RANGE
 
   RoleUsersTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}RoleUsers
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: roleIdKey
-        AttributeType: S
-      - AttributeName: userId
-        AttributeType: S
+        - AttributeName: roleIdKey
+          AttributeType: S
+        - AttributeName: userId
+          AttributeType: S
       KeySchema:
-      - AttributeName: roleIdKey
-        KeyType: HASH
-      - AttributeName: userId
-        KeyType: RANGE
+        - AttributeName: roleIdKey
+          KeyType: HASH
+        - AttributeName: userId
+          KeyType: RANGE
 
   UserRolesTable:
-    Type: "AWS::DynamoDB::Table"
+    Type: 'AWS::DynamoDB::Table'
     Properties:
       TableName: ${self:custom.iz_resourcePrefix}UserRoles
       BillingMode: PAY_PER_REQUEST
       AttributeDefinitions:
-      - AttributeName: userId
-        AttributeType: S
-      - AttributeName: roleIdKey
-        AttributeType: S
+        - AttributeName: userId
+          AttributeType: S
+        - AttributeName: roleIdKey
+          AttributeType: S
       KeySchema:
-      - AttributeName: userId
-        KeyType: HASH
-      - AttributeName: roleIdKey
-        KeyType: RANGE
+        - AttributeName: userId
+          KeyType: HASH
+        - AttributeName: roleIdKey
+          KeyType: RANGE

package/src/generate.js

@@ -9,7 +9,7 @@ import { emitRbacApplicationArtifacts, rbacApplicationManagedPaths } from './emi
 import { dynamicRelationshipFlowSchemaPaths, emitDynamicRelationshipFlowSchemas } from './emit/relationship/emitDynamicRelationshipFlowSchemas.js';
 import { emitRelationshipApplicationArtifacts, relationshipApplicationManagedPaths } from './emit/relationship/emitRelationshipApplicationArtifacts.js';
 import { emitResourceArtifacts, resourceArtifactPaths } from './emit/resource/emitResourceArtifacts.js';
-import { loadLocalSchemaDirectory } from './compile/loadSchemas.js';
+import { loadLocalSchemaDirectory, resolveExtendedObjectSchemas } from './compile/loadSchemas.js';
 import { emitSystemWebSocketArtifacts, hasSystemWebSocket, systemWebSocketManagedPaths } from './emit/system/emitSystemWebSocketArtifacts.js';
 
 export async function generate(rootPath, options = {}) {
@@ -18,11 +18,15 @@ export async function generate(rootPath, options = {}) {
   logger?.info?.(`[INFO] [Generate] STATUS=STARTED | rootPath=${rootPath}`);
   try {
     const project = compileProject({ ...options, rootPath });
-    const [objects, relationships, flows] = await Promise.all([
+    const [rawObjects, relationships, flows] = await Promise.all([
       loadLocalSchemaDirectory(project, 'ObjectSchemas'),
       loadLocalSchemaDirectory(project, 'RelationshipSchemas'),
       loadLocalSchemaDirectory(project, 'FlowSchemas')
     ]);
+    const objects = await resolveExtendedObjectSchemas(
+      rawObjects,
+      options.schemaBucketName
+    );
     logger?.debug?.(`[DEBUG] [Generate] STATUS=SCHEMAS_LOADED | objects=${objects.length} relationships=${relationships.length} flows=${flows.length}`);
     const groups = await emitGroups({ project, objects, relationships, flows });
     logger?.debug?.(`[DEBUG] [Generate] STATUS=ARTIFACTS_EMITTED | ${groups.map(group => `${group.scope}=${group.artifacts.length}`).join(' ')}`);

package/test/createTargetRoleHandler.test.js

@@ -15,27 +15,55 @@ const OWN_TOPIC_FLOWS = [
   'CreateUserRole',
   'DeleteUserFromRole'
 ];
-after(() => Promise.all([...roots].map(root => rm(root, { recursive: true, force: true }))));
+after(() =>
+  Promise.all(
+    [...roots].map(root => rm(root, { recursive: true, force: true }))
+  )
+);
 
 test('generates RBAC own-topic WebSocket entries alongside their SQS handlers', async () => {
   const rootPath = await createProject(true);
   const result = await generateCreateTargetRoleHandler(rootPath);
 
   assert.equal(result.files.length, 36);
-  assert.match(await readFile(join(rootPath, result.files[0].path), 'utf8'), /ProcessCreateTargetRole/);
-  assert.match(await readFile(join(rootPath, result.files[1].path), 'utf8'), /ProcessCreateTargetRoleHdrSqs/);
   assert.match(
-    await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-rbac.yml'), 'utf8'),
+    await readFile(join(rootPath, result.files[0].path), 'utf8'),
+    /CreateTargetRole/
+  );
+  assert.match(
+    await readFile(join(rootPath, result.files[1].path), 'utf8'),
+    /CreateTargetRoleHdrSqs/
+  );
+  assert.match(
+    await readFile(
+      join(rootPath, 'app/sls_yaml/generatedCode/source/flow-rbac.yml'),
+      'utf8'
+    ),
     /FlowRbacRole/
   );
   assert.match(
-    await readFile(join(rootPath, 'app/src/generatedCode/FlowRbac/ListTargetRole/source/ProcessListTargetRole_HdrApi.js'), 'utf8'),
-    /ProcessListTargetRole/
+    await readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/FlowRbac/ListTargetRole/source/ListTargetRole_HdrApi.js'
+      ),
+      'utf8'
+    ),
+    /ListTargetRole/
+  );
+  const yaml = await readFile(
+    join(rootPath, 'app/sls_yaml/generatedCode/source/flow-rbac.yml'),
+    'utf8'
   );
-  const yaml = await readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-rbac.yml'), 'utf8');
   for (const flowTag of OWN_TOPIC_FLOWS) {
     assert.match(
-      await readFile(join(rootPath, `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`), 'utf8'),
+      await readFile(
+        join(
+          rootPath,
+          `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
+        ),
+        'utf8'
+      ),
       new RegExp(`import ${flowTag}`)
     );
     assert.match(yaml, new RegExp(`${flowTag}HdrWbs:\\n[\\s\\S]*websocket:`));
@@ -46,23 +74,44 @@ test('removes CreateTargetRole handler when RBAC is removed', async () => {
   const rootPath = await createProject(true);
   const objectPath = join(rootPath, 'app/src/schemas/ObjectSchemas/User.js');
   await generateCreateTargetRoleHandler(rootPath);
-  await writeFile(objectPath, "export default { objectType: 'user', addOnDataStructure: [] };\n");
+  await writeFile(
+    objectPath,
+    "export default { objectType: 'user', addOnDataStructure: [] };\n"
+  );
 
   assert.deepEqual((await generateCreateTargetRoleHandler(rootPath)).files, []);
-  await assert.rejects(readFile(join(rootPath, 'app/src/generatedCode/FlowRbac/CreateTargetRole/source/ProcessCreateTargetRole_Main.js')));
-  await assert.rejects(readFile(join(rootPath, 'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_HdrWbs.js')));
-  await assert.rejects(readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-rbac.yml')));
+  await assert.rejects(
+    readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_Main.js'
+      )
+    )
+  );
+  await assert.rejects(
+    readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_HdrWbs.js'
+      )
+    )
+  );
+  await assert.rejects(
+    readFile(join(rootPath, 'app/sls_yaml/generatedCode/source/flow-rbac.yml'))
+  );
 });
 
 async function createProject(hasRbac) {
-  const rootPath = await mkdtemp(join(tmpdir(), 'generate-service-code-v2-rbac-handler-'));
+  const rootPath = await mkdtemp(
+    join(tmpdir(), 'generate-service-code-v2-rbac-handler-')
+  );
   roots.add(rootPath);
   const directory = join(rootPath, 'app/src/schemas/ObjectSchemas');
   const addOns = hasRbac ? "[{ type: 'rbac' }]" : '[]';
   await mkdir(directory, { recursive: true });
   await writeFile(
     join(directory, 'User.js'),
-    `export default { objectType: 'user', addOnDataStructure: ${addOns} };\n`
+    `export default { objectType: 'user', fieldNames: [], identifiers: [], addOnDataStructure: ${addOns} };\n`
   );
   return rootPath;
 }