Migrate e2e admin-API curl calls to swctl admin commands#13889
Merged
Conversation
Replace raw curl interactions with the OAP admin-server REST host (port 17128) across the e2e suite with the new 'swctl admin ...' command tree (skywalking-cli #228, commit b447211): - runtime-rule flows (mal/lal/cluster) -> swctl admin runtime-rule ... - dsl-debug flows (oal/mal/lal-block/lal-statement) -> swctl admin dsl-debug ... - ui-management -> swctl admin ui-template ... - storage inspect/config(dump,ttl) -> swctl admin inspect|config ... --display json/yaml keeps response bodies parseable by the existing jq/yq assertions; runtime-rule negative paths assert the CLI's typed error envelope (HTTP <code> (<applyStatus>)). config-dump.yml is regenerated as the JSON string-map that 'admin config dump' returns. Bumps SW_CTL_COMMIT to the admin-capable commit. Non-admin curls (BanyanDB probe, self-telemetry, alarm webhook) are intentionally kept.
wu-sheng
added
the
test
…ctl install) - inspect cases: the CLI marshals typed structs through yaml.v2 (json tags ignored -> lowercased keys scopeid/entityid/mqeentity), which would not match the existing fixtures (scopeId/entityId/mqeEntity). Use '--display json | yq -P' so the json tags are honored and the fixtures stay unchanged. - runtime-rule/cluster and ui-management/banyandb setups now install swctl: both cases newly depend on it (the flows/cases no longer use curl), but their setup only installed jq / yq, so a clean e2e shell would hit 'swctl: command not found'.
wankai123
approved these changes
Jun 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replace raw
curlinteractions with the OAP admin-server REST host (port 17128)across the e2e suite with the new
swctl admin ...command tree(skywalking-cli #228, commit
b447211):swctl admin runtime-rule ...swctl admin dsl-debug ...swctl admin ui-template ...swctl admin inspect|config ...--display json/yamlkeeps response bodies parseable by the existing jq/yqassertions, so the assertions are unchanged for pass-through endpoints. The
runtime-rule negative paths assert the CLI's typed error envelope
(
HTTP <code> (<applyStatus>)) instead ofcurl -w '%{http_code}'.config-dump.ymlis regenerated as the JSON string-map thatadmin config dumpreturns under
Accept: application/json.SW_CTL_COMMITis bumped to theadmin-capable commit. Non-admin curls (BanyanDB
/api/v1/measure/dataprobe,:1234self-telemetry, alarm webhook) are intentionally kept.CHANGESlog.