testAccCheckCustomModelDestroy: Check for deleted custom model.

hashicorp · Feb 1, 2024 · f5c1165 · f5c1165
1 parent e8b5f39
commit f5c1165
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/internal/service/bedrock/custom_model_test.go b/internal/service/bedrock/custom_model_test.go
@@ -301,7 +301,7 @@ func testAccCheckCustomModelDestroy(ctx context.Context) resource.TestCheckFunc
 				continue
 			}
 
-			_, err := tfbedrock.FindModelCustomizationJobByID(ctx, conn, rs.Primary.ID)
+			output, err := tfbedrock.FindModelCustomizationJobByID(ctx, conn, rs.Primary.ID)
 
 			if tfresource.NotFound(err) {
 				continue
@@ -311,6 +311,19 @@ func testAccCheckCustomModelDestroy(ctx context.Context) resource.TestCheckFunc
 				return err
 			}
 
+			// Check the custom model.
+			if modelARN := aws.ToString(output.OutputModelArn); modelARN != "" {
+				_, err := tfbedrock.FindCustomModelByID(ctx, conn, modelARN)
+
+				if tfresource.NotFound(err) {
+					continue
+				}
+
+				if err != nil {
+					return err
+				}
+			}
+
 			return fmt.Errorf("Bedrock Custom Model %s still exists", rs.Primary.ID)
 		}
 

diff --git a/internal/service/bedrock/exports_test.go b/internal/service/bedrock/exports_test.go
@@ -8,6 +8,7 @@ var (
 	ResourceCustomModel                         = newCustomModelResource
 	ResourceModelInvocationLoggingConfiguration = newResourceModelInvocationLoggingConfiguration
 
+	FindCustomModelByID                = findCustomModelByID
 	FindModelCustomizationJobByID      = findModelCustomizationJobByID
 	WaitModelCustomizationJobCompleted = waitModelCustomizationJobCompleted
 )