From a135f76c26d34e3f77c1974ca3fb71488997b98c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 14:19:45 +0000 Subject: [PATCH 1/3] build(deps): Bump github.com/hashicorp/terraform-plugin-framework Bumps [github.com/hashicorp/terraform-plugin-framework](https://github.com/hashicorp/terraform-plugin-framework) from 1.10.0 to 1.11.0. - [Release notes](https://github.com/hashicorp/terraform-plugin-framework/releases) - [Changelog](https://github.com/hashicorp/terraform-plugin-framework/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/terraform-plugin-framework/compare/v1.10.0...v1.11.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/terraform-plugin-framework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 835883c8..3d492415 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/elazarl/goproxy v0.0.0-20220529153421-8ea89ba92021 github.com/elazarl/goproxy/ext v0.0.0-20220529153421-8ea89ba92021 github.com/google/go-cmp v0.6.0 - github.com/hashicorp/terraform-plugin-framework v1.10.0 + github.com/hashicorp/terraform-plugin-framework v1.11.0 github.com/hashicorp/terraform-plugin-framework-validators v0.13.0 github.com/hashicorp/terraform-plugin-go v0.23.0 github.com/hashicorp/terraform-plugin-log v0.9.0 diff --git a/go.sum b/go.sum index f47fdfcf..8914d4d2 100644 --- a/go.sum +++ b/go.sum @@ -79,8 +79,8 @@ github.com/hashicorp/terraform-exec v0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVW github.com/hashicorp/terraform-exec v0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg= github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec= github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A= -github.com/hashicorp/terraform-plugin-framework v1.10.0 h1:xXhICE2Fns1RYZxEQebwkB2+kXouLC932Li9qelozrc= -github.com/hashicorp/terraform-plugin-framework v1.10.0/go.mod h1:qBXLDn69kM97NNVi/MQ9qgd1uWWsVftGSnygYG1tImM= +github.com/hashicorp/terraform-plugin-framework v1.11.0 h1:M7+9zBArexHFXDx/pKTxjE6n/2UCXY6b8FIq9ZYhwfE= +github.com/hashicorp/terraform-plugin-framework v1.11.0/go.mod h1:qBXLDn69kM97NNVi/MQ9qgd1uWWsVftGSnygYG1tImM= github.com/hashicorp/terraform-plugin-framework-validators v0.13.0 h1:bxZfGo9DIUoLLtHMElsu+zwqI4IsMZQBRRy4iLzZJ8E= github.com/hashicorp/terraform-plugin-framework-validators v0.13.0/go.mod h1:wGeI02gEhj9nPANU62F2jCaHjXulejm/X+af4PdZaNo= github.com/hashicorp/terraform-plugin-go v0.23.0 h1:AALVuU1gD1kPb48aPQUjug9Ir/125t+AAurhqphJ2Co= From 5328dab146f65d8fc22e128b86efab98a210221f Mon Sep 17 00:00:00 2001 From: Austin Valle Date: Tue, 6 Aug 2024 13:46:40 -0400 Subject: [PATCH 2/3] update live cert test --- .../provider/data_source_certificate_test.go | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/internal/provider/data_source_certificate_test.go b/internal/provider/data_source_certificate_test.go index acad2a75..475b05c6 100644 --- a/internal/provider/data_source_certificate_test.go +++ b/internal/provider/data_source_certificate_test.go @@ -133,30 +133,23 @@ func TestAccDataSourceCertificate_TerraformIO(t *testing.T) { } `, Check: r.ComposeAggregateTestCheckFunc( - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.#", "3"), + r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.#", "2"), // ISRG Root X1 - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.issuer", "CN=DST Root CA X3,O=Digital Signature Trust Co."), - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.subject", "CN=ISRG Root X1,O=Internet Security Research Group,C=US"), + r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.issuer", "CN=ISRG Root X1,O=Internet Security Research Group,C=US"), + r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.subject", "CN=R11,O=Let's Encrypt,C=US"), r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.signature_algorithm", "SHA256-RSA"), r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.public_key_algorithm", "RSA"), r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.is_ca", "true"), - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.sha1_fingerprint", "933c6ddee95c9c41a40f9f50493d82be03ad87bf"), + r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.sha1_fingerprint", "696db3af0dffc17e65c6a20d925c5a7bd24dec7e"), - // Let's Encrypt Intermediate Root R3 + // www.terraform.io r.TestCheckResourceAttrPair("data.tls_certificate.test", "certificates.1.issuer", "data.tls_certificate.test", "certificates.0.subject"), - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.subject", "CN=R3,O=Let's Encrypt,C=US"), + r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.subject", "CN=www.terraform.io"), r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.signature_algorithm", "SHA256-RSA"), r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.public_key_algorithm", "RSA"), - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.is_ca", "true"), - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.sha1_fingerprint", "a053375bfe84e8b748782c7cee15827a6af5a405"), - - // www.terraform.io - r.TestCheckResourceAttrPair("data.tls_certificate.test", "certificates.2.issuer", "data.tls_certificate.test", "certificates.1.subject"), - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.2.subject", "CN=www.terraform.io"), - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.2.signature_algorithm", "SHA256-RSA"), - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.2.public_key_algorithm", "RSA"), - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.2.is_ca", "false"), + r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.is_ca", "false"), + r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.sha1_fingerprint", "3aeb49dc3768d48c4b7167c5d1d2dd2d3a3e966d"), // NOTE: Not checking the fingerprint, as this certificate is auto-updated frequently: // all the other data are stable, but the signature changes every time. From 09061fbb7327ded4229434155c264ff250acca87 Mon Sep 17 00:00:00 2001 From: Austin Valle Date: Tue, 6 Aug 2024 13:48:19 -0400 Subject: [PATCH 3/3] remove fingerprint for terraform.io --- internal/provider/data_source_certificate_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/provider/data_source_certificate_test.go b/internal/provider/data_source_certificate_test.go index 475b05c6..36d7af79 100644 --- a/internal/provider/data_source_certificate_test.go +++ b/internal/provider/data_source_certificate_test.go @@ -149,7 +149,6 @@ func TestAccDataSourceCertificate_TerraformIO(t *testing.T) { r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.signature_algorithm", "SHA256-RSA"), r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.public_key_algorithm", "RSA"), r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.is_ca", "false"), - r.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.sha1_fingerprint", "3aeb49dc3768d48c4b7167c5d1d2dd2d3a3e966d"), // NOTE: Not checking the fingerprint, as this certificate is auto-updated frequently: // all the other data are stable, but the signature changes every time.