@aws-sdk/client-guardduty 3.1136.0 → 3.1138.0

package/dist-types/ts3.4/GuardDuty.d.ts

@@ -1,5 +1,6 @@
 import {
   HttpHandlerOptions as __HttpHandlerOptions,
+  MetricsRecorder as __MetricsRecorder,
   PaginationConfiguration,
   Paginator,
 } from "@smithy/types";
@@ -376,10 +377,13 @@ import {
   UpdateTrustedEntitySetCommandOutput,
 } from "./commands/UpdateTrustedEntitySetCommand";
 import { GuardDutyClient } from "./GuardDutyClient";
+export interface GuardDutyRequestOptions extends __HttpHandlerOptions {
+  metricsRecorder?: __MetricsRecorder<unknown>;
+}
 export interface GuardDuty {
   acceptAdministratorInvitation(
     args: AcceptAdministratorInvitationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<AcceptAdministratorInvitationCommandOutput>;
   acceptAdministratorInvitation(
     args: AcceptAdministratorInvitationCommandInput,
@@ -387,12 +391,12 @@ export interface GuardDuty {
   ): void;
   acceptAdministratorInvitation(
     args: AcceptAdministratorInvitationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: AcceptAdministratorInvitationCommandOutput) => void,
   ): void;
   acceptInvitation(
     args: AcceptInvitationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<AcceptInvitationCommandOutput>;
   acceptInvitation(
     args: AcceptInvitationCommandInput,
@@ -400,12 +404,12 @@ export interface GuardDuty {
   ): void;
   acceptInvitation(
     args: AcceptInvitationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: AcceptInvitationCommandOutput) => void,
   ): void;
   archiveFindings(
     args: ArchiveFindingsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ArchiveFindingsCommandOutput>;
   archiveFindings(
     args: ArchiveFindingsCommandInput,
@@ -413,12 +417,12 @@ export interface GuardDuty {
   ): void;
   archiveFindings(
     args: ArchiveFindingsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ArchiveFindingsCommandOutput) => void,
   ): void;
   createCustomDetectionRuleAssociation(
     args: CreateCustomDetectionRuleAssociationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateCustomDetectionRuleAssociationCommandOutput>;
   createCustomDetectionRuleAssociation(
     args: CreateCustomDetectionRuleAssociationCommandInput,
@@ -426,12 +430,12 @@ export interface GuardDuty {
   ): void;
   createCustomDetectionRuleAssociation(
     args: CreateCustomDetectionRuleAssociationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateCustomDetectionRuleAssociationCommandOutput) => void,
   ): void;
   createCustomDetectionRuleOrgConfiguration(
     args: CreateCustomDetectionRuleOrgConfigurationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateCustomDetectionRuleOrgConfigurationCommandOutput>;
   createCustomDetectionRuleOrgConfiguration(
     args: CreateCustomDetectionRuleOrgConfigurationCommandInput,
@@ -439,12 +443,12 @@ export interface GuardDuty {
   ): void;
   createCustomDetectionRuleOrgConfiguration(
     args: CreateCustomDetectionRuleOrgConfigurationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateCustomDetectionRuleOrgConfigurationCommandOutput) => void,
   ): void;
   createDetector(
     args: CreateDetectorCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateDetectorCommandOutput>;
   createDetector(
     args: CreateDetectorCommandInput,
@@ -452,12 +456,12 @@ export interface GuardDuty {
   ): void;
   createDetector(
     args: CreateDetectorCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateDetectorCommandOutput) => void,
   ): void;
   createFilter(
     args: CreateFilterCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateFilterCommandOutput>;
   createFilter(
     args: CreateFilterCommandInput,
@@ -465,12 +469,12 @@ export interface GuardDuty {
   ): void;
   createFilter(
     args: CreateFilterCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateFilterCommandOutput) => void,
   ): void;
   createInvestigation(
     args: CreateInvestigationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateInvestigationCommandOutput>;
   createInvestigation(
     args: CreateInvestigationCommandInput,
@@ -478,12 +482,12 @@ export interface GuardDuty {
   ): void;
   createInvestigation(
     args: CreateInvestigationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateInvestigationCommandOutput) => void,
   ): void;
   createIPSet(
     args: CreateIPSetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateIPSetCommandOutput>;
   createIPSet(
     args: CreateIPSetCommandInput,
@@ -491,12 +495,12 @@ export interface GuardDuty {
   ): void;
   createIPSet(
     args: CreateIPSetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateIPSetCommandOutput) => void,
   ): void;
   createMalwareProtectionPlan(
     args: CreateMalwareProtectionPlanCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateMalwareProtectionPlanCommandOutput>;
   createMalwareProtectionPlan(
     args: CreateMalwareProtectionPlanCommandInput,
@@ -504,12 +508,12 @@ export interface GuardDuty {
   ): void;
   createMalwareProtectionPlan(
     args: CreateMalwareProtectionPlanCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateMalwareProtectionPlanCommandOutput) => void,
   ): void;
   createMembers(
     args: CreateMembersCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateMembersCommandOutput>;
   createMembers(
     args: CreateMembersCommandInput,
@@ -517,12 +521,12 @@ export interface GuardDuty {
   ): void;
   createMembers(
     args: CreateMembersCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateMembersCommandOutput) => void,
   ): void;
   createPublishingDestination(
     args: CreatePublishingDestinationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreatePublishingDestinationCommandOutput>;
   createPublishingDestination(
     args: CreatePublishingDestinationCommandInput,
@@ -530,12 +534,12 @@ export interface GuardDuty {
   ): void;
   createPublishingDestination(
     args: CreatePublishingDestinationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreatePublishingDestinationCommandOutput) => void,
   ): void;
   createSampleFindings(
     args: CreateSampleFindingsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateSampleFindingsCommandOutput>;
   createSampleFindings(
     args: CreateSampleFindingsCommandInput,
@@ -543,12 +547,12 @@ export interface GuardDuty {
   ): void;
   createSampleFindings(
     args: CreateSampleFindingsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateSampleFindingsCommandOutput) => void,
   ): void;
   createThreatEntitySet(
     args: CreateThreatEntitySetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateThreatEntitySetCommandOutput>;
   createThreatEntitySet(
     args: CreateThreatEntitySetCommandInput,
@@ -556,12 +560,12 @@ export interface GuardDuty {
   ): void;
   createThreatEntitySet(
     args: CreateThreatEntitySetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateThreatEntitySetCommandOutput) => void,
   ): void;
   createThreatIntelSet(
     args: CreateThreatIntelSetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateThreatIntelSetCommandOutput>;
   createThreatIntelSet(
     args: CreateThreatIntelSetCommandInput,
@@ -569,12 +573,12 @@ export interface GuardDuty {
   ): void;
   createThreatIntelSet(
     args: CreateThreatIntelSetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateThreatIntelSetCommandOutput) => void,
   ): void;
   createTrustedEntitySet(
     args: CreateTrustedEntitySetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<CreateTrustedEntitySetCommandOutput>;
   createTrustedEntitySet(
     args: CreateTrustedEntitySetCommandInput,
@@ -582,12 +586,12 @@ export interface GuardDuty {
   ): void;
   createTrustedEntitySet(
     args: CreateTrustedEntitySetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: CreateTrustedEntitySetCommandOutput) => void,
   ): void;
   declineInvitations(
     args: DeclineInvitationsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeclineInvitationsCommandOutput>;
   declineInvitations(
     args: DeclineInvitationsCommandInput,
@@ -595,12 +599,12 @@ export interface GuardDuty {
   ): void;
   declineInvitations(
     args: DeclineInvitationsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeclineInvitationsCommandOutput) => void,
   ): void;
   deleteCustomDetectionRuleAssociation(
     args: DeleteCustomDetectionRuleAssociationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeleteCustomDetectionRuleAssociationCommandOutput>;
   deleteCustomDetectionRuleAssociation(
     args: DeleteCustomDetectionRuleAssociationCommandInput,
@@ -608,12 +612,12 @@ export interface GuardDuty {
   ): void;
   deleteCustomDetectionRuleAssociation(
     args: DeleteCustomDetectionRuleAssociationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeleteCustomDetectionRuleAssociationCommandOutput) => void,
   ): void;
   deleteCustomDetectionRuleOrgConfiguration(
     args: DeleteCustomDetectionRuleOrgConfigurationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeleteCustomDetectionRuleOrgConfigurationCommandOutput>;
   deleteCustomDetectionRuleOrgConfiguration(
     args: DeleteCustomDetectionRuleOrgConfigurationCommandInput,
@@ -621,12 +625,12 @@ export interface GuardDuty {
   ): void;
   deleteCustomDetectionRuleOrgConfiguration(
     args: DeleteCustomDetectionRuleOrgConfigurationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeleteCustomDetectionRuleOrgConfigurationCommandOutput) => void,
   ): void;
   deleteDetector(
     args: DeleteDetectorCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeleteDetectorCommandOutput>;
   deleteDetector(
     args: DeleteDetectorCommandInput,
@@ -634,12 +638,12 @@ export interface GuardDuty {
   ): void;
   deleteDetector(
     args: DeleteDetectorCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeleteDetectorCommandOutput) => void,
   ): void;
   deleteFilter(
     args: DeleteFilterCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeleteFilterCommandOutput>;
   deleteFilter(
     args: DeleteFilterCommandInput,
@@ -647,12 +651,12 @@ export interface GuardDuty {
   ): void;
   deleteFilter(
     args: DeleteFilterCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeleteFilterCommandOutput) => void,
   ): void;
   deleteInvitations(
     args: DeleteInvitationsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeleteInvitationsCommandOutput>;
   deleteInvitations(
     args: DeleteInvitationsCommandInput,
@@ -660,12 +664,12 @@ export interface GuardDuty {
   ): void;
   deleteInvitations(
     args: DeleteInvitationsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeleteInvitationsCommandOutput) => void,
   ): void;
   deleteIPSet(
     args: DeleteIPSetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeleteIPSetCommandOutput>;
   deleteIPSet(
     args: DeleteIPSetCommandInput,
@@ -673,12 +677,12 @@ export interface GuardDuty {
   ): void;
   deleteIPSet(
     args: DeleteIPSetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeleteIPSetCommandOutput) => void,
   ): void;
   deleteMalwareProtectionPlan(
     args: DeleteMalwareProtectionPlanCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeleteMalwareProtectionPlanCommandOutput>;
   deleteMalwareProtectionPlan(
     args: DeleteMalwareProtectionPlanCommandInput,
@@ -686,12 +690,12 @@ export interface GuardDuty {
   ): void;
   deleteMalwareProtectionPlan(
     args: DeleteMalwareProtectionPlanCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeleteMalwareProtectionPlanCommandOutput) => void,
   ): void;
   deleteMembers(
     args: DeleteMembersCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeleteMembersCommandOutput>;
   deleteMembers(
     args: DeleteMembersCommandInput,
@@ -699,12 +703,12 @@ export interface GuardDuty {
   ): void;
   deleteMembers(
     args: DeleteMembersCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeleteMembersCommandOutput) => void,
   ): void;
   deletePublishingDestination(
     args: DeletePublishingDestinationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeletePublishingDestinationCommandOutput>;
   deletePublishingDestination(
     args: DeletePublishingDestinationCommandInput,
@@ -712,12 +716,12 @@ export interface GuardDuty {
   ): void;
   deletePublishingDestination(
     args: DeletePublishingDestinationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeletePublishingDestinationCommandOutput) => void,
   ): void;
   deleteThreatEntitySet(
     args: DeleteThreatEntitySetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeleteThreatEntitySetCommandOutput>;
   deleteThreatEntitySet(
     args: DeleteThreatEntitySetCommandInput,
@@ -725,12 +729,12 @@ export interface GuardDuty {
   ): void;
   deleteThreatEntitySet(
     args: DeleteThreatEntitySetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeleteThreatEntitySetCommandOutput) => void,
   ): void;
   deleteThreatIntelSet(
     args: DeleteThreatIntelSetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeleteThreatIntelSetCommandOutput>;
   deleteThreatIntelSet(
     args: DeleteThreatIntelSetCommandInput,
@@ -738,12 +742,12 @@ export interface GuardDuty {
   ): void;
   deleteThreatIntelSet(
     args: DeleteThreatIntelSetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeleteThreatIntelSetCommandOutput) => void,
   ): void;
   deleteTrustedEntitySet(
     args: DeleteTrustedEntitySetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DeleteTrustedEntitySetCommandOutput>;
   deleteTrustedEntitySet(
     args: DeleteTrustedEntitySetCommandInput,
@@ -751,12 +755,12 @@ export interface GuardDuty {
   ): void;
   deleteTrustedEntitySet(
     args: DeleteTrustedEntitySetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DeleteTrustedEntitySetCommandOutput) => void,
   ): void;
   describeMalwareScans(
     args: DescribeMalwareScansCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DescribeMalwareScansCommandOutput>;
   describeMalwareScans(
     args: DescribeMalwareScansCommandInput,
@@ -764,12 +768,12 @@ export interface GuardDuty {
   ): void;
   describeMalwareScans(
     args: DescribeMalwareScansCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DescribeMalwareScansCommandOutput) => void,
   ): void;
   describeOrganizationConfiguration(
     args: DescribeOrganizationConfigurationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DescribeOrganizationConfigurationCommandOutput>;
   describeOrganizationConfiguration(
     args: DescribeOrganizationConfigurationCommandInput,
@@ -777,12 +781,12 @@ export interface GuardDuty {
   ): void;
   describeOrganizationConfiguration(
     args: DescribeOrganizationConfigurationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DescribeOrganizationConfigurationCommandOutput) => void,
   ): void;
   describePublishingDestination(
     args: DescribePublishingDestinationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DescribePublishingDestinationCommandOutput>;
   describePublishingDestination(
     args: DescribePublishingDestinationCommandInput,
@@ -790,12 +794,12 @@ export interface GuardDuty {
   ): void;
   describePublishingDestination(
     args: DescribePublishingDestinationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DescribePublishingDestinationCommandOutput) => void,
   ): void;
   disableOrganizationAdminAccount(
     args: DisableOrganizationAdminAccountCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DisableOrganizationAdminAccountCommandOutput>;
   disableOrganizationAdminAccount(
     args: DisableOrganizationAdminAccountCommandInput,
@@ -803,12 +807,12 @@ export interface GuardDuty {
   ): void;
   disableOrganizationAdminAccount(
     args: DisableOrganizationAdminAccountCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DisableOrganizationAdminAccountCommandOutput) => void,
   ): void;
   disassociateFromAdministratorAccount(
     args: DisassociateFromAdministratorAccountCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DisassociateFromAdministratorAccountCommandOutput>;
   disassociateFromAdministratorAccount(
     args: DisassociateFromAdministratorAccountCommandInput,
@@ -816,12 +820,12 @@ export interface GuardDuty {
   ): void;
   disassociateFromAdministratorAccount(
     args: DisassociateFromAdministratorAccountCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DisassociateFromAdministratorAccountCommandOutput) => void,
   ): void;
   disassociateFromMasterAccount(
     args: DisassociateFromMasterAccountCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DisassociateFromMasterAccountCommandOutput>;
   disassociateFromMasterAccount(
     args: DisassociateFromMasterAccountCommandInput,
@@ -829,12 +833,12 @@ export interface GuardDuty {
   ): void;
   disassociateFromMasterAccount(
     args: DisassociateFromMasterAccountCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DisassociateFromMasterAccountCommandOutput) => void,
   ): void;
   disassociateMembers(
     args: DisassociateMembersCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<DisassociateMembersCommandOutput>;
   disassociateMembers(
     args: DisassociateMembersCommandInput,
@@ -842,12 +846,12 @@ export interface GuardDuty {
   ): void;
   disassociateMembers(
     args: DisassociateMembersCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: DisassociateMembersCommandOutput) => void,
   ): void;
   enableOrganizationAdminAccount(
     args: EnableOrganizationAdminAccountCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<EnableOrganizationAdminAccountCommandOutput>;
   enableOrganizationAdminAccount(
     args: EnableOrganizationAdminAccountCommandInput,
@@ -855,12 +859,12 @@ export interface GuardDuty {
   ): void;
   enableOrganizationAdminAccount(
     args: EnableOrganizationAdminAccountCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: EnableOrganizationAdminAccountCommandOutput) => void,
   ): void;
   getAdministratorAccount(
     args: GetAdministratorAccountCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetAdministratorAccountCommandOutput>;
   getAdministratorAccount(
     args: GetAdministratorAccountCommandInput,
@@ -868,12 +872,12 @@ export interface GuardDuty {
   ): void;
   getAdministratorAccount(
     args: GetAdministratorAccountCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetAdministratorAccountCommandOutput) => void,
   ): void;
   getCoverageStatistics(
     args: GetCoverageStatisticsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetCoverageStatisticsCommandOutput>;
   getCoverageStatistics(
     args: GetCoverageStatisticsCommandInput,
@@ -881,12 +885,12 @@ export interface GuardDuty {
   ): void;
   getCoverageStatistics(
     args: GetCoverageStatisticsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetCoverageStatisticsCommandOutput) => void,
   ): void;
   getCustomDetectionRule(
     args: GetCustomDetectionRuleCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetCustomDetectionRuleCommandOutput>;
   getCustomDetectionRule(
     args: GetCustomDetectionRuleCommandInput,
@@ -894,12 +898,12 @@ export interface GuardDuty {
   ): void;
   getCustomDetectionRule(
     args: GetCustomDetectionRuleCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetCustomDetectionRuleCommandOutput) => void,
   ): void;
   getCustomDetectionRuleAssociation(
     args: GetCustomDetectionRuleAssociationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetCustomDetectionRuleAssociationCommandOutput>;
   getCustomDetectionRuleAssociation(
     args: GetCustomDetectionRuleAssociationCommandInput,
@@ -907,12 +911,12 @@ export interface GuardDuty {
   ): void;
   getCustomDetectionRuleAssociation(
     args: GetCustomDetectionRuleAssociationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetCustomDetectionRuleAssociationCommandOutput) => void,
   ): void;
   getCustomDetectionRuleOrgConfiguration(
     args: GetCustomDetectionRuleOrgConfigurationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetCustomDetectionRuleOrgConfigurationCommandOutput>;
   getCustomDetectionRuleOrgConfiguration(
     args: GetCustomDetectionRuleOrgConfigurationCommandInput,
@@ -920,12 +924,12 @@ export interface GuardDuty {
   ): void;
   getCustomDetectionRuleOrgConfiguration(
     args: GetCustomDetectionRuleOrgConfigurationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetCustomDetectionRuleOrgConfigurationCommandOutput) => void,
   ): void;
   getDetector(
     args: GetDetectorCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetDetectorCommandOutput>;
   getDetector(
     args: GetDetectorCommandInput,
@@ -933,12 +937,12 @@ export interface GuardDuty {
   ): void;
   getDetector(
     args: GetDetectorCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetDetectorCommandOutput) => void,
   ): void;
   getFilter(
     args: GetFilterCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetFilterCommandOutput>;
   getFilter(
     args: GetFilterCommandInput,
@@ -946,12 +950,12 @@ export interface GuardDuty {
   ): void;
   getFilter(
     args: GetFilterCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetFilterCommandOutput) => void,
   ): void;
   getFindings(
     args: GetFindingsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetFindingsCommandOutput>;
   getFindings(
     args: GetFindingsCommandInput,
@@ -959,12 +963,12 @@ export interface GuardDuty {
   ): void;
   getFindings(
     args: GetFindingsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetFindingsCommandOutput) => void,
   ): void;
   getFindingsStatistics(
     args: GetFindingsStatisticsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetFindingsStatisticsCommandOutput>;
   getFindingsStatistics(
     args: GetFindingsStatisticsCommandInput,
@@ -972,12 +976,12 @@ export interface GuardDuty {
   ): void;
   getFindingsStatistics(
     args: GetFindingsStatisticsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetFindingsStatisticsCommandOutput) => void,
   ): void;
   getInvestigation(
     args: GetInvestigationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetInvestigationCommandOutput>;
   getInvestigation(
     args: GetInvestigationCommandInput,
@@ -985,13 +989,13 @@ export interface GuardDuty {
   ): void;
   getInvestigation(
     args: GetInvestigationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetInvestigationCommandOutput) => void,
   ): void;
   getInvitationsCount(): Promise<GetInvitationsCountCommandOutput>;
   getInvitationsCount(
     args: GetInvitationsCountCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetInvitationsCountCommandOutput>;
   getInvitationsCount(
     args: GetInvitationsCountCommandInput,
@@ -999,22 +1003,22 @@ export interface GuardDuty {
   ): void;
   getInvitationsCount(
     args: GetInvitationsCountCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetInvitationsCountCommandOutput) => void,
   ): void;
   getIPSet(
     args: GetIPSetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetIPSetCommandOutput>;
   getIPSet(args: GetIPSetCommandInput, cb: (err: any, data?: GetIPSetCommandOutput) => void): void;
   getIPSet(
     args: GetIPSetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetIPSetCommandOutput) => void,
   ): void;
   getMalwareProtectionPlan(
     args: GetMalwareProtectionPlanCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetMalwareProtectionPlanCommandOutput>;
   getMalwareProtectionPlan(
     args: GetMalwareProtectionPlanCommandInput,
@@ -1022,12 +1026,12 @@ export interface GuardDuty {
   ): void;
   getMalwareProtectionPlan(
     args: GetMalwareProtectionPlanCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetMalwareProtectionPlanCommandOutput) => void,
   ): void;
   getMalwareScan(
     args: GetMalwareScanCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetMalwareScanCommandOutput>;
   getMalwareScan(
     args: GetMalwareScanCommandInput,
@@ -1035,12 +1039,12 @@ export interface GuardDuty {
   ): void;
   getMalwareScan(
     args: GetMalwareScanCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetMalwareScanCommandOutput) => void,
   ): void;
   getMalwareScanSettings(
     args: GetMalwareScanSettingsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetMalwareScanSettingsCommandOutput>;
   getMalwareScanSettings(
     args: GetMalwareScanSettingsCommandInput,
@@ -1048,12 +1052,12 @@ export interface GuardDuty {
   ): void;
   getMalwareScanSettings(
     args: GetMalwareScanSettingsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetMalwareScanSettingsCommandOutput) => void,
   ): void;
   getMasterAccount(
     args: GetMasterAccountCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetMasterAccountCommandOutput>;
   getMasterAccount(
     args: GetMasterAccountCommandInput,
@@ -1061,12 +1065,12 @@ export interface GuardDuty {
   ): void;
   getMasterAccount(
     args: GetMasterAccountCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetMasterAccountCommandOutput) => void,
   ): void;
   getMemberDetectors(
     args: GetMemberDetectorsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetMemberDetectorsCommandOutput>;
   getMemberDetectors(
     args: GetMemberDetectorsCommandInput,
@@ -1074,12 +1078,12 @@ export interface GuardDuty {
   ): void;
   getMemberDetectors(
     args: GetMemberDetectorsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetMemberDetectorsCommandOutput) => void,
   ): void;
   getMembers(
     args: GetMembersCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetMembersCommandOutput>;
   getMembers(
     args: GetMembersCommandInput,
@@ -1087,13 +1091,13 @@ export interface GuardDuty {
   ): void;
   getMembers(
     args: GetMembersCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetMembersCommandOutput) => void,
   ): void;
   getOrganizationStatistics(): Promise<GetOrganizationStatisticsCommandOutput>;
   getOrganizationStatistics(
     args: GetOrganizationStatisticsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetOrganizationStatisticsCommandOutput>;
   getOrganizationStatistics(
     args: GetOrganizationStatisticsCommandInput,
@@ -1101,12 +1105,12 @@ export interface GuardDuty {
   ): void;
   getOrganizationStatistics(
     args: GetOrganizationStatisticsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetOrganizationStatisticsCommandOutput) => void,
   ): void;
   getRemainingFreeTrialDays(
     args: GetRemainingFreeTrialDaysCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetRemainingFreeTrialDaysCommandOutput>;
   getRemainingFreeTrialDays(
     args: GetRemainingFreeTrialDaysCommandInput,
@@ -1114,12 +1118,12 @@ export interface GuardDuty {
   ): void;
   getRemainingFreeTrialDays(
     args: GetRemainingFreeTrialDaysCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetRemainingFreeTrialDaysCommandOutput) => void,
   ): void;
   getThreatEntitySet(
     args: GetThreatEntitySetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetThreatEntitySetCommandOutput>;
   getThreatEntitySet(
     args: GetThreatEntitySetCommandInput,
@@ -1127,12 +1131,12 @@ export interface GuardDuty {
   ): void;
   getThreatEntitySet(
     args: GetThreatEntitySetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetThreatEntitySetCommandOutput) => void,
   ): void;
   getThreatIntelSet(
     args: GetThreatIntelSetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetThreatIntelSetCommandOutput>;
   getThreatIntelSet(
     args: GetThreatIntelSetCommandInput,
@@ -1140,12 +1144,12 @@ export interface GuardDuty {
   ): void;
   getThreatIntelSet(
     args: GetThreatIntelSetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetThreatIntelSetCommandOutput) => void,
   ): void;
   getTrustedEntitySet(
     args: GetTrustedEntitySetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetTrustedEntitySetCommandOutput>;
   getTrustedEntitySet(
     args: GetTrustedEntitySetCommandInput,
@@ -1153,12 +1157,12 @@ export interface GuardDuty {
   ): void;
   getTrustedEntitySet(
     args: GetTrustedEntitySetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetTrustedEntitySetCommandOutput) => void,
   ): void;
   getUsageStatistics(
     args: GetUsageStatisticsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<GetUsageStatisticsCommandOutput>;
   getUsageStatistics(
     args: GetUsageStatisticsCommandInput,
@@ -1166,12 +1170,12 @@ export interface GuardDuty {
   ): void;
   getUsageStatistics(
     args: GetUsageStatisticsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: GetUsageStatisticsCommandOutput) => void,
   ): void;
   inviteMembers(
     args: InviteMembersCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<InviteMembersCommandOutput>;
   inviteMembers(
     args: InviteMembersCommandInput,
@@ -1179,12 +1183,12 @@ export interface GuardDuty {
   ): void;
   inviteMembers(
     args: InviteMembersCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: InviteMembersCommandOutput) => void,
   ): void;
   listCoverage(
     args: ListCoverageCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListCoverageCommandOutput>;
   listCoverage(
     args: ListCoverageCommandInput,
@@ -1192,13 +1196,13 @@ export interface GuardDuty {
   ): void;
   listCoverage(
     args: ListCoverageCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListCoverageCommandOutput) => void,
   ): void;
   listCustomDetectionRuleAssociations(): Promise<ListCustomDetectionRuleAssociationsCommandOutput>;
   listCustomDetectionRuleAssociations(
     args: ListCustomDetectionRuleAssociationsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListCustomDetectionRuleAssociationsCommandOutput>;
   listCustomDetectionRuleAssociations(
     args: ListCustomDetectionRuleAssociationsCommandInput,
@@ -1206,13 +1210,13 @@ export interface GuardDuty {
   ): void;
   listCustomDetectionRuleAssociations(
     args: ListCustomDetectionRuleAssociationsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListCustomDetectionRuleAssociationsCommandOutput) => void,
   ): void;
   listCustomDetectionRuleOrgConfigurations(): Promise<ListCustomDetectionRuleOrgConfigurationsCommandOutput>;
   listCustomDetectionRuleOrgConfigurations(
     args: ListCustomDetectionRuleOrgConfigurationsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListCustomDetectionRuleOrgConfigurationsCommandOutput>;
   listCustomDetectionRuleOrgConfigurations(
     args: ListCustomDetectionRuleOrgConfigurationsCommandInput,
@@ -1220,13 +1224,13 @@ export interface GuardDuty {
   ): void;
   listCustomDetectionRuleOrgConfigurations(
     args: ListCustomDetectionRuleOrgConfigurationsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListCustomDetectionRuleOrgConfigurationsCommandOutput) => void,
   ): void;
   listCustomDetectionRules(): Promise<ListCustomDetectionRulesCommandOutput>;
   listCustomDetectionRules(
     args: ListCustomDetectionRulesCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListCustomDetectionRulesCommandOutput>;
   listCustomDetectionRules(
     args: ListCustomDetectionRulesCommandInput,
@@ -1234,13 +1238,13 @@ export interface GuardDuty {
   ): void;
   listCustomDetectionRules(
     args: ListCustomDetectionRulesCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListCustomDetectionRulesCommandOutput) => void,
   ): void;
   listDetectors(): Promise<ListDetectorsCommandOutput>;
   listDetectors(
     args: ListDetectorsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListDetectorsCommandOutput>;
   listDetectors(
     args: ListDetectorsCommandInput,
@@ -1248,12 +1252,12 @@ export interface GuardDuty {
   ): void;
   listDetectors(
     args: ListDetectorsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListDetectorsCommandOutput) => void,
   ): void;
   listFilters(
     args: ListFiltersCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListFiltersCommandOutput>;
   listFilters(
     args: ListFiltersCommandInput,
@@ -1261,12 +1265,12 @@ export interface GuardDuty {
   ): void;
   listFilters(
     args: ListFiltersCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListFiltersCommandOutput) => void,
   ): void;
   listFindings(
     args: ListFindingsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListFindingsCommandOutput>;
   listFindings(
     args: ListFindingsCommandInput,
@@ -1274,12 +1278,12 @@ export interface GuardDuty {
   ): void;
   listFindings(
     args: ListFindingsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListFindingsCommandOutput) => void,
   ): void;
   listInvestigations(
     args: ListInvestigationsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListInvestigationsCommandOutput>;
   listInvestigations(
     args: ListInvestigationsCommandInput,
@@ -1287,13 +1291,13 @@ export interface GuardDuty {
   ): void;
   listInvestigations(
     args: ListInvestigationsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListInvestigationsCommandOutput) => void,
   ): void;
   listInvitations(): Promise<ListInvitationsCommandOutput>;
   listInvitations(
     args: ListInvitationsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListInvitationsCommandOutput>;
   listInvitations(
     args: ListInvitationsCommandInput,
@@ -1301,12 +1305,12 @@ export interface GuardDuty {
   ): void;
   listInvitations(
     args: ListInvitationsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListInvitationsCommandOutput) => void,
   ): void;
   listIPSets(
     args: ListIPSetsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListIPSetsCommandOutput>;
   listIPSets(
     args: ListIPSetsCommandInput,
@@ -1314,13 +1318,13 @@ export interface GuardDuty {
   ): void;
   listIPSets(
     args: ListIPSetsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListIPSetsCommandOutput) => void,
   ): void;
   listMalwareProtectionPlans(): Promise<ListMalwareProtectionPlansCommandOutput>;
   listMalwareProtectionPlans(
     args: ListMalwareProtectionPlansCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListMalwareProtectionPlansCommandOutput>;
   listMalwareProtectionPlans(
     args: ListMalwareProtectionPlansCommandInput,
@@ -1328,13 +1332,13 @@ export interface GuardDuty {
   ): void;
   listMalwareProtectionPlans(
     args: ListMalwareProtectionPlansCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListMalwareProtectionPlansCommandOutput) => void,
   ): void;
   listMalwareScans(): Promise<ListMalwareScansCommandOutput>;
   listMalwareScans(
     args: ListMalwareScansCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListMalwareScansCommandOutput>;
   listMalwareScans(
     args: ListMalwareScansCommandInput,
@@ -1342,12 +1346,12 @@ export interface GuardDuty {
   ): void;
   listMalwareScans(
     args: ListMalwareScansCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListMalwareScansCommandOutput) => void,
   ): void;
   listMembers(
     args: ListMembersCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListMembersCommandOutput>;
   listMembers(
     args: ListMembersCommandInput,
@@ -1355,13 +1359,13 @@ export interface GuardDuty {
   ): void;
   listMembers(
     args: ListMembersCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListMembersCommandOutput) => void,
   ): void;
   listOrganizationAdminAccounts(): Promise<ListOrganizationAdminAccountsCommandOutput>;
   listOrganizationAdminAccounts(
     args: ListOrganizationAdminAccountsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListOrganizationAdminAccountsCommandOutput>;
   listOrganizationAdminAccounts(
     args: ListOrganizationAdminAccountsCommandInput,
@@ -1369,12 +1373,12 @@ export interface GuardDuty {
   ): void;
   listOrganizationAdminAccounts(
     args: ListOrganizationAdminAccountsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListOrganizationAdminAccountsCommandOutput) => void,
   ): void;
   listPublishingDestinations(
     args: ListPublishingDestinationsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListPublishingDestinationsCommandOutput>;
   listPublishingDestinations(
     args: ListPublishingDestinationsCommandInput,
@@ -1382,12 +1386,12 @@ export interface GuardDuty {
   ): void;
   listPublishingDestinations(
     args: ListPublishingDestinationsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListPublishingDestinationsCommandOutput) => void,
   ): void;
   listTagsForResource(
     args: ListTagsForResourceCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListTagsForResourceCommandOutput>;
   listTagsForResource(
     args: ListTagsForResourceCommandInput,
@@ -1395,12 +1399,12 @@ export interface GuardDuty {
   ): void;
   listTagsForResource(
     args: ListTagsForResourceCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListTagsForResourceCommandOutput) => void,
   ): void;
   listThreatEntitySets(
     args: ListThreatEntitySetsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListThreatEntitySetsCommandOutput>;
   listThreatEntitySets(
     args: ListThreatEntitySetsCommandInput,
@@ -1408,12 +1412,12 @@ export interface GuardDuty {
   ): void;
   listThreatEntitySets(
     args: ListThreatEntitySetsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListThreatEntitySetsCommandOutput) => void,
   ): void;
   listThreatIntelSets(
     args: ListThreatIntelSetsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListThreatIntelSetsCommandOutput>;
   listThreatIntelSets(
     args: ListThreatIntelSetsCommandInput,
@@ -1421,12 +1425,12 @@ export interface GuardDuty {
   ): void;
   listThreatIntelSets(
     args: ListThreatIntelSetsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListThreatIntelSetsCommandOutput) => void,
   ): void;
   listTrustedEntitySets(
     args: ListTrustedEntitySetsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<ListTrustedEntitySetsCommandOutput>;
   listTrustedEntitySets(
     args: ListTrustedEntitySetsCommandInput,
@@ -1434,13 +1438,13 @@ export interface GuardDuty {
   ): void;
   listTrustedEntitySets(
     args: ListTrustedEntitySetsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: ListTrustedEntitySetsCommandOutput) => void,
   ): void;
   sendObjectMalwareScan(): Promise<SendObjectMalwareScanCommandOutput>;
   sendObjectMalwareScan(
     args: SendObjectMalwareScanCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<SendObjectMalwareScanCommandOutput>;
   sendObjectMalwareScan(
     args: SendObjectMalwareScanCommandInput,
@@ -1448,12 +1452,12 @@ export interface GuardDuty {
   ): void;
   sendObjectMalwareScan(
     args: SendObjectMalwareScanCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: SendObjectMalwareScanCommandOutput) => void,
   ): void;
   startMalwareScan(
     args: StartMalwareScanCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<StartMalwareScanCommandOutput>;
   startMalwareScan(
     args: StartMalwareScanCommandInput,
@@ -1461,12 +1465,12 @@ export interface GuardDuty {
   ): void;
   startMalwareScan(
     args: StartMalwareScanCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: StartMalwareScanCommandOutput) => void,
   ): void;
   startMonitoringMembers(
     args: StartMonitoringMembersCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<StartMonitoringMembersCommandOutput>;
   startMonitoringMembers(
     args: StartMonitoringMembersCommandInput,
@@ -1474,12 +1478,12 @@ export interface GuardDuty {
   ): void;
   startMonitoringMembers(
     args: StartMonitoringMembersCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: StartMonitoringMembersCommandOutput) => void,
   ): void;
   stopMonitoringMembers(
     args: StopMonitoringMembersCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<StopMonitoringMembersCommandOutput>;
   stopMonitoringMembers(
     args: StopMonitoringMembersCommandInput,
@@ -1487,12 +1491,12 @@ export interface GuardDuty {
   ): void;
   stopMonitoringMembers(
     args: StopMonitoringMembersCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: StopMonitoringMembersCommandOutput) => void,
   ): void;
   tagResource(
     args: TagResourceCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<TagResourceCommandOutput>;
   tagResource(
     args: TagResourceCommandInput,
@@ -1500,12 +1504,12 @@ export interface GuardDuty {
   ): void;
   tagResource(
     args: TagResourceCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: TagResourceCommandOutput) => void,
   ): void;
   unarchiveFindings(
     args: UnarchiveFindingsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UnarchiveFindingsCommandOutput>;
   unarchiveFindings(
     args: UnarchiveFindingsCommandInput,
@@ -1513,12 +1517,12 @@ export interface GuardDuty {
   ): void;
   unarchiveFindings(
     args: UnarchiveFindingsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UnarchiveFindingsCommandOutput) => void,
   ): void;
   untagResource(
     args: UntagResourceCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UntagResourceCommandOutput>;
   untagResource(
     args: UntagResourceCommandInput,
@@ -1526,12 +1530,12 @@ export interface GuardDuty {
   ): void;
   untagResource(
     args: UntagResourceCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UntagResourceCommandOutput) => void,
   ): void;
   updateCustomDetectionRuleAssociation(
     args: UpdateCustomDetectionRuleAssociationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateCustomDetectionRuleAssociationCommandOutput>;
   updateCustomDetectionRuleAssociation(
     args: UpdateCustomDetectionRuleAssociationCommandInput,
@@ -1539,12 +1543,12 @@ export interface GuardDuty {
   ): void;
   updateCustomDetectionRuleAssociation(
     args: UpdateCustomDetectionRuleAssociationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateCustomDetectionRuleAssociationCommandOutput) => void,
   ): void;
   updateCustomDetectionRuleOrgConfiguration(
     args: UpdateCustomDetectionRuleOrgConfigurationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateCustomDetectionRuleOrgConfigurationCommandOutput>;
   updateCustomDetectionRuleOrgConfiguration(
     args: UpdateCustomDetectionRuleOrgConfigurationCommandInput,
@@ -1552,12 +1556,12 @@ export interface GuardDuty {
   ): void;
   updateCustomDetectionRuleOrgConfiguration(
     args: UpdateCustomDetectionRuleOrgConfigurationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateCustomDetectionRuleOrgConfigurationCommandOutput) => void,
   ): void;
   updateDetector(
     args: UpdateDetectorCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateDetectorCommandOutput>;
   updateDetector(
     args: UpdateDetectorCommandInput,
@@ -1565,12 +1569,12 @@ export interface GuardDuty {
   ): void;
   updateDetector(
     args: UpdateDetectorCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateDetectorCommandOutput) => void,
   ): void;
   updateFilter(
     args: UpdateFilterCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateFilterCommandOutput>;
   updateFilter(
     args: UpdateFilterCommandInput,
@@ -1578,12 +1582,12 @@ export interface GuardDuty {
   ): void;
   updateFilter(
     args: UpdateFilterCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateFilterCommandOutput) => void,
   ): void;
   updateFindingsFeedback(
     args: UpdateFindingsFeedbackCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateFindingsFeedbackCommandOutput>;
   updateFindingsFeedback(
     args: UpdateFindingsFeedbackCommandInput,
@@ -1591,12 +1595,12 @@ export interface GuardDuty {
   ): void;
   updateFindingsFeedback(
     args: UpdateFindingsFeedbackCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateFindingsFeedbackCommandOutput) => void,
   ): void;
   updateIPSet(
     args: UpdateIPSetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateIPSetCommandOutput>;
   updateIPSet(
     args: UpdateIPSetCommandInput,
@@ -1604,12 +1608,12 @@ export interface GuardDuty {
   ): void;
   updateIPSet(
     args: UpdateIPSetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateIPSetCommandOutput) => void,
   ): void;
   updateMalwareProtectionPlan(
     args: UpdateMalwareProtectionPlanCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateMalwareProtectionPlanCommandOutput>;
   updateMalwareProtectionPlan(
     args: UpdateMalwareProtectionPlanCommandInput,
@@ -1617,12 +1621,12 @@ export interface GuardDuty {
   ): void;
   updateMalwareProtectionPlan(
     args: UpdateMalwareProtectionPlanCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateMalwareProtectionPlanCommandOutput) => void,
   ): void;
   updateMalwareScanSettings(
     args: UpdateMalwareScanSettingsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateMalwareScanSettingsCommandOutput>;
   updateMalwareScanSettings(
     args: UpdateMalwareScanSettingsCommandInput,
@@ -1630,12 +1634,12 @@ export interface GuardDuty {
   ): void;
   updateMalwareScanSettings(
     args: UpdateMalwareScanSettingsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateMalwareScanSettingsCommandOutput) => void,
   ): void;
   updateMemberDetectors(
     args: UpdateMemberDetectorsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateMemberDetectorsCommandOutput>;
   updateMemberDetectors(
     args: UpdateMemberDetectorsCommandInput,
@@ -1643,12 +1647,12 @@ export interface GuardDuty {
   ): void;
   updateMemberDetectors(
     args: UpdateMemberDetectorsCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateMemberDetectorsCommandOutput) => void,
   ): void;
   updateOrganizationConfiguration(
     args: UpdateOrganizationConfigurationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateOrganizationConfigurationCommandOutput>;
   updateOrganizationConfiguration(
     args: UpdateOrganizationConfigurationCommandInput,
@@ -1656,12 +1660,12 @@ export interface GuardDuty {
   ): void;
   updateOrganizationConfiguration(
     args: UpdateOrganizationConfigurationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateOrganizationConfigurationCommandOutput) => void,
   ): void;
   updatePublishingDestination(
     args: UpdatePublishingDestinationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdatePublishingDestinationCommandOutput>;
   updatePublishingDestination(
     args: UpdatePublishingDestinationCommandInput,
@@ -1669,12 +1673,12 @@ export interface GuardDuty {
   ): void;
   updatePublishingDestination(
     args: UpdatePublishingDestinationCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdatePublishingDestinationCommandOutput) => void,
   ): void;
   updateThreatEntitySet(
     args: UpdateThreatEntitySetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateThreatEntitySetCommandOutput>;
   updateThreatEntitySet(
     args: UpdateThreatEntitySetCommandInput,
@@ -1682,12 +1686,12 @@ export interface GuardDuty {
   ): void;
   updateThreatEntitySet(
     args: UpdateThreatEntitySetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateThreatEntitySetCommandOutput) => void,
   ): void;
   updateThreatIntelSet(
     args: UpdateThreatIntelSetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateThreatIntelSetCommandOutput>;
   updateThreatIntelSet(
     args: UpdateThreatIntelSetCommandInput,
@@ -1695,12 +1699,12 @@ export interface GuardDuty {
   ): void;
   updateThreatIntelSet(
     args: UpdateThreatIntelSetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateThreatIntelSetCommandOutput) => void,
   ): void;
   updateTrustedEntitySet(
     args: UpdateTrustedEntitySetCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: GuardDutyRequestOptions,
   ): Promise<UpdateTrustedEntitySetCommandOutput>;
   updateTrustedEntitySet(
     args: UpdateTrustedEntitySetCommandInput,
@@ -1708,7 +1712,7 @@ export interface GuardDuty {
   ): void;
   updateTrustedEntitySet(
     args: UpdateTrustedEntitySetCommandInput,
-    options: __HttpHandlerOptions,
+    options: GuardDutyRequestOptions,
     cb: (err: any, data?: UpdateTrustedEntitySetCommandOutput) => void,
   ): void;
   paginateDescribeMalwareScans(