Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ddtrace/tracer: removed appsec.enabled assertion in RC test #2562

Merged
merged 1 commit into from
Feb 15, 2024

Conversation

dianashevchenko
Copy link
Contributor

What does this PR do?

Remove faulty appsec.Enabled() assertion in RC tests, which always fails on windows machines.

Motivation

Reviewer's Checklist

  • Changed code has unit tests for its functionality at or near 100% coverage.
  • System-Tests covering this feature have been added and enabled with the va.b.c-dev version tag.
  • There is a benchmark for any new code, or changes to existing code.
  • If this interacts with the agent in a new way, a system test has been added.
  • Add an appropriate team label so this PR gets put in the right place for the release notes.
  • Non-trivial go.mod changes, e.g. adding new modules, are reviewed by @DataDog/dd-trace-go-guild.

For Datadog employees:

  • If this PR touches code that handles credentials of any kind, such as Datadog API keys, 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!

@dianashevchenko dianashevchenko requested a review from a team as a code owner February 15, 2024 10:36
@dianashevchenko dianashevchenko merged commit c86c219 into main Feb 15, 2024
336 of 338 checks passed
@dianashevchenko dianashevchenko deleted the shevchenko/remove-appsec-check branch February 15, 2024 10:44
@@ -8,10 +8,10 @@ require (
)

require (
github.com/DataDog/appsec-internal-go v1.4.0 // indirect
github.com/DataDog/go-libddwaf/v2 v2.2.3 // indirect
github.com/DataDog/appsec-internal-go v1.4.1 // indirect
Copy link
Member

@felixge felixge Feb 20, 2024

Choose a reason for hiding this comment

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

Why was this change made as part of this PR? Was it needed? I'm asking because I need to decide whether to backport this change into my v1.61.0 release branch to get the CI checks to pass.

If this change was not needed, maybe you could approve this PR? 🙇

Copy link
Member

Choose a reason for hiding this comment

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

Update: I made a mistake while looking at this. I thought it was the main go.mod file, not the internal/apps/go.mod file. So this change doesn't matter, and I didn't need to revert it in #2567.

It's all good, but sorry for the noise.

felixge added a commit that referenced this pull request Feb 20, 2024
…C test (#2562)"

This reverts the go.mod and go.sum changes in commit
850fbde.
felixge added a commit that referenced this pull request Feb 20, 2024
… RC test (#2562) (#2567)

Co-authored-by: Diana Shevchenko <40775148+dianashevchenko@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants