From 254be3c2541f3e492fd1fbf7934b70c5ad4eb571 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 17 Jul 2024 09:55:12 -0700 Subject: [PATCH] fix(tf): cf deprecated srv record data fields --- tf/.terraform.lock.hcl | 120 +++++++++++++++++------------------ tf/cloudflare_idp_records.tf | 35 ++-------- 2 files changed, 67 insertions(+), 88 deletions(-) diff --git a/tf/.terraform.lock.hcl b/tf/.terraform.lock.hcl index 399ddd2a..60ea440b 100644 --- a/tf/.terraform.lock.hcl +++ b/tf/.terraform.lock.hcl @@ -2,68 +2,68 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/bpg/proxmox" { - version = "0.57.0" + version = "0.61.1" constraints = ">= 0.42.1" hashes = [ - "h1:mPN5ffViWNH8BLHeFE69i6FgF/7pbg14Osahtrqaui0=", - "zh:182c40ee0b4035300f4481aefe5f016dbd52bc6c63395d1a450814828d8aae07", - "zh:1d51d0a4a5967f1d61f071df5ef912d94d47512e1cb5de78ea01eee385d4ab6b", - "zh:559828f31e15217ed871999e140edc8ecac9f5939baac94a8889204db04ef246", - "zh:703648d2a93256bf0915267c21410f4fac05b429ae240a620850713babf80ae3", - "zh:8e25240cd77dc182e26a229b8a3ae9644703d40f4c1aa52701811aa8cf4594d1", - "zh:9e758f2ae8457fa0cb0bf26f3dafdcac48b34edb7ccf635d429db9d6398cb1e5", - "zh:b52f2cb2d132d70a0c95ed7aa2b3706091c6ee64e6de09f8d6909da123d3217d", - "zh:b5ab43ea2f7aee64cd1960f68cb0e43531198227b92eacd9ba67ce4e1ccba9f2", - "zh:b8edad5744703c69b7f05f5faedc90f472ddf6dc16fd6a4fda8d91d405890842", - "zh:bcd01e92c0f85e50ad12cc7bcc29aae8869b0cc5b8f6d28b9ff7591fb5fec804", - "zh:c77b127de7feb60b10ac5ec0c66d87fe88e2c8fa500bdefb34775c8ff8e7a93f", - "zh:d1c8bdbaa7ae94d2bdd34be52ffc0863a4df23e7e7e63d5a354e3733f2285ee6", - "zh:e56a82436db989c3941241d1b59c909c454bcda8cedb43e1a1ea2010d935be0c", - "zh:ef864bb7267c5e65ee923db240d61d0af9ffb89d0ff50666aece5d38cd3f43eb", + "h1:6kz2Rdjc8+TVq2aUxEQXLOwbb9OdhJJei0L1fC4K2R4=", + "zh:27d8b589a2dc1e0a5b0f8ab299b9f3704a2f0b69799d1d4d8845c68056986d1f", + "zh:46dfa6b33ddd7007a2144f38090457604eb56a59a303b37bb0ad1be5c84ddaca", + "zh:47a1b14a759393c5ecc76f2feb950677c418c910b8c677fde0dd3e4675c41579", + "zh:582e49d109d1c2b1f3b1268a7cbc43548f3c6d96a87c92a5428767097a5e383e", + "zh:5e98ad6afae5969a4c3ffb14c0484936550c66c8313d7686551c29b633ff32f2", + "zh:7b9e24b76f947ab8f1e571cf61beefc983b7d2aa1b85df35c4f015728fe37a38", + "zh:8255ca210f279a0f7b8ca2762df26d2ea1a01704298c5e3d5cf601bd39a743f0", + "zh:85d7655fdc95dedced9cf8105a0beeb0d7bc8f668c55f62019a7215a76d60300", + "zh:8aeea5a1d001b06baaf923b754e1a14d06c75eb8c8b87a7f65a3c8205fc8b079", + "zh:a9cfab6c06f613658c5fdd83742cd22c0eb7563778924b1407965ef8c36c1ce0", + "zh:ceaab67801d49a92eb5858b1ddae6df2569462e5ffbe31f9dbd79dcb684ea142", + "zh:dc25b506d5c55d1d78a335d3ebd03213c99b4b2a5859812349a955c2f746ff7e", + "zh:e04b477fd77a0d37a0bdb76a7cf69184dad9e7fbba9b4f3a378a8901b82b75e5", + "zh:f1e6838d9141557f73340df9b21fce5a82b41cc16ae36f063a920ccc36bc0758", "zh:f26e0763dbe6a6b2195c94b44696f2110f7f55433dc142839be16b9697fa5597", ] } provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.33.0" + version = "4.37.0" constraints = ">= 4.22.0" hashes = [ - "h1:jfvnxO1kjxUquizrBlswsytWQeHXjvNz6IZwPTuixJ4=", - "zh:1839d03c8c30d3eac4f18c78c5c095d44348eb06cc9d758136d16517094b64e3", - "zh:1fd94992cbb8ce2943cf4fe3deff01b9b1a0e913d2cdd484ceb96a859d46dc5d", - "zh:2b4f37c16a7f6d3712b03980b52b149d4ef6a544917bfe1d1c2ca2d40468daa5", - "zh:32ecb8017be0a34f72b9b0fcd43d944b99cdc903c79892a68b48719824fb194c", - "zh:6468dee137fa07b0b43f742cfdaabb6620883b00773af370e10755ba579eb7f7", - "zh:766504de95a418fd763d9474f39fb147053201d6c4efa3efa456fb39a559b28b", - "zh:800342078c0c04a36cb2558d0c5c6bf050a8b4c231abecac59e56c9868b9fa7e", + "h1:0h0qRJYPHL92Dx3NYZO2WJ21cxyZGEoldzw9aYhPnew=", + "zh:012a6c3e8bf4aca0ebe0884e15bd42fd018659193f2159d5d2bf9948a9be1bc4", + "zh:079666c0a079237af46ed19ffc4143655ee0e8920a274868e44fbc3db88f346d", + "zh:08e7ff86f6848f3109d59ad46f8c0987178eff2f70c8ef03f2d44ae68e42dfb3", + "zh:1ce8a499fdf8f484f7d18ec91566bc0759b07d0ca710990cd60d32b222e416b1", + "zh:348e72338095bffccf7c46c7e6b9d0e063a22d9ae761061b0b31dea1aad22cd9", + "zh:47d39343dea1ef469a2c8e51c8d5993687af427a132da5379796fec27acb5710", + "zh:4cdf8e9579f9af3c72270088fc6e22208f0f91fd4382bc4a860d16040c86917b", + "zh:4fbebb21ecebc7e5ac0ea9e341c5dbea3094fc0579e4dc5b40bfe693164e022e", + "zh:778578dda7dd98576a3fe228132c8b60f646f4cf113638c94f1c40e2b11c027c", "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:94420269672dc5bef37e1a8efab656ada5c2d6f162b52cc59ea74cf0cf35d633", - "zh:972481b86636f00771c2b5f3e408ffd9b66d42942645c8b8e11c4f4bf52285f1", - "zh:ac52d6698fa8b2a8ab820ffb59381da27684a205f5a78529b56358efab67fe06", - "zh:c924c7ac3a8fc08eff7588627be68fc94958c1aaa65928a9fd73cf1d610a0dbf", - "zh:cfdfaeab3fcb522a806fc5b71cbd6096df0fafa06cea2131c0db6074b3b76eed", - "zh:d554393736b99bd1f0b60e210e276531bcd8df79f435924879eeecc1a2100a0d", - "zh:df827b0e00c9e2d666cfe6409f61446908e5983a07ae32c822ef193f6b56c37c", + "zh:894071f0f42571f820918d1a4316704923e29c5b2392704c1cbd063a04a641b8", + "zh:8d11dd73dd499c74d89f77a7e1b3d4a077ac88b0c9c3412e9a6a1b4efe17d107", + "zh:991e088be8381a73872cd33bb659e9dd69d7ab1f1f8d89b3cd17ffe59dffc65f", + "zh:9c0848b9c7e6799c9ffcf3afa70ad94a027f3e15a94679d56790714de0b072c5", + "zh:ad71ae800065ffc24b94d994250136ae8a9f6da704cf91b0dc9e14989e947369", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.6.1" + version = "3.6.2" constraints = ">= 3.6.0" hashes = [ - "h1:1OlP753r4lOKlBprL0HdZGWerm5DCabD5Mli8k8lWAg=", - "zh:2a0ec154e39911f19c8214acd6241e469157489fc56b6c739f45fbed5896a176", - "zh:57f4e553224a5e849c99131f5e5294be3a7adcabe2d867d8a4fef8d0976e0e52", - "zh:58f09948c608e601bd9d0a9e47dcb78e2b2c13b4bda4d8f097d09152ea9e91c5", - "zh:5c2a297146ed6fb3fe934c800e78380f700f49ff24dbb5fb5463134948e3a65f", + "h1:wmG0QFjQ2OfyPy6BB7mQ57WtoZZGGV07uAPQeDmIrAE=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:7ce41e26f0603e31cdac849085fc99e5cd5b3b73414c6c6d955c0ceb249b593f", - "zh:8c9e8d30c4ef08ee8bcc4294dbf3c2115cd7d9049c6ba21422bd3471d92faf8a", - "zh:93e91be717a7ffbd6410120eb925ebb8658cc8f563de35a8b53804d33c51c8b0", - "zh:982542e921970d727ce10ed64795bf36c4dec77a5db0741d4665230d12250a0d", - "zh:b9d1873f14d6033e216510ef541c891f44d249464f13cc07d3f782d09c7d18de", - "zh:cfe27faa0bc9556391c8803ade135a5856c34a3fe85b9ae3bdd515013c0c87c1", - "zh:e4aabf3184bbb556b89e4b195eab1514c86a2914dd01c23ad9813ec17e863a8a", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", ] } @@ -88,22 +88,22 @@ provider "registry.terraform.io/hashicorp/tls" { } provider "registry.terraform.io/vancluever/acme" { - version = "2.21.0" + version = "2.24.2" constraints = "~> 2.0" hashes = [ - "h1:PRLnmTCrzjCo0w40cNXMsrTADmyya5IjrkGnlarww/o=", - "zh:075d6fbd95d73bb174b0b3780b29b00f3795623d9ac7ff7579df2ad630b2c32b", - "zh:1b20ed78ea159f64a00d215d50688a3f4641e3f209f42470ac7edf5d7955920e", - "zh:35d51778662fb0ff3810daf3bf916fac79b3b6859c295e5e0d54a5bef51b3feb", - "zh:5a0e6318e79bf88b1ffc02972100685499e107ccb4788dec225f99a073045d16", - "zh:67b183099de08aa6df8dbd530e5f1d35b3a9154d33b60c9cb3214b792c20b83a", - "zh:6cb640ee8de2e3f92f6068463349d6bd0a3c98ca02cab54b9f70093c1b1e7b6d", - "zh:8af30a494db88cfb19b6b2b18fffc7251f39c2a06c915e02dc1ce888e6b3d591", - "zh:8ee496d78c1b0a01792e0fc5f29a8ce428318e6a45d86d89d9d428d088819d87", - "zh:905c6ba603d8f63f764b6e54c41466d86b92cdc7a27e5bad6fd9610a43de493f", - "zh:b4362af63829e6d207f81c4e595540bfd5bd3bbd02594670635bcd5466e49a40", - "zh:d34e85c99077e2407d5e20c31e117b3be87a5b4cae1f901ff9a613d200585ac2", - "zh:ecb30f6e691fa919dcf015b4c22626bc09ad6b36f1659c3dacf560fb3f3de66f", - "zh:f0e37415bf72c3a4e1225c0a8cc594f22a8610149642d6702ccde4aadd1b92e8", + "h1:zxpXpKMgBbhBocwRNRBVmGUZKLFEeDAxrKxEOsALGHk=", + "zh:079162e3cb8e3e1e24ae5cf099f09a545b47e5acfd405d1ac2a478cdfc27a0e1", + "zh:263e8e027a655452420ff621362fbcd8b7f765120adec2881d5a3c906555de16", + "zh:2ef4e642f6f106925112726a7c5eb862578406e6aa52e9623ef56d0207ab8121", + "zh:346729435b3be07830973e5b9173dba43add86589fe5a25c13d029d940b935de", + "zh:5ebc3eaaf33ebaaa7b68499a65978f46413c4d377c1b5e2ba143392664fab231", + "zh:75f74966e7ca1ed328b217e95e59a2c54135bcea0f4ec8e4202cef89c2ba4996", + "zh:8041807080b0134517d2d346fdd72d7b67a6673ede6b99bc7f6eb8c148449285", + "zh:904352a3ddbe530934dfa03da54c1a76b96f059a21f77008031e754db51fe0fb", + "zh:92d47ca9ec6c77b688a6e45ff509b287f2333399d2ecb5907d4ec109466857a1", + "zh:a9b7bc9334c069dcafd98037f5317a93d269d67e792f45d5879f9afc7bb65ca7", + "zh:b38ce8512d14a6f4073a41442c3c6b88b91e4419dc030d63633215c2e14cd8c9", + "zh:c8dc7893fcd9b233cc17acc0ee0f37d9873b93a441f6e1af1c1042c67fb81ab8", + "zh:db66259c5bdb8a11e7b3796358d182a2a00ce557ffaeae31f8be784806f6e273", ] } diff --git a/tf/cloudflare_idp_records.tf b/tf/cloudflare_idp_records.tf index 0bf94915..f9b0f8a4 100644 --- a/tf/cloudflare_idp_records.tf +++ b/tf/cloudflare_idp_records.tf @@ -6,13 +6,10 @@ locals { resource "cloudflare_record" "kerberos_master_tcp" { zone_id = cloudflare_zone.gensokyo-zone_zone.id - name = "@" + name = "_kerberos-master._tcp" type = "SRV" ttl = 3600 data { - service = "_kerberos-master" - proto = "_tcp" - name = cloudflare_zone.gensokyo-zone_zone.zone priority = 0 weight = 100 port = 88 @@ -22,13 +19,10 @@ resource "cloudflare_record" "kerberos_master_tcp" { resource "cloudflare_record" "kerberos_master_udp" { zone_id = cloudflare_zone.gensokyo-zone_zone.id - name = "@" + name = "_kerberos-master._udp" type = "SRV" ttl = 3600 data { - service = "_kerberos-master" - proto = "_udp" - name = cloudflare_zone.gensokyo-zone_zone.zone priority = 0 weight = 100 port = 88 @@ -38,13 +32,10 @@ resource "cloudflare_record" "kerberos_master_udp" { resource "cloudflare_record" "kerberos_tcp" { zone_id = cloudflare_zone.gensokyo-zone_zone.id - name = "@" + name = "_kerberos._tcp" type = "SRV" ttl = 3600 data { - service = "_kerberos" - proto = "_tcp" - name = cloudflare_zone.gensokyo-zone_zone.zone priority = 0 weight = 100 port = 88 @@ -54,13 +45,10 @@ resource "cloudflare_record" "kerberos_tcp" { resource "cloudflare_record" "kerberos_udp" { zone_id = cloudflare_zone.gensokyo-zone_zone.id - name = "@" + name = "_kerberos._udp" type = "SRV" ttl = 3600 data { - service = "_kerberos" - proto = "_udp" - name = cloudflare_zone.gensokyo-zone_zone.zone priority = 0 weight = 100 port = 88 @@ -102,13 +90,10 @@ resource "cloudflare_record" "kerberos_uri_udp" { resource "cloudflare_record" "kpasswd_tcp" { zone_id = cloudflare_zone.gensokyo-zone_zone.id - name = "@" + name = "_kpasswd._tcp" type = "SRV" ttl = 3600 data { - service = "_kpasswd" - proto = "_tcp" - name = cloudflare_zone.gensokyo-zone_zone.zone priority = 0 weight = 100 port = 464 @@ -118,13 +103,10 @@ resource "cloudflare_record" "kpasswd_tcp" { resource "cloudflare_record" "kpasswd_udp" { zone_id = cloudflare_zone.gensokyo-zone_zone.id - name = "@" + name = "_kpasswd._udp" type = "SRV" ttl = 3600 data { - service = "_kpasswd" - proto = "_udp" - name = cloudflare_zone.gensokyo-zone_zone.zone priority = 0 weight = 100 port = 464 @@ -158,13 +140,10 @@ resource "cloudflare_record" "kpasswd_uri_udp" { resource "cloudflare_record" "ldap" { zone_id = cloudflare_zone.gensokyo-zone_zone.id - name = "@" + name = "_ldap._tcp" type = "SRV" ttl = 3600 data { - service = "_ldap" - proto = "_tcp" - name = cloudflare_zone.gensokyo-zone_zone.zone priority = 0 weight = 100 port = 389