resolve preconditino errors

Author: BBBmau

mmv1/third_party/terraform/services/resourcemanager/ephemeral_google_service_account_key.go

@@ -276,13 +276,15 @@ func (p *googleEphemeralServiceAccountKey) Close(ctx context.Context, req epheme
 	}
 	var data ServiceAccountKeyPrivateData
 	json.Unmarshal(dataBytes, &data)
-	log.Printf("[DEBUG] Deleting Service Account Key %q\n", data.Name)
-	_, err := p.providerConfig.NewIamClient(p.providerConfig.UserAgent).Projects.ServiceAccounts.Keys.Delete(data.Name).Do()
-	if err != nil {
-		resp.Diagnostics.AddError(
-			"Error deleting Service Account Key",
-			fmt.Sprintf("Error deleting Service Account Key %q: %s", data.Name, err.Error()),
-		)
-		return
+	if data.Name != "" {
+		log.Printf("[DEBUG] Deleting Service Account Key %q\n", data.Name)
+		_, err := p.providerConfig.NewIamClient(p.providerConfig.UserAgent).Projects.ServiceAccounts.Keys.Delete(data.Name).Do()
+		if err != nil {
+			resp.Diagnostics.AddError(
+				"Error deleting Service Account Key",
+				fmt.Sprintf("Error deleting Service Account Key %q: %s", data.Name, err.Error()),
+			)
+			return
+		}
 	}
 }

mmv1/third_party/terraform/services/resourcemanager/ephemeral_google_service_account_key_test.go

@@ -18,9 +18,6 @@ func TestAccEphemeralServiceAccountKey_create(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		ExternalProviders: map[string]resource.ExternalProvider{
-			"time": {},
-		},
 		Steps: []resource.TestStep{
 			{
 				Config: testAccEphemeralServiceAccountKey_create_setup(accountID, displayName),
@@ -39,10 +36,6 @@ resource "google_service_account" "service_account" {
 	display_name = "%s"
 }
 
-resource "time_sleep" "wait_10_seconds" {
-  create_duration = "10s"
-  depends_on = [google_service_account.service_account]
-}
 `, accountID, displayName)
 }
 
@@ -53,11 +46,6 @@ resource "google_service_account" "service_account" {
 	display_name = "%s"
 }
 
-resource "time_sleep" "wait_10_seconds" {
-  create_duration = "10s"
-  depends_on = [google_service_account.service_account]
-}
-
 ephemeral "google_service_account_key" "key" {
   service_account_id = google_service_account.service_account.email
   public_key_type = "TYPE_X509_PEM_FILE"
@@ -68,8 +56,8 @@ ephemeral "google_service_account_key" "key" {
 func TestAccEphemeralServiceAccountKey_upload(t *testing.T) {
 	t.Parallel()
 
-	accountID := "a" + acctest.RandString(t, 10)
-	displayName := "Terraform Test"
+	accountID := "b" + acctest.RandString(t, 10)
+	displayName := "Terraform Test Two"
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
@@ -93,8 +81,8 @@ resource "google_service_account" "service_account" {
 	account_id   = "%s"
 	display_name = "%s"
 }
-resource "time_sleep" "wait_10_seconds" {
-  create_duration = "10s"
+resource "time_sleep" "wait_30_seconds" {
+  create_duration = "30s"
   depends_on = [google_service_account.service_account]
 }
 `, accountID, displayName)
@@ -106,8 +94,8 @@ resource "google_service_account" "service_account" {
 	account_id   = "%s"
 	display_name = "%s"
 }
-resource "time_sleep" "wait_10_seconds" {
-  create_duration = "10s"
+resource "time_sleep" "wait_30_seconds" {
+  create_duration = "30s"
   depends_on = [google_service_account.service_account]
 }
 
@@ -126,9 +114,6 @@ func TestAccEphemeralServiceAccountKey_fetch(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		ExternalProviders: map[string]resource.ExternalProvider{
-			"time": {},
-		},
 		Steps: []resource.TestStep{
 			{
 				Config: testAccEphemeralServiceAccountKey_fetch_setup(targetServiceAccountEmail),
@@ -146,11 +131,6 @@ resource "google_service_account_key" "acceptance" {
   service_account_id = "%s"
   public_key_type    = "TYPE_X509_PEM_FILE"
 }
-
-resource "time_sleep" "wait_10_seconds" {
-  create_duration = "10s"
-  depends_on = [google_service_account_key.acceptance]
-}
 `, accountID)
 }
 
@@ -161,11 +141,6 @@ resource "google_service_account_key" "acceptance" {
   public_key_type    = "TYPE_X509_PEM_FILE"
 }
 
-resource "time_sleep" "wait_10_seconds" {
-  create_duration = "10s"
-  depends_on = [google_service_account_key.acceptance]
-}
-
 ephemeral "google_service_account_key" "key" {
   name = google_service_account_key.acceptance.name
   fetch_key = true