Skip to content

Commit

Permalink
Merge branch 'master' into conti/add-aws-xray-header-context-extraction
Browse files Browse the repository at this point in the history
  • Loading branch information
wconti27 committed Dec 13, 2024
2 parents 7d99016 + 83c6928 commit 03008e6
Show file tree
Hide file tree
Showing 1,028 changed files with 76,218 additions and 17,153 deletions.
11 changes: 0 additions & 11 deletions .eslintignore

This file was deleted.

41 changes: 0 additions & 41 deletions .eslintrc.json

This file was deleted.

21 changes: 0 additions & 21 deletions .github/actions/injection/action.yml

This file was deleted.

7 changes: 7 additions & 0 deletions .github/actions/install/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: Install dependencies
runs:
using: composite
steps: # retry in case of server error from registry
- run: yarn install --ignore-engines || yarn install --ignore-engines
shell: bash

2 changes: 1 addition & 1 deletion .github/actions/node/latest/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ runs:
steps:
- uses: actions/setup-node@v3
with:
node-version: 'latest'
node-version: '22' # Update this line to the latest Node.js version
20 changes: 20 additions & 0 deletions .github/actions/plugins/test-and-upstream/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Plugin Tests
runs:
using: composite
steps:
- uses: ./.github/actions/testagent/start
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:plugins:ci
shell: bash
- run: yarn test:plugins:upstream
shell: bash
- uses: ./.github/actions/node/latest
- run: yarn test:plugins:ci
shell: bash
- run: yarn test:plugins:upstream
shell: bash
- uses: codecov/codecov-action@v3
- if: always()
uses: ./.github/actions/testagent/logs
16 changes: 16 additions & 0 deletions .github/actions/plugins/test/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Plugin Tests
runs:
using: composite
steps:
- uses: ./.github/actions/testagent/start
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:plugins:ci
shell: bash
- uses: ./.github/actions/node/latest
- run: yarn test:plugins:ci
shell: bash
- uses: codecov/codecov-action@v3
- if: always()
uses: ./.github/actions/testagent/logs
16 changes: 16 additions & 0 deletions .github/actions/plugins/upstream/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Plugin Upstream Tests
runs:
using: composite
steps:
- uses: ./.github/actions/testagent/start
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:plugins:upstream
shell: bash
- uses: ./.github/actions/node/latest
- run: yarn test:plugins:upstream
shell: bash
- uses: codecov/codecov-action@v3
- if: always()
uses: ./.github/actions/testagent/logs
6 changes: 0 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,4 @@
### Additional Notes
<!-- Anything else we should know when reviewing? -->

### Security
Datadog employees:
- [ ] If this PR touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`.
- [ ] This PR doesn't touch any of that.

Unsure? Have a question? Request a review!

19 changes: 19 additions & 0 deletions .github/workflows/all-green.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: All Green
on:
pull_request:
push:
branches:
- master

jobs:

all-green:
runs-on: ubuntu-latest
permissions:
checks: read
contents: read
steps:
- uses: wechuli/allcheckspassed@v1
with:
retries: 20 # once per minute, some checks take up to 15 min
checks_exclude: devflow.*
92 changes: 77 additions & 15 deletions .github/workflows/appsec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: ./.github/actions/install
- run: yarn test:appsec:ci
- uses: codecov/codecov-action@v3

Expand All @@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:ci
- uses: ./.github/actions/node/20
Expand All @@ -39,8 +39,10 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: actions/setup-node@v3
with:
node-version: '18'
- uses: ./.github/actions/install
- run: yarn test:appsec:ci
- uses: codecov/codecov-action@v3

Expand All @@ -62,7 +64,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
Expand All @@ -85,7 +87,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/18
Expand All @@ -110,7 +112,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: ./.github/actions/install
- uses: ./.github/actions/node/18
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/20
Expand All @@ -120,11 +122,11 @@ jobs:
express:
runs-on: ubuntu-latest
env:
PLUGINS: express|body-parser|cookie-parser
PLUGINS: express|body-parser|cookie-parser|multer
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
Expand All @@ -138,7 +140,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
Expand All @@ -158,7 +160,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
Expand All @@ -178,7 +180,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
Expand All @@ -192,7 +194,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: ./.github/actions/install
- uses: ./.github/actions/node/18
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/20
Expand All @@ -202,18 +204,78 @@ jobs:
- uses: codecov/codecov-action@v3

next:
strategy:
fail-fast: false
matrix:
version:
- 18
- latest
range: ['9.5.0', '11.1.4', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0']
runs-on: ubuntu-latest
env:
PLUGINS: next
PACKAGE_VERSION_RANGE: ${{ matrix.range }}
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/testagent/start
- uses: actions/setup-node@v3
with:
cache: yarn
node-version: ${{ matrix.version }}
- uses: ./.github/actions/install
- run: yarn test:appsec:plugins:ci
- if: always()
uses: ./.github/actions/testagent/logs
- uses: codecov/codecov-action@v3

lodash:
runs-on: ubuntu-latest
env:
PLUGINS: lodash
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@v3

integration:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: yarn install
- uses: ./.github/actions/node/oldest
- run: yarn test:integration:appsec
- uses: ./.github/actions/node/latest
- run: yarn test:integration:appsec

passport:
runs-on: ubuntu-latest
env:
PLUGINS: passport-local|passport-http
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@v3

template:
runs-on: ubuntu-latest
env:
PLUGINS: handlebars|pug
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- run: yarn test:appsec:plugins:ci
- if: always()
uses: ./.github/actions/testagent/logs
- uses: codecov/codecov-action@v3
2 changes: 1 addition & 1 deletion .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/node/setup
- run: yarn install
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:shimmer:ci
- uses: ./.github/actions/node/latest
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/datadog-static-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Datadog Static Analysis

on:
pull_request:
push:
branches: [master]

jobs:
static-analysis:
runs-on: ubuntu-latest
name: Datadog Static Analyzer
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Check code meets quality and security standards
id: datadog-static-analysis
uses: DataDog/datadog-static-analyzer-github-action@v1
with:
dd_api_key: ${{ secrets.DD_STATIC_ANALYSIS_API_KEY }}
dd_app_key: ${{ secrets.DD_STATIC_ANALYSIS_APP_KEY }}
dd_service: dd-trace-js
dd_env: ci
dd_site: datadoghq.com
cpu_count: 2
Loading

0 comments on commit 03008e6

Please sign in to comment.