Skip to content
This repository has been archived by the owner on Nov 27, 2024. It is now read-only.

Final updates from debian-9 to debian-11 #895

Merged
merged 1 commit into from
Aug 3, 2022
Merged

Final updates from debian-9 to debian-11 #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion converters/google/resources/compute_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down