remove type block code in tools/* and update payment-3p to use aws cli V2

README.md

@@ -17,6 +17,58 @@ _Please note that you may incure AWS charges for deploying the ecommerce platfor
 
 To install the necessary tools and deploy this in your own AWS account, see the [getting started](docs/getting_started.md) guide in the documentation section.
 
+--------------------------------------------START CUSTOM PIPELINE ---------------------------------------------
+### Deploy without Makefile on LINUX/Ubuntu OS
+For the purpose of learning, we will build, package and deploy project in aws account using the scripts in the [tools] folder on linux system
+
+##### Run pipeline on services
+* [cd project_root](aws-serverless-ecommerce-platform)
+
+###### Build services
+*	./tools/build resources SERVICE
+*	./tools/build openapi SERVICE
+*	./tools/build python3 SERVICE
+*	./tools/build cloudformation SERVICE
+
+###### Check-deps services
+*	./tools/check-deps cloudformation SERVICE
+
+###### Clean services
+*	./tools/clean SERVICE
+
+###### Deploy services
+*	./tools/deploy cloudformation SERVICE
+
+###### Lint services
+*	./tools/lint cloudformation ${SERVICE}
+*	./tools/lint python3 SERVICE
+*	./tools/lint openapi SERVICE
+
+###### Package services
+*	./tools/package cloudformation SERVICE
+
+###### Teardown services
+*	./tools/teardown cloudformation SERVICE
+
+###### Integration tests
+*	./tools/tests-integ cloudformation SERVICE
+
+###### Unit tests
+*	./tools/tests-unit python3 SERVICE
+
+###### End-to-end tests
+[ENVIRONMENT=dev](/tools/tests-e2e)
+*	./tools/tests-e2e
+
+###### Automation
+We use script [package_services.sh](@root/package_services.sh) and [deploy_services.sh](@root/deploy_services.sh) for automate
+[cd project_root](aws-serverless-ecommerce-platform)
+
+*	$ ./package_services.sh SERVICE
+*	$ ./deploy_services.sh SERVICE
+
+--------------------------------------------END CUSTOM PIPELINE ---------------------------------------------
+
 ## Architecture
 
 ### High-level architecture

delivery-pricing/src/pricing/requirements.txt

@@ -1,2 +1,3 @@
 aws-lambda-powertools==1.16.1
-../shared/src/ecom/
+shared/src/ecom/
+

delivery/src/table_update/requirements.txt

@@ -1,3 +1,4 @@
 aws-lambda-powertools==1.16.1
 boto3
-../shared/src/ecom/
+shared/src/ecom/
+

delivery/template.yaml

@@ -171,7 +171,6 @@ Resources:
       # delivery/build folder, not the delivery folder.
       TemplateURL: ../../shared/templates/dlq.yaml
 
-
   #############
   # DASHBOARD #
   #############

deploy_services.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#Get the list of services
+#services=$(./tools/services --graph --env-only)
+
+#Iterate over each service and deploy it
+echo "============= #Iterate over each service and deploy it ==="
+
+while read -r services; do
+    IFS=',' read -ra service_array <<< "$services"
+    for service in "${service_array[@]}";do
+        ./tools/deploy cloudformation "$service"
+    done
+done <<< "$(./tools/services --graph --env-only)"
+
+echo "all services deploy to aws cloud"

environments.yaml

@@ -2,6 +2,10 @@ dev:
   parameters:
     LogLevel: DEBUG
     RetentionInDays: "7"
+  flags:
+    can-tests-integ: true
+    can-tests-e2e: true
+
 
 tests:
   parameters:
@@ -21,5 +25,5 @@ prod:
     RetentionInDays: "30"
   flags:
     can-tests-integ: false
-    can-tests-e2e: false
+    can-tests-e2e: true
     is-prod: true

orders/src/get_order/requirements.txt

@@ -1,3 +1,4 @@
 aws-lambda-powertools==1.16.1
 boto3
-../shared/src/ecom/
+shared/src/ecom/
+

orders/src/table_update/requirements.txt

@@ -1,3 +1,4 @@
 aws-lambda-powertools==1.16.1
 boto3
-../shared/src/ecom/
+shared/src/ecom/
+

orders/template.yaml

@@ -295,6 +295,7 @@ Resources:
       # The path starts with '../..' as this will be evaluated from the
       # orders/build folder, not the orders folder.
       TemplateURL: ../../shared/templates/dlq.yaml
+
       Parameters:
         AlarmAction: !Ref AlarmTopic
 

package_services.sh

@@ -0,0 +1,85 @@
+#!/bin/bash
+
+SERVICE="$1" # arg passed to the script
+
+if [ -z "$SERVICE" ]; then
+        echo "Usage: $0 <service>"
+        exit 1
+fi
+
+# Function to check if the last command executed successfully
+check_error() {
+        if [ $? -ne 0 ]; then
+                echo "Error occured. Existing .."
+                exit 1
+        fi
+}
+
+echo "================= CLEAN SERVICE  ================"
+./tools/clean "$SERVICE"
+check_error
+
+# Evaluate if SERVICE equals "payment-3p"
+if [ "$SERVICE" == "payment-3p" ]; then
+    cd payment-3p/ || exit 1
+    # Copy files to the build folder
+    if [ ! -d build/ ]; then 
+        mkdir build/ 
+    fi
+
+    cp -rp src/ build/src/
+
+    npx cdk synth --verbose > build/template.yaml
+
+    # Save the current directory
+    CURDIR=$(pwd)
+
+    # Install packages and transpile to Javascript for each Lambda function
+    for function_folder in build/src/* ; do
+        cd "$function_folder" || exit
+        npm i
+        cd "$CURDIR" || exit
+        npx tsc -p "$function_folder"
+    done
+
+    cd ../ || exit 1
+else
+    echo "============ BUILD RESOUCES SERVICE  =============="
+    ./tools/build resources "$SERVICE"
+    check_error
+
+    echo "============ BUILD OPENAPI SERVICE  =============="
+    ./tools/build openapi "$SERVICE"
+    check_error
+
+    echo "============ BUILD PYTHON3 SERVICE  =============="
+    ./tools/build python3 "$SERVICE"
+    check_error
+fi
+
+echo "============ BUILD CLOUDFORMATION SERVICE  =============="
+./tools/build cloudformation "$SERVICE"
+check_error
+
+if [ ! "$SERVICE" == "payment-3p" ]; then
+    echo "============ LINT CLOUDFORMATION SERVICE  =============="
+    ./tools/lint cloudformation "$SERVICE"
+    check_error
+
+    echo "============ TESTS-UNIT PYTHON3 SERVICE  =============="
+    ./tools/tests-unit python3 "$SERVICE"
+    check_error
+fi
+
+
+
+echo "============ PACKAGE CLOUDFORMATION SERVICE  =============="
+./tools/package cloudformation "$SERVICE"
+check_error
+
+echo "============ CHECK-DEPS CLOUDFORMATION SERVICE  =============="
+./tools/check-deps cloudformation "$SERVICE" &
+check_error
+
+wait
+echo "Ready to deploy : $SERVICE "

payment-3p/.gitignore

@@ -1,11 +1,8 @@
 *.js
-!*jest.config.js
+!jest.config.js
 *.d.ts
 node_modules
 
 # CDK asset staging directory
 .cdk.staging
 cdk.out
-
-# Prevent ignoring the 'lib' folder
-!lib

payment-3p/bin/payment-3p.ts

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 import 'source-map-support/register';
-import * as cdk from '@aws-cdk/core';
+import * as cdk from 'aws-cdk-lib';
 import { Payment3PStack } from '../lib/payment-3p-stack';
 
 const app = new cdk.App();
-new Payment3PStack(app, 'Payment3PStack');
-app.synth();
+new Payment3PStack(app, 'Payment3PStack');

payment-3p/cdk.json

@@ -1,3 +1,72 @@
 {
-  "app": "npx ts-node bin/payment-3p.ts"
+  "app": "npx ts-node --prefer-ts-exts bin/payment-3p.ts",
+  "watch": {
+    "include": [
+      "**"
+    ],
+    "exclude": [
+      "README.md",
+      "cdk*.json",
+      "**/*.d.ts",
+      "**/*.js",
+      "tsconfig.json",
+      "package*.json",
+      "yarn.lock",
+      "node_modules",
+      "test"
+    ]
+  },
+  "context": {
+    "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
+    "@aws-cdk/core:checkSecretUsage": true,
+    "@aws-cdk/core:target-partitions": [
+      "aws",
+      "aws-cn"
+    ],
+    "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
+    "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
+    "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,
+    "@aws-cdk/aws-iam:minimizePolicies": true,
+    "@aws-cdk/core:validateSnapshotRemovalPolicy": true,
+    "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": true,
+    "@aws-cdk/aws-s3:createDefaultLoggingPolicy": true,
+    "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": true,
+    "@aws-cdk/aws-apigateway:disableCloudWatchRole": true,
+    "@aws-cdk/core:enablePartitionLiterals": true,
+    "@aws-cdk/aws-events:eventsTargetQueueSameAccount": true,
+    "@aws-cdk/aws-iam:standardizedServicePrincipals": true,
+    "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true,
+    "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": true,
+    "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true,
+    "@aws-cdk/aws-route53-patters:useCertificate": true,
+    "@aws-cdk/customresources:installLatestAwsSdkDefault": false,
+    "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": true,
+    "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": true,
+    "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": true,
+    "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": true,
+    "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": true,
+    "@aws-cdk/aws-redshift:columnId": true,
+    "@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2": true,
+    "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": true,
+    "@aws-cdk/aws-apigateway:requestValidatorUniqueId": true,
+    "@aws-cdk/aws-kms:aliasNameRef": true,
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true,
+    "@aws-cdk/core:includePrefixInUniqueNameGeneration": true,
+    "@aws-cdk/aws-efs:denyAnonymousAccess": true,
+    "@aws-cdk/aws-opensearchservice:enableOpensearchMultiAzWithStandby": true,
+    "@aws-cdk/aws-lambda-nodejs:useLatestRuntimeVersion": true,
+    "@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId": true,
+    "@aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters": true,
+    "@aws-cdk/aws-appsync:useArnForSourceApiAssociationIdentifier": true,
+    "@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials": true,
+    "@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": true,
+    "@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction": true,
+    "@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse": true,
+    "@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2": true,
+    "@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope": true,
+    "@aws-cdk/aws-eks:nodegroupNameAttribute": true,
+    "@aws-cdk/aws-ec2:ebsDefaultGp3Volume": true,
+    "@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": true,
+    "@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false
+  }
 }

payment-3p/jest.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+  testEnvironment: 'node',
+  roots: ['<rootDir>/test'],
+  testMatch: ['**/*.test.ts'],
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest'
+  }
+};

payment-3p/lib/payment-3p-stack.ts

@@ -1,15 +1,16 @@
-import * as cdk from '@aws-cdk/core';
-import * as logs from '@aws-cdk/aws-logs';
-import * as sam from '@aws-cdk/aws-sam';
-import * as ssm from '@aws-cdk/aws-ssm';
-import * as dynamodb from '@aws-cdk/aws-dynamodb';
+import * as cdk from 'aws-cdk-lib';
+import * as logs from 'aws-cdk-lib/aws-logs';
+import * as sam from 'aws-cdk-lib/aws-sam';
+import * as ssm from 'aws-cdk-lib/aws-ssm';
+import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
+import { Construct } from 'constructs';
 
 const API_STAGE_NAME = "prod";
-const FUNCTION_RUNTIME = "nodejs12.x";
+const FUNCTION_RUNTIME = "nodejs18.x";
 const SERVICE_NAME = "payment-3p";
 
 export class Payment3PStack extends cdk.Stack {
-  constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps) {
+  constructor(scope: Construct, id: string, props?: cdk.StackProps) {
     super(scope, id, props);
 
     // Parameters
@@ -219,4 +220,4 @@ export class Payment3PStack extends cdk.Stack {
       retention: 30 //retentionInDays.valueAsNumber
     });
   }
-}
+}