WIP - Cloudrun v1

Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Nov 22, 2019 · d9b7c2f · d9b7c2f
1 parent 9764003
commit d9b7c2f
Show file tree

Hide file tree

Showing 10 changed files with 886 additions and 334 deletions.
diff --git a/google-beta/config.go b/google-beta/config.go
@@ -218,7 +218,7 @@ var BigtableDefaultBasePath = "https://bigtableadmin.googleapis.com/v2/"
 var BinaryAuthorizationDefaultBasePath = "https://binaryauthorization.googleapis.com/v1beta1/"
 var CloudBuildDefaultBasePath = "https://cloudbuild.googleapis.com/v1/"
 var CloudFunctionsDefaultBasePath = "https://cloudfunctions.googleapis.com/v1/"
-var CloudRunDefaultBasePath = "https://run.googleapis.com/v1alpha1/"
+var CloudRunDefaultBasePath = "https://{{location}}-run.googleapis.com/apis/serving.knative.dev/v1/"
 var CloudSchedulerDefaultBasePath = "https://cloudscheduler.googleapis.com/v1/"
 var CloudTasksDefaultBasePath = "https://cloudtasks.googleapis.com/v2/"
 var ComputeDefaultBasePath = "https://www.googleapis.com/compute/beta/"

diff --git a/google-beta/resource_cloud_run_domain_mapping.go b/google-beta/resource_cloud_run_domain_mapping.go
@@ -261,7 +261,7 @@ func resourceCloudRunDomainMappingCreate(d *schema.ResourceData, meta interface{
 		return err
 	}
 
-	url, err := replaceVars(d, config, "{{CloudRunBasePath}}projects/{{project}}/locations/{{location}}/domainmappings")
+	url, err := replaceVars(d, config, "{{CloudRunBasePath}}namespaces/{{project}}/services")
 	if err != nil {
 		return err
 	}
@@ -277,7 +277,7 @@ func resourceCloudRunDomainMappingCreate(d *schema.ResourceData, meta interface{
 	}
 
 	// Store the ID now
-	id, err := replaceVars(d, config, "projects/{{project}}/locations/{{location}}/domainmappings/{{name}}")
+	id, err := replaceVars(d, config, "namespaces/{{project}}/services/{{name}}")
 	if err != nil {
 		return fmt.Errorf("Error constructing id: %s", err)
 	}
@@ -291,7 +291,7 @@ func resourceCloudRunDomainMappingCreate(d *schema.ResourceData, meta interface{
 func resourceCloudRunDomainMappingRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	url, err := replaceVars(d, config, "{{CloudRunBasePath}}projects/{{project}}/locations/{{location}}/domainmappings/{{name}}")
+	url, err := replaceVars(d, config, "{{CloudRunBasePath}}namespaces/{{project}}/services/{{name}}")
 	if err != nil {
 		return err
 	}
@@ -361,7 +361,7 @@ func resourceCloudRunDomainMappingUpdate(d *schema.ResourceData, meta interface{
 		return err
 	}
 
-	url, err := replaceVars(d, config, "{{CloudRunBasePath}}projects/{{project}}/locations/{{location}}/domainmappings/{{name}}")
+	url, err := replaceVars(d, config, "{{CloudRunBasePath}}namespaces/{{project}}/services/{{name}}")
 	if err != nil {
 		return err
 	}
@@ -384,7 +384,7 @@ func resourceCloudRunDomainMappingDelete(d *schema.ResourceData, meta interface{
 		return err
 	}
 
-	url, err := replaceVars(d, config, "{{CloudRunBasePath}}projects/{{project}}/locations/{{location}}/domainmappings/{{name}}")
+	url, err := replaceVars(d, config, "{{CloudRunBasePath}}namespaces/{{project}}/services/{{name}}")
 	if err != nil {
 		return err
 	}
@@ -404,15 +404,15 @@ func resourceCloudRunDomainMappingDelete(d *schema.ResourceData, meta interface{
 func resourceCloudRunDomainMappingImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
 	if err := parseImportId([]string{
-		"projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/domainmappings/(?P<name>[^/]+)",
-		"(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<name>[^/]+)",
-		"(?P<location>[^/]+)/(?P<name>[^/]+)",
+		"namespaces/(?P<project>[^/]+)/services/(?P<name>[^/]+)",
+		"(?P<project>[^/]+)/(?P<name>[^/]+)",
+		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
 
 	// Replace import id for the resource id
-	id, err := replaceVars(d, config, "projects/{{project}}/locations/{{location}}/domainmappings/{{name}}")
+	id, err := replaceVars(d, config, "namespaces/{{project}}/services/{{name}}")
 	if err != nil {
 		return nil, fmt.Errorf("Error constructing id: %s", err)
 	}
@@ -765,7 +765,7 @@ func resourceCloudRunDomainMappingEncoder(d *schema.ResourceData, meta interface
 	metadata["name"] = name
 
 	// The only acceptable version/kind right now
-	obj["apiVersion"] = "domains.cloudrun.com/v1alpha1"
+	obj["apiVersion"] = "domains.cloudrun.com/v1"
 	obj["kind"] = "DomainMapping"
 	return obj, nil
 }

diff --git a/google-beta/resource_cloud_run_domain_mapping_generated_test.go b/google-beta/resource_cloud_run_domain_mapping_generated_test.go
@@ -34,12 +34,17 @@ func TestAccCloudRunDomainMapping_cloudRunDomainMappingBasicExample(t *testing.T
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProvidersOiCS,
+		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudRunDomainMappingDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccCloudRunDomainMapping_cloudRunDomainMappingBasicExample(context),
 			},
+			{
+				ResourceName:      "google_cloud_run_domain_mapping.default",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -48,7 +53,6 @@ func testAccCloudRunDomainMapping_cloudRunDomainMappingBasicExample(context map[
 	return Nprintf(`
 resource "google_cloud_run_domain_mapping" "default" {
   location = "us-central1"
-  provider = google-beta
   name     = "tftest-domainmapping.com%{random_suffix}"
 
   metadata {
@@ -73,7 +77,7 @@ func testAccCheckCloudRunDomainMappingDestroy(s *terraform.State) error {
 
 		config := testAccProvider.Meta().(*Config)
 
-		url, err := replaceVarsForTest(config, rs, "{{CloudRunBasePath}}projects/{{project}}/locations/{{location}}/domainmappings/{{name}}")
+		url, err := replaceVarsForTest(config, rs, "{{CloudRunBasePath}}namespaces/{{project}}/services/{{name}}")
 		if err != nil {
 			return err
 		}