Allow domain mapping to succeed if DNS is pending (#5324)

* Allow domain mapping to succeed if DNS is pending Signed-off-by: Modular Magician <[email protected]> * Updated google_folder.html (#4149) * Updated google_folder.html The page in the first example shows that you should use organization_id with value of 1234567. In the Import example, it's not clear whether organization_id is user, or folder_id is used. API call behind this import command is only accepting folder_id (can be checked when setting TF_LOG to trace and viewing the API call) * Update website/docs/r/google_folder.html.markdown Co-Authored-By: Dana Hoffman <[email protected]> Co-authored-by: Dana Hoffman <[email protected]> * Allow domain mapping to succeed if DNS is pending (#2917) Merged PR #2917. Co-authored-by: Chris Stephens <[email protected]> Co-authored-by: Petar Marinkovic <[email protected]> Co-authored-by: Dana Hoffman <[email protected]>
hashicorp · Jan 7, 2020 · fb98676 · fb98676
1 parent e2d493d
commit fb98676
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.changelog/2917.txt b/.changelog/2917.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+`cloudrun`: Stopped returning an error when a `cloud_run_domain_mapping` was waiting on DNS verification.
+```
diff --git a/google/cloudrun_polling.go b/google/cloudrun_polling.go
@@ -59,6 +59,11 @@ func (s KnativeStatus) LatestMessage() string {
 func (s KnativeStatus) State(res interface{}) string {
 	for _, condition := range s.Status.Conditions {
 		if condition.Type == "Ready" {
+			// DomainMapping can enter a 'terminal' state of waiting for external verification
+			// of DNS records.
+			if condition.Reason == "CertificatePending" {
+				return "Ready:CertificatePending"
+			}
 			return fmt.Sprintf("%s:%s", condition.Type, condition.Status)
 		}
 	}
@@ -76,7 +81,7 @@ func (p *CloudRunPolling) PendingStates() []string {
 	return []string{"Ready:Unknown", "Empty"}
 }
 func (p *CloudRunPolling) TargetStates() []string {
-	return []string{"Ready:True"}
+	return []string{"Ready:True", "Ready:CertificatePending"}
 }
 func (p *CloudRunPolling) ErrorStates() []string {
 	return []string{"Ready:False"}