优化
This commit is contained in:
@@ -8,18 +8,18 @@ const read = async (path) => (await readFile(new URL(`../${path}`, import.meta.u
|
||||
test('Jenkins pipelines recognize all overseas deployable modules', async () => {
|
||||
const controller = await read('Jenkinsfile')
|
||||
const service = await read('Jenkinsfile.service')
|
||||
for (const module of ['gateway-overseas', 'lastleg-service', 'warehouse-overseas-service', 'overseas-security-service']) {
|
||||
for (const module of ['gateway-overseas', 'lastleg-service', 'warehouse-overseas-service']) {
|
||||
assert.match(controller, new RegExp(`'${module}'`))
|
||||
assert.match(service, new RegExp(`'${module}'`))
|
||||
}
|
||||
assert.match(controller, /'gateway-overseas': 'SERVICE_GATEWAY_OVERSEAS'/)
|
||||
assert.match(controller, /'lastleg-service': 'SERVICE_LASTLEG'/)
|
||||
assert.match(controller, /'warehouse-overseas-service': 'SERVICE_WAREHOUSE_OVERSEAS'/)
|
||||
assert.match(controller, /'overseas-security-service': 'SERVICE_OVERSEAS_SECURITY'/)
|
||||
assert.match(service, /gateway-overseas\/target\/gateway-overseas-1\.0\.0-SNAPSHOT\.jar/)
|
||||
assert.match(service, /lastleg-service\/target\/lastleg-service-1\.0\.0-SNAPSHOT\.jar/)
|
||||
assert.match(service, /warehouse-overseas-service\/target\/warehouse-overseas-service-1\.0\.0-SNAPSHOT\.jar/)
|
||||
assert.match(service, /overseas-security-service\/target\/overseas-security-service-1\.0\.0-SNAPSHOT\.jar/)
|
||||
assert.doesNotMatch(controller, /overseas-security-service|SERVICE_OVERSEAS_SECURITY/)
|
||||
assert.doesNotMatch(service, /overseas-security-service/)
|
||||
assert.match(controller, /EVENT_BRIDGE_REGION/)
|
||||
assert.match(service, /EVENT_BRIDGE_REGION_OVERRIDE=\$\{bridgeRegion\}/)
|
||||
assert.match(controller, /choices: \['BOTH', 'CN', 'OVERSEAS'\]/)
|
||||
@@ -32,12 +32,11 @@ test('service map freezes unique internal ports and moves event bridge away from
|
||||
assert.match(map, /^ gateway-overseas:[\s\S]*?port: 9300$/m)
|
||||
assert.match(map, /^ lastleg-service:[\s\S]*?port: 9303$/m)
|
||||
assert.match(map, /^ warehouse-overseas-service:[\s\S]*?port: 9305$/m)
|
||||
assert.match(map, /^ overseas-security-service:[\s\S]*?port: 9307$/m)
|
||||
assert.match(map, /^ event-bridge-service:[\s\S]*?port: 9312$/m)
|
||||
assert.match(map, /^ gateway-overseas:[\s\S]*?regions: \[OVERSEAS\]$/m)
|
||||
assert.match(map, /^ lastleg-service:[\s\S]*?regions: \[OVERSEAS\]$/m)
|
||||
assert.match(map, /^ warehouse-overseas-service:[\s\S]*?regions: \[OVERSEAS\]$/m)
|
||||
assert.match(map, /^ overseas-security-service:[\s\S]*?regions: \[OVERSEAS\]$/m)
|
||||
assert.doesNotMatch(map, /overseas-security-service|9307/)
|
||||
assert.match(map, /^ event-bridge-service:[\s\S]*?regions: \[CN, OVERSEAS\]$/m)
|
||||
})
|
||||
|
||||
@@ -50,7 +49,6 @@ test('overseas compose is isolated from CN defaults and disables implicit schema
|
||||
assert.match(compose, /^ gateway-overseas:\s*$/m)
|
||||
assert.match(compose, /^ lastleg-service:\s*$/m)
|
||||
assert.match(compose, /^ warehouse-overseas-service:\s*$/m)
|
||||
assert.match(compose, /^ overseas-security-service:\s*$/m)
|
||||
assert.match(compose, /^ event-bridge-service:\s*$/m)
|
||||
assert.match(compose, /EVENT_BRIDGE_OVERSEAS_PORT:-9313}:9312/)
|
||||
assert.match(compose, /INTERNAL_SERVICE_TOKEN: \$\{INTERNAL_SERVICE_TOKEN\}/)
|
||||
@@ -58,8 +56,9 @@ test('overseas compose is isolated from CN defaults and disables implicit schema
|
||||
assert.match(compose, /EVENT_BRIDGE_DB_URL: \$\{EVENT_BRIDGE_OVERSEAS_DB_URL\}/)
|
||||
assert.match(compose, /EVENT_BRIDGE_DB_USERNAME: \$\{EVENT_BRIDGE_OVERSEAS_DB_USERNAME\}/)
|
||||
assert.match(compose, /EVENT_BRIDGE_DB_PASSWORD: \$\{EVENT_BRIDGE_OVERSEAS_DB_PASSWORD\}/)
|
||||
assert.match(compose, /OVERSEAS_SECURITY_DB_URL: \$\{OVERSEAS_SECURITY_DB_URL\}/)
|
||||
assert.match(compose, /OVERSEAS_SECURITY_EVENT_CONSUMER_URL:/)
|
||||
assert.match(compose, /LASTLEG_SECURITY_SERVICE_URL: \$\{LASTLEG_SECURITY_SERVICE_URL:-http:\/\/lastleg-service:9303\}/)
|
||||
assert.match(compose, /LASTLEG_SECURITY_EVENT_CONSUMER_URL: \$\{LASTLEG_SECURITY_EVENT_CONSUMER_URL:-http:\/\/lastleg-service:9303\/internal\/lastleg\/security\/v1\/events\}/)
|
||||
assert.doesNotMatch(compose, /overseas-security-service|9307|OVERSEAS_SECURITY_DB|OVERSEAS_SECURITY_SERVICE_URL|OVERSEAS_SECURITY_EVENT_CONSUMER_URL/)
|
||||
assert.match(compose, /CN_EVENT_BRIDGE_URL: \$\{CN_EVENT_BRIDGE_TARGET_URL:-http:\/\/event-bridge-cn:9312\}/)
|
||||
assert.match(compose, /FIRSTLEG_EVENT_BRIDGE_URL: \$\{CN_EVENT_BRIDGE_TARGET_URL:-http:\/\/event-bridge-cn:9312\}/)
|
||||
assert.doesNotMatch(compose, /CN_EVENT_BRIDGE_URL: \$\{CN_EVENT_BRIDGE_URL:/)
|
||||
@@ -72,7 +71,11 @@ test('CN and overseas event bridges have explicit opposite-region consumers', as
|
||||
const cn = await read('config/nacos/cn/event-bridge-service.yml')
|
||||
const overseas = await read('config/nacos/overseas/event-bridge-service.yml')
|
||||
const firstleg = await read('config/nacos/cn/firstleg-service.yml')
|
||||
const iam = await read('config/nacos/cn/iam-service.yml')
|
||||
const iamApplication = await read('iam/src/main/resources/application.yml')
|
||||
const iamClient = await read('iam/src/main/java/com/baiyue/iam/client/SecurityEventBridgeClient.java')
|
||||
const lastleg = await read('config/nacos/overseas/lastleg-service.yml')
|
||||
const gatewayOverseas = await read('config/nacos/overseas/gateway-overseas.yml')
|
||||
const scripts = `${await read('deploy/scripts/deploy-built-service.sh')}\n${await read('deploy/scripts/deploy-services.sh')}`
|
||||
assert.match(cn, /EVENT_CONSUMER_URL:http:\/\/firstleg:9202\/internal\/firstleg\/v1\/container-events/)
|
||||
assert.match(overseas, /EVENT_CONSUMER_URL:http:\/\/lastleg-service:9303\/internal\/lastleg\/events/)
|
||||
@@ -80,9 +83,17 @@ test('CN and overseas event bridges have explicit opposite-region consumers', as
|
||||
assert.match(cnCompose, /aliases: \[event-bridge-cn\]/)
|
||||
assert.match(overseasCompose, /EVENT_CONSUMER_URL: \$\{EVENT_CONSUMER_URL:-http:\/\/lastleg-service:9303\/internal\/lastleg\/events\}/)
|
||||
assert.match(firstleg, /LASTLEG_EVENT_BRIDGE_URL/)
|
||||
assert.match(iamClient, /url = "\$\{baiyue\.security-event\.event-bridge-url:\}"/)
|
||||
assert.match(iam, /SECURITY_EVENT_BRIDGE_URL:http:\/\/event-bridge-overseas:9312/)
|
||||
assert.match(iamApplication, /SECURITY_EVENT_BRIDGE_URL:http:\/\/event-bridge-overseas:9312/)
|
||||
assert.match(cnCompose, /SECURITY_EVENT_BRIDGE_URL: \$\{SECURITY_EVENT_BRIDGE_URL:-http:\/\/event-bridge-overseas:9312\}/)
|
||||
assert.match(overseasCompose, /aliases: \[event-bridge-overseas\]/)
|
||||
assert.match(firstleg, /LASTLEG_OUTBOX_RELAY_LEASE_SECONDS/)
|
||||
assert.match(lastleg, /CN_EVENT_BRIDGE_URL:\$\{FIRSTLEG_EVENT_BRIDGE_URL\}/)
|
||||
assert.match(lastleg, /WAREHOUSE_OVERSEAS_SERVICE_URL:http:\/\/warehouse-overseas-service:9305/)
|
||||
assert.match(gatewayOverseas, /LASTLEG_SECURITY_SERVICE_URL:http:\/\/lastleg-service:9303/)
|
||||
assert.match(overseas, /LASTLEG_SECURITY_EVENT_CONSUMER_URL:http:\/\/lastleg-service:9303\/internal\/lastleg\/security\/v1\/events/)
|
||||
assert.doesNotMatch(`${gatewayOverseas}\n${overseas}`, /overseas-security-service|9307|OVERSEAS_SECURITY_/)
|
||||
assert.match(scripts, /FIRSTLEG_EVENT_BRIDGE_URL/)
|
||||
assert.match(scripts, /LASTLEG_EVENT_BRIDGE_URL/)
|
||||
assert.match(scripts, /docker-compose\.overseas\.yml/)
|
||||
|
||||
Reference in New Issue
Block a user