From 94795b46661b4c1c98748731fa9f21639768943e Mon Sep 17 00:00:00 2001 From: Webber Date: Sun, 20 Aug 2023 17:57:34 +0200 Subject: [PATCH] fix: conventions --- .eslintrc.json | 60 +++++++++++++++--- dist/index.js | Bin 22170130 -> 22170100 bytes dist/index.js.map | Bin 14639256 -> 14639226 bytes .../providers/k8s/kubernetes-storage.ts | 2 +- .../providers/k8s/kubernetes-task-runner.ts | 3 +- ...ion.test.ts => system-integration.test.ts} | 0 6 files changed, 53 insertions(+), 12 deletions(-) rename src/model/{system.integration.test.ts => system-integration.test.ts} (100%) diff --git a/.eslintrc.json b/.eslintrc.json index 3b958602..7ff0c589 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,11 +1,22 @@ { - "plugins": ["jest", "@typescript-eslint", "prettier", "unicorn"], - "extends": ["plugin:unicorn/recommended", "plugin:github/recommended", "plugin:prettier/recommended"], + "plugins": [ + "jest", + "@typescript-eslint", + "prettier", + "unicorn" + ], + "extends": [ + "plugin:unicorn/recommended", + "plugin:github/recommended", + "plugin:prettier/recommended" + ], "parser": "@typescript-eslint/parser", "parserOptions": { "ecmaVersion": 2020, "sourceType": "module", - "extraFileExtensions": [".mjs"], + "extraFileExtensions": [ + ".mjs" + ], "ecmaFeatures": { "impliedStrict": true }, @@ -22,7 +33,10 @@ // Namespaces or sometimes needed "import/no-namespace": "off", // Properly format comments - "spaced-comment": ["error", "always"], + "spaced-comment": [ + "error", + "always" + ], "lines-around-comment": [ "error", { @@ -38,14 +52,31 @@ // Mandatory spacing "padding-line-between-statements": [ "error", - { "blankLine": "always", "prev": "*", "next": "return" }, - { "blankLine": "always", "prev": "directive", "next": "*" }, - { "blankLine": "any", "prev": "directive", "next": "directive" } + { + "blankLine": "always", + "prev": "*", + "next": "return" + }, + { + "blankLine": "always", + "prev": "directive", + "next": "*" + }, + { + "blankLine": "any", + "prev": "directive", + "next": "directive" + } ], // Enforce camelCase "camelcase": "error", // Allow forOfStatements - "no-restricted-syntax": ["error", "ForInStatement", "LabeledStatement", "WithStatement"], + "no-restricted-syntax": [ + "error", + "ForInStatement", + "LabeledStatement", + "WithStatement" + ], // Continue is viable in forOf loops in generators "no-continue": "off", // From experience, named exports are almost always desired. I got tired of this rule @@ -53,8 +84,17 @@ // Unused vars are useful to keep method signatures consistent and documented "@typescript-eslint/no-unused-vars": "off", // For this project only use kebab-case - "unicorn/filename-case": ["error", { "cases": { "kebabCase": true } }], + "unicorn/filename-case": [ + "error", + { + "cases": { + "kebabCase": true + } + } + ], // Allow Array.from(set) mitigate TS2569 which would require '--downlevelIteration' - "unicorn/prefer-spread": "off" + "unicorn/prefer-spread": "off", + // Temp disable to prevent mixing changes with other PRs + "i18n-text/no-en": "off" } } diff --git a/dist/index.js b/dist/index.js index fd5b9a898b191bc0feb3b615e990de285bb91f45..a6f2dbdccb40f6876d00df43315ad6457be21c27 100644 GIT binary patch delta 1537 zcmYk+MOYL76h+~0M!^9=1QiTK!46QuKn1bD#x4x7QNhB(!bAmg)UmL;d+aW-ySo*; z+jCdC_|NJt-s(-8o@)QmoNAvi+OX9)Bi?dy@DvxD0AIhrK=Zq>5bLjaV~ojeKvZ;G z)7ZG^9@gHYjLl5{kIs9#nw|QaEE|^^eXYUC#x~CX))v<8=E&o=mT(^j+r+dKqctrh zL;7KZU!pZCBWz%cOfbO?_Q(teI3f$2kQL5wK{jMZ4!FV%Igtywkq7R`3lHQ&et5zQ z1yB%$P#8r}6va>+B~TLH@Ifh*hA(uxKLSt&Wl;|05r_(?h)M`TFe)PiRZtbxP#rZ8 ziZIkfE!0LG)I~kiM>rawAsV4EnxH9~p*dQhC0Zc@t?!849l?sE3pczu?B0g4(qW2 z8?gzSu?1VP4clSG4(!A(?8YAK#XjuE0UX339L5nG#W5Vm38W$oCvgg=aRz5`4(D+J z7jX%faRpa#4cBo4H*pKMaR+yC5BKo^5Ag_(@dQut4A1cbFOiN{c#SuBi+6aB5BP{r z_>3?3if{OiANYx1_>DhF)+obdC`KiNl2NfyY?VxkNwHJxmCTBR;;3X%oRqAJv*My; zQ?e^L6j#Mf$*JU0aw~ZhcO|dlq2yEYE1rs%Qa~xF6jBN+MUrU9lu#v1sj1XbYAbb= Ux=KBzz7no9Fzn}_7$Tni1)`eVCjbBd delta 1543 zcmY+^XH*RU7>Dt5ZXh$8ZM*g{ z{krz`x4sW?^PJtqWN(cdXR^0V8)ft}|C_gNN-?-v&#f_ zfBWw7$w@|Aa*|!zVM9=SVvGstkRJ9hBLghR2nS?BW;h}XoRAgHa6vX?hbwZx4LRYC zT*wU%c)|;LkQd(YK|c5*Km6d202Dw$6hdJXK_GN@Fp8oWLQotfP!gdih0-X4FqB0& z${_;fQ2~*th)Re;WmG{`R6}*tKuy#_G-{&`>Y^U%qX8PC5gMZjnxYw+qXk-`6=KjD zZO|6&&>kJo5uMN(UCcO{6TQ$Ieb5*E&>sUZ5Q7kl!5D&}7>419!w8JTD2&D! zj72=gVLT>aA|_!nreG?jVLE0Y0W&cRvth*?Bw{Y+VLpjulvm zRalKRSc`R7j}6#}P1uYr*otk~4jXo0Cw5^s_FymeVLuMwAP(U$Qg8%EaSX?iiW4}A zQ#g$?IE!;Qj|;enOSp_HxQc7IjvKg%TeyuoxQlzZj|X^&M|g}Uc#3Cuju&`|S9py# zc#C&4_=+@q!*~3^PyE7f{F#^-W0(rXsMskcC7qI9u~*DW2F0ReR2-B{ zN@m4T$)Y$ZSruo+MaiaQS6r1Gikp&CaaVFFxfKt^Q}I&rD0vlc#Yf4f_$v7oKgC}O zPzopol|o8krHB%!1S!EvQKgs?q7+w3C?%CprIb=yDWilbWtDKHoD!jwS1KrxN=2oT e5~WmDswh>JYD#sbhEh|hr9>O{^G^&-pZx{ywY8G~ diff --git a/dist/index.js.map b/dist/index.js.map index 19e8f07e24404483b698708c1d657e8b3f07c116..9acec342bcf75004890d56dce1a82066a7afc285 100644 GIT binary patch delta 957 zcmYMs*;mYQ9LDjJ7!$H&iw$e`8OQ3X+j$#mFiI(qCMIKF4)lNg4DofB}RGrP3qAcl#5ckhgElls1 zmSlCr+Z@(Zx1mxi(EpqNiqryCp>L30S)#OPWv?;$tGaA0+?`vcMFjkB6pcyQ6OB4$ zD-PCWdNr3fD74ncoMm>I&w2yO4=2WMemSum^jw5Brge12~97IE*7Wiepg7Lq3k<1Wuv=r*ImDID@k| zhx53Ai@1c#D1sALP>id%hU>V2o4AGBD8U`L;D!gKxQlzZk1{;KLzJTem3V~5c!H;R rhUa*Jm#D%kyv7^6#XG#m2UO!DKA{GmQHwA5if{OiA8xbDo9z4plry?S delta 975 zcmYk!X;92@9Dwo3u|?6Uu+{!I6mmw6$Wmgi7~K}J7S;LyBP;5SpWDv#Bo)Q>b{iZW;V2dm=m zCY=hmn)IqJUh}m7EYtLEu1U$3#EjH*yGNCl@Alu|YmL9J$}t2Olr>TdRlg&&7-f#r z-0hjwT8P)bOpygBYl2Z{bJlBiXT2$`)}^=2r!)ZV&>kHSh#+)CCv-+Ix}Yn%p*wn@ zCqmE*e_x^KgTCm8{s_YW3`95vVK9bZD25>dkr<9BjKD}lV-!YX48~#{VlW;PFcFh5 z8B;J7(=Z(~FcY&7i#W_iJmw$)b74jz=3zdPkPHhJAO#Dt2#b-5B}l_kSg{Ptu>$GH zz)GybYOKLptiyV2z(!;u3)$F&%@AzCR@kr&+pz;Xu?xGg2YZo&eb|o!IEX_y424|e z;Ruf681iu(CvXy{a2f?TgR>~aIh@A@6yYK+;WDn^DvEIp*Kq?SxQSBO;XoN~;WqA| z9CvXK6{tiN?&AR-;t?L>37+B^s_`5z@Di_3gV%V2w|Iy5_<)b7#V3459h|7Q`;>mM G6#W5P$*Ii% diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts b/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts index 7f6f642d..f4a32e34 100644 --- a/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts +++ b/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts @@ -1,4 +1,4 @@ -import waitUntil from 'async-wait-until'; +import { waitUntil } from 'async-wait-until'; import * as core from '@actions/core'; import * as k8s from '@kubernetes/client-node'; import BuildParameters from '../../../build-parameters'; diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts b/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts index dd7450e8..97a6670c 100644 --- a/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts +++ b/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts @@ -1,6 +1,6 @@ import { CoreV1Api, KubeConfig } from '@kubernetes/client-node'; import CloudRunnerLogger from '../../services/core/cloud-runner-logger'; -import waitUntil from 'async-wait-until'; +import { waitUntil } from 'async-wait-until'; import { CloudRunnerSystem } from '../../services/core/cloud-runner-system'; import CloudRunner from '../../cloud-runner'; import KubernetesPods from './kubernetes-pods'; @@ -10,6 +10,7 @@ class KubernetesTaskRunner { static lastReceivedTimestamp: number = 0; static readonly maxRetry: number = 3; static lastReceivedMessage: string = ``; + static async runTask( kubeConfig: KubeConfig, kubeClient: CoreV1Api, diff --git a/src/model/system.integration.test.ts b/src/model/system-integration.test.ts similarity index 100% rename from src/model/system.integration.test.ts rename to src/model/system-integration.test.ts