From 1815c3c8800c1b98c8ec68c29d4c3194294c2f62 Mon Sep 17 00:00:00 2001
From: Frostebite <jas.f.ukcmti@gmail.com>
Date: Mon, 14 Apr 2025 06:46:51 +0100
Subject: [PATCH] Refactor git configuration for LFS file pulling with
 token-based authentication

- Enhanced the process of configuring git to use GIT_PRIVATE_TOKEN and GITHUB_TOKEN by clearing existing URL configurations before setting new ones.
- Improved the clarity of the URL replacement commands for better readability and maintainability.
- This change ensures a more robust setup for pulling LFS files in environments requiring token authentication.
---
 dist/index.js                                 | Bin 15145916 -> 15146847 bytes
 dist/index.js.map                             | Bin 16837881 -> 16838904 bytes
 src/model/cloud-runner/remote-client/index.ts |  25 +++++++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index b20ac2a14677d26707c0c221ac2b9566a6d69cc8..39bef9542d2300ebdf29ce550b5d3a77157b63b9 100644
GIT binary patch
delta 1655
zcmb8tSyW7M0LSrDx0E79n=QAoG=`?K%a$dwCR=t!P19(aXznO`h=^?AZ^^#zMI>9<
z_kG`Y9(eKY$d`vY)5-SmdAav@@A>_I_ns`sae8$+$0;q{F5Ny~@=<3OWjXrkb;+{M
zJXzMK8ZC;^Y>)>J=p)A@nd6KGYqCz<N`2-nio@+I30W(3b+ei+dL>Y2GRf9tlUDc}
zUV4gejU`tR6=7fNSH#ygqOw@xLxX}0Mnx=BOFm^eb-5ggFvMHOX=9QSRa&FjqUd$8
zk#Qog#LiRX_TBI3r^se~ifuu~m}HhycurQtSN|NZ(ypDW{%oj<SCk1B3W%9%Nh6#!
z(pXVaQ*y81rfXT%FyWz*qJI~3SC#8pdZ-YQ5G>UZiO!N%6b4HH;!7jRt>BYJ`fgv(
z^bbR4ySq4)9^emSvxsk5?k|hmhW~4J-+!Lnrg{14-vmjS6^+UD0GHDL<Jai&-(D0@
zt^D{l=L^Z;3%~)6s01fCqcU9JiYllIH&lZ=JWw4q;0Z5y!w0^oiCU<QI;aaj)PoFv
zs8Amb&=8Ff05uvzgC=N-Kxh$!VEpXf49(F3Ezt_C(FSc1igsv^4(NzZ2t#LdL05D`
zIJ%<;BG41P&>MZw7yS^4{)oZ=48$M|#t=kfD28D;MqngHVKl~IEOZ!$7{o%4I2aHQ
zBgP{ECM3d)Buv0WB*Ov)R!l+)QZX4*Fcs4<9WyW!X_$rCn1gi8#XMwSJ{BMo3$X}U
zSd1lDie*@iY^=aatb)L5tif8WLk`ws12$q4He(C6VjH$&2X<l?c4H6rVjuS701hG-
zc{qf_$j1>JMFEbX5XW%>Cvgg=QG{Zg!C9Qcd0fCnT*75s!Bt$tb=<&B+`?_#!Cl<L
leLTQJJi=o<!BafLbG*Pyyuxd|!CSn;dweKJ2>uxL`3JAuXs7@H

delta 1299
zcma*k_fyhg0LSs8Z$*}o4MNM*tkguHjIwN*WoeY7q+N<aVxk~mdstbvm({mHd+#iZ
zhT7hH@3i?#e}uj9x4QF=A6~yacc15;_dPY$E@`FPB`q$Ilr*Xk6cJ)-gpd?$H`y$P
zY?I1hv4j-aE$UFS(`j?WYBWx3o~a;K3{nb_a)-mrNlvaa4(6gPb+$EMBTAwKomdwj
z_ywp`2BWdTx$NJew>zbn87<VmGDehXg+NiQ74+_^D8W|{<>7+DCs7}tk)EPUNG>bX
z$i1tnjTXWhs41_L_}5>eXsE?A{=dbmRk)`lyOantMiVrJ6wTm+=4b(5w1f<;;D^>|
zgSKb~Iod-3e*~ZdIwBCA5QJcapff_z1zph%VF*VAx+4-wL_q~LH0Xhzh(<4H(Hngb
zgTCm8SoFsL48$M|MjVD99z!t<2^fwMNJJ7wLWfZpjbx-C6=@iQu}Fs=<1ii*FcFh5
z8B;J7(~yBo7?1_e9~fc6bmYK{T+BcoEXYRztgxXFb~xZf5oTf*W@8TKVjkvW0TyBr
zim@0=uoNX&hUF;53arE`ti~Fw#X79V25iJ8lwmWrU@Jsy!*=YzPPniOyRip*u@C!k
z00(ghhj9c)aSX?C0w-|_r*Q^nQI2ysj|yDCMYwSZmvIGGQHd&4;~K8x25#aOZsQK_
z;vVkf0UqKJ9^(m~;u)Uf1zzG6UgHhk;vL@O13uytKI03%q6W42hVS@+pZMjLX@95v
F`3puqn&1Ec

diff --git a/dist/index.js.map b/dist/index.js.map
index d76d1e49ece2d7cbb904894dcc602be1023d4126..fe0ec21d71cd2c9354dc9c6819b40cb2ea5b93b6 100644
GIT binary patch
delta 1839
zcmb8td013c7{~Dk1VT|7l})kXo^i@0VKlPbvN1B#DAB|y(H!v(j0|^l=1#zvG&mJj
zRvPNjQlr!?ZNU~Pammt5v!W=KRxGu$#mX|=%CGXo(**I@AD_SOd+vGP_jiuh1tJ^v
z2O=xijh~;9yvQ9ERb}20?+YpSN45)Cv&yVlAqYhqgdrRexB!u8i*|@YdvriFE`$Lc
z(FvUqgIL5N9tr4zu1G{TTm&PMpj272#Hpm77K@VRRBdj>rWGq{k;9`qv|J@~Y`T);
z((I00uiK_OT$)Fg?miSN>l>7C=`Rs!2CwE(^<<mVsd(Malx&l<MWl9?eSD(56x)sQ
zQb`r5vc6cvHLt8G60!1hNwdn{|NdvLL$@N&J0&H@Rgi5;acCZ0wM`vuZ@j}FXAbMG
z>WZcoHt$#|<fNjz@>MOk_hE*{j`MVVx@VBZVxB2O4ja3j?Wlts=o6~+dxfEuqEMzi
zH^Usi=+ZQ3Oe-f0*{0xGWPPpa@1tcRNmd>+MO1C^i9j3kd4(a2NeN9ix3J=%FcMp<
z3<~2PmH#u0M0ws}1oa*h9UO*C_ltSw0%+kwucoz+`_Gc-mKI$RJ2AZR?Ph4ApIq)^
z<rT@sFuBPmGUe*oqEnf@RKSGpFymref*$CJUg(WW(Fe&$fdzfh50@bom!m(fz?B$)
zff$6r7=o)X6j#HFVYmiqxE8~49Y)}KjKnD1fOOo5n=l#~7=y968RL+N@wf$9xD~fy
z0<tj?lW;pG!-gry!BnWQBNusaU>fq_L;*CoFdZ}Ch6g&lxC4bKLNR=pi90b1CAbTI
zlwvjlxEuH2UX)=D?!*0f0CVvm9>T+zhxvE}<ye4)SOkg1Sb|6K7?xrgmg8|$;0Zj5
z6<CQ?cnYiWG@ij4ti`i<4$tESRAL=o#7lS?uV6i@@G4%z22^7sHeoZi;B{=p8+a4j
zupMt<2j0d`?7}<Pjd$@L-bW2Sz=x>CNB9_fuowGKhfnY+KEvnu0$-vY`|%aN#sM6}
zA$)^x@f{B1d;EYO@e_{VXZ(U+aTLGdcO1hXXuxrtz)76KY5a-5s_msA<@sj-uHFmT

delta 1430
zcmb8qXH?Ar7{~FGj8axf33dOWgxif|BqX9liQ-zNrPA$|?oE`4Te6ktPgeF;X2>Rc
zWJ^f)-lJrFd&xPSlNX;i&v|~&bAF{I8lAF2jZV&vAsMj-dbyd|hH+Zyk_bJGQl6re
zYoQvnQ5`i<6SbfNUDSpi^ic<OQ4jUe00uBbLl~hEjA4StFhvtIMKhSe9Fkn6Tqrje
z3#JNglIY+lg@0hM)L)^H#6&A>Mp}fb)ln)3nM@rS9;|c_i{pegMk-Y(laMgA6GCGG
zYyu-AWTFr+_?k+k{y{;NN9+C_s!AqREJ_m0#T+|9CQ6e9%Us6<!B$(8#|p-}u0GCw
z-k$C*9->#inMoBZWN8GeN-Ct;3&vtrlF(HwP81AGDy>p+;@>L&k+l}}<At^<Jc0$9
zqXk;R5>{vhYqUliRP0M(0~u`54((xw4zNc@bV6rzfdjh25#7)oJ>Z0%a7Himh70<j
zFI?e<esD*B41fnbF%VuDgu(EJ4~AeU<QRtG7=e)(1z-4KH2e{OKm;KeV-SK+gkdbg
zp+E$bh(r{|AsQ;E5rgrF#RN=59O5wv37Cv2NW@f3g9b@R#&o1$24-RwW@8TKVjkur
z6=_(2bS%UoWI)7XEI}rgVi}fW1y&*ptFRhtuommE9viR`o3I&Muoc^|9ofji4(!A(
z?8YAKMK1PXKMo)d2XP38aRf(k499T-Cy|d+IE^zni*q=S3%H0&xQqf^!Bt$tb=<&B
z+`?@X;tq;%7x!=<#dv@cJj5eB#uGfnGd#x&yu>TK#v8oFJG{pSe8eYw#ut3WH<Y3b
T-%*Yq_=#WmotKrQC0G0b;$pLH

diff --git a/src/model/cloud-runner/remote-client/index.ts b/src/model/cloud-runner/remote-client/index.ts
index 38db71c3..cdb6bcde 100644
--- a/src/model/cloud-runner/remote-client/index.ts
+++ b/src/model/cloud-runner/remote-client/index.ts
@@ -231,14 +231,20 @@ export class RemoteClient {
           throw new Error('GIT_PRIVATE_TOKEN is not available');
         }
 
+        // Clear any existing URL configurations
+        await CloudRunnerSystem.Run(`git config --global --unset-all url."https://github.com/".insteadOf`);
+        await CloudRunnerSystem.Run(`git config --global --unset-all url."ssh://git@github.com/".insteadOf`);
+        await CloudRunnerSystem.Run(`git config --global --unset-all url."git@github.com".insteadOf`);
+
+        // Set new URL configuration with token
         await CloudRunnerSystem.Run(
-          `git config --global --replace-all url."https://token:${gitPrivateToken}@github.com/".insteadOf ssh://git@github.com/`,
+          `git config --global url."https://${gitPrivateToken}@github.com/".insteadOf "https://github.com/"`,
         );
         await CloudRunnerSystem.Run(
-          `git config --global --add url."https://token:${gitPrivateToken}@github.com/".insteadOf git@github.com`,
+          `git config --global url."https://${gitPrivateToken}@github.com/".insteadOf "ssh://git@github.com/"`,
         );
         await CloudRunnerSystem.Run(
-          `git config --global --add url."https://token:${gitPrivateToken}@github.com/".insteadOf "https://github.com/"`,
+          `git config --global url."https://${gitPrivateToken}@github.com/".insteadOf "git@github.com"`,
         );
 
         await CloudRunnerSystem.Run(`git lfs pull`);
@@ -255,15 +261,20 @@ export class RemoteClient {
             throw new Error('GITHUB_TOKEN is not available as fallback');
           }
 
-          // Configure git to use GITHUB_TOKEN
+          // Clear any existing URL configurations
+          await CloudRunnerSystem.Run(`git config --global --unset-all url."https://github.com/".insteadOf`);
+          await CloudRunnerSystem.Run(`git config --global --unset-all url."ssh://git@github.com/".insteadOf`);
+          await CloudRunnerSystem.Run(`git config --global --unset-all url."git@github.com".insteadOf`);
+
+          // Set new URL configuration with token
           await CloudRunnerSystem.Run(
-            `git config --global --replace-all url."https://token:${githubToken}@github.com/".insteadOf ssh://git@github.com/`,
+            `git config --global url."https://${githubToken}@github.com/".insteadOf "https://github.com/"`,
           );
           await CloudRunnerSystem.Run(
-            `git config --global --add url."https://token:${githubToken}@github.com/".insteadOf git@github.com`,
+            `git config --global url."https://${githubToken}@github.com/".insteadOf "ssh://git@github.com/"`,
           );
           await CloudRunnerSystem.Run(
-            `git config --global --add url."https://token:${githubToken}@github.com/".insteadOf "https://github.com/"`,
+            `git config --global url."https://${githubToken}@github.com/".insteadOf "git@github.com"`,
           );
 
           await CloudRunnerSystem.Run(`git lfs pull`);