diff --git a/compose.yaml b/compose.yaml index f679b75..46d5d71 100644 --- a/compose.yaml +++ b/compose.yaml @@ -40,6 +40,13 @@ services: MINERU_BASE_URL: "${MINERU_BASE_URL:-}" TEST_INTERNAL_WEKNORA_KB_ID: "${TEST_INTERNAL_WEKNORA_KB_ID:-1b52c140-2e18-4676-afc5-4c7d8d190a8c}" TEST_EXTERNAL_WEKNORA_KB_ID: "${TEST_EXTERNAL_WEKNORA_KB_ID:-fd7db6aa-763a-46f1-84d2-ecc7c952a5ea}" + # 「版本记录」页:**匿名只读**远端仓库的提交与 tag(不使用任何凭据)。 + # 留空 = 未接线(页面降级、同步入口不可用);来源只允许下面批准的 origin 与固定仓库。 + VERSION_HISTORY_GITEA_BASE_URL: "${VERSION_HISTORY_GITEA_BASE_URL:-}" + VERSION_HISTORY_REPO: "${VERSION_HISTORY_REPO:-Weknora/knowledge-governance}" + VERSION_HISTORY_ALLOWED_ORIGINS: "${VERSION_HISTORY_ALLOWED_ORIGINS:-}" + VERSION_HISTORY_HTTP_TIMEOUT: "${VERSION_HISTORY_HTTP_TIMEOUT:-15s}" + VERSION_HISTORY_MAX_PAGES: "${VERSION_HISTORY_MAX_PAGES:-200}" # P10 readiness probe reads the routing KB with the same scoped key. TEST_WEKNORA_API_KEY_FILE: /run/secrets/test_weknora_api_key TEST_WEKNORA_ALLOW_DOCKER_HTTP: "${TEST_WEKNORA_ALLOW_DOCKER_HTTP:-false}" diff --git a/internal/governance/version_history.go b/internal/governance/version_history.go index 524e9f4..bd16332 100644 --- a/internal/governance/version_history.go +++ b/internal/governance/version_history.go @@ -34,6 +34,9 @@ const ( ReasonNoBaseline = "no_baseline" // ReasonIncompleteGraph:提交图不完整(检出被截断)⇒ 提交数算不准 ⇒ 宁可不给号。 ReasonIncompleteGraph = "shallow_or_incomplete_graph" + // ReasonTagCreatedLater:该版本号对应的 tag 是在**更晚的提交**上打的(不在这个提交的历史里) + // ⇒ 这个提交当时还没有发布基线,不能拿"后来才有的 tag"给它编号。 + ReasonTagCreatedLater = "release_tag_created_later" ) // versionHistorySemver 只认三段十进制、无前导零(与 scripts/check_changelog.py 同口径)。 diff --git a/internal/versionhistory/rules.go b/internal/versionhistory/rules.go index bc9e2fd..9a3368a 100644 --- a/internal/versionhistory/rules.go +++ b/internal/versionhistory/rules.go @@ -124,23 +124,32 @@ func DeriveVersions(in DeriveInput) DeriveResult { baseTagName := "" var sinceBase *int + tagCreatedLater := false if governance.SemverValid(top) { candidate := "v" + top if base, exists := tagByName[candidate]; exists { - if !graphComplete { + own, ownKnown := ancestors[commit.SHA] + _, tagIsAncestor := own[base.TargetSHA] + switch { + case !graphComplete: // tag 存在但图不完整 ⇒ 不给号(宁可没号,也不报错号) baseTagName = candidate - } else if baseSet, ok := ancestors[base.TargetSHA]; ok { - if own, ok2 := ancestors[commit.SHA]; ok2 { - count := 0 - for item := range own { - if _, inBase := baseSet[item]; !inBase { - count++ - } + case !ownKnown: + // 连自己的祖先都给不出 ⇒ 不给号 + case !tagIsAncestor: + // **该 tag 是更晚才打在这个提交之后的**:这个提交当时还没有发布基线。 + // (提交数在这里算会得到 0 —— 因为它的祖先全被那个更晚的 tag 覆盖 —— 拿它编号是错的。) + tagCreatedLater = true + default: + baseSet := ancestors[base.TargetSHA] + count := 0 + for item := range own { + if _, inBase := baseSet[item]; !inBase { + count++ } - baseTagName = candidate - sinceBase = &count } + baseTagName = candidate + sinceBase = &count } } } @@ -153,8 +162,12 @@ func DeriveVersions(in DeriveInput) DeriveResult { sort.Slice(evidenceTags, func(i, j int) bool { return evidenceTags[i].Name < evidenceTags[j].Name }) label, state, kind, evidence := governance.DecideVersion(top, evidenceTags, baseTagName, sinceBase) - if label == "" && !graphComplete { + switch { + case label != "": + case !graphComplete: evidence.Reason = governance.ReasonIncompleteGraph + case tagCreatedLater: + evidence.Reason = governance.ReasonTagCreatedLater } record := governance.VersionHistoryCommit{ RepoKey: in.RepoKey, diff --git a/internal/versionhistory/rules_test.go b/internal/versionhistory/rules_test.go index 715f6f7..2bef35c 100644 --- a/internal/versionhistory/rules_test.go +++ b/internal/versionhistory/rules_test.go @@ -193,3 +193,51 @@ func TestDeriveVersionsSortsDeterministicallyForPaging(t *testing.T) { } } } + +// 回归用例(真实数据发现):tag **更晚**才在链尾打上时,tag 之前那些「提交内 CHANGELOG 顶部 +// 已经写着 0.1.0」的提交**不能**被算成 0.1.0 开发版 —— 它们的祖先集合全被那个更晚的 tag 覆盖, +// 按提交数会得到 0。正确结果:历史提交 + 原因 release_tag_created_later。 +func TestDeriveVersionsDoesNotNumberCommitsThatPredateTheTag(t *testing.T) { + commits := []RawCommit{ + commit("A", nil, 1), commit("B", []string{"A"}, 2), + commit("C", []string{"B"}, 3), commit("D", []string{"C"}, 4), + } + // tag 打在 C 上;A、B 的 CHANGELOG 顶部**也已经**是 0.1.0(旧分支遗留的条目) + tags := []RawTag{{Name: "v0.1.0", TargetSHA: "C", Annotated: true}} + top := map[string]string{"A": "0.1.0", "B": "0.1.0", "C": "0.1.0", "D": "0.1.0"} + + result := DeriveVersions(DeriveInput{RepoKey: "repo", Commits: commits, Tags: tags, Changelog: readerFor(top)}) + for _, sha := range []string{"A", "B"} { + record := find(t, result.Records, sha) + if record.VersionLabel != "" || record.RecordKind != governance.RecordKindHistorical { + t.Fatalf("tag 之前的提交 %s 不许编号:%+v", sha, record) + } + if record.VersionEvidence.Reason != governance.ReasonTagCreatedLater { + t.Fatalf("提交 %s 的原因码 = %q,期望 %q", sha, record.VersionEvidence.Reason, governance.ReasonTagCreatedLater) + } + } + if release := find(t, result.Records, "C"); release.RecordKind != governance.RecordKindRelease || release.VersionLabel != "0.1.0" { + t.Fatalf("tag 指向的提交才是正式版本:%+v", release) + } + if after := find(t, result.Records, "D"); after.VersionLabel != "0.1.1" { + t.Fatalf("tag 之后的提交才是开发号:%+v", after) + } +} + +// 侧分支(不含 tag 的那条线)同样不给号。 +func TestDeriveVersionsSideBranchWithoutTagStaysHistorical(t *testing.T) { + commits := []RawCommit{ + commit("A", nil, 1), commit("B", []string{"A"}, 2), commit("T", []string{"B"}, 3), + commit("S", []string{"A"}, 4), // 从 A 分出去、不含 tag 的侧分支 + commit("M", []string{"T", "S"}, 5), // 合并回主干 + } + tags := []RawTag{{Name: "v0.1.0", TargetSHA: "T", Annotated: true}} + top := map[string]string{"A": "0.1.0", "B": "0.1.0", "T": "0.1.0", "S": "0.1.0", "M": "0.1.0"} + result := DeriveVersions(DeriveInput{RepoKey: "repo", Commits: commits, Tags: tags, Changelog: readerFor(top)}) + if side := find(t, result.Records, "S"); side.VersionLabel != "" { + t.Fatalf("不含 tag 的侧分支提交不许编号:%+v", side) + } + if merge := find(t, result.Records, "M"); merge.VersionLabel != "0.1.2" { + t.Fatalf("合并提交含 tag 祖先 ⇒ 按图算号:%+v", merge) + } +} diff --git a/scripts/deploy-api-web.sh b/scripts/deploy-api-web.sh index 93cb52e..84d4bc8 100644 --- a/scripts/deploy-api-web.sh +++ b/scripts/deploy-api-web.sh @@ -9,8 +9,34 @@ echo "=== 1. 打回滚标签 ($TS)" docker tag knowledge-governance-p1-api:latest "knowledge-governance-p1-api:rollback-$TS" || exit 1 docker tag knowledge-governance-p1-web:latest "knowledge-governance-p1-web:rollback-$TS" || exit 1 +echo "=== 1b. 构建身份(构建期注入:页面「当前运行」只认产物里的完整 SHA 精确匹配)" +# 唯一来源是 scripts/version.py --identity(与 Makefile、CI 同一份规则):不注入 ⇒ 页面只能显示"未知"。 +IDENTITY_ARGS=() +while IFS= read -r line; do IDENTITY_ARGS+=("$line"); done < <(python3 scripts/version.py --identity 2>/dev/null | python3 -c ' +import json, sys +try: + d = json.load(sys.stdin) +except Exception: + sys.exit(0) +release = d.get("release_version") or "" +count = d.get("commits_since_release") +print("--build-arg=VERSION=" + (release or "dev")) +print("--build-arg=RELEASE_VERSION=" + release) +print("--build-arg=BUILD_KIND=" + (d.get("build_kind") or "development")) +print("--build-arg=COMMITS_SINCE_RELEASE=" + ("" if count is None else str(count))) +print("--build-arg=COMMIT_SHA=" + (d.get("commit_sha") or "unknown")) +print("--build-arg=BUILD_TIME=" + (d.get("built_at") or "unknown")) +') +if [ "${#IDENTITY_ARGS[@]}" -lt 6 ]; then + echo "IDENTITY_UNAVAILABLE" + echo " 取不到构建身份(scripts/version.py --identity 失败)⇒ 拒绝继续:" + echo " 否则构建出来的产物无法被「版本记录」页识别成「当前运行」,只会显示未知。" + exit 1 +fi +printf ' %s\n' "${IDENTITY_ARGS[@]}" + echo "=== 2. 构建 api" -docker build --network host "${PROXY_ARGS[@]}" -f Dockerfile -t knowledge-governance-p1-api:latest . || { echo "API_BUILD_FAILED"; exit 1; } +docker build --network host "${PROXY_ARGS[@]}" "${IDENTITY_ARGS[@]}" -f Dockerfile -t knowledge-governance-p1-api:latest . || { echo "API_BUILD_FAILED"; exit 1; } echo "=== 3. 构建 web" docker build --network host "${PROXY_ARGS[@]}" -f Dockerfile.web -t knowledge-governance-p1-web:latest . || { echo "WEB_BUILD_FAILED"; exit 1; } @@ -47,4 +73,11 @@ echo "=== 7b. 生产门禁状态(重建后必须与预期一致)" docker exec knowledge-governance-p1-api-1 sh -lc 'for v in PRODUCTION_RELEASE_REQUESTS_ENABLED PRODUCTION_BACKUP_RESTORE_VERIFIED; do eval "val=\$$v"; echo "$v=${val:-}"; done' echo "=== 8. 新包" docker exec knowledge-governance-p1-web-1 sh -lc 'grep -o "index-[A-Za-z0-9_-]*\.js" /usr/share/nginx/html/index.html | head -1' +echo "=== 9. 构建身份是否真的进了产物(页面据此判「当前运行」)" +INJECTED=$(printf '%s\n' "${IDENTITY_ARGS[@]}" | sed -n 's/^--build-arg=COMMIT_SHA=//p') +if docker exec knowledge-governance-p1-api-1 sh -lc "strings /app/api | grep -q '$INJECTED'"; then + echo "INJECTED_COMMIT_SHA=$INJECTED(已进 api 产物)" +else + echo "INJECTION_MISSING(产物里没有 $INJECTED —— 页面会显示当前运行未知)" +fi echo "DONE" \ No newline at end of file diff --git a/web/src/versionHistory.ts b/web/src/versionHistory.ts index 40922cd..4a38fc4 100644 --- a/web/src/versionHistory.ts +++ b/web/src/versionHistory.ts @@ -85,6 +85,7 @@ export const reasonLabels: Record = { no_release_tag_for_commit: '没有指向该提交的正式 tag', no_baseline: '找不到可核验的发布基线(该版本没有对应的 tag)', shallow_or_incomplete_graph: '提交图不完整(检出被截断),提交数算不准', + release_tag_created_later: '该版本是在更晚的提交上发布的 —— 这个提交当时还没有 tag', } export const reasonLabel = (reason: string): string => reasonLabels[reason] ?? '版本号未能核验'