Revert "IAP brand & client (#3135) (#1848)"

This reverts commit 0257a50.
hashicorp · Mar 18, 2020 · 6d6f542 · 6d6f542
1 parent 3c4356c
commit 6d6f542
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 954 deletions.
diff --git a/.changelog/3135.txt b/.changelog/3135.txt
diff --git a/google-beta/provider.go b/google-beta/provider.go
@@ -712,8 +712,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_iap_tunnel_instance_iam_binding":                       ResourceIamBinding(IapTunnelInstanceIamSchema, IapTunnelInstanceIamUpdaterProducer, IapTunnelInstanceIdParseFunc),
 			"google_iap_tunnel_instance_iam_member":                        ResourceIamMember(IapTunnelInstanceIamSchema, IapTunnelInstanceIamUpdaterProducer, IapTunnelInstanceIdParseFunc),
 			"google_iap_tunnel_instance_iam_policy":                        ResourceIamPolicy(IapTunnelInstanceIamSchema, IapTunnelInstanceIamUpdaterProducer, IapTunnelInstanceIdParseFunc),
-			"google_iap_brand":                                             resourceIapBrand(),
-			"google_iap_client":                                            resourceIapClient(),
 			"google_identity_platform_default_supported_idp_config":        resourceIdentityPlatformDefaultSupportedIdpConfig(),
 			"google_identity_platform_tenant_default_supported_idp_config": resourceIdentityPlatformTenantDefaultSupportedIdpConfig(),
 			"google_identity_platform_inbound_saml_config":                 resourceIdentityPlatformInboundSamlConfig(),

diff --git a/google-beta/provider_test.go b/google-beta/provider_test.go
@@ -63,10 +63,6 @@ var orgEnvVars = []string{
 	"GOOGLE_ORG",
 }
 
-var orgEnvDomainVars = []string{
-	"GOOGLE_ORG_DOMAIN",
-}
-
 var serviceAccountEnvVars = []string{
 	"GOOGLE_SERVICE_ACCOUNT",
 }
@@ -760,11 +756,6 @@ func getTestOrgFromEnv(t *testing.T) string {
 	return multiEnvSearch(orgEnvVars)
 }
 
-func getTestOrgDomainFromEnv(t *testing.T) string {
-	skipIfEnvNotSet(t, orgEnvDomainVars...)
-	return multiEnvSearch(orgEnvDomainVars)
-}
-
 func getTestOrgTargetFromEnv(t *testing.T) string {
 	skipIfEnvNotSet(t, orgTargetEnvVars...)
 	return multiEnvSearch(orgTargetEnvVars)

diff --git a/google-beta/resource_iap_brand.go b/google-beta/resource_iap_brand.go
diff --git a/google-beta/resource_iap_brand_test.go b/google-beta/resource_iap_brand_test.go