Merge pull request #12 from paastis/fix-ci-1

ci: fix
paastis · Oct 29, 2022 · c868b4d · c868b4d
2 parents f8615e7 + f96983a
commit c868b4d
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 42 deletions.
diff --git a/my.paastis.yml b/my.paastis.yml
@@ -0,0 +1,18 @@
+rules:
+  - pattern: 'app-review-pr(\d+)-(back|front)'
+    linked_apps:
+      - 'app-review-pr$1-front'
+
+  - pattern: 'hello-fastify'
+    linked_apps:
+      - 'hellofastifydeux'
+
+  - pattern: 'hello-fastify-2'
+    app_name: 'hellofastifydeux'
+
+  - pattern: '.*fastify.*'
+    app_max_idle_time: 1
+
+  - pattern: 'paastis-console'
+    linked_apps:
+      - 'paastis-api'
diff --git a/src/Scheduler.js b/src/Scheduler.js
@@ -1,6 +1,6 @@
 import cron from 'node-cron';
-import provider from "./provider/index.js";
-import { factory, registry } from "./registry/index.js";
+import provider from './provider/index.js';
+import { factory, registry } from './registry/index.js';
 
 export default class Scheduler {
 

diff --git a/src/Server.js b/src/Server.js
@@ -1,5 +1,5 @@
 import http from 'http';
-import { system, upstream } from "./router/index.js";
+import { system, upstream } from './router/index.js';
 
 export default class Server {
 

diff --git a/src/provider/PaasProvider.js b/src/provider/PaasProvider.js
@@ -1,6 +1,6 @@
 import { spawn } from 'child_process';
 import Promise from 'bluebird';
-import config from "../config.js";
+import config from '../config.js';
 
 export default class PaasProvider {
 

diff --git a/src/provider/clever-cloud/CleverCloudApp.js b/src/provider/clever-cloud/CleverCloudApp.js
@@ -1,5 +1,5 @@
-import { getStatus } from "@clevercloud/client/cjs/utils/app-status.js";
-import PaasApp from "../PaasApp.js";
+import { getStatus } from '@clevercloud/client/cjs/utils/app-status.js';
+import PaasApp from '../PaasApp.js';
 
 export default class CleverCloudApp extends PaasApp {
 

diff --git a/src/provider/clever-cloud/CleverCloudProvider.js b/src/provider/clever-cloud/CleverCloudProvider.js
@@ -2,11 +2,11 @@ import application from '@clevercloud/client/cjs/api/v2/application.js';
 import { addOauthHeader } from '@clevercloud/client/cjs/oauth.node.js';
 import { prefixUrl } from '@clevercloud/client/cjs/prefix-url.js';
 import { request } from '@clevercloud/client/cjs/request.superagent.js';
-import { getStatus } from "@clevercloud/client/cjs/utils/app-status.js";
+import { getStatus } from '@clevercloud/client/cjs/utils/app-status.js';
 
-import config from "../../config.js";
-import PaasProvider from "../PaasProvider.js";
-import CleverCloudApp from "./CleverCloudApp.js";
+import config from '../../config.js';
+import PaasProvider from '../PaasProvider.js';
+import CleverCloudApp from './CleverCloudApp.js';
 
 export default class CleverCloudProvider extends PaasProvider {
 

diff --git a/src/provider/heroku/HerokuApp.js b/src/provider/heroku/HerokuApp.js
@@ -1,4 +1,4 @@
-import PaasApp from "../PaasApp.js";
+import PaasApp from '../PaasApp.js';
 import _ from 'lodash';
 
 export default class HerokuApp extends PaasApp {

diff --git a/src/provider/heroku/HerokuProvider.js b/src/provider/heroku/HerokuProvider.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import Promise from 'bluebird';
-import PaasProvider from "../PaasProvider.js";
-import HerokuApp from "./HerokuApp.js";
+import PaasProvider from '../PaasProvider.js';
+import HerokuApp from './HerokuApp.js';
 import heroku from './heroku.js';
 
 export default class HerokuProvider extends PaasProvider {

diff --git a/src/provider/scalingo/ScalingoApp.js b/src/provider/scalingo/ScalingoApp.js
@@ -1,4 +1,4 @@
-import PaasApp from "../PaasApp.js";
+import PaasApp from '../PaasApp.js';
 
 export default class ScalingoApp extends PaasApp {
 

diff --git a/src/provider/scalingo/ScalingoProvider.js b/src/provider/scalingo/ScalingoProvider.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
-import getClient from "./scalingo.js";
-import PaasProvider from "../PaasProvider.js";
-import ScalingoApp from "./ScalingoApp.js";
+import getClient from './scalingo.js';
+import PaasProvider from '../PaasProvider.js';
+import ScalingoApp from './ScalingoApp.js';
 
 export default class ScalingoProvider extends PaasProvider {
 

diff --git a/src/provider/scalingo/scalingo.js b/src/provider/scalingo/scalingo.js
@@ -1,5 +1,5 @@
-import { clientFromToken } from "scalingo";
-import config from "../../config.js";
+import { clientFromToken } from 'scalingo';
+import config from '../../config.js';
 
 let client;
 let tokenLastUpdate;

diff --git a/src/redis.js b/src/redis.js
@@ -1,5 +1,5 @@
 import { createClient } from 'redis';
-import config from "./config.js";
+import config from './config.js';
 
 
 let client;

diff --git a/src/registry/index.js b/src/registry/index.js
@@ -1,11 +1,11 @@
 import fs from 'fs';
-import yaml from "js-yaml";
+import yaml from 'js-yaml';
 import config from '../config.js';
 import redis from '../redis.js';
-import RunningAppsRegistry from "./RunningAppRegistry.js";
-import RunningAppFactory from "./RunningAppFactory.js";
-import RedisRunningAppStore from "./stores/RedisRunningAppStore.js";
-import InMemoryRunningAppStore from "./stores/InMemoryRunningAppStore.js";
+import RunningAppsRegistry from './RunningAppRegistry.js';
+import RunningAppFactory from './RunningAppFactory.js';
+import RedisRunningAppStore from './stores/RedisRunningAppStore.js';
+import InMemoryRunningAppStore from './stores/InMemoryRunningAppStore.js';
 
 let store;
 if (!store) {

diff --git a/src/registry/stores/InMemoryRunningAppStore.js b/src/registry/stores/InMemoryRunningAppStore.js
@@ -1,5 +1,5 @@
-import RunningApp from "../RunningApp.js";
-import { RunningAppStore } from "./RunningAppStore.js";
+import RunningApp from '../RunningApp.js';
+import { RunningAppStore } from './RunningAppStore.js';
 
 export default class InMemoryRunningAppStore extends RunningAppStore {
 

diff --git a/src/registry/stores/RedisRunningAppStore.js b/src/registry/stores/RedisRunningAppStore.js
@@ -1,6 +1,6 @@
-import Promise from "bluebird";
-import RunningApp from "../RunningApp.js";
-import { RunningAppStore } from "./RunningAppStore.js";
+import Promise from 'bluebird';
+import RunningApp from '../RunningApp.js';
+import { RunningAppStore } from './RunningAppStore.js';
 
 export default class RedisRunningAppStore extends RunningAppStore {
 

diff --git a/src/router/index.js b/src/router/index.js
@@ -1,5 +1,5 @@
-import system from "./system.js";
-import upstream from "./upstream.js";
+import system from './system.js';
+import upstream from './upstream.js';
 
 export {
   system,

diff --git a/src/router/system.js b/src/router/system.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
-import config from "../config.js";
-import { registry } from "../registry/index.js";
-import provider from "../provider/index.js";
+import config from '../config.js';
+import { registry } from '../registry/index.js';
+import provider from '../provider/index.js';
 
 export default async (req, res) => {
   try {

diff --git a/src/router/upstream.js b/src/router/upstream.js
@@ -1,9 +1,7 @@
-import provider from "../provider/index.js";
-import { factory, registry } from "../registry/index.js";
-import config from "../config.js";
-import httpProxy from "http-proxy";
-import yaml from "js-yaml";
-import fs from "fs";
+import provider from '../provider/index.js';
+import { registry } from '../registry/index.js';
+import config from '../config.js';
+import httpProxy from 'http-proxy';
 
 const proxy = httpProxy.createProxyServer({ changeOrigin: true, secure: false, preserveHeaderKeyCase: true });
 

diff --git a/test/registry/RunningAppFactory.test.js b/test/registry/RunningAppFactory.test.js
@@ -28,7 +28,7 @@ describe('RunningAppFactory#createRunningAppForRegistration', () => {
     expect(app.region).toBe(providerZone);
     expect(app.name).toBe(appKey);
     expect(app.linkedApps).toStrictEqual([]);
-    expect(app.maxIdleTime).toStrictEqual(1);
+    expect(app.maxIdleTime).toStrictEqual(15);
     expect(app.startedAt).toStrictEqual(startedAt);
     expect(app.lastAccessedAt).toStrictEqual(lastAccessedAt);
   });