Skip to content

chore(appsec): migrate test integrations to gitlab#11931

Merged
avara1986 merged 17 commits into
mainfrom
avara1986/APPSEC-56157-migrate_iast_django
Jan 16, 2025
Merged

chore(appsec): migrate test integrations to gitlab#11931
avara1986 merged 17 commits into
mainfrom
avara1986/APPSEC-56157-migrate_iast_django

Conversation

@avara1986

@avara1986 avara1986 commented Jan 14, 2025

Copy link
Copy Markdown
Member

Partial migration of the tests in appsec/integrations/

Checklist

  • PR author has checked that all the criteria below are met
  • The PR description includes an overview of the change
  • The PR description articulates the motivation for the change
  • The change includes tests OR the PR description describes a testing strategy
  • The PR description notes risks associated with the change, if any
  • Newly-added code is easy to change
  • The change follows the library release note guidelines
  • The change includes or references documentation updates if necessary
  • Backport labels are set (if applicable)

Reviewer Checklist

  • Reviewer has checked that all the criteria below are met
  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Newly-added code is easy to change
  • Release note makes sense to a user of the library
  • If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

@avara1986 avara1986 added changelog/no-changelog A changelog entry is not required for this PR. ASM Application Security Monitoring labels Jan 14, 2025
@github-actions

github-actions Bot commented Jan 14, 2025

Copy link
Copy Markdown
Contributor

CODEOWNERS have been resolved as:

.riot/requirements/5e31227.txt                                          @DataDog/apm-python
.riot/requirements/628e8fe.txt                                          @DataDog/apm-python
.riot/requirements/8dd53b1.txt                                          @DataDog/apm-python
.riot/requirements/968fdc9.txt                                          @DataDog/apm-python
tests/appsec/integrations/django_tests/__init__.py                      @DataDog/asm-python
tests/appsec/integrations/flask_tests/__init__.py                       @DataDog/asm-python
.circleci/config.templ.yml                                              @DataDog/python-guild @DataDog/apm-core-python
hatch.toml                                                              @DataDog/python-guild
riotfile.py                                                             @DataDog/apm-python
tests/appsec/app.py                                                     @DataDog/asm-python
tests/appsec/suitespec.yml                                              @DataDog/asm-python
tests/appsec/integrations/flask_tests/module_with_import_errors.py      @DataDog/asm-python
tests/appsec/integrations/flask_tests/test_flask_remoteconfig.py        @DataDog/asm-python
tests/appsec/integrations/flask_tests/test_gunicorn_handlers.py         @DataDog/asm-python
tests/appsec/integrations/flask_tests/test_iast_flask_entrypoint_iast_patches.py  @DataDog/asm-python
tests/appsec/integrations/flask_tests/test_iast_flask_patching.py       @DataDog/asm-python
tests/appsec/integrations/flask_tests/test_iast_flask_telemetry.py      @DataDog/asm-python
tests/appsec/integrations/flask_tests/test_iast_langchain.py            @DataDog/asm-python
tests/appsec/integrations/flask_tests/test_iast_psycopg2.py             @DataDog/asm-python
tests/appsec/integrations/flask_tests/utils.py                          @DataDog/asm-python

@datadog-dd-trace-py-rkomorn

datadog-dd-trace-py-rkomorn Bot commented Jan 14, 2025

Copy link
Copy Markdown

Datadog Report

Branch report: avara1986/APPSEC-56157-migrate_iast_django
Commit report: 0a40b2a
Test service: dd-trace-py

✅ 0 Failed, 130 Passed, 1468 Skipped, 4m 30.26s Total duration (35m 27.96s time saved)

@pr-commenter

pr-commenter Bot commented Jan 14, 2025

Copy link
Copy Markdown

Benchmarks

Benchmark execution time: 2025-01-16 08:59:47

Comparing candidate commit 0a40b2a in PR branch avara1986/APPSEC-56157-migrate_iast_django with baseline commit 87a74ae in branch main.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 380 metrics, 2 unstable metrics.

@avara1986 avara1986 changed the title chore: split flask and pygoat tests chore(appsec): migrate test integrations to gitlab Jan 14, 2025
@avara1986 avara1986 marked this pull request as ready for review January 15, 2025 08:12
@avara1986 avara1986 requested review from a team as code owners January 15, 2025 08:12
@avara1986 avara1986 changed the title chore(appsec): migrate test integrations to gitlab chore(appsec): migrate test integrations to gitlab Jan 15, 2025
@avara1986 avara1986 enabled auto-merge (squash) January 16, 2025 09:15
@avara1986 avara1986 merged commit c46c302 into main Jan 16, 2025
@avara1986 avara1986 deleted the avara1986/APPSEC-56157-migrate_iast_django branch January 16, 2025 09:20
@github-actions

Copy link
Copy Markdown
Contributor

The backport to 2.19 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.19 2.19
# Navigate to the new working tree
cd .worktrees/backport-2.19
# Create a new branch
git switch --create backport-11931-to-2.19
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c46c3028d8b89749b0bc63ea4b2e215d4d75fe8b
# Push it to GitHub
git push --set-upstream origin backport-11931-to-2.19
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.19

Then, create a pull request where the base branch is 2.19 and the compare/head branch is backport-11931-to-2.19.

avara1986 added a commit that referenced this pull request Feb 14, 2025
Partial migration of the tests in `appsec/integrations/`

- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

- [x] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

(cherry picked from commit c46c302)
avara1986 added a commit that referenced this pull request Feb 18, 2025
backports 
#11931 
#12184
#12212
#12320

to 2.19

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met 
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Christophe Papazian <114495376+christophe-papazian@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ASM Application Security Monitoring changelog/no-changelog A changelog entry is not required for this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants