Fix/build image

.github/workflows/deploy-activity-service.yml

@@ -185,7 +185,6 @@ jobs:
           COMMIT_HASH: ${{ env.sha_short }}
           VERSION: ${{ env.sha_short }}
           ENV: ${{ env.sha_short }}
-          DD_API_KEY_SECRET_ARN: ${{secrets.EU_WEST_1_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
         run: |

.github/workflows/deploy-inventory-service.yml

@@ -49,7 +49,6 @@ jobs:
         env:
           COMMIT_HASH: ${{ env.sha_short }}
           ENV: "dev"
-          DD_API_KEY_SECRET_ARN: ${{secrets.US_EAST_1_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
           AWS_REGION: "us-east-1"
@@ -222,7 +221,6 @@ jobs:
           COMMIT_HASH: ${{ env.sha_short }}
           VERSION: ${{ env.sha_short }}
           ENV: "dev"
-          DD_API_KEY_SECRET_ARN: ${{secrets.US_EAST_1_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
           AWS_REGION: "eu-central-1"
@@ -235,7 +233,6 @@ jobs:
           COMMIT_HASH: ${{ env.sha_short }}
           VERSION: ${{ env.sha_short }}
           ENV: ${{ env.sha_short }}
-          DD_API_KEY_SECRET_ARN: ${{secrets.EU_WEST_1_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
         run: |

.github/workflows/deploy-orders-service.yml

@@ -49,7 +49,6 @@ jobs:
         env:
           COMMIT_HASH: ${{ env.sha_short }}
           ENV: "dev"
-          DD_API_KEY_SECRET_ARN: ${{secrets.US_EAST_1_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
           AWS_REGION: "us-east-1"
@@ -146,7 +145,6 @@ jobs:
         env:
           COMMIT_HASH: ${{ env.sha_short }}
           ENV: "dev"
-          DD_API_KEY_SECRET_ARN: ${{secrets.EU_WEST_2_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
           AWS_REGION: "eu-west-2"
@@ -217,7 +215,6 @@ jobs:
         env:
           COMMIT_HASH: ${{ env.sha_short }}
           ENV: "cdk-${{ env.sha_short }}"
-          DD_API_KEY_SECRET_ARN: ${{secrets.EU_WEST_1_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
         run: |
@@ -237,7 +234,6 @@ jobs:
         env:
           COMMIT_HASH: ${{ env.sha_short }}
           ENV: "cdk-${{ env.sha_short }}"
-          DD_API_KEY_SECRET_ARN: ${{secrets.EU_WEST_1_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
         run: |
@@ -249,7 +245,6 @@ jobs:
         env:
           COMMIT_HASH: ${{ env.sha_short }}
           ENV: "dev"
-          DD_API_KEY_SECRET_ARN: ${{secrets.EU_WEST_1_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
         run: |
@@ -270,7 +265,6 @@ jobs:
         env:
           COMMIT_HASH: ${{ env.sha_short }}
           ENV: "dev"
-          DD_API_KEY_SECRET_ARN: ${{secrets.EU_WEST_1_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
         run: |
@@ -311,7 +305,6 @@ jobs:
         env:
           COMMIT_HASH: ${{ env.sha_short }}
           ENV: "sam-${{ env.sha_short }}"
-          DD_API_KEY_SECRET_ARN: ${{secrets.US_EAST_1_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
           AWS_REGION: "eu-central-1"

.github/workflows/deploy-user-management-service.yml

@@ -47,7 +47,6 @@ jobs:
         env:
           COMMIT_HASH: ${{ env.sha_short }}
           ENV: "dev"
-          DD_API_KEY_SECRET_ARN: ${{secrets.US_EAST_1_DD_API_KEY_SECRET_ARN}}
           DD_API_KEY: ${{secrets.DD_API_KEY}}
           DD_SITE: "datadoghq.eu"
           AWS_REGION: "eu-central-1"
@@ -344,7 +343,6 @@ jobs:
   #       env:
   #         COMMIT_HASH: ${{ env.sha_short }}
   #         ENV: "dev"
-  #         DD_API_KEY_SECRET_ARN: ${{secrets.US_EAST_1_DD_API_KEY_SECRET_ARN}}
   #         DD_API_KEY: ${{secrets.DD_API_KEY}}
   #         DD_SITE: "datadoghq.eu"
   #         AWS_REGION: "us-east-2"
@@ -367,7 +365,6 @@ jobs:
   #       env:
   #         COMMIT_HASH: ${{ env.sha_short }}
   #         ENV: "dev"
-  #         DD_API_KEY_SECRET_ARN: ${{secrets.US_EAST_1_DD_API_KEY_SECRET_ARN}}
   #         DD_API_KEY: ${{secrets.DD_API_KEY}}
   #         DD_SITE: "datadoghq.eu"
   #         AWS_REGION: "us-east-2"

README.md

@@ -99,10 +99,9 @@ If you wish to deploy the entire application there is a custom Docker image avai
    source ~/.profile
    ./cdk-deploy-all.sh
    ```
-5. Once deployment is complete exit the interactive shell by typing `exit`
-6. Open your AWS console and check that all CloudFormation stacks deployments are complete
+5. Open your AWS console and check that all CloudFormation stacks deployments are complete. The deployments run as background tasks, so it can take several minutes for the full deployment to complete.
 
-   There should be 7 stacks in total:
+   There should be 8 stacks in total:
 
    - SharedResourcesStack
    - OrdersService
@@ -111,6 +110,9 @@ If you wish to deploy the entire application there is a custom Docker image avai
    - ProductService
    - LoyaltyService
    - PricingService
+   - ActivityService
+
+6. Once deployment is complete exit the interactive shell by typing `exit`
 
 ### Delete Resources
 
@@ -120,7 +122,6 @@ Once you are finished testing, run the below commands to delete resources from y
 
    ```sh
    docker run -it \
-       -v "$(pwd):/serverless-sample-app" \
        -w "/serverless-sample-app" \
        -e AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}" \
        -e AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}" \

build-image/local-build-essentials.sh

@@ -3,10 +3,13 @@ set -ex
 
 apt-get update -y
 apt-get install software-properties-common -y
+add-apt-repository ppa:dotnet/backports --yes
 add-apt-repository ppa:deadsnakes/ppa --yes
+apt-get update -y
 apt-get install -y \
   curl \
   wget \
+  git-all \
   python3-pip \
   python3.13 \
   python-is-python3 \

build-image/local-build.sh

@@ -1,23 +1,6 @@
 #!/usr/bin/bash
 set -ex
 
-echo "Pre-compile code to speed up first deployment."
-apt-get install git-all -y
-git clone https://github.com/DataDog/serverless-sample-app.git /serverless-sample-app
-cd /serverless-sample-app && ./build-all.sh
-
-# #############################################################
-# ### Install frontend and loadtesting dependencies         ###
-# #############################################################
-
-pushd /serverless-sample-app/src/frontend
-npm i && docker build .
-popd
-
-pushd /serverless-sample-app/loadtest
-npm i && docker build .
-popd
-
 export DOTNET_ROOT=$HOME/.dotnet
 export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools
 export M3_HOME=/opt/apache-maven-3.9.11
@@ -42,13 +25,78 @@ export GOROOT=/usr/local/go
 export GOPATH=$HOME/go
 export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
 export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"                   # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
 . "$HOME/.cargo/env"
 EOF
 
 source /root/.bashrc
 
+# echo "Pre-compile code to speed up first deployment."
+git clone https://github.com/DataDog/serverless-sample-app.git /serverless-sample-app
+cd /serverless-sample-app
+
+mkdir -p build-logs
+
+pushd src/shared-infra
+npm i
+popd
+
+pushd src/inventory-service
+echo "Building inventory service..."
+mvn clean package -DskipTests
+popd
+
+pushd src/user-management-service
+echo "Building user management service..."
+npm i
+./package.sh
+popd
+
+pushd src/loyalty-point-service
+echo "Building loyalty point service..."
+npm i
+./package.sh
+popd
+
+pushd src/pricing-service
+echo "Building pricing service..."
+npm i
+./package.sh
+popd
+
+pushd src/order-service
+echo "Building order service..."
+dotnet restore
+popd
+
+pushd src/order-service/src/Orders.BackgroundWorkers
+echo "Building order background workers..."
+dotnet lambda package
+popd
+
+pushd src/product-management-service
+echo "Building product management service..."
+make build
+popd
+
+pushd src/activity-service
+echo "Building activity service..."
+make dev && make deps && make build
+popd
+
+# #############################################################
+# ### Install frontend and loadtesting dependencies         ###
+# #############################################################
+
+pushd /serverless-sample-app/src/frontend
+npm i
+popd
+
+pushd /serverless-sample-app/loadtest
+npm i
+popd
+
 # Print app version information
 # node --version
 # dotnet --version

build-image/success-build.sh

@@ -14,11 +14,19 @@ echo "Installing AWS CDK"
 npm install -g aws-cdk
 cdk --help
 
-echo "Installing .NET"
-apt install -y dotnet-sdk-8.0
+wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+dpkg -i packages-microsoft-prod.deb
+rm packages-microsoft-prod.deb
+apt-get update
+
+# echo "Installing .NET"
+wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh
+chmod +x ./dotnet-install.sh
+./dotnet-install.sh --channel 9.0
+
 export DOTNET_ROOT=$HOME/.dotnet
 export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools
-dotnet --version
+
 dotnet new install Amazon.Lambda.Templates
 dotnet tool install -g Amazon.Lambda.Tools
 

loadtest/loadsimulator-low.yml

@@ -135,7 +135,7 @@ scenarios:
             as: adminJwt
       - function: generateProductName
       - post:
-          url: "{{ $processEnvironment.INVENTORY_API_ENDPOINT }}/product"
+          url: "{{ $processEnvironment.PRODUCT_API_ENDPOINT }}/product"
           ifTrue: 'ProductName'
           headers:
             Content-Type: "application/json"

loadtest/loadsimulator.yml

@@ -137,7 +137,7 @@ scenarios:
             as: adminJwt
       - function: generateProductName
       - post:
-          url: "{{ $processEnvironment.INVENTORY_API_ENDPOINT }}/product"
+          url: "{{ $processEnvironment.PRODUCT_API_ENDPOINT }}/product"
           ifTrue: 'ProductName'
           headers:
             Content-Type: "application/json"

loadtest/loadsimulator_1.yml

@@ -129,7 +129,7 @@ scenarios:
             as: adminJwt
       - function: generateProductName
       - post:
-          url: "{{ $processEnvironment.INVENTORY_API_ENDPOINT }}/product"
+          url: "{{ $processEnvironment.PRODUCT_API_ENDPOINT }}/product"
           ifTrue: 'ProductName'
           headers:
             Content-Type: "application/json"