Skip to content

fix(apisix-standalone): ensure PUT sent when no diff events #328

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 1 commit into from
Aug 25, 2025
Merged

fix(apisix-standalone): ensure PUT sent when no diff events #328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
112 changes: 52 additions & 60 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,7 +11,6 @@ import {
type Subject,
catchError,
from,
iif,
map,
mergeMap,
of,
Expand Down Expand Up @@ -95,68 +94,61 @@ export class Operator extends ADCSDK.backend.BackendEventSource {
});
}),
switchMap(() =>
iif(
() => events.length > 0,
from(this.opts.serverTokenMap).pipe(
mergeMap(([server, token]) =>
from(
this.opts.client.put(`${server}${ENDPOINT_CONFIG}`, newConfig, {
headers: {
[HEADER_CREDENTIAL]: token,
[HEADER_DIGEST]: createHash('sha1')
.update(JSON.stringify(newConfig))
.digest('hex'),
},
}),
).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(() => {
configCache.set(this.opts.cacheKey, toADC(newConfig));
rawConfigCache.set(this.opts.cacheKey, newConfig);
logger(taskStateEvent('TASK_DONE'));
}),
from(this.opts.serverTokenMap).pipe(
mergeMap(([server, token]) =>
from(
this.opts.client.put(`${server}${ENDPOINT_CONFIG}`, newConfig, {
headers: {
[HEADER_CREDENTIAL]: token,
[HEADER_DIGEST]: createHash('sha1')
.update(JSON.stringify(newConfig))
.digest('hex'),
},
}),
).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(() => {
configCache.set(this.opts.cacheKey, toADC(newConfig));
rawConfigCache.set(this.opts.cacheKey, newConfig);
logger(taskStateEvent('TASK_DONE'));
}),
),
),
of<ADCSDK.BackendSyncResult>({
success: true,
event: {} as ADCSDK.Event, // keep empty
} satisfies ADCSDK.BackendSyncResult),
),
),
);
Expand Down
Loading