安全与效率优化,引入Redis,包名修改
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
COMMUNITY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$COMMUNITY_ROOT/.env" ]]; then
|
||||
VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then
|
||||
set -a
|
||||
source "$COMMUNITY_ROOT/.env"
|
||||
source "$VIBEMAKE_ROOT/.env"
|
||||
set +a
|
||||
fi
|
||||
cd "$COMMUNITY_ROOT"
|
||||
mvn -q -pl community-import -am -DskipTests package
|
||||
exec java -Djava.awt.headless=true -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 -jar community-import/target/community-import-0.0.1-SNAPSHOT.jar "$@"
|
||||
cd "$VIBEMAKE_ROOT"
|
||||
mvn -q -pl vibemake-import -am -DskipTests package
|
||||
exec java -Djava.awt.headless=true -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 -jar vibemake-import/target/vibemake-import-0.0.1-SNAPSHOT.jar "$@"
|
||||
|
||||
@@ -421,7 +421,7 @@ def main() -> int:
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--source-url", required=True, help="测试 Gitea 基础地址,不含 /api/v1")
|
||||
parser.add_argument("--target-url", required=True, help="生产 Gitea 基础地址,不含 /api/v1")
|
||||
parser.add_argument("--source-org", default="community")
|
||||
parser.add_argument("--source-org", default="vibemake")
|
||||
parser.add_argument("--target-org", default="vibemake")
|
||||
parser.add_argument("--state-dir", type=Path, default=Path("logs/gitea-org-migration"))
|
||||
mode = parser.add_mutually_exclusive_group()
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
COMMUNITY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$COMMUNITY_ROOT/.env" ]]; then
|
||||
VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then
|
||||
set -a
|
||||
source "$COMMUNITY_ROOT/.env"
|
||||
source "$VIBEMAKE_ROOT/.env"
|
||||
set +a
|
||||
fi
|
||||
cd "$COMMUNITY_ROOT"
|
||||
mvn -q -pl community-import -am -DskipTests package
|
||||
cd "$VIBEMAKE_ROOT"
|
||||
mvn -q -pl vibemake-import -am -DskipTests package
|
||||
exec java -Djava.awt.headless=true -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 \
|
||||
-Dlogging.level.root=WARN -Dlogging.level.org.springframework.jdbc=INFO \
|
||||
-Dlogging.level.org.apache.http=WARN -Ddebug=false \
|
||||
-jar community-import/target/community-import-0.0.1-SNAPSHOT.jar covers "$@"
|
||||
-jar vibemake-import/target/vibemake-import-0.0.1-SNAPSHOT.jar covers "$@"
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
COMMUNITY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$COMMUNITY_ROOT/.env" ]]; then
|
||||
VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then
|
||||
set -a
|
||||
source "$COMMUNITY_ROOT/.env"
|
||||
source "$VIBEMAKE_ROOT/.env"
|
||||
set +a
|
||||
fi
|
||||
export SERVER_PORT="${ADMIN_SERVER_PORT:-8994}"
|
||||
export SPRING_PROFILES_ACTIVE="${SPRING_PROFILES_ACTIVE:-test}"
|
||||
cd "$COMMUNITY_ROOT"
|
||||
mvn -q -pl community-adminapi -am -DskipTests package
|
||||
exec java -Djava.awt.headless=true -jar community-adminapi/target/community-adminapi-0.0.1-SNAPSHOT.jar "$@"
|
||||
cd "$VIBEMAKE_ROOT"
|
||||
mvn -q -pl vibemake-adminapi -am -DskipTests package
|
||||
exec java -Djava.awt.headless=true -jar vibemake-adminapi/target/vibemake-adminapi-0.0.1-SNAPSHOT.jar "$@"
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
COMMUNITY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$COMMUNITY_ROOT/.env" ]]; then
|
||||
VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then
|
||||
set -a
|
||||
source "$COMMUNITY_ROOT/.env"
|
||||
source "$VIBEMAKE_ROOT/.env"
|
||||
set +a
|
||||
fi
|
||||
export SPRING_PROFILES_ACTIVE="${SPRING_PROFILES_ACTIVE:-test}"
|
||||
cd "$COMMUNITY_ROOT"
|
||||
cd "$VIBEMAKE_ROOT"
|
||||
mvn -q -DskipTests package
|
||||
exec java -Djava.awt.headless=true -jar community-api/target/community-api-0.0.1-SNAPSHOT.jar "$@"
|
||||
exec java -Djava.awt.headless=true -jar vibemake-api/target/vibemake-api-0.0.1-SNAPSHOT.jar "$@"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
COMMUNITY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$COMMUNITY_ROOT/.env" ]]; then
|
||||
VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then
|
||||
set -a
|
||||
source "$COMMUNITY_ROOT/.env"
|
||||
source "$VIBEMAKE_ROOT/.env"
|
||||
set +a
|
||||
fi
|
||||
export ADMIN_MYSQL_TEST_URL="${ADMIN_MYSQL_TEST_URL:-${DB_URL:-}}"
|
||||
@@ -14,6 +14,6 @@ if [[ "$ADMIN_MYSQL_TEST_URL" != jdbc:mysql:* || -z "$ADMIN_MYSQL_TEST_USERNAME"
|
||||
exit 1
|
||||
fi
|
||||
export AI_ENABLED=false OSS_ENABLED=false
|
||||
cd "$COMMUNITY_ROOT"
|
||||
# 只创建和删除随机 community_admin_verify_* 临时库,不修改已有数据库;账号需有创建临时库的权限。
|
||||
mvn -q -pl community-adminapi -am -Dtest=ProjectLocksMySqlTest -Dsurefire.failIfNoSpecifiedTests=false test
|
||||
cd "$VIBEMAKE_ROOT"
|
||||
# 只创建和删除随机 vibemake_admin_verify_* 临时库,不修改已有数据库;账号需有创建临时库的权限。
|
||||
mvn -q -pl vibemake-adminapi -am -Dtest=ProjectLocksMySqlTest -Dsurefire.failIfNoSpecifiedTests=false test
|
||||
|
||||
+2
-2
@@ -25,9 +25,9 @@ if not environment.get("ARK_API_KEY", "").strip():
|
||||
endpoint = environment.get("ARK_ENDPOINT", "https://ark.cn-beijing.volces.com/api/v3/responses")
|
||||
if urlparse(endpoint).scheme != "https" or urlparse(endpoint).hostname != "ark.cn-beijing.volces.com":
|
||||
sys.exit("真实联调脚本仅允许北京区域官方方舟 HTTPS 地址,请核对 ARK_ENDPOINT。")
|
||||
environment["COMMUNITY_ARK_LIVE_TEST"] = "true"
|
||||
environment["VIBEMAKE_ARK_LIVE_TEST"] = "true"
|
||||
environment["AI_ENABLED"] = "true"
|
||||
sys.exit(subprocess.run([
|
||||
"mvn", "-q", "-pl", "community-api", "-am", "test",
|
||||
"mvn", "-q", "-pl", "vibemake-api", "-am", "test",
|
||||
"-Dtest=AiSearchLiveTest", "-Dsurefire.failIfNoSpecifiedTests=false",
|
||||
], cwd=root, env=environment).returncode)
|
||||
|
||||
@@ -18,7 +18,7 @@ if config.exists():
|
||||
environment[key] = parsed[0]
|
||||
if not environment.get("GITEA_TOKEN"):
|
||||
raise SystemExit("请先配置 GITEA_TOKEN 和 GITEA_ORGANIZATION")
|
||||
environment["COMMUNITY_LIVE_GITEA"] = "true"
|
||||
environment["VIBEMAKE_LIVE_GITEA"] = "true"
|
||||
# 本脚本只验证仓库协议;OSS/AI 有独立测试,避免本机其他服务配置阻止启动。
|
||||
environment["AI_ENABLED"] = "false"
|
||||
environment["OSS_ENABLED"] = "false"
|
||||
|
||||
Executable
+9
@@ -0,0 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")/.."
|
||||
if [[ -z "${REDIS_TEST_HOST:-}" ]]; then
|
||||
printf '%s\n' '请通过 REDIS_TEST_HOST/PORT/USERNAME/PASSWORD/DATABASE/SSL_ENABLED 配置独立测试 Redis,不自动加载 .env。' >&2
|
||||
exit 2
|
||||
fi
|
||||
AI_ENABLED=false OSS_ENABLED=false mvn -B -pl vibemake-api -am \
|
||||
-Dtest=RedisLiveTest -Dsurefire.failIfNoSpecifiedTests=false test
|
||||
@@ -27,7 +27,7 @@ FIRST = "p_aaaaaaaaaaaa"
|
||||
SECOND = "p_bbbbbbbbbbbb"
|
||||
|
||||
|
||||
def repository(name, repo_id, owner="community", empty=False):
|
||||
def repository(name, repo_id, owner="vibemake-test", empty=False):
|
||||
return {"id": repo_id, "name": name, "owner": {"login": owner},
|
||||
"private": True, "mirror": False, "empty": empty, "default_branch": "main",
|
||||
"branches": {} if empty else {"main": SHA, "dev": OTHER_SHA},
|
||||
@@ -39,7 +39,7 @@ class FakeApi(migration.ApiClient):
|
||||
|
||||
def __init__(self, source=None):
|
||||
self.source = source
|
||||
self.org = "vibemake" if source else "community"
|
||||
self.org = "vibemake" if source else "vibemake-test"
|
||||
super().__init__("https://target.example" if source else "https://source.example",
|
||||
TARGET_TOKEN if source else SOURCE_TOKEN)
|
||||
self.repositories = {} if source else {
|
||||
@@ -130,7 +130,7 @@ class MigrationTest(unittest.TestCase):
|
||||
def run_migration(self, execute=False, limit=None, selected=None):
|
||||
output = io.StringIO()
|
||||
with self.store.locked(), redirect_stdout(output):
|
||||
code = migration.migrate(self.source, self.target, "community", "vibemake",
|
||||
code = migration.migrate(self.source, self.target, "vibemake-test", "vibemake",
|
||||
self.store, execute, selected or [], limit, 1800)
|
||||
self.assertNotIn(SOURCE_TOKEN, output.getvalue())
|
||||
self.assertNotIn(TARGET_TOKEN, output.getvalue())
|
||||
@@ -154,7 +154,7 @@ class MigrationTest(unittest.TestCase):
|
||||
self.assertEqual(self.mappings(), [])
|
||||
self.assertTrue(all(method == "GET" for method, _ in self.source.requests))
|
||||
self.assertTrue(all(method == "GET" for method, _ in self.target.requests))
|
||||
self.assertIn(("GET", "/orgs/community/repos?page=3&limit=50"), self.source.requests)
|
||||
self.assertIn(("GET", "/orgs/vibemake-test/repos?page=3&limit=50"), self.source.requests)
|
||||
|
||||
def test_stale_empty_metadata_still_copies_and_verifies_real_git_references(self):
|
||||
self.source.repositories[FIRST]["empty"] = True
|
||||
@@ -171,7 +171,7 @@ class MigrationTest(unittest.TestCase):
|
||||
body = self.target.posts[0]
|
||||
self.assertEqual(body["repo_owner"], "vibemake")
|
||||
self.assertEqual(body["repo_name"], FIRST)
|
||||
self.assertEqual(body["clone_addr"], "https://source.example/community/" + FIRST + ".git")
|
||||
self.assertEqual(body["clone_addr"], "https://source.example/vibemake-test/" + FIRST + ".git")
|
||||
self.assertEqual(body["auth_username"], "service")
|
||||
self.assertEqual(body["auth_password"], SOURCE_TOKEN)
|
||||
self.assertTrue(body["lfs"])
|
||||
@@ -179,7 +179,7 @@ class MigrationTest(unittest.TestCase):
|
||||
self.assertFalse(body["mirror"])
|
||||
for option in ("issues", "labels", "milestones", "pull_requests", "releases", "wiki"):
|
||||
self.assertFalse(body[option])
|
||||
self.assertEqual(self.source.repositories[FIRST]["owner"]["login"], "community")
|
||||
self.assertEqual(self.source.repositories[FIRST]["owner"]["login"], "vibemake-test")
|
||||
mapping = self.mappings()[0]
|
||||
self.assertEqual(mapping["source_repo_id"], 101)
|
||||
self.assertEqual(mapping["target_repo_id"], 1001)
|
||||
|
||||
Reference in New Issue
Block a user