-
Notifications
You must be signed in to change notification settings - Fork 146
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 1447-security-agent-excludes
- Loading branch information
Showing
216 changed files
with
7,440 additions
and
1,143 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| name: Release - Update System Config Page | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| version_number: | ||
| required: true | ||
| type: string | ||
| description: 'The version being released. Eg. 7.11.0' | ||
|
|
||
| jobs: | ||
| update-system-config: | ||
| name: Set java_agent_version to ${{ inputs.version_number }} in system config | ||
| runs-on: ubuntu-20.04 | ||
| steps: | ||
| - name: Update system configuration page | ||
| run: | | ||
| PAYLOAD="{ | ||
| \"system_configuration\": { | ||
| \"key\": \"java_agent_version\", | ||
| \"value\": \"${{ inputs.version_number }}\" | ||
| } | ||
| }" | ||
| CONTENT_TYPE='Content-Type: application/json' | ||
| # STAGING | ||
| curl -X POST 'https://staging-api.newrelic.com/v2/system_configuration.json' \ | ||
| -H "X-Api-Key:${{ secrets.NEW_RELIC_API_KEY_STAGING }}" -i \ | ||
| -H "$CONTENT_TYPE" \ | ||
| -d "$PAYLOAD" | ||
| echo "*Staging Java agent version set to:*" >> $GITHUB_STEP_SUMMARY | ||
| curl -X GET 'https://staging-api.newrelic.com/v2/system_configuration.json' \ | ||
| -H "X-Api-Key:${{ secrets.NEW_RELIC_API_KEY_STAGING }}" -i \ | ||
| -H "$CONTENT_TYPE" | grep -o "\"key\":\"java_agent_version\",\"value\":\"[0-9.]*\"" | cut -d'"' -f8 >> $GITHUB_STEP_SUMMARY | ||
| # PRODUCTION | ||
| curl -X POST 'https://api.newrelic.com/v2/system_configuration.json' \ | ||
| -H "X-Api-Key:${{ secrets.NEW_RELIC_API_KEY_PRODUCTION }}" -i \ | ||
| -H "$CONTENT_TYPE" \ | ||
| -d "$PAYLOAD" | ||
| echo "*Prod Java agent version set to:*" >> $GITHUB_STEP_SUMMARY | ||
| curl -X GET 'https://api.newrelic.com/v2/system_configuration.json' \ | ||
| -H "X-Api-Key:${{ secrets.NEW_RELIC_API_KEY_PRODUCTION }}" -i \ | ||
| -H "$CONTENT_TYPE" | grep -o "\"key\":\"java_agent_version\",\"value\":\"[0-9.]*\"" | cut -d'"' -f8 >> $GITHUB_STEP_SUMMARY | ||
| # EU PRODUCTION | ||
| curl -X POST 'https://api.eu.newrelic.com/v2/system_configuration.json' \ | ||
| -H "X-Api-Key:$ {{ secrets.NEW_RELIC_API_KEY_PRODUCTION }}" -i \ | ||
| -H "$CONTENT_TYPE" \ | ||
| -d "$PAYLOAD" | ||
| echo "*EU Java agent version set to:*" >> $GITHUB_STEP_SUMMARY | ||
| curl -X GET 'https://api.eu.newrelic.com/v2/system_configuration.json' \ | ||
| -H "X-Api-Key:${{ secrets.NEW_RELIC_API_KEY_PRODUCTION }}" -i \ | ||
| -H "$CONTENT_TYPE" | grep -o "\"key\":\"java_agent_version\",\"value\":\"[0-9.]*\"" | cut -d'"' -f8 >> $GITHUB_STEP_SUMMARY |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # This workflow automates the process of identifying potential security vulnerabilities | ||
| # in the agent's dependencies using Snyk. Vulnerability scans will be run on a | ||
| # weekly schedule, but can also be triggered manually. | ||
| name: Snyk Vulnerability Scan | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| schedule: | ||
| - cron: '00 15 * * 1' | ||
|
|
||
| jobs: | ||
| security: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout Java Agent | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| ref: 'main' | ||
|
|
||
| - name: Set gradle.properties Workaround | ||
| shell: bash | ||
| run: | | ||
| echo "jdk8=/tmp" >> gradle.properties | ||
| echo "jdk11=/tmp" >> gradle.properties | ||
| echo "jdk17=/tmp" >> gradle.properties | ||
| - name: Run Snyk to check for vulnerabilities | ||
| uses: snyk/actions/gradle@master | ||
| env: | ||
| SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} | ||
| with: | ||
| command: monitor | ||
| args: --all-sub-projects --org=java-agent --debug --configuration-matching='(includeInJar)|(shadowIntoJar)' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.