From 88fa5d247c3d6484d7621fd865903201d42d4add Mon Sep 17 00:00:00 2001 From: Frostebite Date: Mon, 5 Jun 2023 21:05:49 +0100 Subject: [PATCH] stream logs through standard input and new remote client cli command --- dist/index.js | Bin 19461489 -> 19462101 bytes dist/index.js.map | Bin 13760754 -> 13761499 bytes src/model/cloud-runner/providers/k8s/index.ts | 8 ++++++++ src/model/cloud-runner/remote-client/index.ts | 2 +- .../remote-client/remote-client-logger.ts | 11 +++++++++-- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dist/index.js b/dist/index.js index 91dac0b6bd82cf602ef4067155217287b7d9c5c4..d753f86dc1a2350228cf9a9fe6c41ed5c6bad2a9 100644 GIT binary patch delta 1634 zcmZwHc~n$Y9Ki82?+wcg3d{^LG6*~t9Tb?vOik2W+AJllw8G4Jz%ZaNL(LE>qEs51 znyKYYTdb&Tm&&5eEGye6ZK2dQ&9btPY~SYelXo_pTA_nv$1AMePaHd|Lu zo2_NBWs7Eb98(%1)sw=(Y4w$6G>~5#4yyf~F4v;+aOFH>v=It48goWOeAA03ghN#| z!O3QQ{=gEu@z*1>d@MAX+SL3%?`L?~G2)%ccNzR^MqMCk{=M1=nRS7YhCi<@;KcbHn&r8zo=B75gd!Rc1qN)Hg8{iJGB`fbTySA5qz@R#$78Q->8Xh(#RYVS^nB z=!M=$L=uwWfD^Ju3i==wZuCVOJV-}BWFQk+Fp!NLDtgfRk|wPQ__B9TRZ|&cq~4Mk&t16imh0 zI0xrq8m8ksoR14oh8egJGjS1S!4DJVs6ZtGs6r6csKIQ^K`rVKLKyY97?&V|C>n4n z8Zj61Fdt1=fMzVjBDCN#T#hTS7)x*^TCo(%a21wg1ye2! z0#D*8Y{k>qhG+0Bw&OWGj~B25FXAP0R8+a3M;cax`9lVR(*n_=z z5AWjxe29;*5Bu>k4&W1fii7wJpW_Q0!k738-8hUMe2pXc2H)a4e2*XSBYwiq_yxb> zH~fx2@aOU}r)3o+nnagaB{7m%Nt`5JVw2b<36frt-jYN~k|bH;kR03DC8HEcA4#gj qE$J&slXxWQl75m5Nv0%AVo0(jIg(sSo}|BIfW&Lr#&5#nK5!Hy*Cz}B delta 1306 zcmW;MXIRYv6oB#P-rL@L+{SH}$liNzvPbro?7bxsLRtN#tTMBSjFg#dp{znOL&@H} z$A{nhoDb)D&bO0WnrvKFoNOE(sY+FQXqB*Zl{PKdMXk+JQu5V-Y4L^XdAj&_xS5TDZU!Zg7VV9`J-0yx{|1_`x3mD2G6lM+F3- zA}XOWs-P;Wp*m`yCTgKJ>Yy&_p*|X*AsV4EnxH9~p*dQhC0e01+Mq4kp*=dFBZAQh zozVqd(GA_v13l3Ty%B;w=!<^nj{z8nK^Tl77>Z#Sju9A%P>eztMq>=dVjRX}0w!V- zCSwYwVj8An24-RwW@8TKVjjXV9}!r9NG!x6L}4+OU@4-p49l?sF^I)Vtio!n!CJ&Y z!8*iaJraoF&xJU zoJ2ZKAp@B>jWallb2yI+$ihWr;}S083a;WBuHy!7A_uo{8+VY4Jlw@S+{XhvL_P}e z2#@gug?Nf0Ji~Lmz)QTsYZT)R-r^lfP>S~`!v}oCCw#^ie8o3>#}E9(FZ{+I{Eg1A zQ^i1{mS`k;5`Bq*#86@+F_xG}OeJO#bBTq-Qeq{sme@#aCI4^O%j6(&lsHM8C0dD# h#8u)ZahK>M9uiN9m&9A*Bk`5^N&Horya|AkK<|e%m=mInlMJ-^l6{%FVhz3y#?QNSbv`r#ODcFWp zEw~mV`~i`GiVCewpz1|&K~XDilowvmL1!GFWZXu1^&1DD@XUN>&fN3+ojLcMKYkxI zUAj7IN|smc_PSzfL6%`-%=+u)6JDc1ep{4nmiS-h4JQNB4XHILI&K+GP4s%d^(RBj zqF2O1CgaGlnllrw)%9VICCwnSinGo7(BI~%|Mqqyef>$F0ppMcBhq2Qcw`_GSukS) zvT*}$gauaIgdF5zBJz-r0@zTfCw=x`d{%FFxNS+W)fZ~kBL33OV5=B19C^|;KQ?|# zz~7^GRD|6tJqv5-2AemzX=-Yv+8h1|PgaT*jAZd8*o=Mn$_~%aQXxJJaRRIeV5ASQM+o zn^t5_ERD30Pu0UAt;s(_O`T1ucM%`kQ)to;4%!!vN%BXVNk&d7c@jUZ9dz%48Y)Q!(ycWiJx% zpv@x77Z;i&8d35kd67ibcaBQQNGML(y4Ieamb%jF&5BD}63R5GyX44}A1*qIjj10J zPex&G8CP8IaX0&0wC>J`yEYJxXn`ib`?{A2%Y{Ct(m#|)alnZpsF;MwaA69jq8KG8 zMH!}HI%c38Zp_3icyKdr!ED@$+i*K7Fb8un4|kvv^KmDtP>s8=0C!^{YH$x0p%(XI zF_vH{mSH)(xDP9EKOTS&EAb#!;UPSX)u_W7tVKNXoepxXhj>^u?`*RL>B@G zB7{e<9$`e#jSc9*Mr^{P=tUo**o-aMif!1A9e50n;|cU*CwAdUJcXz644%bv7{G2k zj~HIS9_)o+ANJz_Uc^DXghPnqFpl75ynbE?6D8U< z{&MC_a^%622jhV;-qwp5GluVY_`H4R`{`G+=4Y^3QYL%22U9w78zpEwXhe21R67CGWBz_k~DuJfPO!fcfYpb@E z$zPG5qmxR#9-r5vLI~6dMLTHF9%1MJEhKbAI65H$I_P0QB%%P>!@K>9umDT70RK6NMwxm?VT>HVf;YxCEhZvBZnd ze%U56zQsidN17#ExN78RUv<30^L>?w#GNxcE zreQi}U?yf^HawVve9Xl>%*O&O#3C%l5-ddlmSH(oU?o;zHP&D))?qz1U?Voci_O@A zt=NV_6k$7xQGy*P#ZK(PZuqbVd$AAuaR3K#2#0Y5WjKm*9K&&(fWS$d!fBkrS)4-! z&f@|u;u0?73Mz3GRk()hs74KLpcXfA3w7|L9sxAqHts;dT{Pkz?&AR-;t?LB2~Y48 e&+r^C@Dj~ { const pods = await this.kubeClient.listNamespacedPod(this.namespace); const serviceAccounts = await this.kubeClient.listNamespacedServiceAccount(this.namespace); diff --git a/src/model/cloud-runner/remote-client/index.ts b/src/model/cloud-runner/remote-client/index.ts index 5cff4ef5..cd425c94 100644 --- a/src/model/cloud-runner/remote-client/index.ts +++ b/src/model/cloud-runner/remote-client/index.ts @@ -82,7 +82,7 @@ export class RemoteClient { await RemoteClient.runCustomHookFiles(`after-build`); - RemoteClientLogger.printCollectedLogs(); + await RemoteClientLogger.printCollectedLogs(); return new Promise((result) => result(``)); } diff --git a/src/model/cloud-runner/remote-client/remote-client-logger.ts b/src/model/cloud-runner/remote-client/remote-client-logger.ts index 44d8f251..0085f271 100644 --- a/src/model/cloud-runner/remote-client/remote-client-logger.ts +++ b/src/model/cloud-runner/remote-client/remote-client-logger.ts @@ -2,6 +2,8 @@ import CloudRunnerLogger from '../services/core/cloud-runner-logger'; import fs from 'node:fs'; import path from 'node:path'; import CloudRunner from '../cloud-runner'; +import CloudRunnerOptions from '../options/cloud-runner-options'; +import Kubernetes from '../providers/k8s'; export class RemoteClientLogger { private static get LogFilePath() { @@ -32,8 +34,13 @@ export class RemoteClientLogger { } } - public static printCollectedLogs() { + public static async printCollectedLogs() { + if (CloudRunnerOptions.providerStrategy !== 'k8s') { + return; + } CloudRunnerLogger.log(`Collected Logs`); - CloudRunnerLogger.log(fs.readFileSync(RemoteClientLogger.LogFilePath).toString()); + const logs = fs.readFileSync(RemoteClientLogger.LogFilePath).toString(); + CloudRunnerLogger.log(logs); + await Kubernetes.Instance.PushLogUpdate(logs); } }