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

fix(plugin): cleanup and fix error handling #12912

Merged
merged 2 commits into from
May 8, 2024
Merged

fix(plugin): cleanup and fix error handling #12912

merged 2 commits into from
May 8, 2024

Conversation

Tieske
Copy link
Member

@Tieske Tieske commented Apr 23, 2024

Summary

the changelog is omitted, can go with the same entry as #12907

Checklist

  • 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

@github-actions github-actions bot added cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee plugins/ai-prompt-template labels Apr 23, 2024
@Tieske Tieske changed the title fix(plugin): ai-template must be "template" fix(plugin): cleanup and fix error handling Apr 24, 2024
@Tieske Tieske marked this pull request as ready for review April 25, 2024 08:17
@Tieske Tieske requested a review from tysoekong April 25, 2024 08:17
@Tieske Tieske added this to the 3.7.0 milestone May 1, 2024
Copy link
Member

@samugi samugi left a comment

Choose a reason for hiding this comment

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

minor comments only

kong/plugins/ai-prompt-template/handler.lua Outdated Show resolved Hide resolved
kong/plugins/ai-prompt-template/handler.lua Outdated Show resolved Hide resolved
kong/plugins/ai-prompt-template/handler.lua Outdated Show resolved Hide resolved
kong/plugins/ai-prompt-template/templater.lua Outdated Show resolved Hide resolved
kong/plugins/ai-prompt-template/templater.lua Show resolved Hide resolved
@Tieske Tieske force-pushed the template-engine branch from 5d5cb9d to 2ccd176 Compare May 8, 2024 08:13
@Tieske Tieske force-pushed the template-engine branch from 2ccd176 to 41246de Compare May 8, 2024 08:16
@kikito kikito merged commit 0b1705e into master May 8, 2024
25 checks passed
@kikito kikito deleted the template-engine branch May 8, 2024 10:38
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-12912-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-12912-to-master-to-upstream
git checkout -b cherry-pick-12912-to-master-to-upstream
ancref=$(git merge-base 36f13057244b3d6183610d6bbf92e3a98804264e 41246de744b85a70b4ff9d854e39a2c4039a965b)
git cherry-pick -x $ancref..41246de744b85a70b4ff9d854e39a2c4039a965b

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label May 8, 2024
github-actions bot pushed a commit that referenced this pull request May 8, 2024
* chore(ai-prompt-template): cleanup code improve error handling

* review comments

(cherry picked from commit 0b1705e)
@team-gateway-bot
Copy link
Collaborator

Successfully created backport PR for release/3.7.x:

@kikito kikito removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label May 8, 2024
samugi pushed a commit that referenced this pull request May 8, 2024
* chore(ai-prompt-template): cleanup code improve error handling

* review comments

(cherry picked from commit 0b1705e)
locao pushed a commit that referenced this pull request Jun 21, 2024
* chore(ai-prompt-template): cleanup code improve error handling

* review comments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants