From c908b18ed38b2427a19bec39bd08e23e2aa79a30 Mon Sep 17 00:00:00 2001 From: Matt Ray Date: Thu, 26 Oct 2023 16:52:20 +1100 Subject: [PATCH 01/14] Add existing OpenCost plugin to the Backstage Plugin Directory Signed-off-by: Matt Ray --- microsite/data/plugins/opencost.yaml | 10 ++++++++++ microsite/static/img/opencost.png | Bin 0 -> 11349 bytes 2 files changed, 10 insertions(+) create mode 100644 microsite/data/plugins/opencost.yaml create mode 100644 microsite/static/img/opencost.png diff --git a/microsite/data/plugins/opencost.yaml b/microsite/data/plugins/opencost.yaml new file mode 100644 index 0000000000..dbf65979ca --- /dev/null +++ b/microsite/data/plugins/opencost.yaml @@ -0,0 +1,10 @@ +--- +title: OpenCost +author: Matt Ray +authorUrl: https://opencost.io +category: Monitoring +description: OpenCost provides cloud cost monitoring for your cloud native environments. +documentation: https://github.com/backstage/backstage/blob/master/plugins/opencost/README.md +iconUrl: img/opencost.png +npmPackageName: '@backstage/plugin-opencost' +addedDate: '2023-10-26' diff --git a/microsite/static/img/opencost.png b/microsite/static/img/opencost.png new file mode 100644 index 0000000000000000000000000000000000000000..3dcd2965be56fed6ddd02ead5e6c3e98091271a9 GIT binary patch literal 11349 zcmXY1WmKG9uZ7|aGElU*Q*>~5E$;5_#kIIQ6nA%bcP$L=ZpFR8i^HY;?vJr&WpZ+I za1_)A$^Tj1^AY`o+V%wkZyYPj0XkSnyFd}_jBf9mRt0e>jt z_sK~$X4RBTO%Y5Jq=qz8B+AB;-^sRj)rx2g(U#9VyRK=VZEEO~=+J8mzwoOnCql?fon|l9^jx|P(I$iv5Es&lie`dCnk{Ecq<;m``KFUJVW6L4CHd*1 zxvc5U0m?sPBR>=nO9lx>u2h*|;Iot+wf;{hJce1z?8mQEXurP_VPw=`8S>dOloW1L zQu3XLe?r8`xu6c*h5j<#>+63zL|~!@znB`+XVLw&i`XU?B=T=pGePYjU$kk3%x*1N zgp4^jesy_-SoDoCx^Quj4MC_lrbz*=>+}n~f zXtag=ZL*8IbR-DlU*DS34QpinxmO3FQU^8~ub_HNl$#Agb^z5WjG4y$34sJPu^||T zg#7!BTQ;C0xgl5)#+$xFF_Gl&K6gVdt7R;t=P8cL@yUY}gg6u^+)Ky*qz-MdsIHeV zS#B%w^>XpEyzbjTZlwNmOzUnW2|TbTa4``M58t9h*VD zPagjkm}i&`PWz?$)yOixdW@gY@FRLdaz}00;5>9Ah?zTf_Q|Is;=ES^nN0tQ*X9eS z?sL+ccmUbFN%LXpbV93Q^e3@WjV5ejwos}SokSeDH%T;YbGKQzWf_+7JIjqv{`oT; zNE4KnH8h5D^4}?)IY6m=SA=&hY@&uJ?v9JbukM~pN5Hd+nGVM3f5(VQGiF+gNObb$ z3<|px1e7pSXBTnBMY8luqB|tDI&R{Y8DeZz|0f#`^j~1A2r#qC4#JXQu5F+`hf*(5 z>-9ioBF9m1$a(RlLv7yS8LG&*Tj#8K@1k!+h$Jd!KRP#EY;df=E%&7m}nYYhDpf&jZv$*jbe%(o|pn$ubh7f4Pbv5Pk z69y0>Bg+AKi0fptauJ)Xtp3BC@AaUT@F?t4AQAt4LQSkr`&HHc{yrPS-l?EN$lp7- zGpKF|n_R#jYnx`GIbjmXvVinmqvIl6Wb16zE{r*FN$$`M`Td|t#0hZ2LolomP<*_c z^Un#wA>TFA!kr_udgPdI$7F&E)8 z!*0#w99i~lb|d6wt^b_9`+1Ds%%JXM56PM6@4-t83vPFzofZXRR>4VH2MUVeNo&<*(l^q4$tL*{o%`bI?$LA< zt`KxOYaRnPj?Y&QHM||(HiV^M?!=JQMflTF!J{^b zW#pqT6&7qAtj;rUY`u?RD<%oVVSZ~GyE4Hvg=M`sdtB0cbAodSL4f=l^XTY_@GP~`r0V{`QM^tyZ0BB#?M@LL9U!K=1?HjlSe zI7}Z|(+`5BlaK&^6UB*Mx^oF_E1m|t9WvS$#ytLH(nJkrmWX|U5+2>Ck2$2AJVAG< zne2HOJ~Z*pz7Wh0jX%pHbp@e@(?eOPio|XEMXO`4U(#IM355X&1>-|X#nVAI8jN6e zAYZ)Pe&r^fXjGcjhr;>K!WU#gHu0~DcDptk=}n>1JwINzV7!r4ATt6P+#lmd4M9l1 z@KY`PiTNR>GA|%5Tvn~y;5M?uXiN}UTKlKLrCBryUG95%ST1vV09YNL_bji(&ic{;h%Q&B(SMSVGIpnizwu{U&2ec zwe07RQ+L53B-SkR34BhsqhG?voan#MW)QvDzWXxh=Dbxd7`E89y_Wc{KaTc*dEb7s z^^8ye!f21@Iycl9&&nNU#DQ`+YmYEO2p2bmFEMC}K|#1-WtjsL{p(@);Cb@1zWMF? z_5GA!aK!lMJ?q%l+mWtFX=&{$pZ68{#`kAN@BiM2ObC4)nM#@de4;Oj2{vi<7!@8) z#eg;>kC#)d+gsch#kMQs^dqheLu4tzqhz*|tnusksWp5-9>jVIqD)7+TCZT#y4X$s z@sguvqmIv|V#U^Z_i4fVp0@tmQyzFveiE8n64e4@oAFcg zs4x&4XZ7(|3W3fX>OnV@NZG-t;lc3)aqx_uRhi0uDD%g0UMzCMr`;iTKcF=1ak0tH zw!mXS&!f+~uh;Zg5trj}e~UPS?t`@OXrxxoARLlCM#w_6@kg@B;ynqhh&UDxCM@(W0$XZ$!lMZKQ6sn-;GRrnp5ff z-szt*fP1}hUH^ig6^x5wwBKgEG@ICtie|%-T7tl-D=qMujI$WpP1fJgPo>xSmN3mM zx|E)~5#Mm*bb8!#0|4Mf<*3pm4Jx($Q0`lPYHzok^PL*pyDl1jf_?hFa?<+j`|i}^ zy?2)OZk$x~xVfAZ+VemK=f?LQXna_h69-M4teEudi1SvIfzXiDvT&;ukFY2)00}~Y z5#lEvWHNQVO=$>b;0p~oLTUg(S*L9T(oBDY@4L5_Nv>w&4x^_%z{XBDKRjS(WT3Co z*U?&4&||2nQK8B1iCytH%^5MOD-z{p+ECCJn3-SZtgH5z2)ge08%*zSd)Ph>k)Q&# zhOJKTr?0}JJxMM;^?uD#%q;a$>{23nVraY|?rn;SeLz+L)VysVt`2;?a4e~!8g!re zZM&{N<*o{hO-uTdb%fU82X?QGgJtv0+(r5)$OuV;V1o!rZAwO%7{1mQyKjM+ma z67$m!D2KoV%|Udw3(>hsYjkRFzgW?D;R==eBlpNuw3hHU+ke;QZ;|P8)f@@VM?wqu zO8c4e#34h!gB>qaX3|div^f9R|JaHRlvL1)ydIlpVD+^6A6`QPefeOj`flCB`k=F= ztNp{HK!Zo5ntwS;^tmQZQ2F}o>Fzf=&qvU321yg5O|Rq6-Lb;^I#w6_t65!WF-_>} z>5bAa`VGwIl$jMx;Nt&O0Ig;1XS=qFsW? zU}eQzR}5}y7zQr@c6ni$?W>zg2qAdBWpK?ThHwRPu}&ee5F|oxvSe=dp8`qYR4Kp7 zR7`S|{Dv&025> zr_}s3=!Qu#n*4@;Mki4Uu=mtn#e<@~?se%8H^1*g`{cYb(LX>7bx6@LG)0_QqGFA(m+64y&Vg`dhXPsn`vtsg za_rT2^NPl1!0#qa?PxpiehQdoF|vs6y_8ip>-t+~#lXQXH@PRPbyZ17aK-x5n8wB96*1fgHakC($ zFM;^?DjE4;jq$io)Y7wLd05)$gpGeIY(lGVFh&a?`o?n43Vvu@uvqOptV4G5F0>Vc zM_HR`DAD0ahKY(3Tfg9-3Hjt9yE`F~T%q!7XK;&$f<42+6?h{Wad?ijzW581E)+g$ zoL-GSrN+XOEgV|x)DMTt!yc!R19}dek!>EBfyWK`l8eWirU~m!kdHVFt}WWF1nQ4R`TsWOicO(xSyU2dlyIJ+ zBr|`v-=$Qd>|*`+ir4Dl4js_k)U!>(e6}NBp-2K&BMQ2Tn?Pu#?-E{0Qa0#Qj5y9T z`A^l9YYHD8rKj~5A40%wVSdQ-?MukECJEH$sS1nB+jjP~b)b-7ZghF-0Dm=y8qU30 zDP5Hde&1qX<$(z`*4o>`l)x2@H|ZIa@u-I9nL8ZRIq<%_4# z+(=z3jb@b4i(SyAs+mqG-WF6|4Y@TImhR?mcYW^CjXP=9A2w}ZCB8^Rx^Kp}0GI$t zPJwLMtz63Bnj})78ab3PiZtyqARl~rSNz5J!ZoN!S1ofVgfPe_RVK26Wb7dnhgb0< zySZ2|>NGrg&|%$lv@%ZNBZ!o9FX3Qn((!!KAxEx=RB;QZ%m;&+dRz~$xc;U$;X^6| z+}Iyj#otWeNXEeU0l$$*WDY+UQnSpVC6jKtx(t+3kizoOaLl~J3JsfN`4#WokK$T^ zbh2@tO;kSO<8{>~nE=A5ZaI)2HCQ6dqDNzZ(kyPTiiVwq50dexE%Q)XNIrNwRo-sG zm_M?9VG47Z^9p>bG@tSEZ1H$I28pn1BS@xLES4o*v;2W72$0zbZn7m0j^aIqNA-jy zyG{}mU@%P$Y4OL$vb3AEC?TLBZWy>l{d;-$R7k+i8suvx8r*$i`32N0M*!n#CMc-P zPZ{QV678wfxe3%P+gRp5J#)tjS!BY=96Gj55HvaSY^p?a?di@va9tF|)m9DICbVBW zmC8!tNt=V5?k7I05Ml75CQ}Q{--nZb^ogc70)9rdKGPrP{g;5rd&523kA%+Q{Mi&1 zF4v8TmKmKbgkDc9W)B}pyTp%sc|!Z^n(Jg1e^avUN9pmIDEoc7zwUF^gDHR5VF=obC0YvConeodE>48MSde zWp$F49eDCATsWE;%i9LKRvZEjHFlig zrT`D?MwQdVZM8GQ)DhmBt{e(u^vQ&7W)v}NI6kwKS@U0W488;H-|!A#y|PVimH zIwOBo*S3KUKd|6PNilz$ir#8rpFQwA?NDt z?2{n6S^i1rc!uC1{Q(T=F~sjxpo2#wU)m==uP$}XXl~xRh!%r(f#c$OGBEPQY43zm zqrwHfvpLw^u_Ln{WU26a3y$XbK-3>-n!#4@1F&%sfF}bmBZrdFuLoH%?PQ~)KcA*A z$!NT0VX8z;OitKlr)8|gU@=2$%90(TqZDsg!D>O)2`{C|#qI;$2~9lGB3Ut+6^i#b z2i9Ir;Cp|gFpJa(gxO@bE7JsPlKXQFlEs9Gjq$_#Owrw25%-Fd-Cnne(=C)ne@kk5 zdX70E!ZEV3GxRy_-`!Pv%kzPchAhaB_#cE$ESBWO%84A=YcQkDz_kk2*3+|d{T$dd zs^n3Yw^$<-t@LSz^bD)m%WmKRxJW3C&oBH6pD(JT zeYWsd)655>(6l1unce00h$xy(M6ax@mHVPa4i&aWqE*Fft-(+RNEoS6(qTTn_5;ma zBeA82=Odb;5Sg`7@BTb23#4b|SeG>+jnp#frPtE|W)<|`FW$Zjgd{f}%~p^S6V&Ir zTOqgcEo&0JP-xcCs`vYV3okT;R&2_ zM#m5aZ!yuE_zZI=<7l|R1reA?v% zTU!bL^WdJ6(=)$jjeZVlUk@Dvfhukrg?q0QROMH?`~>REEk*F|yk$aP14?Ujj`@JZ z&^!}l%=Wof5BpC;mw{`I ztj>IuMg{3iS>gE4cBrmuhI5d(S~P~MJ5J=v9zv?uVE*A*V!dEorOs4HrlWg)(?2J;?|hiWSkjfL8&S#nF>A7Q?`yH%W~T>h z+)J!%dDH+Bg!|H=h zXC!#Q0p)>=gBk0a#d{0U^B0oeEYWv&r}_3wR?%r~ZQ>mf?@l*2niGtna@9f{?!)C) z{$HOO-I)MDxOOtcR$jFjY6>h+4Ge!`$#$FiMt1_CeP4MoGM!CmA7=Yc zO?+4NQq9yA`o$KR!q+Vy8vx1g9CYCenZeH(YpbSV-BI0ceY09vu_FK0Jl7nFxPf(A45b|0eJ9sW@Pa+06hQUv=*6bKlU>c!s@ ztCAHhY%Jha^<{oTmEzr;%nveDj4PI@yhJgwY@?A1!?3+VV8LWRWKcslk9n3FL>Gh+ zZ<8YTKjnYY4aTL-W|vmLW~6oyH#p}*$ifmHCxF}|Kz|_3 zCv(;`8B(fF61(sengLVh&B3|O`&mI>v;<@3;DZWMKj-1@9S=pZ7goj7rhGc zMG=a6%WF17^{fg|dm&xeSV-h?c45Zr$J7dCktM0fFOw51xz$9z-$wT)y+$LPnLIPI z%iX6#6_2tvRtd2MA}xTI;|wyo%B-{FhiX$<*wnRFy_A~hz9AN7A3fsbON?-V^P+5s zJ{HTOi+@WvcU9gp;wRgn!&b0H z@e-++m>oa8(abV=lpCWKAV57H?1s<%ShVDj`*#lpRZ5zn7g&P1Gp&8H#IsM{jxHB~ z!2PE7*rI(AkB^)kx&isobOh0|h$>j8>7FxNoghER9N8TJN1jU;D&-B&DF{6|v3VBQ zBDG2_{*c7PJwjSxtHUJ?YNFoPh9t9NWD_y>deq#L&we#cy7Kn(Kv5vcbGO|?qft6w z{_$~JX=&g~qKjosD!y6@i(5A^Y*a0AAh2}6*c&>`sHF}WF(JL7qLpm&d-p6@7}qTa z7o}_|9Sb`JYn`GWV>pdt<)T7MYy;TOPQI6^oTCZIoNw@(G}fEVw4EnQR|>1M2pNXp&Mox3L(nk$vceyAq^rf5;LF-FWhKIyo3?pjS#sn^d^_7Tfyu1&U{ z_i7T!D1NO0ely5!Se#_e4TtdGI{h8kw)tzP**t4pxBNnV61qr`gV*^YRVR;kCHvb( z!(&xY+J4~9(^)j8p{s|Hjl_l9_tzVB`NOwc^|tr58}%L>cO!#`$58o~r=;f*Y2{@` zW#uC`r-Kc}@#T6^ULRPcbSSvtzKo_Dg*X5^-L%N3>n}bq#gwYy8X89)MsMp_UW=i9 z{_vO-(KMuWd2j((=CzPqa)*=!oW@z>--7pr-D4`EDZU6Zb91c<1k0srUg$(#>Yn5a zS1Rz{n-`tVp-wW=t;^C|e#}~ud?GLPd}_|k8MEA@5LxdA#5K4cpJ?^#%CyB#PET`Y z&jLd1`jUyqLcCqO_zJ1x+G7W_#4+Gm@&jQo>);M}Y8Ik;yZC>%K$PUbSx2EIWSC%> z^EzpIzDwXR$`?2kb80Mf(e^!!dCIB+Sn_V}=)hy+`}8VdZ3J^2y6&AMJgOUkrQ@H03o_&)hY+j{cc$vlpCm*R?NULR4OP)mN9X`m%ZZGN_K`n=&((16H6q4I9^`{|Mg2=kg*MmThYd zXg~Ab=E<-O8XVG*j(I|zGz)Su(CEovL1!Da2kk)i-4H9PUE>khrvkq!T4BWI<4C-eXL8gTUey{}q&wsf9 zRou8iF5XxtQpToCWXvbRisLIEQzec6j6`4jBkEr+5t|psWluR?N;rHT?%(A{YM|Ef z^8xI-)TmUmU(?UO()(dSh|19sD^KyV*&*)D!c*s6(7dpKE7Q3>mH>62a0x3G`4Y=p5p{8ZhI)5r> zuMF|KNcft&qfvPZsyI!c`Wm^`k6WQaliUMbhxE0NayNSO-+B-9KX2J$qIAR$BH&O= z4jb`pyqe93J^5h??Im=Ai~ zJ6d5rKE7PqS2i=~Iw@+RpzrySWft}+(ZPws(k_3J(IMi!e(un-GAO127~|zM1@O<% z(#9(fFM`q6Pep1yM!CE>KsC|Nog(&jb5j@g^+AEHhvC=EG4fUFe0m3Xnc5tk?p4q7 zDGf04c=)wS9ScKeq0jL=pLMr!9T+Q8NaN*X9dvlwDV zt-7}&`$aha(4g48ZkzHx`Ov@lHWL{|6=c6lIR;NMFV)P5B=&^@dVxnVh>O>%fy^qD zSZ-x^WV_64kOfoeMH)I*n7?K51U<_mIJc^073Pc$HXrMRX$PiilD0IHxd2=Ob z*4<*Inc8>gBEtLA>JJu^2+akVgad58k;<&jWS=$0iO?4@&FDwkf%?lbIr0%cZlp!F z#R*3^^Ln(Zfnghmpjyn$Q%;S2lnsrh;@^2GM~E@~l~xJ_t~@A=<#)za9r~*ugNL|{ zed|wJ6=zj54RY7sx8iolA3eBbV*DioYG%WF49%TDkaF}PK`XA1bRfY&XjAFKZ*=n} z25=a;e6(3>ctdTaEh>-Z%mjS3^z9~7WoE&`5;FVAdBEb6P^tfLkOXZmJWsT2zHZbC z{WRWWp6M8d4z+d;7bZZ!<2v}2#mOleQNGeFZz;)4-xFx6)A2~`53^$s)V(I8sE7sm zhc`d!2Z)F{z!a;}A~4t|2RhOq169)^9{M8k4L(bIwrm`>(pHG|#w;&KDA5IAhjrZL z1V4E4wVeypLtK56x@~?n99V9b(n5p92Vmh4TyffLw>%W_`UveF1(!Fd4Lgu~igfI^5MdAnT*nMGL_U3%&v^ zn87p)HP>n0{UPRyp*;*>CBx&_XqaOEqYzNRm6sI@yQ5MtZkuK%SFr$N(ztd*58vIy z$0U8Orc=*-@7^Sq>|`3^J*V?wTw+p>*EeUp46A^63`sDvZITiBx>0fo0?xy&63eO2 zg$xHYJK2NyF5Mo{pf`gf83w7WxoI(!^;I`D9+gV7 z1AFUncXoG@V>0`3R$qYUVYEiB>p$GHmSZGL69LaR^Vpfn@yB487Hc-7G}d^aDJB02;$~)l=qA3aTlin)`|`+zMwAQdCRFoRyT2_%+Ep(zA0!)IO^< z3xQN|vFQQCW5lgibvhv??%5Rl!iVlHNPw^4eI)3<=jg`6kl20sb>O65i?AW=HRXPP z)DIkt<$(r^YFj(PwdTkF;(5MrdDdZB=P3e6ZBeGKl1X`SUTne$I2DA23f=Q%f&f&W z{t~G(QQ|pbQA!S4(So*QiXl6^Vkho-ASWTEJe4$fOnTS;!?sK~!>@PGfq$_0Ad~NQ zXnyTsiWPaGJduKt4DwAyy9@ueK>s!&Te;dC=-TXF+0t}jN=>b9y8vrcQp$4vx6P%% zSi+N^Y1elorFg{=w`mZBVDUVO{Q$6^dTQEc&Ftz?Bxe(p70M$MY7k5sBqGaYZ`UTw zCwh2m55n>bS~qpt?D6i*(AfKeJ`lX@z9H|=p~Hy%1$9F+Vv$^2g}lYK%gBD1CkxlT zqi5{3v3TY(#?ShMnn{ur8>IOBXTHbeXf9gj@kRha9G6T?x20Kuw zAfj_CKtm-pEylP}{ih;9Cc~At5JJ6`K^4=1KOI1NQ>9F2)gvFYH!$MWWfAlVx^7V_ zbKE~Gbg*eSMhKWLG%;WoR%e_RDz3P(a7hLYV( z3^-S1(rn``8O=NMH3E%YQ=hV$MLNDPE>&A_kKkvTSEcaGV9j-H+Ie0_q#EiTwpcQ> zq-%|6Zd7&@6Ye#kYOjS~2+w!P7A+Ph7bQVtPuMPIg%#wyZ>90Jq@2&AEfBHTwo#6K8$I)-+ zUrG;yMs;{eQv2V8;hXwj=MT~xSTwUe&CS=aV?%r#Jjn!kdtD}O#I^- z&4^+fnn`r5aEro(C#^Y|*~Mt4&J1s<4QYLp6*5IiZCgNr4_3#rIIA74IY1!by?7$R zY5K0)%BJB|V?^A;_oZByk}`egFBOYC|7drt(P=_c^|Z-mLTGPDga2wb>HhrfEsZ8J zF$>sU#$B&VkZR3Q?Nsz#KMlVnl2L?%@~;`97`h+qFzXA5Mi=|nwd=BP#rd`BC6si* znng-nig#o@hKs`5%s3m{kkT`fRZeuq4Gjk~8oV|UQGfYOGhzUBN=&?P=W-L}?+2hT z7P7!erQbSf_*-Lt(monJu0oF-nuWyH^OITMo=sc=@DhyDWE9%@yZkAv=ljw_7n%Qg z7u2o+hHqr8Er1C^^WHGN0KDoiMk~UGGsWaOw^*%W^3(|YaS3KCGQlG!Y{`H0Al?4SDK8yt@hzb;bs%rm~ zn3AIUqp^fAVA|TADypi~h!_iFCOZ6|-z3&PHB56@4>eiLn55Q+0{`g4ljx|vR~#{# z1LS_eEg0jmEorc@>9akE2#@+Ef*3yaH-7#fGZEd}x#p!OKsLefOWeDg!SPA`*QOoV z^PV)cDrB=6h0K_9O={tB`~=v=`@l8xlv|898;Qs*iQ;Bf^ literal 0 HcmV?d00001 From d98c8112e4360636c6e36c4040ad23f3a7f70401 Mon Sep 17 00:00:00 2001 From: Matt Ray Date: Fri, 27 Oct 2023 08:12:13 +1100 Subject: [PATCH 02/14] Squared Penny the Pig logo Signed-off-by: Matt Ray --- microsite/static/img/opencost.png | Bin 11349 -> 8173 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/microsite/static/img/opencost.png b/microsite/static/img/opencost.png index 3dcd2965be56fed6ddd02ead5e6c3e98091271a9..14fe563941abc8fb0248247428790bfd1e66dfc6 100644 GIT binary patch literal 8173 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 literal 11349 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 From 8889079f0601282e8c2082269a3d6802961d3cd4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 16:27:23 +0000 Subject: [PATCH 03/14] chore(deps): update dependency @types/recharts to v1.8.26 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index d48588b7b2..ca203fa0d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19557,12 +19557,12 @@ __metadata: linkType: hard "@types/recharts@npm:^1.8.14, @types/recharts@npm:^1.8.15": - version: 1.8.25 - resolution: "@types/recharts@npm:1.8.25" + version: 1.8.26 + resolution: "@types/recharts@npm:1.8.26" dependencies: "@types/d3-shape": ^1 "@types/react": "*" - checksum: b2ab1596f391b70e349ae5f6fc6b29c16f6298f1151747aff84b3380f4644c4e087a489ca55325dc627794317f8e677c9906ab75d2e270c79e45da976a347af5 + checksum: fb644ca93b12691ab45ac2bab863051945f9f33ddf52ad07857c982995262b14135c6d18ec3caed71f4fe7c4a6933b69e62bee3aba8e0bf3463f04e0d6ae7952 languageName: node linkType: hard From 24954cf6e775289ac8534aa2a60f3c8b6e5b7072 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 17:01:46 +0000 Subject: [PATCH 04/14] chore(deps): update dependency @types/recursive-readdir to v2.2.3 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 80481ebf27..a5ee76dc80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19567,11 +19567,11 @@ __metadata: linkType: hard "@types/recursive-readdir@npm:^2.2.0": - version: 2.2.2 - resolution: "@types/recursive-readdir@npm:2.2.2" + version: 2.2.3 + resolution: "@types/recursive-readdir@npm:2.2.3" dependencies: "@types/node": "*" - checksum: ed7f73d11354c7df7c5296a73500ace0b9874083c9f9cce4c5a294bb6c9b11f92d25c08a23bdc991f0537358d31e2ae3943169d42fe739ff54ecfddf9ff6b420 + checksum: 9a9136b93a133de006bf6d9b2f8bbae6e308a0b5a9c9acf490848de3ec3621804a09bc166999e81beace3151cacc2085f5617d90eaa329a99f73c1bb6806531d languageName: node linkType: hard From 59167a54042fa79f484169a5c7a75a6580709c01 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 17:11:58 +0000 Subject: [PATCH 05/14] chore(deps): update dependency @types/luxon to v3.3.3 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- microsite/yarn.lock | 6 +++--- yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/microsite/yarn.lock b/microsite/yarn.lock index ba22850109..0200b84675 100644 --- a/microsite/yarn.lock +++ b/microsite/yarn.lock @@ -3055,9 +3055,9 @@ __metadata: linkType: hard "@types/luxon@npm:^3.0.0": - version: 3.3.2 - resolution: "@types/luxon@npm:3.3.2" - checksum: b9111132720eae0269538872a5a496b29587ecfc8edc3b0ff7d269aa93a5ff00a131b23d1e9d1f12ec39f2c779ad21bd8d9f90b122c85a182771aabde7f676b8 + version: 3.3.3 + resolution: "@types/luxon@npm:3.3.3" + checksum: 072dd39eea3f63453788fab2fcfc83eb33917afcaffe178ce08ecd8b016824b8ab3bfa991f66266f2fc1927768a56b4334945f2eb1d83638e325c0c43d7d0e86 languageName: node linkType: hard diff --git a/yarn.lock b/yarn.lock index 008f181286..146486067c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19057,9 +19057,9 @@ __metadata: linkType: hard "@types/luxon@npm:*, @types/luxon@npm:^3.0.0, @types/luxon@npm:~3.3.0": - version: 3.3.2 - resolution: "@types/luxon@npm:3.3.2" - checksum: b9111132720eae0269538872a5a496b29587ecfc8edc3b0ff7d269aa93a5ff00a131b23d1e9d1f12ec39f2c779ad21bd8d9f90b122c85a182771aabde7f676b8 + version: 3.3.3 + resolution: "@types/luxon@npm:3.3.3" + checksum: 072dd39eea3f63453788fab2fcfc83eb33917afcaffe178ce08ecd8b016824b8ab3bfa991f66266f2fc1927768a56b4334945f2eb1d83638e325c0c43d7d0e86 languageName: node linkType: hard From 1d6ed3011d928e10f91b270642dbb06a8a2e6f12 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 17:13:14 +0000 Subject: [PATCH 06/14] chore(deps): update dependency @types/regression to v2.0.4 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 008f181286..187acc06ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19576,9 +19576,9 @@ __metadata: linkType: hard "@types/regression@npm:^2.0.0": - version: 2.0.3 - resolution: "@types/regression@npm:2.0.3" - checksum: 774ef76911225b61c44946573b54ab710401d0e65b9433aa7014c701272167c47e818d4c9809284514881837c2159cd47aad6b290f00f8581920f2c7a146a512 + version: 2.0.4 + resolution: "@types/regression@npm:2.0.4" + checksum: e35f7474103ecd9750da2daa6182e236e096ad9edeba70e479a6f6dbe1486b3b7b03dac1976976622161e8f48ef92f83f1ed3f1d42b8e6ba249a50c168059a46 languageName: node linkType: hard From 877e58ceefbcce38b18756e66a93bcf2abfda376 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 18:13:47 +0000 Subject: [PATCH 07/14] chore(deps): update dependency @types/rollup-plugin-peer-deps-external to v2.2.3 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 71094bbd15..9c3dc07b8c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19630,12 +19630,12 @@ __metadata: linkType: hard "@types/rollup-plugin-peer-deps-external@npm:^2.2.0": - version: 2.2.2 - resolution: "@types/rollup-plugin-peer-deps-external@npm:2.2.2" + version: 2.2.3 + resolution: "@types/rollup-plugin-peer-deps-external@npm:2.2.3" dependencies: "@types/node": "*" rollup: ^0.63.4 - checksum: a821911276d1882cf30c9650abc3c1cf7b29490ecacfdd537663a4de32b42ff7171bcd69568ce1b256191ad1d2937b1de839d1db85538769787986a5877273e2 + checksum: aa656653c469d50fd68cdb6af332032952a27fd761155e749df14e2379eec77fa24a40910c1f207f2d7a2f0c2274087882dea0ce52ad8031b1066e64905dfbc8 languageName: node linkType: hard From ad069a5ede3750bffb9cbdec909706c91139c5ac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 21:35:22 +0000 Subject: [PATCH 08/14] chore(deps): update dependency @types/stoppable to v1.1.2 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7c3810e6b0..88f1912bf7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19784,11 +19784,11 @@ __metadata: linkType: hard "@types/stoppable@npm:^1.1.0": - version: 1.1.1 - resolution: "@types/stoppable@npm:1.1.1" + version: 1.1.2 + resolution: "@types/stoppable@npm:1.1.2" dependencies: "@types/node": "*" - checksum: 65617648686469e7130a9c00a018c03ddcfed8527a162e50352780e9a1acb7187d646389a596c2aef3a5566e3d649f68f0de7822be7349cafde5c1ec863c37c6 + checksum: 729137560d508786dd381b96206074b6a622387a5c8a1f082fa23620a0734b84e909a972dee4dbc1891272b8fcdbd30f372043c43bdf917f2a5bfb7ac6640cf0 languageName: node linkType: hard From 081b151be7c53d64e92ae8ff7e7c2f1bdbf684b6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 21:36:02 +0000 Subject: [PATCH 09/14] chore(deps): update dependency @types/supertest to v2.0.15 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7c3810e6b0..2616086dc1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19812,11 +19812,11 @@ __metadata: linkType: hard "@types/supertest@npm:^2.0.12, @types/supertest@npm:^2.0.8": - version: 2.0.14 - resolution: "@types/supertest@npm:2.0.14" + version: 2.0.15 + resolution: "@types/supertest@npm:2.0.15" dependencies: "@types/superagent": "*" - checksum: 9f6850a22b8f0fd4c26a6dfd9b64771a66476b1a4f841a3b84a9da843ce69463efbf37594fe107297dd14a225d199b802464d48d70e9413238c637903d392137 + checksum: 89c1983662f0ab20969b3a6c44344397fd222d0f78b282619aabbe817f7c88a64210fd2b8b8f075ea22a27084e30ebc287bc5105619cbbf9af7f008e77f6eb93 languageName: node linkType: hard From ae30a9ae8cbedc6df69c0656bf7044d1c869db40 Mon Sep 17 00:00:00 2001 From: Andy Muldoon Date: Wed, 11 Oct 2023 12:08:54 +0100 Subject: [PATCH 10/14] Added description for publish:gerrit scaffolder actions Signed-off-by: Andy Muldoon --- .changeset/lovely-turtles-remain.md | 5 + .../builtin/publish/gerrit.examples.ts | 159 ++++++++++++++++++ .../actions/builtin/publish/gerrit.ts | 2 + 3 files changed, 166 insertions(+) create mode 100644 .changeset/lovely-turtles-remain.md create mode 100644 plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.examples.ts diff --git a/.changeset/lovely-turtles-remain.md b/.changeset/lovely-turtles-remain.md new file mode 100644 index 0000000000..711a397baa --- /dev/null +++ b/.changeset/lovely-turtles-remain.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder-backend': patch +--- + +Added description for publish:gerrit scaffolder actions diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.examples.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.examples.ts new file mode 100644 index 0000000000..6729b3602f --- /dev/null +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.examples.ts @@ -0,0 +1,159 @@ +/* + * Copyright 2023 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { TemplateExample } from '@backstage/plugin-scaffolder-node'; +import yaml from 'yaml'; + +export const examples: TemplateExample[] = [ + { + description: + 'Initializes a Gerrit repository of contents in workspace and publish it to Gerrit with default configuration.', + example: yaml.stringify({ + steps: [ + { + id: 'publish', + action: 'publish:gerrit', + name: 'Publish to Gerrit', + input: { + repoUrl: 'gerrit.com?repo=repo&owner=owner', + }, + }, + ], + }), + }, + { + description: 'Initializes a Gerrit repository with a description.', + example: yaml.stringify({ + steps: [ + { + id: 'publish', + action: 'publish:gerrit', + name: 'Publish to Gerrit', + input: { + repoUrl: 'gerrit.com?repo=repo&owner=owner', + description: 'Initialize a gerrit repository', + }, + }, + ], + }), + }, + { + description: + 'Initializes a Gerrit repository with a default Branch, if not set defaults to master', + example: yaml.stringify({ + steps: [ + { + id: 'publish', + action: 'publish:gerrit', + name: 'Publish to Gerrit', + input: { + repoUrl: 'gerrit.com?repo=repo&owner=owner', + defaultBranch: 'staging', + }, + }, + ], + }), + }, + { + description: + 'Initializes a Gerrit repository with an initial commit message, if not set defaults to initial commit', + example: yaml.stringify({ + steps: [ + { + id: 'publish', + action: 'publish:gerrit', + name: 'Publish to Gerrit', + input: { + repoUrl: 'gerrit.com?repo=repo&owner=owner', + gitCommitMessage: 'Initial Commit Message', + }, + }, + ], + }), + }, + { + description: + 'Initializes a Gerrit repository with a repo Author Name, if not set defaults to Scaffolder', + example: yaml.stringify({ + steps: [ + { + id: 'publish', + action: 'publish:gerrit', + name: 'Publish to Gerrit', + input: { + repoUrl: 'gerrit.com?repo=repo&owner=owner', + gitAuthorName: 'John Doe', + }, + }, + ], + }), + }, + { + description: 'Initializes a Gerrit repository with a repo Author Email', + example: yaml.stringify({ + steps: [ + { + id: 'publish', + action: 'publish:gerrit', + name: 'Publish to Gerrit', + input: { + repoUrl: 'gerrit.com?repo=repo&owner=owner', + gitAuthorEmail: 'johndoe@email.com', + }, + }, + ], + }), + }, + { + description: + 'Path within the workspace that will be used as the repository root. If omitted, the entire workspace will be published as the repository', + example: yaml.stringify({ + steps: [ + { + id: 'publish', + action: 'publish:gerrit', + name: 'Publish to Gerrit', + input: { + repoUrl: 'gerrit.com?repo=repo&owner=owner', + sourcePath: 'repository/', + }, + }, + ], + }), + }, + { + description: + 'Initializes a Gerrit repository with all proporties being set', + example: yaml.stringify({ + steps: [ + { + id: 'publish', + action: 'publish:gerrit', + name: 'Publish to Gerrit', + input: { + repoUrl: 'gerrit.com?repo=repo&owner=owner', + description: 'Initialize a gerrit repository', + defaultBranch: 'staging', + gitCommitMessage: 'Initial Commit Message', + gitAuthorName: 'John Doe', + gitAuthorEmail: 'johndoe@email.com', + sourcePath: 'repository/', + }, + }, + ], + }), + }, +]; diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts index 60a0cc4aae..67ed868c4c 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts @@ -26,6 +26,7 @@ import { createTemplateAction } from '@backstage/plugin-scaffolder-node'; import { getRepoSourceDirectory, parseRepoUrl } from './util'; import fetch, { Response, RequestInit } from 'node-fetch'; import { initRepoAndPush } from '../helpers'; +import { examples } from './gerrit.examples'; const createGerritProject = async ( config: GerritIntegrationConfig, @@ -98,6 +99,7 @@ export function createPublishGerritAction(options: { id: 'publish:gerrit', description: 'Initializes a git repository of the content in the workspace, and publishes it to Gerrit.', + examples, schema: { input: { type: 'object', From 587c1990431c63eee29af7a08445d0e42709e6b9 Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Tue, 31 Oct 2023 21:29:52 +0000 Subject: [PATCH 11/14] fix dagda1 github link in OWNERS.md Signed-off-by: Paul Cowan --- OWNERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS.md b/OWNERS.md index 2ea263f3b4..b3f9d7bef9 100644 --- a/OWNERS.md +++ b/OWNERS.md @@ -129,7 +129,7 @@ Scope: The Scaffolder frontend and backend plugins, and related tooling. | Name | Organization | GitHub | Discord | | ------------------- | -------------- | ------------------------------------- | ---------------- | | Bogdan Nechyporenko | Bol.com | [acierto](https://github.com/acierto) | `bogdan_haarlem` | -| Paul Cowan | frontendrescue | [dagda1](https://github.com/dadga1) | `dagda1` | +| Paul Cowan | frontendrescue | [dagda1](https://github.com/dagda1) | `dagda1` | ## Sponsors From 6192093e21bab602c428da1b497704712998bd54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:10:42 +0000 Subject: [PATCH 12/14] chore(deps): update dependency @types/swagger-ui-react to v4.18.2 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0a8a00ef9f..7fe8853e37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19813,11 +19813,11 @@ __metadata: linkType: hard "@types/swagger-ui-react@npm:^4.18.0": - version: 4.18.1 - resolution: "@types/swagger-ui-react@npm:4.18.1" + version: 4.18.2 + resolution: "@types/swagger-ui-react@npm:4.18.2" dependencies: "@types/react": "*" - checksum: 33c5e9aeccaf6591bd8f59489f8ef50b941daf491f08ba00cb1f26140a756b00ecd6a84fcf0171cdb068134e52c3877bdac571357e12f224ae7fc5979aeedb6f + checksum: 71c5659f6d4bd75da20923aea551ecf013f4bc5af25cb03824ae6a8d324704ca413a0031c0488107c748000ff919b2179a36f34ab8d47e3519617217a95de039 languageName: node linkType: hard From 165db53cbec8661b7d839570cdb01c8e213d867c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:11:14 +0000 Subject: [PATCH 13/14] chore(deps): update dependency @types/tar to v6.1.7 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0a8a00ef9f..9436e31683 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19822,12 +19822,12 @@ __metadata: linkType: hard "@types/tar@npm:^6.1.1": - version: 6.1.6 - resolution: "@types/tar@npm:6.1.6" + version: 6.1.7 + resolution: "@types/tar@npm:6.1.7" dependencies: "@types/node": "*" minipass: ^4.0.0 - checksum: d4bcb5a06d8e4b6eac564f22274d72f6a14c614eaf5f6c6c270f3a43c197da2797a7c707bc0377cd2e6d8c429f277e1ca446121546c86021e9782034a306eafb + checksum: 74a346c86eb9fd1d7849b675e019ec784accf2f4a2abedc607e5449809f5205db6c31a7c0e7ac34e1ae5beabc3d260dbf82d7829398791397b971a56de4028b9 languageName: node linkType: hard From 9d52c0831d9912db1e28cb4d93f125296ffa6034 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 15:14:04 +0000 Subject: [PATCH 14/14] chore(deps): update dependency @types/xml2js to v0.4.13 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9df6b9bcd3..f98a71a3b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19970,11 +19970,11 @@ __metadata: linkType: hard "@types/xml2js@npm:*, @types/xml2js@npm:^0.4.7": - version: 0.4.12 - resolution: "@types/xml2js@npm:0.4.12" + version: 0.4.13 + resolution: "@types/xml2js@npm:0.4.13" dependencies: "@types/node": "*" - checksum: 6197f6d51d70ba7e6d3169ef6d58adacfeddeb2d8cfe4d2bb24eda86223c7dd77c82896c3aa3c636b3b1442cebc6d05959d1e65fa206dac2caeb99aa2c943716 + checksum: 757355c1867b4bd70a85cacac91ed771d172f269469b92b3bace2c7e91f9848ea3efa2be2901f831e2a632efbf6d128208a4495ec8a5fed9f7c12f2c9ec4d929 languageName: node linkType: hard