From f2777d5b2775bc2246cc44d922d6e7ea42a0e4ed Mon Sep 17 00:00:00 2001 From: Matthieu Nicolescu Date: Wed, 27 Mar 2024 18:39:13 +0100 Subject: [PATCH] feat : Add ip_rules variable for az-acr tf module --- terraform/modules/az-acr/README.md | Bin 4077 -> 8442 bytes terraform/modules/az-acr/main.tf | 17 +++++++++++++++++ .../az-acr/tests/acr_secure.tftest.hcl | 13 +++++++------ terraform/modules/az-acr/variables.tf | 6 ++++++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/terraform/modules/az-acr/README.md b/terraform/modules/az-acr/README.md index f79406c34575d44e5a8e1e67a62a0533dcd55211..c26309bcb8eba6e7179f996b98b8de96c6b15285 100644 GIT binary patch literal 8442 zcmd^FO>Y}F5aqc*|HC4_B!|ca3bcUH1~A%-QP&NUxR*9qsggeywIx+6#Zchip7uSC zMkHsc^{$dSC%Tu7xC2+XSMI|7lGt#JL`J#llhe~G#G(2nviu=f-90;>)&`T{F|GqZ2qQ($6w{O&B5XI|REeeDMB zTlWntK>-Vv`4zL-Pm7E;jX zuCPkurG#vh=Fk5WM(vtBgii4E6W}q2x5jy+>8U?@l<7YesF&UsB<>3rdvW1Nc?pCW zJIhV1F(yI=nsoB_IFmew-^b7ClV+BqgodL>+q{&^H;fh0oH=3wf8a<7S?M8v_}HIh zvW`+Rx1_X^g92a4KD+7FO2kYePGq1*7m(%>pG(9QGenTE0Jb&87M_NbsT7i-htOb# zpBpy>1uZ)CcDeCub!-ZXIAWSvIcSq=8=|HJ58@{I#b)VPHsYbN#_wDw7-?oY@HP;u zaHjj}K3J*@g_nTXa(^P;2TkVH6(rmbOJ*Qu)(iOH4R#(w3XLm8DU8$&KWtkcaE>|T zyt6+S#rf2u#R#8yKNU>l{R)gz!{EbhyQz;73!V{A{U`Iy6xsUO7Udz%zqi|`e*PKFYk4P zq$GWZw(|QD-tj3cNQ(FiNv!s zdWX>FHT2>fYlCBNi3+~Qii+oeQug(^IlPCNLTbq-W^<2IpvWU-sT3a@hbQhO5D45D zea!JA?9Ujz!*{9K!^y(z_c*>}vxG&%&gZbOG>XLWw&IkV5vyO(^b~*N{HjsIT5uiN zl~t?EtzmPRsiYXsLGKVNMItY)5cF=Z4R+-d-oLrq zzPW>S5bID@2c_o}v)bp>TB;W@0lX*X6GDV8>davW%Zm`68@?8m8(9dbJqiKKn; z|F|mJ-u_FR*X&}gAQQb@GO9(~t|Gc&9iMb%&hNXgR%Bnn1JWKv*e&$H9xLxte%3hR zugp-Xua&5FM!pit;g+t<`KhkngPXQls`+HEuF8nnOosRA0TFymmjib9jm7 z4I9hN4z2X%(+;iHc)RKecIbIGsl4CqTUD@6d(n)lZD)=H`4 z{8vY}4MyaA=WT!LJIVXiq) z>XPex+r5_6lgg5I#`R7pcgE%|BlM`n^Cc@NwOBIdPOA1bYB$ZZ=ZH(5)gjL|Gf%!_ z_JjA^_#Ij35=g#f59t^lDLr^r2D}kbURFv4-Y3xZyL$4LdRH%5-{Lhp?J+VjE+r&L zwYC{6#n4iB!QHO;|KiRbrp1?Ic@#Ngu{yy!Fnj)Y^S$98QYI%{78)T_9GZ>SmoDcVnghD4ZEVj3#y@wZGM+HquVqKdouj A#Q*>R literal 4077 zcmc&%OK%%D5Wf3YOzn$vkW{pX7KUrUiPFNTs|0@Zk~KEeF0~>oksFd5V*~&A%<#1< zX{8tmis~YAX2|(CGaP<<{?lj#uiyT4HOue*%%|_(+`?#daddJ5H~dp0G+%RR&C$_J zf$j;$M`ZF|tIwk38uiaGV`~o2@GnkI6a9LSu}Zt+y6TL{g?62xI6j(N0rTrdvt3*_P}nqQH?H0m4Mx~HR9Vs zMUbM)yin3IA-T>quY|F>9kW6|oGz`c&DmsMma9p$ zbrNBDP3BY?>JShWQA9VW9tKGX2fRwSejiG!n*$&#t~9S#qF|IKLgWS}LfzCm$ljoX zyVryuU*jbKwScrS;H7Z!-CRcTT%qkL-YFrgS1!OG9`;8Un~Jo;wz()1*eJ_L*a6%S z6R1ldR|G4l1g4!CqY8nyv4kgKm%auHJ^p@V7TZaTV~2sHL)b`8;O?;YXxxL>QW=&h za+qv~%7@BD>iD)bmai|35tYRH-ygS_hzKmsJ4jLDB1N4SuWCh?_&O8^MTE)L`Is=A zwHUsED@k2Ex}kCBf@ZY+4FBnz?!I9OzjR}6pOk*gHMaJA-qx79T)9S*+|Xzli4I)f}&44mVD(eM$v1>oK8 zgMYXu#%DIKv})?SU&c|Dc^zhBqpku``b_g6OR%e*jVjJ-<>8{96V6487_~s=MPnfd2Av`9Cm1MLT;&j z-~N5Sk>bSWFsy+!Ql$DF;yu!6(X0ztt9IuJ7dlKYy2a+?aA5M(3{h_3M!3K+zyliC2u%RqvrpFE>fgL*+VGG z2 0 ? [1] : [] + + content { + default_action = "Deny" + + dynamic "ip_rule" { + for_each = var.ip_rules + + content { + action = "Allow" + ip_range = ip_rule.value + } + } + } + } + zone_redundancy_enabled = var.zone_redundancy_enabled identity { diff --git a/terraform/modules/az-acr/tests/acr_secure.tftest.hcl b/terraform/modules/az-acr/tests/acr_secure.tftest.hcl index 84893a78..d786e0b7 100644 --- a/terraform/modules/az-acr/tests/acr_secure.tftest.hcl +++ b/terraform/modules/az-acr/tests/acr_secure.tftest.hcl @@ -14,11 +14,11 @@ run "plan" { command = plan variables { - name = "usingsystemazacrtest1" - location = run.setup.resource_group_location - resource_group_name = run.setup.resource_group_name - - tags = { Environment = "Test" } + name = "usingsystemazacrtest1" + location = run.setup.resource_group_location + resource_group_name = run.setup.resource_group_name + ip_rules = ["20.75.211.8/29", "20.99.157.152/29"] + tags = { Environment = "Test" } } assert { @@ -126,7 +126,8 @@ run "apply" { name = "usingsystemazacrtest1" location = run.setup.resource_group_location resource_group_name = run.setup.resource_group_name - + ip_rules = ["20.75.211.8/29", "20.99.157.152/29"] + tags = { Environment = "Test" } } diff --git a/terraform/modules/az-acr/variables.tf b/terraform/modules/az-acr/variables.tf index 1c21c359..502cb519 100644 --- a/terraform/modules/az-acr/variables.tf +++ b/terraform/modules/az-acr/variables.tf @@ -87,6 +87,12 @@ variable "identity_ids" { default = [] } +variable "ip_rules" { + description = "List of IP rules to allow on the acr." + type = list(string) + default = [] +} + variable "tags" { description = "Tags to associate with resources." type = map(string)