Skip to content

merge main #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeastham1993 merged 6 commits into from
Jul 2, 2025
Merged

merge main #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d1cf88e
feat: improvements to .NET code sample
jeastham1993 Jul 1, 2025
4781712
feat: add SAM and TF example
jeastham1993 Jul 1, 2025
00592b3
fix: update tracer download (#356)
jeastham1993 Jul 1, 2025
482f0d6
chore: update dependabot references (#357)
jeastham1993 Jul 1, 2025
c726bfd
chore: update codeowners (#385)
jeastham1993 Jul 1, 2025
9418235
chore(deps): bump @types/jsonwebtoken from 9.0.9 to 9.0.10 in /src/pr…
dependabot[bot] Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @DataDog/serverless-onboarding-enablement
* @jeastham1993
27 changes: 19 additions & 8 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,43 @@ version: 2
updates:

- package-ecosystem: "maven"
directory: "/src/java"
directory: "/src/inventory-service"
schedule:
interval: "monthly"

- package-ecosystem: "npm"
directories:
- "/src/nodejs"
- "/src/rust"
- "/src/loyalty-point-service"
- "/src/pricing-service"
- "/src/user-management-service"
schedule:
interval: "monthly"

- package-ecosystem: "nuget"
directory: "/src/dotnet"
directory: "/src/order-service"
schedule:
interval: "monthly"

- package-ecosystem: "terraform"
directories:
- "/src/java/infra"
- "/src/nodejs/infra"
- "/src/dotnet/infra"
- "/src/inventory-service/infra"
- "/src/loyalty-point-service/infra"
- "/src/pricing-service/infra"
- "/src/user-management-service/infra"
- "/src/order-service/infra"
- "/src/product-management-service/infra"
- "/src/activity-service/infra"
schedule:
interval: "monthly"

- package-ecosystem: "cargo"
directories:
- "/src/rust"
- "/src/user-management-service"
schedule:
interval: "monthly"

- package-ecosystem: "pip"
directories:
- "/src/activity-service"
schedule:
interval: "monthly"
238 changes: 134 additions & 104 deletions .github/workflows/deploy-activity-service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# python-version: "3.13"
# cache: "poetry" # NOTE: poetry must be installed before this step, or else cache doesn't work
# - name: Configure AWS credentials
# uses: aws-actions/configure-aws-credentials@master
# uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df
# with:
# role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
# role-session-name: GitHub_to_AWS_via_FederatedOIDC
Expand All @@ -40,6 +40,18 @@
# shell: bash
# run: |
# echo "sha_short=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
# - name: Setup dev environment
# shell: bash
# env:
# COMMIT_HASH: ${{ env.sha_short }}
# VERSION: ${{ env.sha_short }}
# ENV: "dev"
# DD_API_KEY: ${{secrets.DD_API_KEY}}
# DD_SITE: "datadoghq.eu"
# AWS_REGION: "eu-central-1"
# run: |
# cd src/activity-service
# make dev
# - name: Build
# shell: bash
# env:
Expand Down Expand Up @@ -73,6 +85,7 @@
# ENV: ${{ env.sha_short }}
# VERSION: ${{ env.sha_short }}
# AWS_REGION: "eu-west-2"
# AWS_DEFAULT_REGION: "eu-west-2"
# run: |
# cd src/activity-service
# make integration-test
Expand Down Expand Up @@ -114,6 +127,7 @@
# env:
# ENV: "dev"
# AWS_REGION: "eu-west-2"
# AWS_DEFAULT_REGION: "eu-west-2"
# run: |
# cd src/activity-service
# make integration-test
Expand Down Expand Up @@ -183,6 +197,7 @@
ENV: ${{ env.sha_short }}
VERSION: ${{ env.sha_short }}
AWS_REGION: "eu-west-1"
AWS_DEFAULT_REGION: "eu-west-1"
run: |
cd src/activity-service
make integration-test
Expand Down Expand Up @@ -216,6 +231,7 @@
env:
ENV: "dev"
AWS_REGION: "eu-west-1"
AWS_DEFAULT_REGION: "eu-west-1"
run: |
cd src/activity-service
make integration-test
Expand All @@ -232,106 +248,120 @@
cd src/activity-service
make cdk-destroy

# deploy-sam:
# runs-on: ubuntu-latest
# steps:
# - name: Check out repository code
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# - name: Install poetry
# run: pipx install poetry
# - name: Set up Python
# uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
# with:
# python-version: "3.13"
# cache: "poetry" # NOTE: poetry must be installed before this step, or else cache doesn't work
# - uses: aws-actions/setup-sam@v1
# - name: Configure AWS credentials
# uses: aws-actions/configure-aws-credentials@master
# with:
# role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
# role-session-name: GitHub_to_AWS_via_FederatedOIDC
# aws-region: "eu-central-1"
# - name: Set Commit Hash Environment Variables
# shell: bash
# run: |
# echo "sha_short=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
# - name: Build
# shell: bash
# env:
# COMMIT_HASH: ${{ env.sha_short }}
# VERSION: ${{ env.sha_short }}
# ENV: "dev"
# DD_API_KEY: ${{secrets.DD_API_KEY}}
# DD_SITE: "datadoghq.eu"
# AWS_REGION: "eu-central-1"
# run: |
# cd src/activity-service
# make build
# - name: Deploy to ephermal environment
# shell: bash
# env:
# COMMIT_HASH: ${{ env.sha_short }}
# VERSION: ${{ env.sha_short }}
# ENV: ${{ env.sha_short }}
# DD_API_KEY: ${{secrets.DD_API_KEY}}
# DD_SITE: "datadoghq.eu"
# AWS_REGION: "eu-central-1"
# run: |
# cd src/activity-service
# make sam
# - name: Integration test ephermal environment
# shell: bash
# env:
# ENV: ${{ env.sha_short }}
# VERSION: ${{ env.sha_short }}
# AWS_REGION: "eu-central-1"
# run: |
# cd src/activity-service
# make integration-test
# - name: Destroy
# shell: bash
# if: always()
# env:
# COMMIT_HASH: ${{ env.sha_short }}
# ENV: ${{ env.sha_short }}
# DD_API_KEY: ${{secrets.DD_API_KEY}}
# DD_SITE: "datadoghq.eu"
# AWS_REGION: "eu-central-1"
# run: |
# cd src/activity-service
# make sam-destroy
# - name: Deploy to dev
# if: github.event_name == 'push'
# shell: bash
# env:
# COMMIT_HASH: ${{ env.sha_short }}
# VERSION: ${{ env.sha_short }}
# ENV: "dev"
# DD_API_KEY: ${{secrets.DD_API_KEY}}
# DD_SITE: "datadoghq.eu"
# AWS_REGION: "eu-central-1"
# run: |
# cd src/activity-service
# make sam
# - name: Integration test dev
# if: github.event_name == 'push'
# shell: bash
# env:
# ENV: "dev"
# AWS_REGION: "eu-central-1"
# run: |
# cd src/activity-service
# make integration-test
# - name: Destroy dev
# shell: bash
# if: always()
# env:
# COMMIT_HASH: ${{ env.sha_short }}
# VERSION: ${{ env.sha_short }}
# ENV: "dev"
# DD_API_KEY: ${{secrets.DD_API_KEY}}
# DD_SITE: "datadoghq.eu"
# AWS_REGION: "eu-central-1"
# run: |
# cd src/activity-service
# make sam-destroy
deploy-sam:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Install poetry
run: pipx install poetry
- name: Set up Python
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
with:
python-version: "3.13"
cache: "poetry" # NOTE: poetry must be installed before this step, or else cache doesn't work
- uses: aws-actions/setup-sam@v1

Check warning

Code scanning / Scorecard

Pinned-Dependencies Medium

score is 2: third-party GitHubAction not pinned by hash
Remediation tip: update your workflow using https://app.stepsecurity.io
Click Remediation section below for further remediation help
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
role-session-name: GitHub_to_AWS_via_FederatedOIDC
aws-region: "eu-central-1"
- name: Set Commit Hash Environment Variables
shell: bash
run: |
echo "sha_short=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
- name: Setup dev environment
shell: bash
env:
COMMIT_HASH: ${{ env.sha_short }}
VERSION: ${{ env.sha_short }}
ENV: "dev"
DD_API_KEY: ${{secrets.DD_API_KEY}}
DD_SITE: "datadoghq.eu"
AWS_REGION: "eu-central-1"
run: |
cd src/activity-service
make dev
- name: Build
shell: bash
env:
COMMIT_HASH: ${{ env.sha_short }}
VERSION: ${{ env.sha_short }}
ENV: "dev"
DD_API_KEY: ${{secrets.DD_API_KEY}}
DD_SITE: "datadoghq.eu"
AWS_REGION: "eu-central-1"
run: |
cd src/activity-service
make build
- name: Deploy to ephermal environment
shell: bash
env:
COMMIT_HASH: ${{ env.sha_short }}
VERSION: ${{ env.sha_short }}
ENV: ${{ env.sha_short }}
DD_API_KEY: ${{secrets.DD_API_KEY}}
DD_SITE: "datadoghq.eu"
AWS_REGION: "eu-central-1"
run: |
cd src/activity-service
make sam
- name: Integration test ephermal environment
shell: bash
env:
ENV: ${{ env.sha_short }}
VERSION: ${{ env.sha_short }}
AWS_REGION: "eu-central-1"
AWS_DEFAULT_REGION: "eu-central-1"
run: |
cd src/activity-service
make integration-test
- name: Destroy
shell: bash
if: always()
env:
COMMIT_HASH: ${{ env.sha_short }}
ENV: ${{ env.sha_short }}
DD_API_KEY: ${{secrets.DD_API_KEY}}
DD_SITE: "datadoghq.eu"
AWS_REGION: "eu-central-1"
run: |
cd src/activity-service
make sam-destroy
- name: Deploy to dev
if: github.event_name == 'push'
shell: bash
env:
COMMIT_HASH: ${{ env.sha_short }}
VERSION: ${{ env.sha_short }}
ENV: "dev"
DD_API_KEY: ${{secrets.DD_API_KEY}}
DD_SITE: "datadoghq.eu"
AWS_REGION: "eu-central-1"
run: |
cd src/activity-service
make sam
- name: Integration test dev
if: github.event_name == 'push'
shell: bash
env:
ENV: "dev"
AWS_REGION: "eu-central-1"
AWS_DEFAULT_REGION: "eu-central-1"
run: |
cd src/activity-service
make integration-test
- name: Destroy dev
shell: bash
if: always()
env:
COMMIT_HASH: ${{ env.sha_short }}
VERSION: ${{ env.sha_short }}
ENV: "dev"
DD_API_KEY: ${{secrets.DD_API_KEY}}
DD_SITE: "datadoghq.eu"
AWS_REGION: "eu-central-1"
run: |
cd src/activity-service
make sam-destroy
2 changes: 1 addition & 1 deletion .github/workflows/deploy-build-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@master
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
role-session-name: GitHub_to_AWS_via_FederatedOIDC
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-inventory-service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
distribution: "corretto"
architecture: x64
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@master
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
role-session-name: GitHub_to_AWS_via_FederatedOIDC
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
distribution: "corretto"
architecture: x64
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@master
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
role-session-name: GitHub_to_AWS_via_FederatedOIDC
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
distribution: "corretto"
architecture: x64
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@master
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
role-session-name: GitHub_to_AWS_via_FederatedOIDC
Expand Down Expand Up @@ -316,7 +316,7 @@ jobs:
architecture: x64
- uses: aws-actions/setup-sam@v1
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@master
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df
with:
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
role-session-name: GitHub_to_AWS_via_FederatedOIDC
Expand Down
Loading
Loading