Merge pull request #34424 from hashicorp/b-inspector2-crashes

inspector2: Fix a couple of crashes

.changelog/34424.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_inspector2_delegated_admin_account: Fix `errors: *target must be interface or implement error` panic
+```
+
+```release-note:bug
+resource/aws_inspector2_enabler: Fix `interface conversion: interface {} is nil, not map[string]inspector2.AccountResourceStatus` panic
+```

internal/service/inspector2/delegated_admin_account.go

@@ -210,12 +210,11 @@ func FindDelegatedAdminAccountStatusID(ctx context.Context, conn *inspector2.Cli
  for pages.HasMorePages() {
  page, err := pages.NextPage(ctx)
 
- if err != nil {
- var ve types.ValidationException
- if errs.AsContains(err, &ve, "is the delegated admin") {
- return string(types.RelationshipStatusEnabled), accountID, nil
- }
+ if errs.IsAErrorMessageContains[*types.ValidationException](err, "is the delegated admin") {
+ return string(types.RelationshipStatusEnabled), accountID, nil
+ }
 
+ if err != nil {
  return "", "", err
  }
 

internal/service/inspector2/enabler.go

@@ -419,9 +419,13 @@ func waitEnabled(ctx context.Context, conn *inspector2.Client, accountIDs []stri
  Delay: 10 * time.Second,
  }
 
- raw, err := stateConf.WaitForStateContext(ctx)
- result := raw.(map[string]AccountResourceStatus)
- return result, err
+ outputRaw, err := stateConf.WaitForStateContext(ctx)
+
+ if output, ok := outputRaw.(map[string]AccountResourceStatus); ok {
+ return output, err
+ }
+
+ return nil, err
 }
 
 func waitDisabled(ctx context.Context, conn *inspector2.Client, accountIDs []string, timeout time.Duration) error {