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.

Sign up for GitHub

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

Merge software definitions for integration installation for py2 and py3 #21041

Merged
merged 1 commit into from
Nov 29, 2023
+527 −986
Merged

Merge software definitions for integration installation for py2 and py3 #21041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions omnibus/config/patches/datadog-agent-integrations-py3/remove-maxfile-maxpath-psutil.patch
View file
Open in desktop

This file was deleted.

0 ...rations-py2/create-regex-at-runtime.patch → ...ntegrations/create-regex-at-runtime.patch
View file
Open in desktop
File renamed without changes.
0 ...s-py2/remove-maxfile-maxpath-psutil.patch → ...tions/remove-maxfile-maxpath-psutil.patch
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions omnibus/config/projects/agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,13 @@

if with_python_runtime? "2"
dependency 'pylint2'
dependency 'datadog-agent-integrations-py2'
end

if with_python_runtime? "3"
dependency 'datadog-agent-integrations-py3'
if with_python_runtime? "3" or with_python_runtime? "2"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a case where the overall condition is false?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Don't we have Python-less Agent builds? e.g. iot builds.

Copy link
Contributor

Choose a reason for hiding this comment

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

Indeed, but this flavor is in the iot-agent project so it should not be an issue for this file

That being said this was mostly a nit/check and definitely not a blocking comment

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In practice it doesn't make a big difference, since this condition is also checked in the loop inside datadog-agent-integrations.rb, so if any of these conditions are actually not met, that definition would run but do pretty much nothing. At any rate, this came to be as a straightforward attempt to maintain the semantics of the original bit of code it replaces.

dependency 'datadog-agent-integrations'
end


if linux_target?
dependency 'datadog-security-agent-policies'
end
Expand Down
Loading