Skip to content

Commit

Permalink
Add handling of amd64 canonical ubuntu lts images on compute disk. (#…
Browse files Browse the repository at this point in the history
…10952)

[upstream:716507e1ae25949b6d9835a07c9b69ecf88fbae2]

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician committed Jun 12, 2024
1 parent fa7da3f commit f20c75a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/hashicorp/hcl/v2 v2.19.1
github.com/hashicorp/terraform-json v0.21.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240612170719-7ccf0e005321
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240612181241-3f95c3c7dba5
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ github.com/hashicorp/terraform-plugin-mux v0.15.0 h1:+/+lDx0WUsIOpkAmdwBIoFU8UP9
github.com/hashicorp/terraform-plugin-mux v0.15.0/go.mod h1:9ezplb1Dyq394zQ+ldB0nvy/qbNAz3mMoHHseMTMaKo=
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh3R4yp6pKksKHcqZx5G8=
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240612170719-7ccf0e005321 h1:E0zu5Y4B4UWkcQG86aIdXKD34yG6/X228UTQepbLm3w=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240612170719-7ccf0e005321/go.mod h1:qGTuIbb/eUvNzz6mdjRCOMedFoejBXIavNnhS3TAMbU=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240612181241-3f95c3c7dba5 h1:fEFdX3k8v5G1YcwrzJklGmoYEReGMqx9ov0lSeo6PTA=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240612181241-3f95c3c7dba5/go.mod h1:qGTuIbb/eUvNzz6mdjRCOMedFoejBXIavNnhS3TAMbU=
github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI=
github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM=
github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var (
resolveImageLink = regexp.MustCompile(fmt.Sprintf("^https://www.googleapis.com/compute/[a-z0-9]+/projects/(%s)/global/images/(%s)", verify.ProjectRegex, resolveImageImageRegex))

windowsSqlImage = regexp.MustCompile("^sql-(?:server-)?([0-9]{4})-([a-z]+)-windows-(?:server-)?([0-9]{4})(?:-r([0-9]+))?-dc-v[0-9]+$")
canonicalUbuntuLtsImage = regexp.MustCompile("^ubuntu-(minimal-)?([0-9]+)(?:.*(arm64))?.*$")
canonicalUbuntuLtsImage = regexp.MustCompile("^ubuntu-(minimal-)?([0-9]+)(?:.*(arm64|amd64))?.*$")
cosLtsImage = regexp.MustCompile("^cos-([0-9]+)-")
)

Expand Down

0 comments on commit f20c75a

Please sign in to comment.