Skip to content

feat(apisix-standalone): optional sync put request #298

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

Merged
merged 2 commits into from
Jul 15, 2025
Merged

feat(apisix-standalone): optional sync put request #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c10d3b
feat(apisix-standalone): optional sync put request
bzp2010 Jul 15, 2025
fd7e1fb
test: apisix 3.13.0
bzp2010 Jul 15, 2025
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
2 changes: 2 additions & 0 deletions .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
- 3.10.0
- 3.11.0
- 3.12.0
- 3.13.0
env:
BACKEND_APISIX_VERSION: ${{ matrix.version }}
BACKEND_APISIX_IMAGE: ${{ matrix.version }}-debian
Expand Down Expand Up @@ -56,6 +57,7 @@ jobs:
strategy:
matrix:
version:
- 3.13.0
- dev # test on latest release
#env:
# BACKEND_APISIX_VERSION: ${{ matrix.version }}
Expand Down
83 changes: 46 additions & 37 deletions libs/backend-apisix-standalone/src/operator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
type Subject,
catchError,
from,
iif,
map,
of,
switchMap,
Expand Down Expand Up @@ -177,44 +178,52 @@ export class Operator extends ADCSDK.backend.BackendEventSource {
});
}),
switchMap(() =>
from(this.client.put('/apisix/admin/configs', newConfig)).pipe(
tap((resp) => logger(this.debugLogEvent(resp))),
map<AxiosResponse, ADCSDK.BackendSyncResult>(
(response) =>
({
success: true,
event: {} as ADCSDK.Event, // keep empty
axiosResponse: response,
}) satisfies ADCSDK.BackendSyncResult,
),
catchError<
ADCSDK.BackendSyncResult,
ObservableInput<ADCSDK.BackendSyncResult>
>((error: Error | AxiosError) => {
if (opts.exitOnFailure) {
if (axios.isAxiosError(error) && error.response)
return throwError(
() =>
new Error(
error.response?.data?.error_msg ??
JSON.stringify(error.response?.data),
),
);
return throwError(() => error);
}
return of({
success: false,
event: {} as ADCSDK.Event, // keep empty,
error,
...(axios.isAxiosError(error) && {
axiosResponse: error.response,
...(error.response?.data?.error_msg && {
error: new Error(error.response.data.error_msg),
iif(
() => events.length > 0,
from(this.client.put('/apisix/admin/configs', newConfig)).pipe(
tap((resp) => logger(this.debugLogEvent(resp))),
map<AxiosResponse, ADCSDK.BackendSyncResult>(
(response) =>
({
success: true,
event: {} as ADCSDK.Event, // keep empty
axiosResponse: response,
}) satisfies ADCSDK.BackendSyncResult,
),
catchError<
ADCSDK.BackendSyncResult,
ObservableInput<ADCSDK.BackendSyncResult>
>((error: Error | AxiosError) => {
if (opts.exitOnFailure) {
if (axios.isAxiosError(error) && error.response)
return throwError(
() =>
new Error(
error.response?.data?.error_msg ??
JSON.stringify(error.response?.data),
),
);
return throwError(() => error);
}
return of({
success: false,
event: {} as ADCSDK.Event, // keep empty,
error,
...(axios.isAxiosError(error) && {
axiosResponse: error.response,
...(error.response?.data?.error_msg && {
error: new Error(error.response.data.error_msg),
}),
}),
}),
} satisfies ADCSDK.BackendSyncResult);
}),
tap(() => logger(taskStateEvent('TASK_DONE'))),
} satisfies ADCSDK.BackendSyncResult);
}),
tap(() => logger(taskStateEvent('TASK_DONE'))),
),
of<ADCSDK.BackendSyncResult>({
success: true,
event: {} as ADCSDK.Event, // keep empty
axiosResponse: null,
} satisfies ADCSDK.BackendSyncResult),
),
),
);
Expand Down