Loosen regex in computeDiskUserRegexString - accept ":" or "." (#1145)

Author: derfloh

google/resource_compute_disk.go

@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	computeDiskUserRegexString = "^(?:https://www.googleapis.com/compute/v1/projects/)?([-_a-zA-Z0-9]*)/zones/([-_a-zA-Z0-9]*)/instances/([-_a-zA-Z0-9]*)$"
+	computeDiskUserRegexString = "^(?:https://www.googleapis.com/compute/v1/projects/)?(" + ProjectRegex + ")/zones/([-_a-zA-Z0-9]*)/instances/([-_a-zA-Z0-9]*)$"
 )
 
 var (

google/resource_compute_disk_test.go

@@ -372,6 +372,38 @@ func TestAccComputeDisk_deleteDetach(t *testing.T) {
 	})
 }
 
+func TestAccComputeDisk_computeDiskUserRegex(t *testing.T) {
+
+	shouldPass := []string{
+
+		"https://www.googleapis.com/compute/v1/projects/project-id/zones/us-central1/instances/123",
+		"https://www.googleapis.com/compute/v1/projects/123123/zones/us-central1/instances/123",
+		"https://www.googleapis.com/compute/v1/projects/hashicorptest.net:project-123/zones/us-central1/instances/123",
+		"https://www.googleapis.com/compute/v1/projects/123/zones/456/instances/789",
+	}
+
+	shouldFail := []string{
+		"https://www.googleapis.com/compute/v1/projects/project#/zones/us-central1/instances/123",
+		"https://www.googleapis.com/compute/v1/projects/project/zones/us-central#/instances/123",
+		"https://www.googleapis.com/compute/v1/projects/project/zones/us-central1/instances/?",
+		"https://www.googleapis.com/compute/v1/projects/foo.com:bar:baz/zones/us-central1/instances/?",
+		"https://www.googleapis.com/compute/v1/projects/foo.com:/zones/us-central1/instances/?",
+	}
+
+	for _, element := range shouldPass {
+		if !computeDiskUserRegex.MatchString(element) {
+			t.Error("computeDiskUserRegex should match on '" + element + "' but doesn't")
+		}
+	}
+
+	for _, element := range shouldFail {
+		if computeDiskUserRegex.MatchString(element) {
+			t.Error("computeDiskUserRegex shouldn't match on '" + element + "' but does")
+		}
+	}
+
+}
+
 func testAccCheckComputeDiskDestroy(s *terraform.State) error {
 	config := testAccProvider.Meta().(*Config)