From e9e76d1ee4e4b39edcd6821ced7a5bc3ed60eba0 Mon Sep 17 00:00:00 2001 From: sai-sunder-s <4540365+sai-sunder-s@users.noreply.github.com> Date: Mon, 7 Nov 2022 17:31:40 +0000 Subject: [PATCH 1/5] fix: Update minimum required version of cryptography in pyopenssl extra (#1176) * fix: Update minimum required version of cryptography in pyopenssl extra * update rst * update rst * update rt --- README.rst | 11 +++++++++++ setup.py | 2 +- system_tests/secrets.tar.enc | Bin 10324 -> 10324 bytes 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 6e6716173..1f6b9affb 100644 --- a/README.rst +++ b/README.rst @@ -22,6 +22,17 @@ For more information on setting up your Python development environment, please r .. _`Python Development Environment Setup Guide`: https://cloud.google.com/python/setup +Extras +------ + +google-auth has few extras that you can install. For example:: + + $ pip install google-auth[pyopenssl] + +Note that the extras pyopenssl and enterprise_cert should not be used together because they use conflicting versions of `cryptography`_. + +.. _`cryptography`: https://cryptography.io/en/latest/ + Supported Python Versions ^^^^^^^^^^^^^^^^^^^^^^^^^ Python >= 3.6 diff --git a/setup.py b/setup.py index 1fce9743e..79d31b87c 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ "aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'", "requests >= 2.20.0, < 3.0.0dev", ], - "pyopenssl": "pyopenssl>=20.0.0", + "pyopenssl": ["pyopenssl>=20.0.0", "cryptography>=38.0.3"], "reauth": "pyu2f>=0.1.5", # Enterprise cert only works for OpenSSL 1.1.1. Newer versions of these # dependencies are built with OpenSSL 3.0 so we need to fix the version. diff --git a/system_tests/secrets.tar.enc b/system_tests/secrets.tar.enc index abfaddd92913cbd9392312fc240a82ee8fe99e47..d428e414d2cd621ebc5a333bc3a33d272dd172ca 100644 GIT binary patch literal 10324 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 literal 10324 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�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 From b9aa92a1f1640f9c8bc4beb7b13051a01cb263a4 Mon Sep 17 00:00:00 2001 From: sai-sunder-s <4540365+sai-sunder-s@users.noreply.github.com> Date: Mon, 7 Nov 2022 18:24:13 +0000 Subject: [PATCH 2/5] fix: apply quota project for compute cred in adc (#1177) * fix: apply quota project for compute cred in adc * update secret --- google/auth/_default.py | 9 ++++++--- system_tests/secrets.tar.enc | Bin 10324 -> 10324 bytes tests/test__default.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/google/auth/_default.py b/google/auth/_default.py index 8fe168428..67a1c369d 100644 --- a/google/auth/_default.py +++ b/google/auth/_default.py @@ -267,7 +267,7 @@ def _get_gae_credentials(): return None, None -def _get_gce_credentials(request=None): +def _get_gce_credentials(request=None, quota_project_id=None): """Gets credentials and project ID from the GCE Metadata Service.""" # Ping requires a transport, but we want application default credentials # to require no arguments. So, we'll use the _http_client transport which @@ -293,7 +293,10 @@ def _get_gce_credentials(request=None): except exceptions.TransportError: project_id = None - return compute_engine.Credentials(), project_id + cred = compute_engine.Credentials() + cred = _apply_quota_project_id(cred, quota_project_id) + + return cred, project_id else: _LOGGER.warning( "Authentication failed using Compute Engine authentication due to unavailable metadata server." @@ -603,7 +606,7 @@ def default(scopes=None, request=None, quota_project_id=None, default_scopes=Non lambda: _get_explicit_environ_credentials(quota_project_id=quota_project_id), lambda: _get_gcloud_sdk_credentials(quota_project_id=quota_project_id), _get_gae_credentials, - lambda: _get_gce_credentials(request), + lambda: _get_gce_credentials(request, quota_project_id=quota_project_id), ) for checker in checkers: diff --git a/system_tests/secrets.tar.enc b/system_tests/secrets.tar.enc index d428e414d2cd621ebc5a333bc3a33d272dd172ca..99e8d8b8280442550f1718fd0b57c77579ac386b 100644 GIT binary patch literal 10324 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 literal 10324 zcmV-aD67{BB>?tKRTJBVp1_tCZWN0r^a@mcGZ708(kAWPR?oK3%C=qf&TY(Vdq>A<7=*{bHK{8q2-u3 zE5K;_`!7|$mg-U)pbzq2r>K<3Ev(>+^^0=P`D8DDAaes=P|avRC3G+>Nhood04sL- zmAaJSGg7s{qx+z~&U~~83LNfHv%3crs6hP}Evn_%A2EZ#f_X(Vv}YNCd$ACPWu$#7 zd@EEK1@Q!5-X5HalR1YZ4<{)1jW^&gm6Cn+%-Vw8Mnd!b;e`}pRTEW%`G!A~3#o;N zMsK8;jZUNL>_YCh2XH%R=>)Z?KSJ0imcJzx$4e8_k*|;#%DQ$9wi(fzLY-FaGVti^ z-&KVtJZB>i^MFWG{b4c{9WYXD!vcg4E^z~u7voX8?wWEaL?f5%&rkGDfb}`j>gD)^ zl*b7AF9udoVD_@hbHCjcE{LC_}_J#pnQo|e2^tg&?&QW2wd_VVC z0gM>&yqT5$o;P&I+BW&)LE1)GtsVrznH+e&xc4t8B@{o=jM4RKCP&Gjls;W zAzaP6ta1JBfKb4m5i@0_Pv5>wJ}F^X%}@RPPuOuyDyO*mqD6@|XW2;@;G*Oa^}K@_ z2&iCWiaq*Gra^C)_wyN8h3~kN6c$-t6WfgjS|9=%6@B z2%O%>MLaR_0%V(iCxCF~$3|6q=|CQlrsl8s`k2ny2OZ-??e)A64h|Xmy%A`9T7Y*Z zE0Ut(@+;d8^<}I0y*UWGyHbAKQs;z(I> zKtUR7=1EJMTvdbpAy9M4?zlomkhyP(Vm%;44p${x$&dRr-bYa)3s_c@8p@!SnpYaa zC&X#+{IMW?K=}0pemK?+GU7D1;Y}UIE?D+EY|636*RU{?@6DNpUX?H2ipVZlLOJS+4$YO>bUVaz`q&+5$da zNU!re61P2lY0;A}hvCx*ya8&N{8ku8gQIfZ%h({j7H^y0jGLbydJetN6GA|3Os76Z za1Do&w8Kt=DNY&~ezr@CP8$g@vlMh2;9>+X9wa2byT zq|w_&eKgGN!Yos3ce>C7@doLU{W2uS%3>`q5V@`Ej9bfH?q<8CY|agojMesnGm9(v z76>kpR=5$Ya6@dm7@WOELEJPOu@&CMZ9HT;RkzVB<$pRr-mC|wV69k+lcj#_`j!=P zV|AG}YzDw9HZa|NWJAD?849KNrF~#2cWdqX(De+nxfxO1Epe}lY~6SqckXu@A4lMk|Km#+31MFAJwGO+#B>sm`gstBbVn};YXqI@YbB3hDf%IpM7-zmRU;X z{**M4T1a(%10c-_Kc3vGTVDUH*`;`A?<1bq^b~4^#E-M~iQ`y{Gu=z4O6b49@3M&jQ?Nwv)%{zjq52|%gn)98l zaOQ0nnnxryYfe|9x%6@ZkgFtJIRybH=Kp+Nd9)J zaPZ5tmB4L7U3T*vSa0YND0ky-d)llCrQc{RaLjkK>@o#B7)s~x@kr1ULac@cpN_a! zrZuKywxkYh^k{56y~SJSQcp7Rva}XvmTACejiyFO6gsRcpSBwx2Q7)lqi7r|MCE?b zoy!XWM))dPu+r6ouTncpCY@ajVI*ZW*=j9BjI)!ncY`>|XSipC-7ate*ka>9pj>w! z!UPEPe!Ew_bJU-TVg+E9l;eh!)gO)44k5KAAEjatMQMyGF3)TFtfNg#%Mx+_t_39y zFFrXYohMJqx~Z)DlZzICwyk%|v}tO}+Utr^=%TGDNgGogQwF;j=5Qp$uR#Q+K`0KU zAWrZRQ$oA$jnH(HpZYEWwRM_o&!&tA67!p!;EJ$hb!<)6`h~kMc?i()#D&8SgN8Q# z7gHb-A`WL4!!$pvWb;i$bT!xujP2}-Z({hm3T!~+@2THV?`SHfDgCL;;{n<8{sJbe z4}9sF!;Z%i&OG(lss{L1A~(e@7ByYj0AlHixTNG^;Pl=onX3spW~gTU0iTG7S(7V* zKESGhkdi=5QkB=+G024W6^_OGALAzWig!&2O73ieuE!0**lv|dnIL*O;T8`&8emhM zxMjk(Esyz~LEO;@G%b|n=#HYdG9`u0e&Zg$K$~}hdaGf%!ZFN# z{no}KLMxz}*)P-UrCIm{s`2?Cr6c2N?{1!a?U2F%s5h;4koNQr)zGCx)bRHzd-w{w zUi+u9*uBJG65MQB>;j`@zeKPs!w=4j*v~f741pQ;I)X7=O+)O^x6)sIj3`i3;C(}; zl}AZwQoQ)8kN?)>G)J!deAU>MtyC)Yaa+YK(pep(MD-ymS(%>TlC8LZ!%`aEkKm7N zzSx_5TL0qS%k(89_}1!Im%pf^Mx^mF*fNEexD>j{#jRP1)5$Et2}D*sjkbB|Gdcl# zuu4v<=-RdHEuza>8RAgT>yadLw8+(0tq8J}^8`hQ)5Y#m>rAIfjM>8+CpSH+Q5-Pm z2dvjMscNtIFJ{o9qhN9n@I>2aWD@WiX+}4G6OmX3yjp=#dhwBAeOkGi2XFaT_Q{Q~ zWnnQkpyOTEgol_NXJuG@EpS*Sz2-ML=MP9(bp7mGW;Q#7pJ z1nrFv-@gS+i$33J-J&de%9)qXQSsVSXpzwrDfZ|k{16}tIH)NiM?>Ej-bRie)ke}HcdZI)g> z-?H~@mXJjsG3PV}!nrR!jT08UEt_L;M6DNNGu!StqJF;|Sy)<~&a!}H9oG-!>E zc6HF6(cXX|DMYwHXDa@C(^4ONlPX!O>P?9s`#kA@W;aFIwyUXBmH)OkJp<{ovny(} z78FcN-NVM4L+Soj2CnKPe@O@lXxiYVy-xCtGMSVDn~aUr1VZT!8}&M^JLRzN^9VG% zUm&6HiyZ`73uY1$vFc`wg*O-!5H8L~H41RuG-APOYYFTvPNy5#8JsY_`5rJinLJl7 zplhISV@YSxW94d%bDzpGt2`llX)^vU|0&0pbdph*=qU2~s9)0AhCIsbn>1GULfGYB zPrAI@`kT3w%WvimZSanT#P(nP$j;B1Au+ef&zk<0h!1DdP1!{YzYI-`#Pwx3WK!sh z6)?aO<@Y;~o<`)$hFr~0*7Fif$H-brfDuzgXwqB@s;3WI$0jWI2QR5b>tSSK%Kj_H z0_%g4e| z?-!VIHn?zMBZNkp76j*akuVgl|0*nC!tm!IpiA8kyiK4QRDm#vTs7Q-R6V%2&`$5b zdZE{q4#{;srBK!IN?w<{Q6N}XjqV5a>$O{OQ}bGWK#K48?Xj)I)VafI{N`%^*kvnkm!&eb!jp2 zsf@z$`d6{3%o5)#Oa|3;0iOL?T$D($IoZ|Kiw$-`O_XDg7Y;*&CUl@E)mED{d4-Bm;StgjS+&Coql5 z@;S^e83!R3hMSYoU-RL8T6}#v=b6X7O`F=Yxc^KcMvj`oQ2 z`DKR8CK><+gaV`)Ie5e&B)s)Z@Xbz7k-?zS4HqkxaVXJhb|}sW6Gd6#kDe>kz)JYu zC+Ld$N7rc>w4-rQ0?}ePCKJM*@9Uu2{d#EU;v-&H~)W_CYw}R&Vqu zd|B@=%@g1uMs%@|!amfxH*hz5&--@^C8PHM8 zR}&~fMwLonwtAYV+v+)+H1U2ye^KAQh3_$jG?b&snApi6wEcU)f1vo9+i(k_bL#+E zb(P?<;2B$yYkFIF*Z+}}rWyE1Ptl~`uv0fVSv5u23;_?r&p-(M$$OREW{9SF1JTXFRoZ+s3PWKGG^FcRF&>y1xF~l9`yRv~s z8`fegP7@*QV(IV+T8of$9EHiT?;r3vDgpNYhy^6Vs7LV~skG(vNO5jsq59dp#8kQhAUAKDtex593RQBLf<&tytK~EyAO{63OLBGtrn-O>YYKA{b^} zfv2&i9)&Zwj$6s_n3uPh;JI89)9N2k77Ftk_)T`~2z7C6mo+iwQk$5J!gp7vW@FG? zGlzR^SnG7I=hj7v23wG_B+6!)_ zd7c;?&giti<}-jZnU)w^MV#zNtDy{rL4$;GmFguWwM@F)j)(%acYmb~W69ZZ;{H*# zkA&iO`&HHL$i9=SG#6Vgi(JkM{WDMk60}Gy^6G|3>nB}e=)pUHlVHheGs@z>s32<6 z^t|pfXjlzzXB6x98gN*fMs_~3(P0DN$u;|j&M71~;7#c7^~SfkO4G#t0U-5K~X$~XZT&7t+HA-kUKI+_g zkA+JVtdQp3*2)oLAGxEB%Wji2G3$q0O>P6@P6H7M?Oiz0l2Sl*o=|&v_n|h^S{oge z!*-l6YA_&7LKB}GQ49XOebr!s!>NK>9bd^VM&}5A$1vUw)A*OKP7G@_Cge23Funz; z5HiwL9r!+fx-3esAZUj7C3T9I1fuh*l=@s0J`ZjF+|NZSosOuda}@*~QP&F%j+2F+ zc5whGBdXOj7m!ikbP|j{&Fj@@2bt;Lxo4tgKR^(YAd%O)TFQ)Zl|ZxS_K7JxJCc6$ zW?1)IrU<)I~s+g*bq~xopdkog9)_G@`M#f z@Tf~@OIR7fEzlFF?Sw|$?YAzi7d&c=y5mX$Sv2e2@gQE*K8`F5%OGvasZx8oyHC!5 z%L5MGMgxZxb}q}>*@7(>u|<{SsY)ZocNARC&<%FEt;JhE2ski)xpR*!#_84H>qQ{f z8`3```l^GQcjzHeVU8DotpASgi)tb}Oa2~tu(cz{tjf!Xsb@-M#Xy40Am3~H6c}pI zp)BII1#FY8Sr+#N7LH=fajmXeQwg=`c4h55d{0G_hYavkAL?4MBL`!YMny3@hy!w9tworm}U$GsX$Zi$!eKf&G;Wn(Eif6 zk<63}Zr930J`ZN?i=g%L4wAGw&r9lMUx1)D*Mlwg^~J^QQ6`XhWqjVcjy?Cd%4&jX z?V>47RF|l3nTdC%BXg@u7& z0vh6cnnKy?UDncnFDB6fA1SsM;8GHJ^x^O*7>^UEuyUW?K=fN0eLKsOU8!qad530vx- z-=IJ$F9ZgAbROwlyy}e-RlQ3&551{v7}J#zYzEi*EFszWX+d-z-*AIf)$RKtlXO^+ z#nbheTYs!hWLguj*SZJy#7e`mdED;|lH9>pKbOE|0AZVmNf8pmU{TJ!ce|NY9@z=b zO%pTw;_JSyc-21{6jO1}{py2C-Dx@Gtn5i3M*1WB%IcCEKWIZYf)}=H=+KRX$BuAo zWX8Gc+&b^1$|H%(-D zvpzFZr!G+xUCdQ}MvHR8PdQ&E{qfaE6zzNFr`V`UVnBV@ zIJPo>$&o?SGLTSLk-#v|)}L9@muHZdh7)PKAe<8PW$+V>gEpK<=N&hUe8Vp$A$Hum z0$R9ANXXOy3tcplux$$tC?L;QCI4zk49^TtO>N>eBQ3gN!iJWQ|r48{L zVC5y7;<;-FSKPP|NAZ=8lN__pB*zylE9+$UJzfb;2eJ0M5UWAUkIn4QTCh_w^n}AR z$Bkq4+l|!lXR9LMf=v=Zat*3(C-L{LVD#CmHy~~Ne;S0Ic9P_61xl^gzRl+9Eq6uY z;aU+hJ}?qm9GThAYQM5oCW|&f@O0LD8Ii_%_|mI-RTl6&Qy4|}agUWG?zwY(=MK7< z8PjQ>y%KZHd|YFdGUwX%!BsC+b4A(PiEBRzPg!Mmwz*Q}Zs2v#yUSAYKlI@b0u!}y z;-7eoay1Q+FOz#%za6Yyw(djgS<^>f75|FSsO7^-?G{2x*S+&~T>oV=+Rdf;zs^oq}w&#;Ght=Gi?425N_2d=xX6Ts6xUGJP4DzS`iz1sboN(C2 z7^Xsoa-V@viE{u^5+?NDUh(uDKZwS_&eT>vnY0a}!p$FoS6LDeU@16WSJA~d*au84 ze~iO-UqSrL+F%-gCi1JJM1)lOY4I6+y6uU1;sGD_KQp;%`X4z9dj?Wer_DgnoJ=Mb zar|}fQvLR#_Q4py3d+jf`d=P&TRSV^$7Y%oop1?e@=Down(+x}8unR-;)c;|`EqQF z%;!5TSSB}D?m?1NDaryXSNYZCRW*y^6vowNRgH2A+0MB{qz1`G?jm$VlH{ztzK|aN z(kaWR`7me66bgdomk|QjTjm{yoFWp3m57gU0@2pTMVI{m4f9FADA5M^b{iim=tdc2 z4@`mo-te{m(ukfan%%dNf7&VA)zslRfe?c=I(2I*-CSKr^NJxSr@+6~o5)+E9ih!U zM`cYZqs*ABsyN+_g9AYSt`$&X9UgS8eAin+2*+i~`lAG`#L!J@`;#GHWtN!DD6WdM z9-`j1OcSV(k=MS{W$U(1U*Ivsc7Z7x4V(?>n93-Sc0)8jc)Obf1r%GO!2?W%zR~1m z`hMVqN~o)2_dBfqlyUpi)Pe*MaJh|zbR-YfI94j~< z!T?;w?q7-!@*I%g1CsWrqLKEJn&WHELtOGpnN)ouT(7Syn!|xQ882{j_k7u^r={0+ zAY2OP*SKB~$81umwisg)wM9CBLcl6r{w&!B++(u+|L9~AHh#JV#5UmWn^+S#rD`I+ zJ~6{bX=~N7{9tm_{N0@+oSsMbd-JU2TO`}oXt*k~GvR#Alh$%i!K6|zU#s=fjb;cs ziiZF&KI)r~rj|Cu341mL#WJBa$1>!xU#6M7H;=55F3Sw@7zNLM{on4%VU-bW2+nl; zwv{BT`L2+=YkKPHIlLDSI?loq+GG6lSK)^GqS3M_bEyY_m-)i&o$h$j(moK1!6E)Q zRCNSO3UFg1BU5}@m*D@XHI{9%^>_W9o*4F3{q^zT9|VlQ zBoK8-3hy@&0|1%N3k4CmCE27n5l{bJcy7rp(rkmN8IE&!j)62QyfJ0U;&#@Y@@( zl7WF-WA)HA#s&8_;ITN`90$W5@zY7MRvF`DZ6UdZxcoc5KyO-GR|r#w^g?t4T)J5+ zB1j*|7$>h&wJ8Sa=voT7MPmYx=!p|Be!_JF^OiQv^?iFOr)*G6_?rjuM-%&;(tWw; zNc|sDh3bxIJ0z4mz5oj_V#8@$R!9?yCtZ+@71tKPu&f~UqK=%C*Bp`%?V1aj1Wp}< zdfH6A7)#eu7CzMDicoz_e-d`)llr_*XL<0g0LmS1uyx^g6dx9lgMxHB3AQJOeM0OE zjq!Z#VGVr6r9~=dF0^YAES?bcez-T+SNZR+=7T%uF#OL=FLB9TaQ-r)(caYy%7Y5C z7P+hxPqFVO&omC8LV2jo786Sb)+dBJASQp!Mu88BpB`R_L6f^Z5vz*wseSg5sSH^R z#)g26_*dEZ$kUy!EbLP=A)xJ?< z2#35Ph4&L@cF@^z(=w5OfbA3cv;lH z-22@3XVm|Um~&Y@!R)(6u`1g6Vwm2S*iDy za&YIsDo8FKt~RClHRb(2WVa~+YpGZ~(@MWlpPJ5~ect)uIPscJD#Vvl(czXi`{96| zT5Pmu&5{ieu`HZh`5I_odlyDo<0fKlDAoS&i4Qn|;^Q1ye_8HwakzK?41DNb0JuIb6o>uvEPH>0U}Dvdsd_=6Gmgu@tTGSyU0LdYYc zq)|o(705|AQgQ{jb`lb#251g4y0J8^u*UIQ1jlBtpbcAb=^qdpd=RKE(=ew&B9;pp z#j&~**K)glT5U=+E&}%|YnoPf>m{5BkPM5AYRv;59L;9;%~YNZ^pMR|P}#kwhI=K* zq(|Ek8J8kvn&7jb>ptf40ab%O=aQ!<7|%+aw*@#u^@^=FwSiycn4D7_378kry11dB zi!Pn#uGKyGf6SBUOVoCIRoKy1NN)8gd;hF1-@}8=FOv9yWneI3|vZkW(JzY!$y=qiQfqQVpm4VW7Hv-kQFyU0KnOYUu?zPnL4PfueuR2Aa_a zqs_!L&K@m=XHIIJu2C^zN@F&9JV$IiR3Q0Y_!RFU9mp2ac_vC6Mbn1Fq#%CI8HI~b zWbLZRqbil%w>uXaK5qtEd2JWfWN8HG=9I>A|Cn&9xv#qMLIx{&ik;7 zudwEK@s)@BBxc%_ci)=bw3*`=INwib98I#;K56Rsi%NkTAnyr1`DmNz9!Oy3T%474 z6y$t?wS46jp3XSoER|;>dv#!g^~RaTscxROIYOxzlr)_bABkPTMO;afTjfeNlzx^R zBJnW)Ggg`SOH}_i?6r2#%eV=KouEH1EI5CfB<*2c2?#7MUq(u|NMQyn4MoLa9~NDl z!mKP)Qyg6fr@}WG#8qSsCtZh@#qy0Uo*m1)6BPMa>hFn0-q1b(Vb77@?R}}dRz24J>JLP>tV*)59 z)N@yD4ESjEd(sqK$R~xXZ~6<)E)cX%SibrQ2@^4a7J>QGdzw9LS}XC!CL=dHm-K+5 zMv3Ew_c;^U9=e0mtpM_tW`0yz(5;aMAR5MiAIae1ep>_~7oLD907 zp%*v|COj@9L|@ez@mr=soFf}E+twj>!?#f7;&ehg7;c?eu6xLYR+O9JqrMnaievep zm)=nHi5$!Pzoz%S{PU}iX-Qa>s|rI})!T-DcQ50xwH@PHGp#e_z1n44`u8$aAq;}k zf83H7^gaL?FD}5WGzA3dhx?m}(3Xu5RRFo+7OPINL_zHE6X3;)#`|V5SlZm&UilnV z752@g0C`2VYn=sHz5NJ?Rmb_nBG$k8sQQ`d7xTCDgX8)2FZPDHJ(e{`!`)L2| zkTs+=J%bh){QkRk`!gt4ohEwJ##bPFR znj6ktgV~lY(EvcRhl^duP<7QK6@LsG)+2Uie^B&kz8I^9R!eGWYr@A2l*5r_^5ZM< zG_Y|w`rNPE45^H|F%el~6Y;OQ;VADwutvjk$3GaweWll-xs^-+O(O-F2FOv80#_Ro!o;a*j&>z!i9IPXEc=yqy6H~A|g6s*W zzQ73=0XojKQwltH-k}SQ`)W9ua8$kPp*%6y$9Ok#C-1MR%3hYLWsR9ZJ-aQByv-+H zsy&hmCA!FN5-;>oR?q=XH$y6v0+tCbF{BVwP= ze6?AW&Na08)(Wu^#temMtGE|j?b<0}i7#Ab@cXPZw^1jj?kn65f(`GNq0MmbC*wf_ m8>Y2lV3($f|GM)NMWHu&4?!=6>dL3FRUW`p9}hw*HV1wH diff --git a/tests/test__default.py b/tests/test__default.py index 26b41b995..7f19656b9 100644 --- a/tests/test__default.py +++ b/tests/test__default.py @@ -1234,3 +1234,32 @@ def test_quota_project_from_environment(get_adc_path): explicit_quota = "explicit_quota" credentials, _ = _default.default(quota_project_id=explicit_quota) assert credentials.quota_project_id == explicit_quota + + +@mock.patch( + "google.auth.compute_engine._metadata.ping", return_value=True, autospec=True +) +@mock.patch( + "google.auth.compute_engine._metadata.get_project_id", + return_value="example-project", + autospec=True, +) +@mock.patch.dict(os.environ) +def test_quota_gce_credentials(unused_get, unused_ping): + # No quota + credentials, project_id = _default._get_gce_credentials() + assert project_id == "example-project" + assert credentials.quota_project_id is None + + # Quota from environment + quota_from_env = "quota_from_env" + os.environ[environment_vars.GOOGLE_CLOUD_QUOTA_PROJECT] = quota_from_env + credentials, project_id = _default._get_gce_credentials() + assert credentials.quota_project_id == quota_from_env + + # Explicit quota + explicit_quota = "explicit_quota" + credentials, project_id = _default._get_gce_credentials( + quota_project_id=explicit_quota + ) + assert credentials.quota_project_id == explicit_quota From f9d7d77739db86870c9b87b003e8ce0c93d53e53 Mon Sep 17 00:00:00 2001 From: sai-sunder-s <4540365+sai-sunder-s@users.noreply.github.com> Date: Mon, 7 Nov 2022 19:59:15 +0000 Subject: [PATCH 3/5] fix: Validate url domain for aws metadata urls (#1174) * fix: Validate url domain for aws metadata urls * optimize tests --- google/auth/aws.py | 19 +++++++++ tests/test_aws.py | 103 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/google/auth/aws.py b/google/auth/aws.py index 08c94427e..04c5e7c5d 100644 --- a/google/auth/aws.py +++ b/google/auth/aws.py @@ -47,6 +47,7 @@ from six.moves import http_client from six.moves import urllib from six.moves.urllib.parse import urljoin +from six.moves.urllib.parse import urlparse from google.auth import _helpers from google.auth import environment_vars @@ -397,6 +398,8 @@ def __init__( self._request_signer = None self._target_resource = audience + self.validate_metadata_server_urls() + # Get the environment ID. Currently, only one version supported (v1). matches = re.match(r"^(aws)([\d]+)$", self._environment_id) if matches: @@ -413,6 +416,22 @@ def __init__( ) ) + def validate_metadata_server_urls(self): + self.validate_metadata_server_url_if_any(self._region_url, "region_url") + self.validate_metadata_server_url_if_any(self._security_credentials_url, "url") + self.validate_metadata_server_url_if_any( + self._imdsv2_session_token_url, "imdsv2_session_token_url" + ) + + @staticmethod + def validate_metadata_server_url_if_any(url_string, name_of_data): + if url_string: + url = urlparse(url_string) + if url.hostname != "169.254.169.254" and url.hostname != "fd00:ec2::254": + raise ValueError( + "Invalid hostname '{}' for '{}'".format(url.hostname, name_of_data) + ) + def retrieve_subject_token(self, request): """Retrieves the subject token using the credential_source object. The subject token is a serialized `AWS GetCallerIdentity signed request`_. diff --git a/tests/test_aws.py b/tests/test_aws.py index 85f5e8dd4..d059487f4 100644 --- a/tests/test_aws.py +++ b/tests/test_aws.py @@ -50,6 +50,11 @@ REGION_URL = "http://169.254.169.254/latest/meta-data/placement/availability-zone" IMDSV2_SESSION_TOKEN_URL = "http://169.254.169.254/latest/api/token" SECURITY_CREDS_URL = "http://169.254.169.254/latest/meta-data/iam/security-credentials" +REGION_URL_IPV6 = "http://[fd00:ec2::254]/latest/meta-data/placement/availability-zone" +IMDSV2_SESSION_TOKEN_URL_IPV6 = "http://[fd00:ec2::254]/latest/api/token" +SECURITY_CREDS_URL_IPV6 = ( + "http://[fd00:ec2::254]/latest/meta-data/iam/security-credentials" +) CRED_VERIFICATION_URL = ( "https://sts.{region}.amazonaws.com?Action=GetCallerIdentity&Version=2011-06-15" ) @@ -676,6 +681,13 @@ class TestCredentials(object): "url": SECURITY_CREDS_URL, "regional_cred_verification_url": CRED_VERIFICATION_URL, } + CREDENTIAL_SOURCE_IPV6 = { + "environment_id": "aws1", + "region_url": REGION_URL_IPV6, + "url": SECURITY_CREDS_URL_IPV6, + "regional_cred_verification_url": CRED_VERIFICATION_URL, + "imdsv2_session_token_url": IMDSV2_SESSION_TOKEN_URL_IPV6, + } SUCCESS_RESPONSE = { "access_token": "ACCESS_TOKEN", "issued_token_type": "urn:ietf:params:oauth:token-type:access_token", @@ -1311,6 +1323,97 @@ def test_retrieve_subject_token_success_temp_creds_no_environment_vars_idmsv2( }, ) + def test_validate_metadata_server_url_if_any(self): + aws.Credentials.validate_metadata_server_url_if_any( + "http://[fd00:ec2::254]/latest/meta-data/placement/availability-zone", "url" + ) + aws.Credentials.validate_metadata_server_url_if_any( + "http://169.254.169.254/latest/meta-data/placement/availability-zone", "url" + ) + + with pytest.raises(ValueError) as excinfo: + aws.Credentials.validate_metadata_server_url_if_any( + "http://fd00:ec2::254/latest/meta-data/placement/availability-zone", + "url", + ) + assert excinfo.match("Invalid hostname 'fd00' for 'url'") + + with pytest.raises(ValueError) as excinfo: + aws.Credentials.validate_metadata_server_url_if_any( + "http://abc.com/latest/meta-data/placement/availability-zone", "url" + ) + assert excinfo.match("Invalid hostname 'abc.com' for 'url'") + + def test_retrieve_subject_token_invalid_hosts(self): + keys = ["url", "region_url", "imdsv2_session_token_url"] + for key in keys: + credential_source = self.CREDENTIAL_SOURCE.copy() + credential_source[ + key + ] = "http://abc.com/latest/meta-data/iam/security-credentials" + + with pytest.raises(ValueError) as excinfo: + self.make_credentials(credential_source=credential_source) + assert excinfo.match("Invalid hostname 'abc.com' for '{}'".format(key)) + + @mock.patch("google.auth._helpers.utcnow") + def test_retrieve_subject_token_success_ipv6(self, utcnow): + utcnow.return_value = datetime.datetime.strptime( + self.AWS_SIGNATURE_TIME, "%Y-%m-%dT%H:%M:%SZ" + ) + request = self.make_mock_request( + region_status=http_client.OK, + region_name=self.AWS_REGION, + role_status=http_client.OK, + role_name=self.AWS_ROLE, + security_credentials_status=http_client.OK, + security_credentials_data=self.AWS_SECURITY_CREDENTIALS_RESPONSE, + imdsv2_session_token_status=http_client.OK, + imdsv2_session_token_data=self.AWS_IMDSV2_SESSION_TOKEN, + ) + credential_source_token_url = self.CREDENTIAL_SOURCE_IPV6.copy() + credentials = self.make_credentials( + credential_source=credential_source_token_url + ) + + subject_token = credentials.retrieve_subject_token(request) + + assert subject_token == self.make_serialized_aws_signed_request( + { + "access_key_id": ACCESS_KEY_ID, + "secret_access_key": SECRET_ACCESS_KEY, + "security_token": TOKEN, + } + ) + # Assert session token request. + self.assert_aws_metadata_request_kwargs( + request.call_args_list[0][1], + IMDSV2_SESSION_TOKEN_URL_IPV6, + {"X-aws-ec2-metadata-token-ttl-seconds": "300"}, + "PUT", + ) + # Assert region request. + self.assert_aws_metadata_request_kwargs( + request.call_args_list[1][1], + REGION_URL_IPV6, + {"X-aws-ec2-metadata-token": self.AWS_IMDSV2_SESSION_TOKEN}, + ) + # Assert role request. + self.assert_aws_metadata_request_kwargs( + request.call_args_list[2][1], + SECURITY_CREDS_URL_IPV6, + {"X-aws-ec2-metadata-token": self.AWS_IMDSV2_SESSION_TOKEN}, + ) + # Assert security credentials request. + self.assert_aws_metadata_request_kwargs( + request.call_args_list[3][1], + "{}/{}".format(SECURITY_CREDS_URL_IPV6, self.AWS_ROLE), + { + "Content-Type": "application/json", + "X-aws-ec2-metadata-token": self.AWS_IMDSV2_SESSION_TOKEN, + }, + ) + @mock.patch("google.auth._helpers.utcnow") def test_retrieve_subject_token_session_error_idmsv2(self, utcnow): utcnow.return_value = datetime.datetime.strptime( From 2d38afd1a7f73134e3a5feb60ef5abcf5bda5cbb Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 12:47:35 -0800 Subject: [PATCH 4/5] chore(python): update dependencies in .kokoro/requirements.txt (#1180) Source-Link: https://github.com/googleapis/synthtool/commit/e3a1277ac35fc88c09db1930533e24292b132ced Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:452901c74a22f9b9a3bd02bce780b8e8805c97270d424684bff809ce5be8c2a2 Co-authored-by: Owl Bot Co-authored-by: Anthonios Partheniou --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/requirements.txt | 326 +++++++++++++++++++++----------------- 2 files changed, 178 insertions(+), 150 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b8dcb4a4a..12edee776 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:993a058718e84a82fda04c3177e58f0a43281a996c7c395e0a56ccc4d6d210d7 + digest: sha256:452901c74a22f9b9a3bd02bce780b8e8805c97270d424684bff809ce5be8c2a2 diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 385f2d4d6..31425f164 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -20,9 +20,9 @@ cachetools==5.2.0 \ --hash=sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757 \ --hash=sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db # via google-auth -certifi==2022.6.15 \ - --hash=sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d \ - --hash=sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412 +certifi==2022.9.24 \ + --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \ + --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382 # via requests cffi==1.15.1 \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ @@ -110,29 +110,33 @@ commonmark==0.9.1 \ --hash=sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60 \ --hash=sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9 # via rich -cryptography==37.0.4 \ - --hash=sha256:190f82f3e87033821828f60787cfa42bff98404483577b591429ed99bed39d59 \ - --hash=sha256:2be53f9f5505673eeda5f2736bea736c40f051a739bfae2f92d18aed1eb54596 \ - --hash=sha256:30788e070800fec9bbcf9faa71ea6d8068f5136f60029759fd8c3efec3c9dcb3 \ - --hash=sha256:3d41b965b3380f10e4611dbae366f6dc3cefc7c9ac4e8842a806b9672ae9add5 \ - --hash=sha256:4c590ec31550a724ef893c50f9a97a0c14e9c851c85621c5650d699a7b88f7ab \ - --hash=sha256:549153378611c0cca1042f20fd9c5030d37a72f634c9326e225c9f666d472884 \ - --hash=sha256:63f9c17c0e2474ccbebc9302ce2f07b55b3b3fcb211ded18a42d5764f5c10a82 \ - --hash=sha256:6bc95ed67b6741b2607298f9ea4932ff157e570ef456ef7ff0ef4884a134cc4b \ - --hash=sha256:7099a8d55cd49b737ffc99c17de504f2257e3787e02abe6d1a6d136574873441 \ - --hash=sha256:75976c217f10d48a8b5a8de3d70c454c249e4b91851f6838a4e48b8f41eb71aa \ - --hash=sha256:7bc997818309f56c0038a33b8da5c0bfbb3f1f067f315f9abd6fc07ad359398d \ - --hash=sha256:80f49023dd13ba35f7c34072fa17f604d2f19bf0989f292cedf7ab5770b87a0b \ - --hash=sha256:91ce48d35f4e3d3f1d83e29ef4a9267246e6a3be51864a5b7d2247d5086fa99a \ - --hash=sha256:a958c52505c8adf0d3822703078580d2c0456dd1d27fabfb6f76fe63d2971cd6 \ - --hash=sha256:b62439d7cd1222f3da897e9a9fe53bbf5c104fff4d60893ad1355d4c14a24157 \ - --hash=sha256:b7f8dd0d4c1f21759695c05a5ec8536c12f31611541f8904083f3dc582604280 \ - --hash=sha256:d204833f3c8a33bbe11eda63a54b1aad7aa7456ed769a982f21ec599ba5fa282 \ - --hash=sha256:e007f052ed10cc316df59bc90fbb7ff7950d7e2919c9757fd42a2b8ecf8a5f67 \ - --hash=sha256:f2dcb0b3b63afb6df7fd94ec6fbddac81b5492513f7b0436210d390c14d46ee8 \ - --hash=sha256:f721d1885ecae9078c3f6bbe8a88bc0786b6e749bf32ccec1ef2b18929a05046 \ - --hash=sha256:f7a6de3e98771e183645181b3627e2563dcde3ce94a9e42a3f427d2255190327 \ - --hash=sha256:f8c0a6e9e1dd3eb0414ba320f85da6b0dcbd543126e30fcc546e7372a7fbf3b9 +cryptography==38.0.3 \ + --hash=sha256:068147f32fa662c81aebab95c74679b401b12b57494872886eb5c1139250ec5d \ + --hash=sha256:06fc3cc7b6f6cca87bd56ec80a580c88f1da5306f505876a71c8cfa7050257dd \ + --hash=sha256:25c1d1f19729fb09d42e06b4bf9895212292cb27bb50229f5aa64d039ab29146 \ + --hash=sha256:402852a0aea73833d982cabb6d0c3bb582c15483d29fb7085ef2c42bfa7e38d7 \ + --hash=sha256:4e269dcd9b102c5a3d72be3c45d8ce20377b8076a43cbed6f660a1afe365e436 \ + --hash=sha256:5419a127426084933076132d317911e3c6eb77568a1ce23c3ac1e12d111e61e0 \ + --hash=sha256:554bec92ee7d1e9d10ded2f7e92a5d70c1f74ba9524947c0ba0c850c7b011828 \ + --hash=sha256:5e89468fbd2fcd733b5899333bc54d0d06c80e04cd23d8c6f3e0542358c6060b \ + --hash=sha256:65535bc550b70bd6271984d9863a37741352b4aad6fb1b3344a54e6950249b55 \ + --hash=sha256:6ab9516b85bebe7aa83f309bacc5f44a61eeb90d0b4ec125d2d003ce41932d36 \ + --hash=sha256:6addc3b6d593cd980989261dc1cce38263c76954d758c3c94de51f1e010c9a50 \ + --hash=sha256:728f2694fa743a996d7784a6194da430f197d5c58e2f4e278612b359f455e4a2 \ + --hash=sha256:785e4056b5a8b28f05a533fab69febf5004458e20dad7e2e13a3120d8ecec75a \ + --hash=sha256:78cf5eefac2b52c10398a42765bfa981ce2372cbc0457e6bf9658f41ec3c41d8 \ + --hash=sha256:7f836217000342d448e1c9a342e9163149e45d5b5eca76a30e84503a5a96cab0 \ + --hash=sha256:8d41a46251bf0634e21fac50ffd643216ccecfaf3701a063257fe0b2be1b6548 \ + --hash=sha256:984fe150f350a3c91e84de405fe49e688aa6092b3525f407a18b9646f6612320 \ + --hash=sha256:9b24bcff7853ed18a63cfb0c2b008936a9554af24af2fb146e16d8e1aed75748 \ + --hash=sha256:b1b35d9d3a65542ed2e9d90115dfd16bbc027b3f07ee3304fc83580f26e43249 \ + --hash=sha256:b1b52c9e5f8aa2b802d48bd693190341fae201ea51c7a167d69fc48b60e8a959 \ + --hash=sha256:bbf203f1a814007ce24bd4d51362991d5cb90ba0c177a9c08825f2cc304d871f \ + --hash=sha256:be243c7e2bfcf6cc4cb350c0d5cdf15ca6383bbcb2a8ef51d3c9411a9d4386f0 \ + --hash=sha256:bfbe6ee19615b07a98b1d2287d6a6073f734735b49ee45b11324d85efc4d5cbd \ + --hash=sha256:c46837ea467ed1efea562bbeb543994c2d1f6e800785bd5a2c98bc096f5cb220 \ + --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \ + --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722 # via # gcp-releasetool # secretstorage @@ -148,23 +152,23 @@ filelock==3.8.0 \ --hash=sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc \ --hash=sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4 # via virtualenv -gcp-docuploader==0.6.3 \ - --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ - --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b +gcp-docuploader==0.6.4 \ + --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ + --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf # via -r requirements.in -gcp-releasetool==1.8.7 \ - --hash=sha256:3d2a67c9db39322194afb3b427e9cb0476ce8f2a04033695f0aeb63979fc2b37 \ - --hash=sha256:5e4d28f66e90780d77f3ecf1e9155852b0c3b13cbccb08ab07e66b2357c8da8d +gcp-releasetool==1.9.1 \ + --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \ + --hash=sha256:d0d3c814a97c1a237517e837d8cfa668ced8df4b882452578ecef4a4e79c583b # via -r requirements.in -google-api-core==2.8.2 \ - --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ - --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50 +google-api-core==2.10.2 \ + --hash=sha256:10c06f7739fe57781f87523375e8e1a3a4674bf6392cd6131a3222182b971320 \ + --hash=sha256:34f24bd1d5f72a8c4519773d99ca6bf080a6c4e041b4e9f024fe230191dda62e # via # google-cloud-core # google-cloud-storage -google-auth==2.11.0 \ - --hash=sha256:be62acaae38d0049c21ca90f27a23847245c9f161ff54ede13af2cb6afecbac9 \ - --hash=sha256:ed65ecf9f681832298e29328e1ef0a3676e3732b2e56f41532d45f70a22de0fb +google-auth==2.14.0 \ + --hash=sha256:1ad5b0e6eba5f69645971abb3d2c197537d5914070a8c6d30299dfdb07c5c700 \ + --hash=sha256:cf24817855d874ede2efd071aa22125445f555de1685b739a9782fcf408c2a3d # via # gcp-releasetool # google-api-core @@ -178,72 +182,97 @@ google-cloud-storage==2.5.0 \ --hash=sha256:19a26c66c317ce542cea0830b7e787e8dac2588b6bfa4d3fd3b871ba16305ab0 \ --hash=sha256:382f34b91de2212e3c2e7b40ec079d27ee2e3dbbae99b75b1bcd8c63063ce235 # via gcp-docuploader -google-crc32c==1.3.0 \ - --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \ - --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \ - --hash=sha256:12674a4c3b56b706153a358eaa1018c4137a5a04635b92b4652440d3d7386206 \ - --hash=sha256:127f9cc3ac41b6a859bd9dc4321097b1a4f6aa7fdf71b4f9227b9e3ebffb4422 \ - --hash=sha256:13af315c3a0eec8bb8b8d80b8b128cb3fcd17d7e4edafc39647846345a3f003a \ - --hash=sha256:1926fd8de0acb9d15ee757175ce7242e235482a783cd4ec711cc999fc103c24e \ - --hash=sha256:226f2f9b8e128a6ca6a9af9b9e8384f7b53a801907425c9a292553a3a7218ce0 \ - --hash=sha256:276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df \ - --hash=sha256:318f73f5484b5671f0c7f5f63741ab020a599504ed81d209b5c7129ee4667407 \ - --hash=sha256:3bbce1be3687bbfebe29abdb7631b83e6b25da3f4e1856a1611eb21854b689ea \ - --hash=sha256:42ae4781333e331a1743445931b08ebdad73e188fd554259e772556fc4937c48 \ - --hash=sha256:58be56ae0529c664cc04a9c76e68bb92b091e0194d6e3c50bea7e0f266f73713 \ - --hash=sha256:5da2c81575cc3ccf05d9830f9e8d3c70954819ca9a63828210498c0774fda1a3 \ - --hash=sha256:6311853aa2bba4064d0c28ca54e7b50c4d48e3de04f6770f6c60ebda1e975267 \ - --hash=sha256:650e2917660e696041ab3dcd7abac160b4121cd9a484c08406f24c5964099829 \ - --hash=sha256:6a4db36f9721fdf391646685ecffa404eb986cbe007a3289499020daf72e88a2 \ - --hash=sha256:779cbf1ce375b96111db98fca913c1f5ec11b1d870e529b1dc7354b2681a8c3a \ - --hash=sha256:7f6fe42536d9dcd3e2ffb9d3053f5d05221ae3bbcefbe472bdf2c71c793e3183 \ - --hash=sha256:891f712ce54e0d631370e1f4997b3f182f3368179198efc30d477c75d1f44942 \ - --hash=sha256:95c68a4b9b7828ba0428f8f7e3109c5d476ca44996ed9a5f8aac6269296e2d59 \ - --hash=sha256:96a8918a78d5d64e07c8ea4ed2bc44354e3f93f46a4866a40e8db934e4c0d74b \ - --hash=sha256:9c3cf890c3c0ecfe1510a452a165431b5831e24160c5fcf2071f0f85ca5a47cd \ - --hash=sha256:9f58099ad7affc0754ae42e6d87443299f15d739b0ce03c76f515153a5cda06c \ - --hash=sha256:a0b9e622c3b2b8d0ce32f77eba617ab0d6768b82836391e4f8f9e2074582bf02 \ - --hash=sha256:a7f9cbea4245ee36190f85fe1814e2d7b1e5f2186381b082f5d59f99b7f11328 \ - --hash=sha256:bab4aebd525218bab4ee615786c4581952eadc16b1ff031813a2fd51f0cc7b08 \ - --hash=sha256:c124b8c8779bf2d35d9b721e52d4adb41c9bfbde45e6a3f25f0820caa9aba73f \ - --hash=sha256:c9da0a39b53d2fab3e5467329ed50e951eb91386e9d0d5b12daf593973c3b168 \ - --hash=sha256:ca60076c388728d3b6ac3846842474f4250c91efbfe5afa872d3ffd69dd4b318 \ - --hash=sha256:cb6994fff247987c66a8a4e550ef374671c2b82e3c0d2115e689d21e511a652d \ - --hash=sha256:d1c1d6236feab51200272d79b3d3e0f12cf2cbb12b208c835b175a21efdb0a73 \ - --hash=sha256:dd7760a88a8d3d705ff562aa93f8445ead54f58fd482e4f9e2bafb7e177375d4 \ - --hash=sha256:dda4d8a3bb0b50f540f6ff4b6033f3a74e8bf0bd5320b70fab2c03e512a62812 \ - --hash=sha256:e0f1ff55dde0ebcfbef027edc21f71c205845585fffe30d4ec4979416613e9b3 \ - --hash=sha256:e7a539b9be7b9c00f11ef16b55486141bc2cdb0c54762f84e3c6fc091917436d \ - --hash=sha256:eb0b14523758e37802f27b7f8cd973f5f3d33be7613952c0df904b68c4842f0e \ - --hash=sha256:ed447680ff21c14aaceb6a9f99a5f639f583ccfe4ce1a5e1d48eb41c3d6b3217 \ - --hash=sha256:f52a4ad2568314ee713715b1e2d79ab55fab11e8b304fd1462ff5cccf4264b3e \ - --hash=sha256:fbd60c6aaa07c31d7754edbc2334aef50601b7f1ada67a96eb1eb57c7c72378f \ - --hash=sha256:fc28e0db232c62ca0c3600884933178f0825c99be4474cdd645e378a10588125 \ - --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \ - --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \ - --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3 +google-crc32c==1.5.0 \ + --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \ + --hash=sha256:02c65b9817512edc6a4ae7c7e987fea799d2e0ee40c53ec573a692bee24de876 \ + --hash=sha256:02ebb8bf46c13e36998aeaad1de9b48f4caf545e91d14041270d9dca767b780c \ + --hash=sha256:07eb3c611ce363c51a933bf6bd7f8e3878a51d124acfc89452a75120bc436289 \ + --hash=sha256:1034d91442ead5a95b5aaef90dbfaca8633b0247d1e41621d1e9f9db88c36298 \ + --hash=sha256:116a7c3c616dd14a3de8c64a965828b197e5f2d121fedd2f8c5585c547e87b02 \ + --hash=sha256:19e0a019d2c4dcc5e598cd4a4bc7b008546b0358bd322537c74ad47a5386884f \ + --hash=sha256:1c7abdac90433b09bad6c43a43af253e688c9cfc1c86d332aed13f9a7c7f65e2 \ + --hash=sha256:1e986b206dae4476f41bcec1faa057851f3889503a70e1bdb2378d406223994a \ + --hash=sha256:272d3892a1e1a2dbc39cc5cde96834c236d5327e2122d3aaa19f6614531bb6eb \ + --hash=sha256:278d2ed7c16cfc075c91378c4f47924c0625f5fc84b2d50d921b18b7975bd210 \ + --hash=sha256:2ad40e31093a4af319dadf503b2467ccdc8f67c72e4bcba97f8c10cb078207b5 \ + --hash=sha256:2e920d506ec85eb4ba50cd4228c2bec05642894d4c73c59b3a2fe20346bd00ee \ + --hash=sha256:3359fc442a743e870f4588fcf5dcbc1bf929df1fad8fb9905cd94e5edb02e84c \ + --hash=sha256:37933ec6e693e51a5b07505bd05de57eee12f3e8c32b07da7e73669398e6630a \ + --hash=sha256:398af5e3ba9cf768787eef45c803ff9614cc3e22a5b2f7d7ae116df8b11e3314 \ + --hash=sha256:3b747a674c20a67343cb61d43fdd9207ce5da6a99f629c6e2541aa0e89215bcd \ + --hash=sha256:461665ff58895f508e2866824a47bdee72497b091c730071f2b7575d5762ab65 \ + --hash=sha256:4c6fdd4fccbec90cc8a01fc00773fcd5fa28db683c116ee3cb35cd5da9ef6c37 \ + --hash=sha256:5829b792bf5822fd0a6f6eb34c5f81dd074f01d570ed7f36aa101d6fc7a0a6e4 \ + --hash=sha256:596d1f98fc70232fcb6590c439f43b350cb762fb5d61ce7b0e9db4539654cc13 \ + --hash=sha256:5ae44e10a8e3407dbe138984f21e536583f2bba1be9491239f942c2464ac0894 \ + --hash=sha256:635f5d4dd18758a1fbd1049a8e8d2fee4ffed124462d837d1a02a0e009c3ab31 \ + --hash=sha256:64e52e2b3970bd891309c113b54cf0e4384762c934d5ae56e283f9a0afcd953e \ + --hash=sha256:66741ef4ee08ea0b2cc3c86916ab66b6aef03768525627fd6a1b34968b4e3709 \ + --hash=sha256:67b741654b851abafb7bc625b6d1cdd520a379074e64b6a128e3b688c3c04740 \ + --hash=sha256:6ac08d24c1f16bd2bf5eca8eaf8304812f44af5cfe5062006ec676e7e1d50afc \ + --hash=sha256:6f998db4e71b645350b9ac28a2167e6632c239963ca9da411523bb439c5c514d \ + --hash=sha256:72218785ce41b9cfd2fc1d6a017dc1ff7acfc4c17d01053265c41a2c0cc39b8c \ + --hash=sha256:74dea7751d98034887dbd821b7aae3e1d36eda111d6ca36c206c44478035709c \ + --hash=sha256:759ce4851a4bb15ecabae28f4d2e18983c244eddd767f560165563bf9aefbc8d \ + --hash=sha256:77e2fd3057c9d78e225fa0a2160f96b64a824de17840351b26825b0848022906 \ + --hash=sha256:7c074fece789b5034b9b1404a1f8208fc2d4c6ce9decdd16e8220c5a793e6f61 \ + --hash=sha256:7c42c70cd1d362284289c6273adda4c6af8039a8ae12dc451dcd61cdabb8ab57 \ + --hash=sha256:7f57f14606cd1dd0f0de396e1e53824c371e9544a822648cd76c034d209b559c \ + --hash=sha256:83c681c526a3439b5cf94f7420471705bbf96262f49a6fe546a6db5f687a3d4a \ + --hash=sha256:8485b340a6a9e76c62a7dce3c98e5f102c9219f4cfbf896a00cf48caf078d438 \ + --hash=sha256:84e6e8cd997930fc66d5bb4fde61e2b62ba19d62b7abd7a69920406f9ecca946 \ + --hash=sha256:89284716bc6a5a415d4eaa11b1726d2d60a0cd12aadf5439828353662ede9dd7 \ + --hash=sha256:8b87e1a59c38f275c0e3676fc2ab6d59eccecfd460be267ac360cc31f7bcde96 \ + --hash=sha256:8f24ed114432de109aa9fd317278518a5af2d31ac2ea6b952b2f7782b43da091 \ + --hash=sha256:98cb4d057f285bd80d8778ebc4fde6b4d509ac3f331758fb1528b733215443ae \ + --hash=sha256:998679bf62b7fb599d2878aa3ed06b9ce688b8974893e7223c60db155f26bd8d \ + --hash=sha256:9ba053c5f50430a3fcfd36f75aff9caeba0440b2d076afdb79a318d6ca245f88 \ + --hash=sha256:9c99616c853bb585301df6de07ca2cadad344fd1ada6d62bb30aec05219c45d2 \ + --hash=sha256:a1fd716e7a01f8e717490fbe2e431d2905ab8aa598b9b12f8d10abebb36b04dd \ + --hash=sha256:a2355cba1f4ad8b6988a4ca3feed5bff33f6af2d7f134852cf279c2aebfde541 \ + --hash=sha256:b1f8133c9a275df5613a451e73f36c2aea4fe13c5c8997e22cf355ebd7bd0728 \ + --hash=sha256:b8667b48e7a7ef66afba2c81e1094ef526388d35b873966d8a9a447974ed9178 \ + --hash=sha256:ba1eb1843304b1e5537e1fca632fa894d6f6deca8d6389636ee5b4797affb968 \ + --hash=sha256:be82c3c8cfb15b30f36768797a640e800513793d6ae1724aaaafe5bf86f8f346 \ + --hash=sha256:c02ec1c5856179f171e032a31d6f8bf84e5a75c45c33b2e20a3de353b266ebd8 \ + --hash=sha256:c672d99a345849301784604bfeaeba4db0c7aae50b95be04dd651fd2a7310b93 \ + --hash=sha256:c6c777a480337ac14f38564ac88ae82d4cd238bf293f0a22295b66eb89ffced7 \ + --hash=sha256:cae0274952c079886567f3f4f685bcaf5708f0a23a5f5216fdab71f81a6c0273 \ + --hash=sha256:cd67cf24a553339d5062eff51013780a00d6f97a39ca062781d06b3a73b15462 \ + --hash=sha256:d3515f198eaa2f0ed49f8819d5732d70698c3fa37384146079b3799b97667a94 \ + --hash=sha256:d5280312b9af0976231f9e317c20e4a61cd2f9629b7bfea6a693d1878a264ebd \ + --hash=sha256:de06adc872bcd8c2a4e0dc51250e9e65ef2ca91be023b9d13ebd67c2ba552e1e \ + --hash=sha256:e1674e4307fa3024fc897ca774e9c7562c957af85df55efe2988ed9056dc4e57 \ + --hash=sha256:e2096eddb4e7c7bdae4bd69ad364e55e07b8316653234a56552d9c988bd2d61b \ + --hash=sha256:e560628513ed34759456a416bf86b54b2476c59144a9138165c9a1575801d0d9 \ + --hash=sha256:edfedb64740750e1a3b16152620220f51d58ff1b4abceb339ca92e934775c27a \ + --hash=sha256:f13cae8cc389a440def0c8c52057f37359014ccbc9dc1f0827936bcd367c6100 \ + --hash=sha256:f314013e7dcd5cf45ab1945d92e713eec788166262ae8deb2cfacd53def27325 \ + --hash=sha256:f583edb943cf2e09c60441b910d6a20b4d9d626c75a36c8fcac01a6c96c01183 \ + --hash=sha256:fd8536e902db7e365f49e7d9029283403974ccf29b13fc7028b97e2295b33556 \ + --hash=sha256:fe70e325aa68fa4b5edf7d1a4b6f691eb04bbccac0ace68e34820d283b5f80d4 # via google-resumable-media -google-resumable-media==2.3.3 \ - --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ - --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 +google-resumable-media==2.4.0 \ + --hash=sha256:2aa004c16d295c8f6c33b2b4788ba59d366677c0a25ae7382436cb30f776deaa \ + --hash=sha256:8d5518502f92b9ecc84ac46779bd4f09694ecb3ba38a3e7ca737a86d15cbca1f # via google-cloud-storage googleapis-common-protos==1.56.4 \ --hash=sha256:8eb2cbc91b69feaf23e32452a7ae60e791e09967d81d4fcc7fc388182d1bd394 \ --hash=sha256:c25873c47279387cfdcbdafa36149887901d36202cb645a0e4f29686bf6e4417 # via google-api-core -idna==3.3 \ - --hash=sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff \ - --hash=sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d +idna==3.4 \ + --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ + --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2 # via requests -importlib-metadata==4.12.0 \ - --hash=sha256:637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670 \ - --hash=sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23 +importlib-metadata==5.0.0 \ + --hash=sha256:da31db32b304314d044d3c12c79bd59e307889b287ad12ff387b3500835fc2ab \ + --hash=sha256:ddb0e35065e8938f867ed4928d0ae5bf2a53b7773871bfe6bcc7e4fcdc7dea43 # via # -r requirements.in # twine -jaraco-classes==3.2.2 \ - --hash=sha256:6745f113b0b588239ceb49532aa09c3ebb947433ce311ef2f8e3ad64ebb74594 \ - --hash=sha256:e6ef6fd3fcf4579a7a019d87d1e56a883f4e4c35cfe925f86731abc58804e647 +jaraco-classes==3.2.3 \ + --hash=sha256:2353de3288bc6b82120752201c6b1c1a14b058267fa424ed5ce5984e3b922158 \ + --hash=sha256:89559fa5c1d3c34eff6f631ad80bb21f378dbcbb35dd161fd2c6b93f5be2f98a # via keyring jeepney==0.8.0 \ --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ @@ -255,9 +284,9 @@ jinja2==3.1.2 \ --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \ --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61 # via gcp-releasetool -keyring==23.9.0 \ - --hash=sha256:4c32a31174faaee48f43a7e2c7e9c3216ec5e95acf22a2bebfb4a1d05056ee44 \ - --hash=sha256:98f060ec95ada2ab910c195a2d4317be6ef87936a766b239c46aa3c7aac4f0db +keyring==23.9.3 \ + --hash=sha256:69732a15cb1433bdfbc3b980a8a36a04878a6cfd7cb99f497b573f31618001c0 \ + --hash=sha256:69b01dd83c42f590250fe7a1f503fc229b14de83857314b1933a3ddbf595c4a5 # via # gcp-releasetool # twine @@ -303,9 +332,9 @@ markupsafe==2.1.1 \ --hash=sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a \ --hash=sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7 # via jinja2 -more-itertools==8.14.0 \ - --hash=sha256:1bc4f91ee5b1b31ac7ceacc17c09befe6a40a503907baf9c839c229b5095cfd2 \ - --hash=sha256:c09443cd3d5438b8dafccd867a6bc1cb0894389e90cb53d227456b0b0bccb750 +more-itertools==9.0.0 \ + --hash=sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41 \ + --hash=sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab # via jaraco-classes nox==2022.8.7 \ --hash=sha256:1b894940551dc5c389f9271d197ca5d655d40bdc6ccf93ed6880e4042760a34b \ @@ -325,35 +354,34 @@ platformdirs==2.5.2 \ --hash=sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788 \ --hash=sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19 # via virtualenv -protobuf==3.20.1 \ - --hash=sha256:06059eb6953ff01e56a25cd02cca1a9649a75a7e65397b5b9b4e929ed71d10cf \ - --hash=sha256:097c5d8a9808302fb0da7e20edf0b8d4703274d140fd25c5edabddcde43e081f \ - --hash=sha256:284f86a6207c897542d7e956eb243a36bb8f9564c1742b253462386e96c6b78f \ - --hash=sha256:32ca378605b41fd180dfe4e14d3226386d8d1b002ab31c969c366549e66a2bb7 \ - --hash=sha256:3cc797c9d15d7689ed507b165cd05913acb992d78b379f6014e013f9ecb20996 \ - --hash=sha256:62f1b5c4cd6c5402b4e2d63804ba49a327e0c386c99b1675c8a0fefda23b2067 \ - --hash=sha256:69ccfdf3657ba59569c64295b7d51325f91af586f8d5793b734260dfe2e94e2c \ - --hash=sha256:6f50601512a3d23625d8a85b1638d914a0970f17920ff39cec63aaef80a93fb7 \ - --hash=sha256:7403941f6d0992d40161aa8bb23e12575637008a5a02283a930addc0508982f9 \ - --hash=sha256:755f3aee41354ae395e104d62119cb223339a8f3276a0cd009ffabfcdd46bb0c \ - --hash=sha256:77053d28427a29987ca9caf7b72ccafee011257561259faba8dd308fda9a8739 \ - --hash=sha256:7e371f10abe57cee5021797126c93479f59fccc9693dafd6bd5633ab67808a91 \ - --hash=sha256:9016d01c91e8e625141d24ec1b20fed584703e527d28512aa8c8707f105a683c \ - --hash=sha256:9be73ad47579abc26c12024239d3540e6b765182a91dbc88e23658ab71767153 \ - --hash=sha256:adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9 \ - --hash=sha256:adfc6cf69c7f8c50fd24c793964eef18f0ac321315439d94945820612849c388 \ - --hash=sha256:af0ebadc74e281a517141daad9d0f2c5d93ab78e9d455113719a45a49da9db4e \ - --hash=sha256:cb29edb9eab15742d791e1025dd7b6a8f6fcb53802ad2f6e3adcb102051063ab \ - --hash=sha256:cd68be2559e2a3b84f517fb029ee611546f7812b1fdd0aa2ecc9bc6ec0e4fdde \ - --hash=sha256:cdee09140e1cd184ba9324ec1df410e7147242b94b5f8b0c64fc89e38a8ba531 \ - --hash=sha256:db977c4ca738dd9ce508557d4fce0f5aebd105e158c725beec86feb1f6bc20d8 \ - --hash=sha256:dd5789b2948ca702c17027c84c2accb552fc30f4622a98ab5c51fcfe8c50d3e7 \ - --hash=sha256:e250a42f15bf9d5b09fe1b293bdba2801cd520a9f5ea2d7fb7536d4441811d20 \ - --hash=sha256:ff8d8fa42675249bb456f5db06c00de6c2f4c27a065955917b28c4f15978b9c3 +protobuf==3.20.3 \ + --hash=sha256:03038ac1cfbc41aa21f6afcbcd357281d7521b4157926f30ebecc8d4ea59dcb7 \ + --hash=sha256:28545383d61f55b57cf4df63eebd9827754fd2dc25f80c5253f9184235db242c \ + --hash=sha256:2e3427429c9cffebf259491be0af70189607f365c2f41c7c3764af6f337105f2 \ + --hash=sha256:398a9e0c3eaceb34ec1aee71894ca3299605fa8e761544934378bbc6c97de23b \ + --hash=sha256:44246bab5dd4b7fbd3c0c80b6f16686808fab0e4aca819ade6e8d294a29c7050 \ + --hash=sha256:447d43819997825d4e71bf5769d869b968ce96848b6479397e29fc24c4a5dfe9 \ + --hash=sha256:67a3598f0a2dcbc58d02dd1928544e7d88f764b47d4a286202913f0b2801c2e7 \ + --hash=sha256:74480f79a023f90dc6e18febbf7b8bac7508420f2006fabd512013c0c238f454 \ + --hash=sha256:819559cafa1a373b7096a482b504ae8a857c89593cf3a25af743ac9ecbd23480 \ + --hash=sha256:899dc660cd599d7352d6f10d83c95df430a38b410c1b66b407a6b29265d66469 \ + --hash=sha256:8c0c984a1b8fef4086329ff8dd19ac77576b384079247c770f29cc8ce3afa06c \ + --hash=sha256:9aae4406ea63d825636cc11ffb34ad3379335803216ee3a856787bcf5ccc751e \ + --hash=sha256:a7ca6d488aa8ff7f329d4c545b2dbad8ac31464f1d8b1c87ad1346717731e4db \ + --hash=sha256:b6cc7ba72a8850621bfec987cb72623e703b7fe2b9127a161ce61e61558ad905 \ + --hash=sha256:bf01b5720be110540be4286e791db73f84a2b721072a3711efff6c324cdf074b \ + --hash=sha256:c02ce36ec760252242a33967d51c289fd0e1c0e6e5cc9397e2279177716add86 \ + --hash=sha256:d9e4432ff660d67d775c66ac42a67cf2453c27cb4d738fc22cb53b5d84c135d4 \ + --hash=sha256:daa564862dd0d39c00f8086f88700fdbe8bc717e993a21e90711acfed02f2402 \ + --hash=sha256:de78575669dddf6099a8a0f46a27e82a1783c557ccc38ee620ed8cc96d3be7d7 \ + --hash=sha256:e64857f395505ebf3d2569935506ae0dfc4a15cb80dc25261176c784662cdcc4 \ + --hash=sha256:f4bd856d702e5b0d96a00ec6b307b0f51c1982c2bf9c0052cf9019e9a544ba99 \ + --hash=sha256:f4c42102bc82a51108e449cbb32b19b180022941c727bac0cfd50170341f16ee # via # gcp-docuploader # gcp-releasetool # google-api-core + # googleapis-common-protos py==1.11.0 \ --hash=sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 \ --hash=sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378 @@ -378,9 +406,9 @@ pygments==2.13.0 \ # via # readme-renderer # rich -pyjwt==2.4.0 \ - --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \ - --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba +pyjwt==2.6.0 \ + --hash=sha256:69285c7e31fc44f68a1feb309e948e0df53259d579295e6cfe2b1792329f05fd \ + --hash=sha256:d83c3d892a77bbb74d3e1a2cfa90afaadb60945205d1095d9221f04466f64c14 # via gcp-releasetool pyparsing==3.0.9 \ --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ @@ -393,9 +421,9 @@ python-dateutil==2.8.2 \ --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 # via gcp-releasetool -readme-renderer==37.0 \ - --hash=sha256:07b7ea234e03e58f77cc222e206e6abb8f4c0435becce5104794ee591f9301c5 \ - --hash=sha256:9fa416704703e509eeb900696751c908ddeb2011319d93700d8f18baff887a69 +readme-renderer==37.3 \ + --hash=sha256:cd653186dfc73055656f090f227f5cb22a046d7f71a841dfa305f55c9a513273 \ + --hash=sha256:f67a16caedfa71eef48a31b39708637a6f4664c4394801a7b0d6432d13907343 # via twine requests==2.28.1 \ --hash=sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 \ @@ -406,17 +434,17 @@ requests==2.28.1 \ # google-cloud-storage # requests-toolbelt # twine -requests-toolbelt==0.9.1 \ - --hash=sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f \ - --hash=sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0 +requests-toolbelt==0.10.1 \ + --hash=sha256:18565aa58116d9951ac39baa288d3adb5b3ff975c4f25eee78555d89e8f247f7 \ + --hash=sha256:62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d # via twine rfc3986==2.0.0 \ --hash=sha256:50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd \ --hash=sha256:97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c # via twine -rich==12.5.1 \ - --hash=sha256:2eb4e6894cde1e017976d2975ac210ef515d7548bc595ba20e195fb9628acdeb \ - --hash=sha256:63a5c5ce3673d3d5fbbf23cd87e11ab84b6b451436f1b7f19ec54b6bc36ed7ca +rich==12.6.0 \ + --hash=sha256:a4eb26484f2c82589bd9a17c73d32a010b1e29d89f1604cd9bf3a2097b81bb5e \ + --hash=sha256:ba3a3775974105c221d31141f2c116f4fd65c5ceb0698657a11e9f295ec93fd0 # via twine rsa==4.9 \ --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \ @@ -438,9 +466,9 @@ twine==4.0.1 \ --hash=sha256:42026c18e394eac3e06693ee52010baa5313e4811d5a11050e7d48436cf41b9e \ --hash=sha256:96b1cf12f7ae611a4a40b6ae8e9570215daff0611828f5fe1f37a16255ab24a0 # via -r requirements.in -typing-extensions==4.3.0 \ - --hash=sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02 \ - --hash=sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6 +typing-extensions==4.4.0 \ + --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \ + --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e # via -r requirements.in urllib3==1.26.12 \ --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \ @@ -448,9 +476,9 @@ urllib3==1.26.12 \ # via # requests # twine -virtualenv==20.16.4 \ - --hash=sha256:014f766e4134d0008dcaa1f95bafa0fb0f575795d07cae50b1bee514185d6782 \ - --hash=sha256:035ed57acce4ac35c82c9d8802202b0e71adac011a511ff650cbcf9635006a22 +virtualenv==20.16.6 \ + --hash=sha256:186ca84254abcbde98180fd17092f9628c5fe742273c02724972a1d8a2035108 \ + --hash=sha256:530b850b523c6449406dfba859d6345e48ef19b8439606c5d74d7d3c9e14d76e # via nox webencodings==0.5.1 \ --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \ @@ -460,13 +488,13 @@ wheel==0.37.1 \ --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \ --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 # via -r requirements.in -zipp==3.8.1 \ - --hash=sha256:05b45f1ee8f807d0cc928485ca40a07cb491cf092ff587c0df9cb1fd154848d2 \ - --hash=sha256:47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009 +zipp==3.10.0 \ + --hash=sha256:4fcb6f278987a6605757302a6e40e896257570d11c51628968ccb2a47e80c6c1 \ + --hash=sha256:7a7262fd930bd3e36c50b9a64897aec3fafff3dfdeec9623ae22b40e93f99bb8 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -setuptools==65.2.0 \ - --hash=sha256:7f4bc85450898a09f76ebf28b72fa25bc7111f6c7d665d514a60bba9c75ef2a9 \ - --hash=sha256:a3ca5857c89f82f5c9410e8508cb32f4872a3bafd4aa7ae122a24ca33bccc750 +setuptools==65.5.0 \ + --hash=sha256:512e5536220e38146176efb833d4a62aa726b7bbff82cfbc8ba9eaa3996e0b17 \ + --hash=sha256:f62ea9da9ed6289bfe868cd6845968a2c854d1427f8548d52cae02a42b4f0356 # via -r requirements.in From bf95dfc17c15e9e6b71fbfa03c90ab8eb18ade43 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 15:40:32 -0800 Subject: [PATCH 5/5] chore(main): release 2.14.1 (#1179) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: sai-sunder-s <4540365+sai-sunder-s@users.noreply.github.com> --- CHANGELOG.md | 9 +++++++++ google/auth/version.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a974e5256..f65921b5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ [1]: https://pypi.org/project/google-auth/#history +## [2.14.1](https://github.com/googleapis/google-auth-library-python/compare/v2.14.0...v2.14.1) (2022-11-07) + + +### Bug Fixes + +* Apply quota project for compute cred in adc ([#1177](https://github.com/googleapis/google-auth-library-python/issues/1177)) ([b9aa92a](https://github.com/googleapis/google-auth-library-python/commit/b9aa92a1f1640f9c8bc4beb7b13051a01cb263a4)) +* Update minimum required version of cryptography in pyopenssl extra ([#1176](https://github.com/googleapis/google-auth-library-python/issues/1176)) ([e9e76d1](https://github.com/googleapis/google-auth-library-python/commit/e9e76d1ee4e4b39edcd6821ced7a5bc3ed60eba0)) +* Validate url domain for aws metadata urls ([#1174](https://github.com/googleapis/google-auth-library-python/issues/1174)) ([f9d7d77](https://github.com/googleapis/google-auth-library-python/commit/f9d7d77739db86870c9b87b003e8ce0c93d53e53)) + ## [2.14.0](https://github.com/googleapis/google-auth-library-python/compare/v2.13.0...v2.14.0) (2022-10-31) diff --git a/google/auth/version.py b/google/auth/version.py index 6f8afc72a..5a2a1ee06 100644 --- a/google/auth/version.py +++ b/google/auth/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "2.14.0" +__version__ = "2.14.1"