From dd427466ce741f0f68264e5962f034214d814904 Mon Sep 17 00:00:00 2001
From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Sun, 17 Mar 2024 13:33:23 -0700
Subject: [PATCH] Hotfix: Fix version checking in image-tag (#640)

* Update version check regex and fix tests
---
 dist/index.js               | Bin 22303230 -> 22303227 bytes
 dist/index.js.map           | Bin 14796913 -> 14796911 bytes
 src/model/image-tag.test.ts |  12 ++++++------
 src/model/image-tag.ts      |   2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 4e872ec8bb91cf8d2b13560513c81228310b1352..f8abda07c5c57c764a0d24523e2104e7935853c8 100644
GIT binary patch
delta 1470
zcmXxkS5yc97>41~phX%=Xi24_vNcpH(w4mnk-awwA+q=0WbeKA-h1!tz4wUsyKwQm
z=lply)t{Gh(fk)OvkbBfvy8SFpUkjJPAi@4_diWjebZAovU4+xkq`M{0#lg592O{m
zg0Ms(Siu@Lutj0m!5&56fTAdd;&6l$oZ$jjlz<yb!W|y)L@9W|8$Qs!GVp~T{81L=
zP#zUf5tUFGRS<wc1R)qz5rR;Jp&G&wfk;$G4Md?Pq7j2w#33FDNJK3pp*HHEF6yB^
z8lWK>p)s1EDUy+bW@wHUNJUGuLK<454cej|+M@$Hq7yo!3%a5kx}yhrq8ECj5Bj1X
z`Xe0!kb!|1gu%$f5DdjIWMMc)AR8kw3ZpRwV=)fnF#!`X36n7eQ!x$GF#|I(3$rl?
zb1@I|u>cFP2#b+}C0L4OSdJA~iB(vQHCT&vSdR_Zh)vjxE!c`}*p408iCx%@J=lwV
z*pCA^h(kDxBRGm<IF1uIiBmX@GdPQLIFAdsh)cMPE4YelxQ-jRiCeghJGhH`xQ_?O
z#X~&8V?4oAJi~Lmz)QTsYrMf*yu*8Zz(;(-XMDj|e8YGAz)$?bZ~Q?X{*KAbFqi<v
zP%%=Bm3&Hm#Y8bx%oKCQLMfmWR4kQ3ij`um*eJG2VZ~0dSBfYON>QblQe1IVoD^rp
zMR8S1C~itg#a;1GJe5+4m*TDXD5aG$im&3Q_$y_Va!Prnf>Kebq*PX_C;>{K5~Ktx
zRh1AWR0&h6Dd9?l5~);IYA8`kO(j~1QDT)iC0<ET5|vs?l2Ti#W3Zo(V&HW3AD6Hk
AF#rGn

delta 1479
zcmWmES6mGM0EO{ibrl&6R7#|xB9#iEZ4?o*xpwx<rkj~PviHv3J3D*tz4zWbM11Gr
z|2>|^lbwFqItRm3%~H)%Ep`}Ao1DD^1B{8ufhk5mV<HA72l)o4n1Xyf{bwX)IF8LS
z8ITK>utIL+fi?0XAM&FBY+wsJ*rOl{p)eevJtq`_Gh9#<t|*4$a6<{W!vmfuiBj-_
zH+)bUW#Egl@Pj`BP!53zLNLms0xBW|l~5T~5Q;E_BLb0#LNuzP8mglPVi1d(sD(Jx
zMjgbXF6yB^63_q*(Fl#v1WnNl&Cvozv_vbkMjNz6JG4h4I-nyup)<OmE4raOdY~tI
zp*NDy2Yt~G{V@OoF$jY(1j#TV1w%0m!!ZIQF$$>|jWHODaTt#Yn21T3j44RNR7}Hk
z%)m^{!fedJT+G9KEWko6!eT7JQY^!Aq+<nEVii_n4c1~E)?))UViPuF3$|h#wqpl&
zViz*78+))9`>-Dea1fa|gu^(3qd11+IDwNmh0{2Lvp9$IxPXhegv+>stGI^ixPhCv
zh1<A;ySRt@cz}m^gvWS-r+9|vc!8IAh1Yn4w|Iy5_<)c2gwObbulR=V_<=0^#4r3t
zHvZr*a`10rmdPv)in(H;7?fO!rDCPzR`Mv;N?s+Ol3yvH*eJG&ono&PR0=7D6$iyp
zaZ-vX&WejtRB=^`Da92xrG(<HcqpDqNu`wHrFbhoN@=Bx;;WQZ{1ksBKq;pLDnUxH
zQeLT`R8&HgN=jv=iV~`XDd9?l5~)Nf(MnaNno?b<p~NV$N=>Df5~tKw>L~F_U8SB<
OUr8{_<WbBF*Z%`D);u5p

diff --git a/dist/index.js.map b/dist/index.js.map
index 4de56fb12074b6d75133dcd2319068f9ae2276ae..9d25c910d6dbc8e8b5e3b5c011bd9b21c68547f3 100644
GIT binary patch
delta 874
zcmWN=Q+E(x007XF&Bdi<tmS3fu7zdWc73(%TDFbVvTd8cpwn|N-FwdcyEY-+ALoY@
zA!SGvQin7lZAcf=hYTTO$P_Y%EFo*i7P5yNA!mpPxkB!cC*%$JLjDjL3WS28P$(RV
zBt`wGmYCvSR7A!BF*Ezb#}AG!Q897C`T~U#B4eX0YB7sj!jhJ<v}G)7IioFaj1{bC
zB`aISs#Y`B>ejHPwXAI&>srtHHn5?MY-|&o+RWy*u%)eRZ5!L#&h~b&qn+$*7rWZc
z?#9`}p7yf0@%FK={p{}m2Rg{X4soc%9PS85I?B<GajfGU?*u10$;nP}s?(hA3}-sa
z+0JpU^PKMj7rMycVwafUQkS{h6|QuZt6k$-*SX#eZgi8IO>~P}-R5?8xYJ$kc8`1A
z=Y9`(&_f>fh(|r<aZh;CQ=ayWXFcb6lf2+XlfC3+uXxpKUiXGKz2$B1c-MR0_kj<6
s<YS-s)Mq~Tg)e>OYv1_RcfR+7AN}NKzxdT}e)oqz{goUU`#WyKe^iYl#sB~S

delta 890
zcmW;8<B}F&0D#fSwl>>dWZQOMw#{v8tG71Wwr$(Cc?C^((3yUmXP!T+lG6MoF(eDg
zLyC|xqzb7+nvgc63+Y3KkTGNmnM0P4HDn9fLynL$<O;b%o)8uChI}D^C=d#ULZR@v
zB0pjamx-<ti42a9PKZP*ng5*@A5$SVVOC7p5|uYjSd+hCQdC?Kic*Z?l%OP~C`}p4
zQjYRepdyv1OckmUO$@QbQH|=<peD7bO&#h|kNPyAA&qEE6PnVD=Cq(Ct!Paf+R~2p
zbf6=h=u8*7(v9x)peMcPO@u!5r62tnz(58um>~>h7{eLCNJcT5F^pv#<C(xjCNY^Q
zOl2C=nZZornMDG#nL{FTna6wr3s^`Ji&)GOma>fHtY9UpSj`&NvX1p^U?ZE@%oet?
zjqU7UC%f3q9`>@2{T$#Rhd9g;j&h9SoZuv<IL#T(a*p#{;3Ai}%oVP3jqBXtCbziF
z9qw|E`#j(wk9f=zp7M<6yx=9Tc+DH$@{ad>;3J>-%oo1$jqm*6C%-O6#r^KS_8$>c
BCocd1

diff --git a/src/model/image-tag.test.ts b/src/model/image-tag.test.ts
index 47adf65e..eb0db0f1 100644
--- a/src/model/image-tag.test.ts
+++ b/src/model/image-tag.test.ts
@@ -2,7 +2,7 @@ import ImageTag from './image-tag';
 
 describe('ImageTag', () => {
   const testImageParameters = {
-    editorVersion: '2099.9.f9f9',
+    editorVersion: '2099.9.9f9',
     targetPlatform: 'Test',
     builderPlatform: '',
     containerRegistryRepository: 'unityci/editor',
@@ -27,7 +27,7 @@ describe('ImageTag', () => {
       expect(image.builderPlatform).toStrictEqual(testImageParameters.builderPlatform);
     });
 
-    test.each(['2000.0.0f0', '2011.1.11f1'])('accepts %p version format', (version) => {
+    test.each(['2000.0.0f0', '2011.1.11f1', '6000.0.0f1'])('accepts %p version format', (version) => {
       expect(
         () =>
           new ImageTag({
@@ -50,23 +50,23 @@ describe('ImageTag', () => {
   describe('toString', () => {
     it('returns the correct version', () => {
       const image = new ImageTag({
-        editorVersion: '2099.1.1111',
+        editorVersion: '2099.1.1111f1',
         targetPlatform: testImageParameters.targetPlatform,
         containerRegistryRepository: 'unityci/editor',
         containerRegistryImageVersion: '3',
       });
       switch (process.platform) {
         case 'win32':
-          expect(image.toString()).toStrictEqual(`${defaults.image}:windows-2099.1.1111-3`);
+          expect(image.toString()).toStrictEqual(`${defaults.image}:windows-2099.1.1111f1-3`);
           break;
         case 'linux':
-          expect(image.toString()).toStrictEqual(`${defaults.image}:ubuntu-2099.1.1111-3`);
+          expect(image.toString()).toStrictEqual(`${defaults.image}:ubuntu-2099.1.1111f1-3`);
           break;
       }
     });
     it('returns customImage if given', () => {
       const image = new ImageTag({
-        editorVersion: '2099.1.1111',
+        editorVersion: '2099.1.1111f1',
         targetPlatform: testImageParameters.targetPlatform,
         customImage: `${defaults.image}:2099.1.1111@347598437689743986`,
         containerRegistryRepository: 'unityci/editor',
diff --git a/src/model/image-tag.ts b/src/model/image-tag.ts
index e32ccbdd..2b9fd910 100644
--- a/src/model/image-tag.ts
+++ b/src/model/image-tag.ts
@@ -42,7 +42,7 @@ class ImageTag {
   }
 
   static get versionPattern(): RegExp {
-    return /^(20\d{2}\.\d\.\w{3,4}|3)$/;
+    return /^\d+\.\d+\.\d+[a-z]\d+$/;
   }
 
   static get targetPlatformSuffixes() {