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

fix(sysdig): set filter being compatible with chisel api #2118

Merged
merged 4 commits into from
Jul 18, 2024
Merged

fix(sysdig): set filter being compatible with chisel api #2118

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1312e9c
fix(sysdig): set filter being compatible with chisel api
therealbobo Jul 17, 2024
f3bf1c2
fix(ci): force usage of node 16
therealbobo Jul 18, 2024
9d4f2da
fix(cmake/modules): use zlib from falcosecurity until next libs release
therealbobo Jul 18, 2024
3290b06
fix(cmake/modules): use yaml-cpp from falcosecurity until next libs r…
therealbobo Jul 18, 2024
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
- name: Get new skeleton builder image tag
id: get-new-skeleton-builder
if: steps.builder-files.outputs.any_changed == 'true'
run: |

Check failure on line 54 in .github/workflows/ci.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:1:197: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/ci.yaml:54:9: shellcheck reported issue in this script: SC2086:info:1:197: Double quote to prevent globbing and word splitting [shellcheck]
echo "name=skeleton_builder_image::${{ (github.event.pull_request.number != '') && format('{0}:{1}', env.SKEL_BUILDER_IMAGE_BASE, github.event.pull_request.number) || env.SKEL_BUILDER_DEV }}" >> $GITHUB_OUTPUT

- name: Get new builder image tag
id: get-new-builder
if: steps.builder-files.outputs.any_changed == 'true'
run: |

Check failure on line 60 in .github/workflows/ci.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:1:178: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/ci.yaml:60:9: shellcheck reported issue in this script: SC2086:info:1:178: Double quote to prevent globbing and word splitting [shellcheck]
echo "name=builder_image::${{ (github.event.pull_request.number != '') && format('{0}:{1}', env.BUILDER_IMAGE_BASE, github.event.pull_request.number) || env.BUILDER_DEV }}" >> $GITHUB_OUTPUT

- name: Build new skeleton builder
Expand Down Expand Up @@ -116,6 +116,8 @@
runs-on: ubuntu-latest
container:
image: ${{ needs.builder.outputs.builder_image }}
env:
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
steps:
- name: Checkout Sysdig
uses: actions/checkout@v3
Expand Down Expand Up @@ -163,6 +165,7 @@
SKEL_BUILDER_IMAGE_BASE: ghcr.io/draios/sysdig-skel-builder-pr
BUILDER_DEV: ghcr.io/draios/sysdig-builder:dev
SKEL_BUILDER_DEV: ghcr.io/draios/sysdig-skel-builder:dev
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
runs-on: ubuntu-latest
steps:
- name: Checkout Sysdig
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release-draft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
runs-on: ubuntu-latest
env:
BUILD_VERSION: ${{ github.ref_name }}
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
container:
image: ghcr.io/draios/sysdig-builder:dev
steps:
Expand Down Expand Up @@ -71,6 +72,7 @@
env:
REGISTRY: ghcr.io
BUILD_VERSION: ${{ github.ref_name }}
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
steps:
- name: Checkout Sysdig
uses: actions/checkout@v3
Expand Down Expand Up @@ -239,9 +241,9 @@
PRIVATE_KEY: ${{ secrets.SYSDIG_REPO_SIGNING_KEY }}
run: printenv PRIVATE_KEY | gpg --import -
- name: Sign RPMs
run: rpm --define "_gpg_name ${{ env.KEY_ID }}" --define "_binary_filedigest_algorithm 8" --addsign *.rpm

Check failure on line 244 in .github/workflows/release-draft.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2035:info:1:96: Use ./*glob* or -- *glob* so names with dashes won't become options [shellcheck]

Raw Output:
.github/workflows/release-draft.yaml:244:9: shellcheck reported issue in this script: SC2035:info:1:96: Use ./*glob* or -- *glob* so names with dashes won't become options [shellcheck]
- name: Check signature
run: test "$(rpm -qpi *.rpm | awk '/Signature/' | grep -i none | wc -l)" -eq 0

Check failure on line 246 in .github/workflows/release-draft.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2035:info:1:18: Use ./*glob* or -- *glob* so names with dashes won't become options [shellcheck]

Raw Output:
.github/workflows/release-draft.yaml:246:9: shellcheck reported issue in this script: SC2035:info:1:18: Use ./*glob* or -- *glob* so names with dashes won't become options [shellcheck]

Check failure on line 246 in .github/workflows/release-draft.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2126:style:1:46: Consider using 'grep -c' instead of 'grep|wc -l' [shellcheck]

Raw Output:
.github/workflows/release-draft.yaml:246:9: shellcheck reported issue in this script: SC2126:style:1:46: Consider using 'grep -c' instead of 'grep|wc -l' [shellcheck]
- name: Upload Signed RPMs
uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -276,9 +278,9 @@
PRIVATE_KEY: ${{ secrets.SYSDIG_REPO_SIGNING_KEY }}
run: printenv PRIVATE_KEY | gpg --import -
- name: Sign DEBs
run: dpkg-sig -k ${{ env.KEY_ID }} -s builder *.deb

Check failure on line 281 in .github/workflows/release-draft.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2035:info:1:42: Use ./*glob* or -- *glob* so names with dashes won't become options [shellcheck]

Raw Output:
.github/workflows/release-draft.yaml:281:9: shellcheck reported issue in this script: SC2035:info:1:42: Use ./*glob* or -- *glob* so names with dashes won't become options [shellcheck]
- name: Check signature
run: dpkg-sig --verify *.deb

Check failure on line 283 in .github/workflows/release-draft.yaml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2035:info:1:19: Use ./*glob* or -- *glob* so names with dashes won't become options [shellcheck]

Raw Output:
.github/workflows/release-draft.yaml:283:9: shellcheck reported issue in this script: SC2035:info:1:19: Use ./*glob* or -- *glob* so names with dashes won't become options [shellcheck]
- name: Upload Signed DEBs
uses: actions/upload-artifact@v3
with:
Expand Down
3 changes: 1 addition & 2 deletions userspace/sysdig/sysdig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1913,8 +1913,7 @@ sysdig_init_res sysdig_init(int argc, char **argv)
{
try
{
sinsp_filter_compiler compiler(filter_factory, filter);
inspector->set_filter(compiler.compile());
inspector->set_filter(filter);
}
catch (sinsp_exception& e)
{
Expand Down
Loading