From 24de58242760a641cc59a85022b25131b8ffee02 Mon Sep 17 00:00:00 2001
From: Sam Levenick <slevenick@google.com>
Date: Thu, 8 Aug 2024 14:35:15 -0400
Subject: [PATCH] Ignore failing tests for AppEngine and IAP (#11396)

---
 .../appengine/FlexibleAppVersion.yaml         |  2 ++
 mmv1/products/iap/AppEngineService.yaml       |  2 ++
 ...pp_engine_flexible_app_version_test.go.erb | 26 +++++++++++++++++--
 ...ce_app_engine_standard_app_version_test.go |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/mmv1/products/appengine/FlexibleAppVersion.yaml b/mmv1/products/appengine/FlexibleAppVersion.yaml
index d6b37123e320..8e6c5b86d433 100644
--- a/mmv1/products/appengine/FlexibleAppVersion.yaml
+++ b/mmv1/products/appengine/FlexibleAppVersion.yaml
@@ -73,6 +73,8 @@ examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'app_engine_flexible_app_version'
     primary_resource_id: 'myapp_v1'
+    # https://github.com/hashicorp/terraform-provider-google/issues/19040
+    skip_test: true
     ignore_read_extra:
       - 'noop_on_destroy'
       - 'deployment.0.zip'
diff --git a/mmv1/products/iap/AppEngineService.yaml b/mmv1/products/iap/AppEngineService.yaml
index 14b7976a55b1..dfbc6670875a 100644
--- a/mmv1/products/iap/AppEngineService.yaml
+++ b/mmv1/products/iap/AppEngineService.yaml
@@ -41,6 +41,8 @@ examples:
     name: 'iap_app_engine_service'
     primary_resource_id: 'version'
     primary_resource_name: 'context["project_id"], "default"'
+    # https://github.com/hashicorp/terraform-provider-google/issues/18936
+    skip_test: true
     test_env_vars:
       org_id: :ORG_ID
       billing_account: :BILLING_ACCT
diff --git a/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go.erb b/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go.erb
index 723ae9559371..a233e5c3aa97 100644
--- a/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go.erb
+++ b/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go.erb
@@ -4,14 +4,18 @@ package appengine_test
 <% unless version == 'ga' -%>
 
 import (
-	"testing"
+  "log"
+  "strings"
+  "testing"
 
-	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+  "github.com/hashicorp/terraform-plugin-testing/helper/resource"
+  "github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
 	"github.com/hashicorp/terraform-provider-google/google/envvar"
 )
 
 func TestAccAppEngineFlexibleAppVersion_update(t *testing.T) {
+	t.Skip("https://github.com/hashicorp/terraform-provider-google/issues/18239")
 	t.Parallel()
 
 	context := map[string]interface{}{
@@ -419,4 +423,22 @@ resource "google_storage_bucket_object" "main" {
 }`, context)
 }
 
+// Remove when generated test is enabled
+func testAccCheckAppEngineFlexibleAppVersionDestroyProducer(t *testing.T) func(s *terraform.State) error {
+  return func(s *terraform.State) error {
+    for name, rs := range s.RootModule().Resources {
+      if rs.Type != "google_app_engine_flexible_app_version" {
+        continue
+      }
+      if strings.HasPrefix(name, "data.") {
+        continue
+      }
+
+      log.Printf("[DEBUG] Ignoring destroy during test")
+    }
+
+    return nil
+  }
+}
+
 <% end -%>
diff --git a/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go b/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go
index aa6619ab958e..8fee78713b8e 100644
--- a/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go
+++ b/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go
@@ -9,6 +9,7 @@ import (
 )
 
 func TestAccAppEngineStandardAppVersion_update(t *testing.T) {
+	t.Skip("https://github.com/hashicorp/terraform-provider-google/issues/18936")
 	t.Parallel()
 
 	context := map[string]interface{}{