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

Jump to bottom

feat(build): incorporate wasm filters into bazel build #12853

Merged
merged 8 commits into from
Apr 19, 2024
Merged

feat(build): incorporate wasm filters into bazel build #12853

merged 8 commits into from
Apr 19, 2024

Conversation

curiositycasualty
Copy link
Contributor

@curiositycasualty curiositycasualty commented Apr 11, 2024 •
edited by jira bot
Loading

Summary

The changes in this PR cause the defined wasm filters to be downloaded from github and packaged with Kong.

Checklist

  • [na] The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

Fix #KAG-4210

@github-actions github-actions bot added build/bazel cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Apr 11, 2024
@curiositycasualty curiositycasualty force-pushed the build/add-bazel-datakit-filter branch from 3fb85fe to 8773d3e Compare April 11, 2024 19:55
@curiositycasualty
Copy link
Contributor Author

Validated that this produced a package w/ the filters in /usr/local/kong/include/filters as requested:
CleanShot 2024-04-11 at 13 31 03

@curiositycasualty curiositycasualty force-pushed the build/add-bazel-datakit-filter branch from 5668cf8 to 1e7ad28 Compare April 11, 2024 20:33
@curiositycasualty curiositycasualty marked this pull request as ready for review April 11, 2024 20:33
@curiositycasualty curiositycasualty changed the title [KAG-4210] Incorporate wasm filters into bazel build (WIP) [KAG-4210] Incorporate wasm filters into bazel build Apr 11, 2024
@curiositycasualty curiositycasualty added the core/wasm Everything relevant to [proxy-]wasm label Apr 11, 2024
flrgh
flrgh reviewed Apr 11, 2024
View reviewed changes
build/BUILD.bazel Outdated Show resolved Hide resolved
@curiositycasualty curiositycasualty force-pushed the build/add-bazel-datakit-filter branch 2 times, most recently from 457a32d to 2d5900f Compare April 15, 2024 18:29
@flrgh flrgh mentioned this pull request Apr 15, 2024
Merged
@flrgh
Copy link
Contributor

flrgh commented Apr 15, 2024

update: here's the first datakit release

https://github.com/Kong/datakit-filter/releases/tag/0.1.0

filenames: datakit.wasm and datakit.meta.json

@flrgh flrgh requested a review from hishamhm April 15, 2024 22:44
@flrgh flrgh added this to the 3.7.0 milestone Apr 15, 2024
@curiositycasualty
Copy link
Contributor Author

(22:36:00) INFO: From Action build/kong-dev.nop:
mkdir: created directory '/home/runner/work/kong/kong/bazel-bin/build/kong-dev/kong/filters'
'external/datakit.meta.json/file/downloaded' -> '/home/runner/work/kong/kong/bazel-bin/build/kong-dev/kong/filters/datakit.meta.json'
'external/datakit.wasm/file/downloaded' -> '/home/runner/work/kong/kong/bazel-bin/build/kong-dev/kong/filters/datakit.wasm'

@flrgh flrgh mentioned this pull request Apr 16, 2024
Merged
3 tasks
@flrgh flrgh requested a review from locao April 16, 2024 17:08
@hishamhm
Copy link
Contributor

The latest revision of this is installing to /usr/local/kong/filters, right?

@curiositycasualty curiositycasualty force-pushed the build/add-bazel-datakit-filter branch from ebc42b3 to 438de19 Compare April 18, 2024 19:09
@curiositycasualty
Copy link
Contributor Author

Added @fffonion 's suggestion and rebased.

@hishamhm
Copy link
Contributor

@curiositycasualty sorry for the late bikeshed change, but we'll be going with /usr/local/kong/wasm for the location of wasm assets (@flrgh is already on board for the equivalent change at #12843). Apart from that small tweak, it's a +1 from me. 👍

@curiositycasualty curiositycasualty force-pushed the build/add-bazel-datakit-filter branch from 438de19 to 867e1c5 Compare April 19, 2024 19:04
@curiositycasualty
Copy link
Contributor Author

Swapped the path @hishamhm

hishamhm
hishamhm approved these changes Apr 19, 2024
View reviewed changes
Copy link
Contributor

@hishamhm hishamhm left a comment

Choose a reason for hiding this comment

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

lgtm! 👍 (as far as my weak understanding of bazel goes :) )

@flrgh flrgh merged commit 6531037 into master Apr 19, 2024
25 checks passed
@flrgh flrgh deleted the build/add-bazel-datakit-filter branch April 19, 2024 20:07
@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Apr 19, 2024
locao pushed a commit that referenced this pull request Apr 24, 2024
@flrgh @curiositycasualty
feat(bazel): incorporate wasm filters into bazel build [KAG-4210] (#1…
aee3845 
…2853) (#8917)

* feat(bazel): add wasm filters to build

* fix(bazel): mv wasm filters to kong/filters



* fix(bazel): filter file renaming



* chore(wasm): response_transofmrer filter 0.1.2

* fix(bazel): filter typo

* feat(wasm): swap to datakit filter

* fix(bazel): rename wasm filters repo

* fix(bazel): mv wasm filters to kong/wasm

---------

Co-authored-by: Isa Farnik <isa@konghq.com>
@locao locao changed the title [KAG-4210] Incorporate wasm filters into bazel build feat(build): incorporate wasm filters into bazel build Apr 26, 2024
@kikito kikito removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Apr 30, 2024
@Kong Kong deleted a comment from team-gateway-bot Apr 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flrgh flrgh flrgh approved these changes

@hishamhm hishamhm hishamhm approved these changes

@locao locao Awaiting requested review from locao

@fffonion fffonion Awaiting requested review from fffonion

Assignees

@curiositycasualty curiositycasualty

Labels
build/bazel cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee core/wasm Everything relevant to [proxy-]wasm size/M
Projects
None yet
Milestone
3.7.0
Development

Successfully merging this pull request may close these issues.
5 participants
@curiositycasualty @flrgh @hishamhm @fffonion @kikito