Skip to content

refactor: handle ADC output last line #186

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 3 commits into from
Jun 26, 2025
Merged

refactor: handle ADC output last line #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b95ade
fix: improve handling of ADC output for better logging and parsing
dspo Jun 26, 2025
1ebf35d
fix:
dspo Jun 26, 2025
d435d7c
fix: disable fail-fast in apisix-e2e-test configuration
dspo Jun 26, 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
1 change: 1 addition & 0 deletions .github/workflows/apisix-e2e-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
provider_type:
- apisix-standalone
- apisix
fail-fast: false
runs-on: buildjet-2vcpu-ubuntu-2204
steps:
- name: Checkout
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,6 @@ jobs:
shell: bash
env:
API7_EE_LICENSE: ${{ secrets.API7_EE_LICENSE }}
PROVIDER_TYPE: api7ee
run: |
make e2e-test
6 changes: 3 additions & 3 deletions internal/provider/adc/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ func (e *DefaultADCExecutor) buildCmdError(runErr error, stdout, stderr []byte)

func (e *DefaultADCExecutor) handleOutput(output []byte) error {
var result adctypes.SyncResult
if index := strings.IndexByte(string(output), '{'); index > 0 {
log.Warnf("extra output: %s", string(output[:index]))
output = output[index:]
log.Debugf("adc output: %s", string(output))
if lines := bytes.Split(output, []byte{'\n'}); len(lines) > 0 {
output = lines[len(lines)-1]
}
if err := json.Unmarshal(output, &result); err != nil {
log.Errorw("failed to unmarshal adc output",
Expand Down
Loading