From db3e89cd7caf79b0bfe5472631032acee1fcb0d7 Mon Sep 17 00:00:00 2001 From: cloudpossebot <11232728+cloudpossebot@users.noreply.github.com> Date: Fri, 29 Nov 2024 13:08:13 +0000 Subject: [PATCH 1/3] =?UTF-8?q?Update=20terraform-config-inspect=20to=200.?= =?UTF-8?q?0.20240801114854+git6714b46f5fe4=20=E2=86=92=200.0.202411071339?= =?UTF-8?q?21+git3adb156ecfe2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docs/badges.md | 2 +- docs/targets.md | 2 +- vendor/terraform-config-inspect/VERSION | 2 +- vendor/terraform-config-inspect/go.mod | 20 +++++++++++--------- vendor/terraform-config-inspect/go.sum | 16 ++++++++++++++++ 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 0538ad60f3..e58fafd479 100644 --- a/README.md +++ b/README.md @@ -453,7 +453,7 @@ terraform-0.13 \[frozen\] | 0.13.7 | Terraform is a tool for building, chang [![terraform-0.14](https://github.com/cloudposse/packages/actions/workflows/terraform-0.14.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-0.14) | 0.14.11 | Terraform is a tool for building, changing, and combining infrastructure safely and efficiently. [![terraform-0.15](https://github.com/cloudposse/packages/actions/workflows/terraform-0.15.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-0.15) | 0.15.5 | Terraform is a tool for building, changing, and combining infrastructure safely and efficiently. terraform-1 \[frozen\] | 1.5.7 | Terraform enables you to safely and predictably create, change, and improve infrastructure. -[![terraform-config-inspect](https://github.com/cloudposse/packages/actions/workflows/terraform-config-inspect.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-config-inspect) |
show0.0.20240801114854+git6714b46f5fe4
| A helper library for shallow inspection of Terraform configurations +[![terraform-config-inspect](https://github.com/cloudposse/packages/actions/workflows/terraform-config-inspect.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-config-inspect) |
show0.0.20241107133921+git3adb156ecfe2
| A helper library for shallow inspection of Terraform configurations [![terraform-docs](https://github.com/cloudposse/packages/actions/workflows/terraform-docs.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-docs) | 0.19.0 | Generate docs from terraform modules [![terraform-module-versions](https://github.com/cloudposse/packages/actions/workflows/terraform-module-versions.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-module-versions) | 3.1.13 | CLI tool that checks Terraform code for module updates. Single binary, no dependencies. linux, osx, windows. terraform_0.11 \[frozen\] | 0.11.15 | Terraform (Deprecated package. Use terraform-0.11 instead) diff --git a/docs/badges.md b/docs/badges.md index e4f2ba2986..1f2bc107bd 100644 --- a/docs/badges.md +++ b/docs/badges.md @@ -126,7 +126,7 @@ terraform-0.13 \[frozen\] | 0.13.7 | Terraform is a tool for building, chang [![terraform-0.14](https://github.com/cloudposse/packages/actions/workflows/terraform-0.14.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-0.14) | 0.14.11 | Terraform is a tool for building, changing, and combining infrastructure safely and efficiently. [![terraform-0.15](https://github.com/cloudposse/packages/actions/workflows/terraform-0.15.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-0.15) | 0.15.5 | Terraform is a tool for building, changing, and combining infrastructure safely and efficiently. terraform-1 \[frozen\] | 1.5.7 | Terraform enables you to safely and predictably create, change, and improve infrastructure. -[![terraform-config-inspect](https://github.com/cloudposse/packages/actions/workflows/terraform-config-inspect.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-config-inspect) |
show0.0.20240801114854+git6714b46f5fe4
| A helper library for shallow inspection of Terraform configurations +[![terraform-config-inspect](https://github.com/cloudposse/packages/actions/workflows/terraform-config-inspect.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-config-inspect) |
show0.0.20241107133921+git3adb156ecfe2
| A helper library for shallow inspection of Terraform configurations [![terraform-docs](https://github.com/cloudposse/packages/actions/workflows/terraform-docs.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-docs) | 0.19.0 | Generate docs from terraform modules [![terraform-module-versions](https://github.com/cloudposse/packages/actions/workflows/terraform-module-versions.yml/badge.svg?branch=main)](https://github.com/cloudposse/packages/actions?query=workflow%3Aterraform-module-versions) | 3.1.13 | CLI tool that checks Terraform code for module updates. Single binary, no dependencies. linux, osx, windows. terraform_0.11 \[frozen\] | 0.11.15 | Terraform (Deprecated package. Use terraform-0.11 instead) diff --git a/docs/targets.md b/docs/targets.md index 4eaf875770..11bdf3b0cf 100644 --- a/docs/targets.md +++ b/docs/targets.md @@ -141,7 +141,7 @@ terraform-0.13 0.13.7 Terraform is a tool for building, changing, terraform-0.14 0.14.11 Terraform is a tool for building, changing, and combining infrastructure safely and efficiently. terraform-0.15 0.15.5 Terraform is a tool for building, changing, and combining infrastructure safely and efficiently. terraform-1 1.5.7 Terraform enables you to safely and predictably create, change, and improve infrastructure. -terraform-config-inspect 0.0.20240801114854+git6714b46f5fe4 A helper library for shallow inspection of Terraform configurations +terraform-config-inspect 0.0.20241107133921+git3adb156ecfe2 A helper library for shallow inspection of Terraform configurations terraform-docs 0.19.0 Generate docs from terraform modules terraform-module-versions 3.1.13 CLI tool that checks Terraform code for module updates. Single binary, no dependencies. linux, osx, windows. terraform_0.11 0.11.15 Terraform (Deprecated package. Use terraform-0.11 instead) diff --git a/vendor/terraform-config-inspect/VERSION b/vendor/terraform-config-inspect/VERSION index bc17777f8b..792dd1c634 100644 --- a/vendor/terraform-config-inspect/VERSION +++ b/vendor/terraform-config-inspect/VERSION @@ -1 +1 @@ -0.0.20240801114854+git6714b46f5fe4 \ No newline at end of file +0.0.20241107133921+git3adb156ecfe2 \ No newline at end of file diff --git a/vendor/terraform-config-inspect/go.mod b/vendor/terraform-config-inspect/go.mod index 39eb54c605..be33777875 100644 --- a/vendor/terraform-config-inspect/go.mod +++ b/vendor/terraform-config-inspect/go.mod @@ -1,9 +1,11 @@ module github.com/cloudposse/packages -go 1.22 +go 1.22.0 + +toolchain go1.23.3 require ( - github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 + github.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2 github.com/spf13/pflag v1.0.5 ) @@ -13,12 +15,12 @@ require ( github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/hashicorp/hcl/v2 v2.22.0 // indirect + github.com/hashicorp/hcl/v2 v2.23.0 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect - github.com/zclconf/go-cty v1.15.0 // indirect - golang.org/x/mod v0.21.0 // indirect - golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.26.0 // indirect - golang.org/x/text v0.19.0 // indirect - golang.org/x/tools v0.26.0 // indirect + github.com/zclconf/go-cty v1.15.1 // indirect + golang.org/x/mod v0.22.0 // indirect + golang.org/x/sync v0.9.0 // indirect + golang.org/x/sys v0.27.0 // indirect + golang.org/x/text v0.20.0 // indirect + golang.org/x/tools v0.27.0 // indirect ) diff --git a/vendor/terraform-config-inspect/go.sum b/vendor/terraform-config-inspect/go.sum index bfeb720305..297bd6020e 100644 --- a/vendor/terraform-config-inspect/go.sum +++ b/vendor/terraform-config-inspect/go.sum @@ -43,6 +43,8 @@ github.com/hashicorp/hcl/v2 v2.21.0 h1:lve4q/o/2rqwYOgUg3y3V2YPyD1/zkCLGjIV74Jit github.com/hashicorp/hcl/v2 v2.21.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M= github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= +github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos= +github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= github.com/hashicorp/terraform-config-inspect v0.0.0-20211115214459-90acf1ca460f h1:R8UIC07Ha9jZYkdcJ51l4ownCB8xYwfJtrgZSMvqjWI= github.com/hashicorp/terraform-config-inspect v0.0.0-20211115214459-90acf1ca460f/go.mod h1:Z0Nnk4+3Cy89smEbrq+sl1bxc9198gIP4I7wcQF6Kqs= github.com/hashicorp/terraform-config-inspect v0.0.0-20230223165911-2d94e3d51111 h1:Q5X4tdq+BK6DbQWqu16uUfBsRcJKuK0h4h7q3PojiWM= @@ -81,6 +83,8 @@ github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI= github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 h1:RwY5HBgtBZ997UtKJAO2Rx+94ETyevwWEVXWx1SL5YY= github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI= +github.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2 h1:h+wcDC5wTiM+5YKjuLtUSWJtdtMVJNCRCPHoWieLpM4= +github.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -123,6 +127,8 @@ github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8 github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ= github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0= +github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= @@ -133,6 +139,8 @@ golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -140,6 +148,8 @@ golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= +golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -151,6 +161,8 @@ golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= @@ -175,6 +187,8 @@ golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= @@ -184,5 +198,7 @@ golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= +golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o= +golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 493b2fe85849f1362f6402baed90891b7bcadf9b Mon Sep 17 00:00:00 2001 From: Nuru Date: Wed, 4 Dec 2024 17:10:44 -0800 Subject: [PATCH 2/3] Ignore go toolchain --- vendor/terraform-config-inspect/Makefile | 3 +++ vendor/terraform-config-inspect/go.mod | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vendor/terraform-config-inspect/Makefile b/vendor/terraform-config-inspect/Makefile index 71857afa11..835c0ebafd 100644 --- a/vendor/terraform-config-inspect/Makefile +++ b/vendor/terraform-config-inspect/Makefile @@ -14,6 +14,9 @@ export PACKAGE_VERSION_TARGET := go-update include ../../tasks/Makefile.vendor_includes +# Prevent build errors because of different versions of go in different workflows +export GOTOOLCHAIN := local + version.go: VERSION go generate diff --git a/vendor/terraform-config-inspect/go.mod b/vendor/terraform-config-inspect/go.mod index be33777875..89f4158575 100644 --- a/vendor/terraform-config-inspect/go.mod +++ b/vendor/terraform-config-inspect/go.mod @@ -2,8 +2,6 @@ module github.com/cloudposse/packages go 1.22.0 -toolchain go1.23.3 - require ( github.com/hashicorp/terraform-config-inspect v0.0.0-20241107133921-3adb156ecfe2 github.com/spf13/pflag v1.0.5 From 24f373727666f16d64aad4d396561921b642433a Mon Sep 17 00:00:00 2001 From: Nuru Date: Sun, 8 Dec 2024 17:14:03 -0800 Subject: [PATCH 3/3] Restore version.go --- vendor/terraform-config-inspect/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/terraform-config-inspect/version.go b/vendor/terraform-config-inspect/version.go index 9078fb0587..6082e99cbc 100644 --- a/vendor/terraform-config-inspect/version.go +++ b/vendor/terraform-config-inspect/version.go @@ -1,5 +1,5 @@ package main const ( -Version = `0.0.20240801114854+git6714b46f5fe4` + Version = `0.0.20241107133921+git3adb156ecfe2` )