优化
This commit is contained in:
@@ -62,13 +62,13 @@ const parseCompose = (yaml) => {
|
||||
}))
|
||||
}
|
||||
|
||||
test('root POM freezes 22 modules and service-map freezes 15 executable services', async () => {
|
||||
test('root POM freezes 20 modules and service-map freezes 13 executable services', async () => {
|
||||
const modules = parseRootModules(await read('pom.xml'))
|
||||
const services = parseServiceMap(await read('deploy/service-map.yml'))
|
||||
|
||||
assert.equal(modules.length, 22)
|
||||
assert.equal(new Set(modules).size, 22)
|
||||
assert.equal(services.size, 15)
|
||||
assert.equal(modules.length, 20)
|
||||
assert.equal(new Set(modules).size, 20)
|
||||
assert.equal(services.size, 13)
|
||||
|
||||
const bootModules = []
|
||||
for (const module of modules) {
|
||||
@@ -181,24 +181,13 @@ test('SpotBugs remains an opt-in non-blocking report without quality thresholds'
|
||||
assert.doesNotMatch(packageJob, /^ - 静态分析报告$/m)
|
||||
})
|
||||
|
||||
test('regional Compose and Nacos manifests cover the service-map topology', async () => {
|
||||
test('one TEST Compose and Nacos manifest cover every retained service', async () => {
|
||||
const services = parseServiceMap(await read('deploy/service-map.yml'))
|
||||
const composeByRegion = new Map([
|
||||
['CN', parseCompose(await read('deploy/docker-compose.yml'))],
|
||||
['OVERSEAS', parseCompose(await read('deploy/docker-compose.overseas.yml'))]
|
||||
])
|
||||
|
||||
const compose = parseCompose(await read('deploy/docker-compose.yml'))
|
||||
assert.deepEqual(sorted(compose.keys()), sorted(services.keys()))
|
||||
assert.equal(services.size, 13)
|
||||
for (const [module, service] of services) {
|
||||
const regions = service.regions ?? ['CN']
|
||||
for (const [region, compose] of composeByRegion) {
|
||||
assert.equal(compose.has(module), regions.includes(region), `${module} Compose region drifted for ${region}`)
|
||||
if (!regions.includes(region)) continue
|
||||
assert.equal(compose.get(module), service.port, `${module} internal port drifted for ${region}`)
|
||||
await access(new URL(`../config/nacos/${region.toLowerCase()}/${service.artifactId}.yml`, import.meta.url))
|
||||
}
|
||||
assert.equal(compose.get(module), service.port, module)
|
||||
await access(new URL(`../config/nacos/test/${service.artifactId}.yml`, import.meta.url))
|
||||
}
|
||||
assert.deepEqual(
|
||||
sorted(new Set([...composeByRegion.values()].flatMap((compose) => [...compose.keys()]))),
|
||||
sorted(services.keys())
|
||||
)
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user