Skip to content

Commit

Permalink
Update requirements to latest spec
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewlock
andrewlock committed Sep 16, 2024
1 parent c3134b5 commit eb5bcb0
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 93 deletions.
78 changes: 23 additions & 55 deletions tracer/build/artifacts/requirements.json
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,28 @@
{
"$schema": "https://raw.githubusercontent.com/DataDog/auto_inject/andrew/updated-denylist/preload_go/cmd/library_requirements_tester/testdata/requirements_schema.json?token=GHSAT0AAAAAACODEGPWBCS2GSWOYGRKJOHOZXICK4Q",
"version": 1,
"host": {
"linux": {
"x64": {
"supported": true,
"glibc": {
"supported": true,
"description": "From centOS 7",
"min": "2.17"
},
"musl": {
"supported": true,
"description": "From alpine 2.14",
"min": "1.2.2"
}
},
"arm64": {
"supported": true,
"glibc": {
"supported": true,
"description": "From debian buster (10)",
"min": "2.23"
},
"musl": {
"supported": false
}
},
"x86": {
"supported": false,
"glibc": {
"supported": false
},
"musl": {
"supported": false
}
}
},
"windows": {
"x64": {
"supported": true
},
"x86": {
"supported": false
},
"arm64": {
"supported": false
}
},
"macos": {
"x64": {
"supported": false
},
"arm64": {
"supported": false
}
}
"native_deps": {
"glibc": [{
"arch": "x64",
"supported": true,
"description": "From centOS 7",
"min": "2.17"
},
{
"arch": "arm64",
"supported": true,
"description": "From debian buster (10)",
"min": "2.23"
}],
"musl": [{
"arch": "x64",
"supported": true,
"description": "From alpine 3.14"
},{
"arch": "arm64",
"supported": true,
"description": "From alpine 3.18"
}]
},
"deny": [
{
Expand Down
28 changes: 14 additions & 14 deletions tracer/build/artifacts/requirements_allow.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "amd64", "libc": "glibc:2.17"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "amd64", "libc": "glibc:2.23"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "amd64", "libc": "glibc:3.0"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "amd64", "libc": "musl:1.2.2"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "amd64", "libc": "musl:1.2.7"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "arm64", "libc": "glibc:2.23"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "arm64", "libc": "glibc:2.27"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "run", "myproj.csproj"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "test", "myproj.csproj"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "exec", "/some/path"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "exec", "-flag", "/some/path"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/not-dotnet", "args": ["/pathto/not-dotnet", "build"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "buildme"], "envars": [], "host": {"os": "windows", "arch": "amd64"}}
{"name": "min glibc x64", "filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:2.17"}},
{"name": "ok glibc x64", "filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:2.23"}},
{"name": "high glibc x64", "filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:3.0"}},
{"name": "musl x64", "filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "musl:1.2.2"}},
{"name": "min glibc arm64", "filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "arm64", "libc": "glibc:2.23"}},
{"name": "ok glibc arm64", "filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "arm64", "libc": "glibc:2.27"}},
{"name": "musl arm64", "filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "musl:1.2.2"}},
{"name": "windows", "filepath": "/some/path", "args": [], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet run", "filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "run", "myproj.csproj"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet test", "filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "test", "myproj.csproj"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet exec path", "filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "exec", "/some/path"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet exec flag", "filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "exec", "-flag", "/some/path"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "not-dotnet build", "filepath": "/pathto/not-dotnet", "args": ["/pathto/not-dotnet", "build"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet buildme", "filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "buildme"], "envars": [], "host": {"os": "windows", "arch": "x64"}}
]
44 changes: 20 additions & 24 deletions tracer/build/artifacts/requirements_block.json
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
[
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "amd64", "libc": "glibc:2.16"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "amd64", "libc": "glibc:1.22"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "amd64", "libc": "glibc:2.16.9"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "amd64", "libc": "musl:1.2.1"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "arm64", "libc": "glibc:2.22"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "arm64", "libc": "glibc:2.22.9"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "arm64", "libc": "musl:1.2.2"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "windows", "arch": "386"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "windows", "arch": "arm64"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "darwin", "arch": "amd64"}},
{"filepath": "/some/path", "args": [], "envars": [], "host": {"os": "darwin", "arch": "arm64"}},
{"filepath": "/some/path/to/dotnet-core-uninstall", "args": ["/some/path/to/dotnet-core-uninstall"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"filepath": "/some/path/to/dotnet-core-uninstall", "args": ["/some/path/to/dotnet-core-uninstall", "-a", "--force"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "msbuild", "myproj.csproj"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "nuget", "restore", "myproj.csproj"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "restore", "myproj.csproj"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "build"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "tool", "install", "dd-trace"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "exec","/usr/share/dotnet/sdk/6.0.400/Roslyn/bincore/csc.dll", "/noconfig", "@/tmp/tmp8895f601306443a6a54388ecc6dcfc44.rsp"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "exec", "-framework", "net7.0", "/usr/share/dotnet/sdk/6.0.400/Roslyn/bincore/csc.dll", "/noconfig", "@/tmp/tmp8895f601306443a6a54388ecc6dcfc44.rsp"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "exec", "-framework", "net7.0", "/usr/share/dotnet/sdk/6.0.400/Roslyn/bincore/VBCSCompiler.dll", "/noconfig", "@/tmp/tmp8895f601306443a6a54388ecc6dcfc44.rsp"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dd-dotnet", "args": ["/pathto/dd-dotnet", "run", "myapp"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dd-trace", "args": ["/pathto/dd-trace", "run", "--", "myapp"], "envars": [], "host": {"os": "windows", "arch": "amd64"}},
{"filepath": "/pathto/dd-trace", "args": ["/pathto/dd-trace", "ci", "--", "myapp"], "envars": [], "host": {"os": "windows", "arch": "amd64"}}
{"name": "unsupported 2.x glibc x64","filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:2.16"}},
{"name": "unsupported 1.x glibc x64","filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:1.22"}},
{"name": "unsupported 2.x.x glibc x64","filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:2.16.9"}},
{"name": "unsupported 2.x glibc arm64","filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "arm64", "libc": "glibc:2.22"}},
{"name": "unsupported 2.x.x glibc x64","filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "arm64", "libc": "glibc:2.22.9"}},
{"name": "glibx x86","filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "x86", "libc": "glibc:2.23"}},
{"name": "musl x86","filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "x86", "libc": "musl:1.2.2"}},
{"name": "dotnet-core-uninstall","filepath": "/some/path/to/dotnet-core-uninstall", "args": ["/some/path/to/dotnet-core-uninstall"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet-core-uninstall with flags","filepath": "/some/path/to/dotnet-core-uninstall", "args": ["/some/path/to/dotnet-core-uninstall", "-a", "--force"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet msbuild","filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "msbuild", "myproj.csproj"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet nuget","filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "nuget", "restore", "myproj.csproj"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet restore","filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "restore", "myproj.csproj"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet build","filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "build"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet tool","filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "tool", "install", "dd-trace"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet exec csc.dl","filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "exec","/usr/share/dotnet/sdk/6.0.400/Roslyn/bincore/csc.dll", "/noconfig", "@/tmp/tmp8895f601306443a6a54388ecc6dcfc44.rsp"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet exec flags csc.dl","filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "exec", "-framework", "net7.0", "/usr/share/dotnet/sdk/6.0.400/Roslyn/bincore/csc.dll", "/noconfig", "@/tmp/tmp8895f601306443a6a54388ecc6dcfc44.rsp"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dotnet exec VBCSCompiler.dll","filepath": "/pathto/dotnet", "args": ["/pathto/dotnet", "exec", "-framework", "net7.0", "/usr/share/dotnet/sdk/6.0.400/Roslyn/bincore/VBCSCompiler.dll", "/noconfig", "@/tmp/tmp8895f601306443a6a54388ecc6dcfc44.rsp"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dd-dotnet run myapp","filepath": "/pathto/dd-dotnet", "args": ["/pathto/dd-dotnet", "run", "myapp"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dd-trace run -- myapp","filepath": "/pathto/dd-trace", "args": ["/pathto/dd-trace", "run", "--", "myapp"], "envars": [], "host": {"os": "windows", "arch": "x64"}},
{"name": "dd-trace ci -- myapp","filepath": "/pathto/dd-trace", "args": ["/pathto/dd-trace", "ci", "--", "myapp"], "envars": [], "host": {"os": "windows", "arch": "x64"}}
]

0 comments on commit eb5bcb0

Please sign in to comment.