@kumologica/sdk 3.2.0-beta1 → 3.2.0-beta11

package/src/app/ui/editor-client/src/js/ui/tab-awsDeploy.js

@@ -118,6 +118,7 @@ RED.sidebar.awsDeploy = (function () {
               <span class="option-disabled">Generate script...</span>
               <span id="exportCloudFormationBtn" class="option">AWS CloudFormation</span>
               <span id="exportServerlessBtn" class="option">Serverless</span>
+              <span id="exportGithubActionBtn" class="option">Github Action Workflow</span>
             </div>        
           </div>
         </div>
@@ -181,6 +182,12 @@ RED.sidebar.awsDeploy = (function () {
     });
     //tagsSection.expand();
 
+    // vpc section
+    vpcSection = sections.add({
+      title: 'vpc',
+      collapsible: true,
+    });
+
     // event section
     eventSection = sections.add({
       title: 'Triggers',
@@ -203,7 +210,7 @@ RED.sidebar.awsDeploy = (function () {
 
     // Function content init
     let functionSectionHtml = `
-    <table class="node-info">
+    <table class="node-info"> 
         <tr class="node-info-node-row">
             <td>Name</td>
             <td colspan="2" style="background: white"><input style="width:100%" id="cloud-fn-name" class="palette-textinput" pattern="[a-zA-Z0-9-_]{1,64}" type="text"></td>
@@ -238,7 +245,10 @@ RED.sidebar.awsDeploy = (function () {
             </tr>
             <tr class="node-info-node-row">
               <td>Custom Role</td>
-              <td colspan="2" style="background: white; overflow-x:hidden"><input id="cloud-fn-role" list="iamroles-cloud-fn-role-dataList" style="width:100%" class="palette-textinput" placeHolder="optional" type="string"><datalist id="iamroles-cloud-fn-role-dataList"></datalist></td>
+              <td colspan="2" style="background: white; overflow-x:hidden">
+                <input id="cloud-fn-role" list="iamroles-cloud-fn-role-dataList" style="width:100%" class="palette-textinput" placeHolder="optional" type="string">
+                <datalist id="iamroles-cloud-fn-role-dataList"></datalist>
+              </td>
             </tr>
         </table>
         `;
@@ -283,6 +293,28 @@ RED.sidebar.awsDeploy = (function () {
     $(tagsSectionHtml).appendTo(tagsSection.content);
     tagsSection.container.show();
 
+        // VPC section init
+        let vpcSectionHtml = `
+       <table class="node-info">
+          <tbody>
+            <tr class="node-info-node-row">
+              <td>Security Group Ids</td>
+              <td colspan="2" style="background: white; overflow-x:hidden">
+                <input id="cloud-fn-vpc-security-group" style="width:100%" class="palette-textinput" placeHolder="sg-11111, sg-22222" type="string">
+              </td>
+            </tr>
+            <tr class="node-info-node-row">
+              <td>Subnet Ids</td>
+              <td colspan="2" style="background: white; overflow-x:hidden">
+                <input id="cloud-fn-vpc-subnet" style="width:100%" class="palette-textinput" placeHolder="subnet-111, subnet-222" type="string">    
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        `;
+         $(vpcSectionHtml).appendTo(vpcSection.content);
+         vpcSection.container.show();
+     
     // Event section init
     $(`
     <div style="display:flex; flex-direction: column; justify-content: flex-start;">
@@ -292,10 +324,10 @@ RED.sidebar.awsDeploy = (function () {
             <option value="kinesis">Amazon Kinesis</option>
             <option value="sqs">Amazon SQS</option>
             <option disabled>────────────────────</option>
-            <option value="alb">Application Load Balancer</option>
+            <!--option value="alb">Application Load Balancer</option-->
             <!--option value="cognito">Amazon Cognito Sync Trigger</option-->
             <!--option value="lex">Amazon Lex</option-->
-            <option value="alexa">Amazon Alexa</option>
+            <!--option value="alexa">Amazon Alexa</option-->
             <option selected value="api">Amazon API Gateway</option>
             <!--option value="cf">Amazon CloudFront (Lambda@Edge)</option-->
             <!--option value="firehose">Amazon Kinesis Data Firehose</option-->
@@ -308,7 +340,7 @@ RED.sidebar.awsDeploy = (function () {
             <option value="cwevents">Amazon CloudWatch Events</option>
             <!--option value="codecommit">Amazon CodeCommit</option-->
             <!--option value="config">Amazon Config</option-->
-            <option value="iot">Amazon IoT Events</option>
+            <!--option value="iot">Amazon IoT Events</option-->
           </select>
 
           <a id="add-event" href="#" style="float: right; margin: 0px 0px 0px 5px !important; height: 21px !important;" class="editor-button editor-button-small">
@@ -397,6 +429,12 @@ RED.sidebar.awsDeploy = (function () {
     if (params.timeout) {
       $('#cloud-fn-timeout').val(params.timeout);
     }
+    if (params.vpcConfig && params.vpcConfig.sg) {
+      $('#cloud-fn-vpc-security-group').val(params.vpcConfig.sg);
+    }
+    if (params.vpcConfig && params.vpcConfig.sn) {
+      $('#cloud-fn-vpc-subnet').val(params.vpcConfig.sn);
+    }
     if (params.reservedConcurrency) {
       $('#cloud-fn-reservedConcurrency').val(params.reservedConcurrency);
     }
@@ -454,7 +492,11 @@ RED.sidebar.awsDeploy = (function () {
     let fnXray = $('#cloud-fn-x-ray').prop('checked');
     let fnProfile = getProfile();
     let fnRole = $('#cloud-fn-role').val();
-
+    let fnVpcConfig = { 
+          sg: $('#cloud-fn-vpc-security-group').val(), 
+          sn:  $('#cloud-fn-vpc-subnet').val()
+        };
+   
     // Environment variables
     let environment = [];
     let envvarRows = $('#cloud-fn-env-table tr');
@@ -506,7 +548,7 @@ RED.sidebar.awsDeploy = (function () {
       events.push(event);
     });
 
-    return {
+    const res = {
       functionName: fnName,
       description: fnDescription,
       memory: fnMemory,
@@ -518,7 +560,10 @@ RED.sidebar.awsDeploy = (function () {
       environment: environment,
       tags: tags,
       events: events,
+      vpcConfig: fnVpcConfig
     };
+
+    return res;
   }
 
   async function attachDataList(serviceType, itemId, dataListId) {
@@ -790,8 +835,7 @@ RED.sidebar.awsDeploy = (function () {
     $('#cloud-fn-memory').val('512');
     $('#cloud-fn-timeout').val('20');
 
-    $('#cloud-fn-timeout, #cloud-fn-memory, #cloud-fn-description, #cloud-fn-name, #cloud-fn-reservedConcurrency, #cloud-fn-x-ray, #cloud-fn-role'
-    ).change(function () {
+    $('#cloud-fn-timeout, #cloud-fn-memory, #cloud-fn-description, #cloud-fn-name, #cloud-fn-reservedConcurrency, #cloud-fn-x-ray, #cloud-fn-role, #cloud-fn-vpc-subnet, #cloud-fn-security-group').change(function () {
       saveSettings();
     });
 
@@ -960,6 +1004,14 @@ RED.sidebar.awsDeploy = (function () {
       exportScript(window.__kumologica.cloud.provider.serverless);
     });
 
+    // Export serverless script
+    $('#exportGithubActionBtn').click((e) => {
+      e.preventDefault();
+      hideMenu();
+      exportScript(window.__kumologica.cloud.provider.github);
+    });
+    
+
     $('#cloud-options-dropdown').click((e) => {
       e.stopPropagation();
 
@@ -1307,19 +1359,19 @@ RED.sidebar.awsDeploy = (function () {
       function: 'attachDataList',
     },
   ];
-  parameterSets['cognito'] = [
-    { label: 'Identity Pool ARN', key: 'identityPool', value: '' },
-  ];
-  parameterSets['iot'] = [
-    {
-      label: 'Rule Name',
-      key: 'rule',
-      value: '',
-      required: true,
-      function: 'attachDataList',
-    },
-    { label: 'Query', key: 'query', value: '', required: true },
-  ];
+  //parameterSets['cognito'] = [
+  //  { label: 'Identity Pool ARN', key: 'identityPool', value: '' },
+  //];
+  //parameterSets['iot'] = [
+  //  {
+  //    label: 'Rule Name',
+  //    key: 'rule',
+  //    value: '',
+  //    required: true,
+  //    function: 'attachDataList',
+  //  },
+  //  { label: 'Query', key: 'query', value: '', required: true },
+  //];
   parameterSets['api'] = [
     {
       label: 'API',
@@ -1328,7 +1380,10 @@ RED.sidebar.awsDeploy = (function () {
       required: true,
       function: 'attachDataList',
     },
-    { label: 'Deployment Stage', key: 'stage', value: '', required: true }
+    { label: 'Deployment Stage', key: 'stage', value: '', required: true },
+    { label: 'Parent Id', key: 'parentId', value: '', required: false },
+    { label: 'Resource', key: 'resource', value: '', required: false },
+    { label: 'Authorizer Id', key: 'authorizerId', value: '', required: false }
   ];
   parameterSets['alb'] = [
     {
@@ -1344,23 +1399,23 @@ RED.sidebar.awsDeploy = (function () {
   ];
   parameterSets['sqs'] = [
     {
-      label: 'Queue URL',
-      key: 'stream',
+      label: 'Queue Arn',
+      key: 'queueArn',
       value: '',
       required: true,
       function: 'attachDataList',
     },
     { label: 'Batch Size', key: 'batchSize', value: '', min: 1, max: 10 },
   ];
-  parameterSets['alexa'] = [
-    {
-      label: 'Skill ID',
-      key: 'skillID',
-      value: '',
-      required: true,
-      function: 'attachDataList',
-    },
-  ];
+  //parameterSets['alexa'] = [
+  //  {
+  //    label: 'Skill ID',
+  //    key: 'skillID',
+  //    value: '',
+  //    required: true,
+  //    function: 'attachDataList',
+  //  },
+  //];
   parameterSets['kinesis'] = [
     { label: 'Stream ARN', key: 'stream', value: '', required: true },
     { label: 'Batch Size', key: 'batchSize', value: '', min: 1, max: 10000 },
@@ -1377,48 +1432,44 @@ RED.sidebar.awsDeploy = (function () {
     },
   ];
   parameterSets['cwevents'] = [
-    {
-      label: 'Rule ARN',
-      key: 'rule',
-      value: '',
-      required: true,
-      function: 'attachDataList',
-    },
-  ];
-  parameterSets['cwlogs'] = [
-    {
-      label: 'Log Group',
-      key: 'logGroup',
-      value: '',
-      required: true,
-      function: 'attachDataList',
-    },
-    { label: 'Filter Name', key: 'filterName', value: '' },
-    { label: 'Filter Pattern', key: 'filterPattern', value: '' },
-  ];
-  parameterSets['codecommit'] = [
-    {
-      label: 'Repository Name',
-      key: 'repository',
-      value: '',
-      required: true,
-      function: 'attachDataList',
-    },
-    { label: 'Trigger Name', key: 'trigger', value: '', required: true },
-    {
-      label: 'Events',
-      key: 'events',
-      value: '',
-      list: [
-        { k: 'all', v: 'all' },
-        { k: 'updateReference', v: 'updateReference' },
-        { k: 'createReference', v: 'createReference' },
-        { k: 'deleteReference', v: 'deleteReference' },
-      ],
-    },
-    { label: 'Branch Names', key: 'branchNames', value: '' },
-    { label: 'Custom Data', key: 'customData', value: '' },
+    { label: 'Expression', key: 'expression', value: 'cron()', required: true },
+    { label: 'Reference', key: 'reference', value: '' },
+    { label: 'Name', key: 'name', value: ''}
   ];
+  //parameterSets['cwlogs'] = [
+  //  {
+  //    label: 'Log Group',
+  //    key: 'logGroup',
+  //    value: '',
+  //    required: true,
+  //    function: 'attachDataList',
+  //  },
+  //  { label: 'Filter Name', key: 'filterName', value: '' },
+  //  { label: 'Filter Pattern', key: 'filterPattern', value: '' },
+  //];
+  //parameterSets['codecommit'] = [
+  //  {
+  //    label: 'Repository Name',
+  //    key: 'repository',
+  //    value: '',
+  //    required: true,
+  //    function: 'attachDataList',
+  //  },
+  //  { label: 'Trigger Name', key: 'trigger', value: '', required: true },
+  //  {
+  //    label: 'Events',
+  //    key: 'events',
+  //    value: '',
+  //    list: [
+  //      { k: 'all', v: 'all' },
+  //      { k: 'updateReference', v: 'updateReference' },
+  //      { k: 'createReference', v: 'createReference' },
+  //      { k: 'deleteReference', v: 'deleteReference' },
+  //    ],
+  //  },
+  //  { label: 'Branch Names', key: 'branchNames', value: '' },
+  //  { label: 'Custom Data', key: 'customData', value: '' },
+  //];
 
   return {
     init: init,

package/src/app/ui/editor-client/src/vendor/jsonata/formatter.js

@@ -166,7 +166,14 @@
         '$uppercase':{ args:[ 'str' ]},
         '$zip':{ args:[ 'array1' ]},
         '$vars': {args:['string']},
-        '$single': {args:['array','function']}
+        '$single': {args:['array','function']},
+        '$maskjson':{ args:[ 'object','object' ]},
+        '$maskemail':{ args:[ 'string','object' ]},
+        '$maskcard':{ args:[ 'string','object' ]},
+        '$maskphone':{ args:[ 'string','object' ]},
+        '$maskpassword':{ args:[ 'string','object' ]},
+        '$queryparam': { args:[ 'string']},
+        '$uriparam': { args:[ 'string']}
     }
     jsonata.getFunctionSnippet = function(fn) {
         var snippetText = "";