Skip to content

APPSEC-61588 - SDS scans returned in SDK response by AI Guard [system-tests]#6445

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 14 commits intomainfrom
oceane.bordeau/test-sds-attach-sdk-response
Mar 19, 2026
Merged

APPSEC-61588 - SDS scans returned in SDK response by AI Guard [system-tests]#6445
gh-worker-dd-mergequeue-cf854d[bot] merged 14 commits intomainfrom
oceane.bordeau/test-sds-attach-sdk-response

Conversation

@obordeau
Copy link
Copy Markdown
Contributor

@obordeau obordeau commented Mar 6, 2026 •
edited by atlassian bot
Loading

Motivation

Test that AI Guard return SDS tags in SDK response from evaluator API response.

APPSEC-61588

Changes

Adds Test_SDS_Findings_In_SDK_Response
Update weblogs for Python and Ruby to add SDS in the Abort Error and SDK Response

Workflow

  1. ⚠️ Create your PR as draft ⚠️
  2. Work on you PR until the CI passes
  3. Mark it as ready for review
    • Test logic is modified? -> Get a review from RFC owner.
    • Framework is modified, or non obvious usage of it -> get a review from R&P team

🚀 Once your PR is reviewed and the CI green, you can merge it!

🛟 #apm-shared-testing 🛟

Reviewer checklist

  • Anything but tests/ or manifests/ is modified ? I have the approval from R&P team
  • A docker base image is modified?
    • the relevant build-XXX-image label is present
  • A scenario is added, removed or renamed?

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Mar 6, 2026

CODEOWNERS have been resolved as:

manifests/cpp_httpd.yml                                                 @DataDog/dd-trace-cpp
manifests/cpp_nginx.yml                                                 @DataDog/dd-trace-cpp
manifests/dotnet.yml                                                    @DataDog/apm-dotnet @DataDog/asm-dotnet
manifests/golang.yml                                                    @DataDog/dd-trace-go-guild
manifests/java.yml                                                      @DataDog/asm-java @DataDog/apm-java
manifests/nodejs.yml                                                    @DataDog/dd-trace-js
manifests/php.yml                                                       @DataDog/apm-php @DataDog/asm-php
manifests/python.yml                                                    @DataDog/apm-python @DataDog/asm-python
manifests/ruby.yml                                                      @DataDog/ruby-guild @DataDog/asm-ruby
tests/ai_guard/test_ai_guard_sdk.py                                     @DataDog/k9-ai-guard @DataDog/system-tests-core
utils/build/docker/python/flask/app.py                                  @DataDog/apm-python @DataDog/asm-python @DataDog/system-tests-core
utils/build/docker/ruby/rails52/app/controllers/ai_guard_controller.rb  @DataDog/ruby-guild @DataDog/asm-ruby @DataDog/system-tests-core
utils/build/docker/ruby/rails61/app/controllers/ai_guard_controller.rb  @DataDog/ruby-guild @DataDog/asm-ruby @DataDog/system-tests-core
utils/build/docker/ruby/rails72/app/controllers/ai_guard_controller.rb  @DataDog/ruby-guild @DataDog/asm-ruby @DataDog/system-tests-core
utils/build/docker/ruby/rails80/app/controllers/ai_guard_controller.rb  @DataDog/ruby-guild @DataDog/asm-ruby @DataDog/system-tests-core

@obordeau obordeau changed the title Oceane.bordeau/test sds attach sdk response APPSEC-61588 - SDS scans returned in SDK response by AI Guard [system-tests] Mar 6, 2026
@datadog-datadog-prod-us1
Copy link
Copy Markdown

datadog-datadog-prod-us1 bot commented Mar 6, 2026 •
edited
Loading

✅ Tests

🎉 All green!

❄️ No new flaky tests detected
🧪 All tests passed

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 1bfd813 | Docs | Datadog PR Page | Was this helpful? React with 👍/👎 or give us feedback!

@smola @claude
fix(ai-guard) guard ruby controller against missing sds attribute
e6a5c4e 
Use respond_to?(:sds) to conditionally include sds in the response,
preventing NoMethodError when the SDK version doesn't support it yet.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@smola smola mentioned this pull request Mar 9, 2026
Merged
This was referenced Mar 12, 2026
Merged
Merged
gh-worker-dd-mergequeue-cf854d bot pushed a commit to DataDog/dd-trace-py that referenced this pull request Mar 12, 2026
@obordeau @avara1986
feat(aiguard): return SDS findings in SDK AI Guard response (#16788)
f51862a 
## Description
AI Guard return SDS tags in SDK response from evaluator API response.

[APPSEC-61590](https://datadoghq.atlassian.net/browse/APPSEC-61590)

<!-- Provide an overview of the change and motivation for the change -->

## Testing
System tests passed locally: DataDog/system-tests#6445

<!-- Describe your testing strategy or note what tests are included -->

## Risks

<!-- Note any risks associated with this change, or "None" if no risks -->

## Additional Notes

<!-- Any other information that would be helpful for reviewers -->


Co-authored-by: alberto.vara <alberto.vara@datadoghq.com>
@obordeau obordeau marked this pull request as ready for review March 18, 2026 16:24
@obordeau obordeau requested review from a team as code owners March 18, 2026 16:24
@obordeau obordeau requested review from a team as code owners March 18, 2026 16:24
@obordeau obordeau requested review from amarziali, claponcet, dubloom, emmettbutler, jandro996 and tabgok and removed request for a team March 18, 2026 16:24
CarlesDD
CarlesDD approved these changes Mar 18, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@CarlesDD CarlesDD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM from a Node.js perspective

@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d bot merged commit 8f9d899 into main Mar 19, 2026
1308 of 1310 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d bot deleted the oceane.bordeau/test-sds-attach-sdk-response branch March 19, 2026 09:13
mabdinur pushed a commit to DataDog/dd-trace-py that referenced this pull request Mar 23, 2026
@obordeau @avara1986 @mabdinur
feat(aiguard): return SDS findings in SDK AI Guard response (#16788)
8b7753b 
## Description
AI Guard return SDS tags in SDK response from evaluator API response.

[APPSEC-61590](https://datadoghq.atlassian.net/browse/APPSEC-61590)

<!-- Provide an overview of the change and motivation for the change -->

## Testing
System tests passed locally: DataDog/system-tests#6445

<!-- Describe your testing strategy or note what tests are included -->

## Risks

<!-- Note any risks associated with this change, or "None" if no risks -->

## Additional Notes

<!-- Any other information that would be helpful for reviewers -->


Co-authored-by: alberto.vara <alberto.vara@datadoghq.com>
@cbeauchesne cbeauchesne mentioned this pull request Mar 23, 2026
Merged
5 tasks
annacai21 pushed a commit that referenced this pull request Mar 24, 2026
@obordeau @smola @annacai21
APPSEC-61588 - SDS scans returned in SDK response by AI Guard [system…
0767d74 
…-tests] (#6445)

Co-authored-by: smola <santiago.mola@datadoghq.com>
Co-authored-by: oceane.bordeau <oceane.bordeau@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@smola smola smola approved these changes

@cbeauchesne cbeauchesne cbeauchesne approved these changes

@CarlesDD CarlesDD CarlesDD approved these changes

@emmettbutler emmettbutler Awaiting requested review from emmettbutler emmettbutler is a code owner automatically assigned from DataDog/apm-python

@tabgok tabgok Awaiting requested review from tabgok tabgok is a code owner automatically assigned from DataDog/apm-python

@jandro996 jandro996 Awaiting requested review from jandro996 jandro996 is a code owner automatically assigned from DataDog/asm-java

@claponcet claponcet Awaiting requested review from claponcet claponcet is a code owner automatically assigned from DataDog/asm-java

@amarziali amarziali Awaiting requested review from amarziali amarziali is a code owner automatically assigned from DataDog/apm-java

@dubloom dubloom Awaiting requested review from dubloom dubloom is a code owner automatically assigned from DataDog/dd-trace-cpp

Assignees

No one assigned

Labels

mergequeue-status: done

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@obordeau @smola @cbeauchesne @CarlesDD