Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
if: contains(github.event.pull_request.labels.*.name, 'test/api7') || github.event_name == 'push'
strategy:
matrix:
version: [3.5.5, 3.6.1, 3.7.8, 3.8.15]
version: [3.5.5, 3.6.1, 3.7.8, 3.8.22, 3.9.2]
env:
BACKEND_API7_VERSION: ${{ matrix.version }}
BACKEND_API7_DOWNLOAD_URL: https://run.api7.ai/api7-ee/api7-ee-v${{ matrix.version }}.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion apps/cli/src/command/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { PingCommand } from './ping.command';
import { SyncCommand } from './sync.command';
import { configurePluralize } from './utils';

const versionCode = '0.23.1';
const versionCode = '0.24.0';

// initialize dotenv
dotenv.config();
Expand Down
102 changes: 100 additions & 2 deletions libs/backend-api7/e2e/default-value.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ describe('Default Value', () => {
},
);

conditionalIt(semverCondition(gte, '3.6.0'))(
'Check default value (>=3.6.0)',
conditionalIt(semverCondition(gte, '3.6.0') && semverCondition(lt, '3.8.0'))(
'Check default value (>=3.6.0 && <3.8.0)',
async () => {
const defaultValue = await getDefaultValue(backend);
expect(defaultValue).toMatchObject({
Expand All @@ -101,4 +101,102 @@ describe('Default Value', () => {
});
},
);

conditionalIt(semverCondition(gte, '3.8.0'))(
'Check default value (>=3.8.0)',
async () => {
const defaultValue = await getDefaultValue(backend);
expect(defaultValue).toMatchObject({
core: {
consumer: {},
consumer_credential: {},
global_rule: {},
plugin_metadata: {},
route: {
priority: 0,
timeout: {
connect: 60,
read: 60,
send: 60,
},
},
service: {
strip_path_prefix: true,
upstream: {
discovery_args: {},
hash_on: 'vars',
keepalive_pool: {
idle_timeout: 60,
requests: 1000,
size: 320,
},
name: 'default',
nodes: [
{
priority: 0,
},
],
pass_host: 'pass',
retry_timeout: 0,
scheme: 'http',
timeout: {
connect: 60,
read: 60,
send: 60,
},
type: 'roundrobin',
},
},
ssl: {
certificates: [],
snis: [],
},
stream_route: {},
stream_service: {
upstream: {
hash_on: 'vars',
name: 'default',
nodes: [
{
priority: 0,
},
],
retry_timeout: 0,
scheme: 'tcp',
timeout: {
connect: 60,
read: 60,
send: 60,
},
type: 'roundrobin',
},
},
upstream: {
discovery_args: {},
hash_on: 'vars',
keepalive_pool: {
idle_timeout: 60,
requests: 1000,
size: 320,
},
name: 'default',
nodes: [
{
priority: 0,
},
],
pass_host: 'pass',
retry_timeout: 0,
scheme: 'http',
timeout: {
connect: 60,
read: 60,
send: 60,
},
type: 'roundrobin',
},
},
});
},
);
});
2 changes: 1 addition & 1 deletion libs/backend-api7/e2e/misc.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ describe('Miscellaneous', () => {
upstream: structuredClone(upstream),
} as ADCSDK.Service;

const errorPattern = `validate request failed: request body has an error: doesn't match schema: doesn't match schema due to: Error at "/path_prefix": value must be a string`;
const errorPattern = `Error at "/path_prefix": value must be a string`;
it('Create services (exitOnFailure = true, default)', async () => {
await expect(
syncEvents(backend, [
Expand Down
11 changes: 2 additions & 9 deletions libs/backend-api7/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,8 @@
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
"src/**/*.spec.tsx",
"src/**/*.test.js",
"src/**/*.spec.js",
"src/**/*.test.jsx",
"src/**/*.spec.jsx",
"src/**/*.d.ts"
"test/**/*.ts",
"e2e/**/*.ts"
],
"references": [
{
Expand Down
Loading