Merge pull request #808 from hashicorp/backport/cloud-run-ar-patch/he…

…avily-enjoyed-cat

Backport of Fix waypoint to work with Artifact Registry into release/0.1.x

builtin/google/cloudrun/platform.go

@@ -161,7 +161,7 @@ func (p *Platform) Deploy(
 
  // Validate that the Docker image is stored in a GCP registry
  // It is not possible to deploy to Cloud Run using external container registries
- err = validateImageName(img.Image, p.config.Project)
+ err = validateImageName(img.Image)
  if err != nil {
  return nil, status.Error(codes.FailedPrecondition, err.Error())
  }

builtin/google/cloudrun/validation.go

@@ -2,6 +2,7 @@ package cloudrun
 
 import (
  "fmt"
+ "regexp"
  "strings"
 
  "github.com/go-playground/validator"
@@ -10,7 +11,7 @@ import (
 
 // ValidateImageName validates that that the specified image is in the gcr Docker Registry for this project
 // Returns an error message when validation fails.
-func validateImageName(image string, project string) error {
+func validateImageName(image string) error {
  // cloud run deployments must come from one of the following image registries
  var validRegistries = []string{
  "gcr.io",
@@ -26,6 +27,15 @@ func validateImageName(image string, project string) error {
  registryValid = true
  break
  }
+
+ // Also check if a valid Artifact Registry was supplied which is LOCATION-docker.pkg.dev
+ parts := regexp.MustCompile(`([a-z0-9-]*)-docker\.pkg\.dev`).FindStringSubmatch(image)
+ if len(parts) > 1 {
+ if parts[1] != "" {
+ registryValid = true
+ }
+ }
+
  }
 
  if !registryValid {

builtin/google/cloudrun/validation_test.go

@@ -8,15 +8,25 @@ import (
 )
 
 func TestValidateImageReturnsErrorOnInvalidImageName(t *testing.T) {
- err := validateImageName("foo", "proj")
+ err := validateImageName("foo")
  require.Error(t, err)
 }
 
 func TestValidateImageReturnsErrorOnInvalidRegistry(t *testing.T) {
- err := validateImageName("foo/proj/image", "proj")
+ err := validateImageName("foo/proj/image")
  require.Error(t, err)
 }
 
+func TestValidateImageReturnsErrorOnInvalidArtifactRegistry(t *testing.T) {
+ err := validateImageName("FOO-docker.pkg.dev/waypoint-286812/foo/bar")
+ require.Error(t, err)
+}
+
+func TestValidateImageReturnsNoErrorOnValidArtifactRegistry(t *testing.T) {
+ err := validateImageName("europe-north1-docker.pkg.dev/waypoint-286812/foo/bar")
+ require.NoError(t, err)
+}
+
 var locations = []*run.Location{
  {LocationId: "asia-east1"},
  {LocationId: "asia-northeast1"},