From 84b41f77fc3e734c220cc394bf2376aa9495a877 Mon Sep 17 00:00:00 2001
From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Sun, 17 Mar 2024 10:25:47 -0700
Subject: [PATCH] Update version check regex and fix tests

---
 dist/index.js               | Bin 22303007 -> 22303227 bytes
 dist/index.js.map           | Bin 14796635 -> 14796911 bytes
 src/model/image-tag.test.ts |  15 ++++++++++-----
 src/model/image-tag.ts      |   8 ++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 33531379c733305e507ff5629e4efb2570ba044b..f8abda07c5c57c764a0d24523e2104e7935853c8 100644
GIT binary patch
delta 1586
zcmXxkXH*q*7{~DgT&94cvP6+77m*7p-~bWah#-n9LF+14x+#!w9S9i}Wkm&rb+s~A
z!@W{b8<u+ul{wp5T5fHU<@a}}7oYDr|8t(_dHG+uqRFFqWs^r$wL`UIwbNEZUAfUZ
zEyNg_QDiQ(j4>CQW?M?jtR=-cW}D4YT5Pge%4|kUfz?)0YF}cl2(UNCdivPYau>P<
z{5KgA7E#eMFs^0QzAV`}u%WKpP~&L#-e+)iX}MLu{G@MS+~oX%n0(X!$uq~!o5Uj`
zu6|~N|AL@O1DxRkSGd6)9%uzmc)=U3(FQ(fi*{%aU-&`y0uYD}2tr46LNGcb1fd8+
zI3f^<E{K8=(ddd8bVDpmh(kQOqX&8-0f|ULFZ4zq^hGjK&=0BTk2IuX00v?Z24e_@
zVi+<o9GMt_EM#LOaxe;`k&7`Hi*Xo_33vb#k%xRt!el&%hhWAOOho}Kn1(_;3@aYN
zbj&~zicx|`F%zXIgAKDV8*?xh<(P*GRN^tr$K$BN6L=C&p&C!)87#oFcn;5_1~1@6
zyo6fR;bpvndMw1Ncnx+e!eYFRH}EEw;4Li0GAzdmti;=R2k+uNtio!n!CI`tdThW(
zY{F)2!TZ>XZP<<m?7&X!!Uy;eAK_!{#wYj`d$1S#upb9-5QlIWM{pF!a2zLa5{+oW
zXZRdn;1s^ZX`I1XoWprsz*qPh-{4z(hwt$NF5(h?#80@4EBG0|;3}@+I&R=5Zs9iW
z;4Xf}Z}=U5;7|O8X8etN_y_;i1XViJLUB}_6ocZdxG1iQo8qo`D6JGv#Y^#4S}Sc7
zAEm9*PHC_BDt?N;5}*Vs9h4xYqtZzURyr#oN~jX1gewtBq|!x+QjAKp(p8C3x+$@W
zNr_Y9mF`LprKgghBq~WtFQvEAN9n61D=A7pB~|IKq$%mj0A-*uNExgQQHCnRlniCK
alBtYPvXpFPq>`hIQbs%M=0|ZboVpKny+TI-

delta 1454
zcmWmEXFC=E07l^pZzZ9W5Fw*P3lW7xWwp@Wd+!}-E0v1&p4xkBYwxAf-h1y-X`Sc8
zeSX5p%g8ocx+2?bbh1&hak9xyLwZ7{eWD@NI3+j9fPBc00x(5En4u8NVF61NMiE${
zD2l-v#bE<m*r5dM;ee8GgcF=m3NCPk8{APEW#ECb@Prr2p*$*}A}YZfKJZ0l_`x4l
z5P(2bMKuH=7$K;RP}D#e!ch~oP#Y15L=>VCgF2{-dZ>>Eh(#RY(GZQ$7){U=&Cnbz
z&=RfC8g0-P?a&?_&=H-`8C}p7-OwF9&=bAT8-36h{m>r+Fc5<<7(*}=!;pYP3`Y`1
zU?fIiG{#^o#vvKwF##!<h)I}?R7}BCOhX#dF&#576SFWIb1)b4FdqxB5R0%FORyBn
zupBFpft6T=)mVeIScmo4fQ{IM&Desi*oN)cft}ce-N?iq?8QFp#{nF~A!Ok&j^HSc
z;W$p<Bu?Qp&fqN0;XE$jA}--FvT+4haSb`RjvKg%TeyuoxQlzZj|X^&M|g}Uc#3Cu
zju&`|S9py#c#C&<j}Q2WPxy>4_=<1%j$Hh}Py9k2e&Y}R;$LcRl2IBIW5q-<DEXB9
zN&&@GDX5q!g%oqeLa|f|D@7D5rKnO&u~v#JHj1rcr<73a6$hoH;;1+&&Ppl8MR8T!
z6nCYxQbzGm$||0Umr_nCuT)SfDwPy(#Ygc~Dl2}9zfwgBPy&^zN;M@&306Xs>Po0m
sLkUyDm6}Q|rM42GL@H5Av=XD#QR*u7l=?~oC02=3;*GL6ijg7bKUYaJqW}N^

diff --git a/dist/index.js.map b/dist/index.js.map
index e50af36bfdea210b88bd75f7a502a28201693ff7..9d25c910d6dbc8e8b5e3b5c011bd9b21c68547f3 100644
GIT binary patch
delta 1124
zcmY++`CrQc9LMp8j8TM<NXNG<mb8h;og>GbizND%##Tlx))cj@ggMhJzV7=LikQ3H
z_mMj}{{oMG^P|_|2mSDTe6IK7(^%$^|0;LLtF#49U9glc_w#YpCserVV!frf09kf(
zQyU>mY(7cCZ~s)MPUqQ{+HDTItrfh`8Zxv&TgcH4?cog{bU;V=q7yo!3l!*zZtz2Q
z_@f7UA^^P*h#&;J?Y5AH8jUGKP=#u<^_j**eWp6kXvsC@n00!q)o3xRt;Srd%4jfI
zb1X@JFH(srBs^Se&eLa^48p&-AciRmTf~aQFtya=4hnQ9M+=o+zAgVs)$xJ;A(}K%
zG(?J``oEH*k19y@%u0>alrKa&6fpuq5r*DSA{>3t7b--cA3XW~h=Lj#3_vsnVi005
z7()<?p%{kY7=e)(h0%z^7>va@j7K~sU?L`AGPIb2shEc8n1PwlApx^68;O{MB+NxJ
z=3zckAR-lMSb%isu@H-3fDswU#A2AR1WS>HY?zUQWmpaia$&^^<RKp`u?ht!gbhVl
z4Lgcaf;A|`TCBr*IIsa5u?d^81zS;uZ77Em+u=e5c3>wY?80vB!CvgcejLC-9KvB7
z!BHH;ah$+OoWg0G!C6$|9M0ncs!)xKxP%&9#ud1671wYbH*gcTa2vI#!yVkkJ>16w
yJj5eB#uGfnGd#x&yu>TKMm^r(E#BchKHwuhp#h)Kh%fkxZ}^TMZbi&bt?LgDRe_HH

delta 989
zcmW;C<9ZbU007W$s8!3_vTZEeZrQeNFWlVLs+(=DR^6;++kAoQ5jtN#&cE{~F%b1-
zeIP2O?cC(OEuw=T(&ye3%w8h0Pf~p0<Xg2f1;3Sx>>m6X6CNE*ITAA<DLy_}wQ1y^
z;NOU>RZ@SCtsE9gTpRW&;{RBhmJmow2qT;bB1uPjqR2o-G7(K?vXGT*WG4qX$whAR
zke3)@$wz()P>@0t4y7d&Nj)8ku3q$Hcpx^eD8(pF2})9m(v+br<tR@DDpHBcRG})>
zs7?)P5=Sj+Q-`|LqdpC2NFy54gr+p3IW1^OD_YZrwzQ)?9q33WIulP9y3&pA^q?ob
z=uIE`(vSWOU?77S%n*h$jNy!6B%>J37{)S=@l0SMlbFmDrZSD`%wQ(7n9UsKGLQKz
zU?GcG%n}k<$}*O-f&eR7#cI~DmUXOW1BoQDkz_WpnJom_$~LyMgPrVRH+$I2KK65f
zgB;>8M>xtcj&p*OoZ>WRNZ~B!NaZ{ixJZagT;>W_xyE&FaFbiy<_>Ax<sSEWz(XGK
qm?u2t8P9paOJ4DsH@xK?@A<$-KJl3^eB~S8`N7XnY}~J2$^QVPMPMrc

diff --git a/src/model/image-tag.test.ts b/src/model/image-tag.test.ts
index a9241f2e..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',
@@ -37,6 +37,11 @@ describe('ImageTag', () => {
       ).not.toThrow();
     });
 
+    test.each(['some version', ''])('throws for incorrect version %p', (editorVersion) => {
+      const { targetPlatform } = testImageParameters;
+      expect(() => new ImageTag({ editorVersion, targetPlatform })).toThrow();
+    });
+
     test.each(['nonExisting'])('throws for unsupported target %p', (targetPlatform) => {
       expect(() => new ImageTag({ targetPlatform })).toThrow();
     });
@@ -45,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 06f68d79..2b9fd910 100644
--- a/src/model/image-tag.ts
+++ b/src/model/image-tag.ts
@@ -20,6 +20,10 @@ class ImageTag {
       providerStrategy,
     } = imageProperties;
 
+    if (!ImageTag.versionPattern.test(editorVersion)) {
+      throw new Error(`Invalid version "${editorVersion}".`);
+    }
+
     // Todo we might as well skip this class for customImage.
     // Either
     this.customImage = customImage;
@@ -37,6 +41,10 @@ class ImageTag {
     this.imageRollingVersion = Number(containerRegistryImageVersion); // Will automatically roll to the latest non-breaking version.
   }
 
+  static get versionPattern(): RegExp {
+    return /^\d+\.\d+\.\d+[a-z]\d+$/;
+  }
+
   static get targetPlatformSuffixes() {
     return {
       generic: '',