Fix check destroyer error in different universe domain

Author: hao-nan-li

mmv1/third_party/terraform/provider/provider.go.tmpl

@@ -416,6 +416,13 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 		return nil, diag.FromErr(err)
 	}
 
+	// Bypass checkDestroyer failure with universe domain set
+	if _, ok := d.GetOk("universe_domain"); !ok {
+		if config.UniverseDomain != "" && config.UniverseDomain != "googleapis.com" {
+			d.Set("universe_domain", config.UniverseDomain)
+		}
+	}
+	
 	// Verify that universe domains match between credentials and configuration
 	if v, ok := d.GetOk("universe_domain"); ok {
 		if config.UniverseDomain == "" && v.(string) != "googleapis.com" { // v can't be "", as it wouldn't pass `ok` above

mmv1/third_party/terraform/provider/universe/universe_domain_compute_test.go

@@ -34,8 +34,6 @@ func TestAccUniverseDomainDisk(t *testing.T) {
 }
 
 func TestAccUniverseDomainDiskImage(t *testing.T) {
-	// Skip this test in all env since this can only run in specific test project.
-	// t.Skip()
 
 	universeDomain := envvar.GetTestUniverseDomainFromEnv(t)
 	zone := envvar.GetTestZoneFromEnv()