From 85d3fc929f77cac50089a28b972bc118039bb398 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Wed, 3 Aug 2022 23:04:18 +0000 Subject: [PATCH] Final updates from debian-9 to debian-11 (#6372) Signed-off-by: Modular Magician --- converters/google/resources/compute_disk.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/converters/google/resources/compute_disk.go b/converters/google/resources/compute_disk.go index 3a2a14c93..c2930cd42 100644 --- a/converters/google/resources/compute_disk.go +++ b/converters/google/resources/compute_disk.go @@ -137,7 +137,7 @@ func diskImageEquals(oldImageName, newImageName string) bool { func diskImageFamilyEquals(imageName, familyName string) bool { // Handles the case when the image name includes the family name - // e.g. image name: debian-11-drawfork-v20180109, family name: debian-11 + // e.g. image name: debian-11-bullseye-v20220719, family name: debian-11 // We have to check for arm64 because of cases like: // image name: opensuse-leap-15-4-v20220713-arm64, family name: opensuse-leap (should not suppress) if strings.Contains(imageName, strings.TrimSuffix(familyName, "-arm64")) { diff --git a/go.mod b/go.mod index f17f35494..05071a809 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/terraform-json v0.14.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.18.0 - github.com/hashicorp/terraform-provider-google v1.20.1-0.20220803171618-278ee07d47b8 + github.com/hashicorp/terraform-provider-google v1.20.1-0.20220803230021-8db22b24e5ec github.com/mitchellh/go-homedir v1.1.0 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 diff --git a/go.sum b/go.sum index f0f25fb2a..7f4713ab9 100644 --- a/go.sum +++ b/go.sum @@ -642,8 +642,8 @@ github.com/hashicorp/terraform-plugin-log v0.4.1 h1:xpbmVhvuU3mgHzLetOmx9pkOL2rm github.com/hashicorp/terraform-plugin-log v0.4.1/go.mod h1:p4R1jWBXRTvL4odmEkFfDdhUjHf9zcs/BCoNHAc7IK4= github.com/hashicorp/terraform-plugin-sdk/v2 v2.18.0 h1:/cdI5di5XA+N80gXzXF4YcHq36DprBskubk6Z8i26ZQ= github.com/hashicorp/terraform-plugin-sdk/v2 v2.18.0/go.mod h1:L3SHkD/Q8zPVgXviQmpVwy9nKwpXXZscVIpVEnQ/T50= -github.com/hashicorp/terraform-provider-google v1.20.1-0.20220803171618-278ee07d47b8 h1:/pG36CxKcrKXeNpsVOY6C12/IF+NNA7cZTrLuLnbkIQ= -github.com/hashicorp/terraform-provider-google v1.20.1-0.20220803171618-278ee07d47b8/go.mod h1:HJ4eeT50GEXVlW89O0pxY505sHy2X6JoqnPu2A8n/lY= +github.com/hashicorp/terraform-provider-google v1.20.1-0.20220803230021-8db22b24e5ec h1:qukCNJa2ssHWubOQSzfomJPx/BdpwuaPM933CvRVZbs= +github.com/hashicorp/terraform-provider-google v1.20.1-0.20220803230021-8db22b24e5ec/go.mod h1:HJ4eeT50GEXVlW89O0pxY505sHy2X6JoqnPu2A8n/lY= github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c h1:D8aRO6+mTqHfLsK/BC3j5OAoogv1WLRWzY1AaTo3rBg= github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c/go.mod h1:Wn3Na71knbXc1G8Lh+yu/dQWWJeFQEpDeJMtWMtlmNI= github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0=