Skip to content

Commit bc53b4f

Browse files
kr-igorkr-igor
authored
Merge branch 'master' into kr-igor/kafka-lag-spark-streaming
2 parents d01114e + bb8b0d2 commit bc53b4f

File tree

495 files changed

+7894
-11162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

495 files changed

+7894
-11162
lines changed

‎.circleci/config.continue.yml.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ parameters:
5454
global_pattern:
5555
# Pattern for files that should always trigger a test jobs
5656
type: string
57-
default: "^build.gradle$|^settings.gradle$|^gradle.properties$|^buildSrc/|^gradle/|.circleci"
57+
default: "^build.gradle$|^settings.gradle$|^gradle.properties$|^buildSrc/|^gradle/|.circleci|^gradlew|^mvnw|^.mvn/"
5858

5959
docker_image:
6060
type: string

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ dd-java-agent/instrumentation/*iast* @DataDog/asm-java
4545
dd-java-agent/instrumentation/*appsec* @DataDog/asm-java
4646
dd-java-agent/instrumentation/json/ @DataDog/asm-java
4747
dd-java-agent/instrumentation/snakeyaml/ @DataDog/asm-java
48+
dd-java-agent/instrumentation/velocity/ @DataDog/asm-java
4849
dd-java-agent/instrumentation/freemarker/ @DataDog/asm-java
4950
dd-smoke-tests/iast-util/ @DataDog/asm-java
5051
dd-smoke-tests/spring-security/ @DataDog/asm-java
@@ -54,6 +55,9 @@ dd-java-agent/instrumentation/spring-security-5/ @DataDog/asm-java
5455
**/iast/ @DataDog/asm-java
5556
**/Iast*.java @DataDog/asm-java
5657
**/Iast*.groovy @DataDog/asm-java
58+
**/rasp/ @Datadog/asm-java
59+
**/*Rasp*.java @DataDog/asm-java
60+
**/*Rasp*.groovy @DataDog/asm-java
5761

5862
# @DataDog/data-jobs-monitoring
5963
dd-java-agent/instrumentation/spark/ @DataDog/data-jobs-monitoring

‎.github/workflows/analyze-changes.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ jobs:
4444
with:
4545
submodules: 'recursive'
4646

47-
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
47+
- name: Cache Gradle dependencies
48+
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
4849
with:
4950
path: |
5051
~/.gradle/caches
@@ -97,7 +98,8 @@ jobs:
9798
with:
9899
submodules: 'recursive'
99100

100-
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
101+
- name: Cache Gradle dependencies
102+
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
101103
with:
102104
path: |
103105
~/.gradle/caches

‎.github/workflows/comment-on-submodule-update.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
comment_on_submodule_update:
1313
permissions:
1414
issues: write # Required to create a comment on the pull request
15+
pull-requests: write # Required to create a comment on the pull request
1516
runs-on: ubuntu-latest
1617

1718
steps:

.github/workflows/tests/add-milestone-to-pull-requests/payload.json renamed to .github/workflows/tests/add-milestone-to-pull-requests/payload-pull-request.json

File renamed without changes.

‎.github/workflows/tests/add-milestone-to-pull-requests/test-pull-request.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
source "$(dirname "$0")/../env.sh"
3+
testworkflow pull_request

‎.github/workflows/tests/add-milestone-to-pull-requests/test.sh‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/workflows/tests/env.sh‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,32 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

3-
# Move to project root directory
4-
FILE_PATH=$(dirname "$0")
5-
cd $FILE_PATH/../../../../
6-
7-
export COMMON_ACT_ARGS="--container-architecture linux/amd64 --secret GITHUB_TOKEN="$(gh auth token)" --verbose"
3+
function testworkflow() {
4+
local EVENT_TYPE=$1
5+
# Get workflow name
6+
local TEST_PATH
7+
TEST_PATH=$(dirname "$(readlink -f "${BASH_SOURCE[1]}")")
8+
local WORKFLOW_NAME
9+
WORKFLOW_NAME=$(basename "$TEST_PATH")
10+
local WORKFLOW_FILE=.github/workflows/${WORKFLOW_NAME}.yaml
11+
local PAYLOAD_FILE=${TEST_PATH}/payload-${EVENT_TYPE//_/-}.json
12+
# Move to project root directory
13+
local FILE_PATH
14+
FILE_PATH=$(dirname "$0")
15+
cd "$FILE_PATH/../../../../" || exit 1
16+
# Check if workflow file and payload file exist
17+
if [ ! -f "$WORKFLOW_FILE" ]; then
18+
echo "Workflow file not found: $WORKFLOW_FILE"
19+
exit 1
20+
fi
21+
if [ ! -f "$PAYLOAD_FILE" ]; then
22+
echo "Payload file not found: $PAYLOAD_FILE"
23+
exit 1
24+
fi
25+
# Run workflow using act
26+
act "${EVENT_TYPE}" \
27+
--workflows "${WORKFLOW_FILE}" \
28+
--eventpath "${PAYLOAD_FILE}" \
29+
--container-architecture linux/amd64 \
30+
--secret GITHUB_TOKEN="$(gh auth token)" \
31+
--verbose
32+
}

.github/workflows/tests/increment-milestone-on-tag/payload.json renamed to .github/workflows/tests/increment-milestone-on-tag/payload-create.json

File renamed without changes.

‎.github/workflows/tests/increment-milestone-on-tag/test-create.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
source "$(dirname "$0")/../env.sh"
3+
testworkflow create

0 commit comments

Comments
 (0)