Skip to content

Commit 11a2340

Browse files
author
awstools
committed
feat(client-guardduty): Add EC2 support for GuardDuty Runtime Monitoring auto management.
1 parent 790018d commit 11a2340

15 files changed

+143
-33
lines changed

clients/client-guardduty/src/commands/CreateDetectorCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export interface CreateDetectorCommandOutput extends CreateDetectorResponse, __M
8484
* Status: "ENABLED" || "DISABLED",
8585
* AdditionalConfiguration: [ // DetectorAdditionalConfigurations
8686
* { // DetectorAdditionalConfiguration
87-
* Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT",
87+
* Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT" || "EC2_AGENT_MANAGEMENT",
8888
* Status: "ENABLED" || "DISABLED",
8989
* },
9090
* ],

clients/client-guardduty/src/commands/CreateMembersCommand.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ export interface CreateMembersCommandOutput extends CreateMembersResponse, __Met
4343
* accounts in this request, irrespective of the accounts being new or existing members. For
4444
* more information about the existing auto-enable settings for your organization, see
4545
* <a href="https://docs.aws.amazon.com/guardduty/latest/APIReference/API_DescribeOrganizationConfiguration.html">DescribeOrganizationConfiguration</a>.</p>
46-
* <p>If you are adding accounts by invitation, before using <a href="https://docs.aws.amazon.com/guardduty/latest/APIReference/API_InviteMembers.html">InviteMembers</a>, use
47-
* <code>CreateMembers</code> after GuardDuty has been enabled in potential member accounts.</p>
48-
* <p>If you disassociate a member from a GuardDuty
49-
* delegated administrator, the member account details
46+
* <p>If you disassociate a member account that was added by invitation, the member account details
5047
* obtained from this API, including the associated email addresses, will be retained.
5148
* This is done so that the delegated administrator can invoke the <a href="https://docs.aws.amazon.com/guardduty/latest/APIReference/API_InviteMembers.html">InviteMembers</a> API without the need to invoke the CreateMembers API again. To
5249
* remove the details associated with a member account, the delegated administrator must invoke the
5350
* <a href="https://docs.aws.amazon.com/guardduty/latest/APIReference/API_DeleteMembers.html">DeleteMembers</a> API. </p>
51+
* <p>When the member accounts added through Organizations are later disassociated, you (administrator)
52+
* can't invite them by calling the InviteMembers API. You can create an association with these
53+
* member accounts again only by calling the CreateMembers API.</p>
5454
* @example
5555
* Use a bare-bones client and the command you need to make an API call.
5656
* ```javascript

clients/client-guardduty/src/commands/DescribeOrganizationConfigurationCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export interface DescribeOrganizationConfigurationCommandOutput
7979
* // AutoEnable: "NEW" || "NONE" || "ALL",
8080
* // AdditionalConfiguration: [ // OrganizationAdditionalConfigurationResults
8181
* // { // OrganizationAdditionalConfigurationResult
82-
* // Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT",
82+
* // Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT" || "EC2_AGENT_MANAGEMENT",
8383
* // AutoEnable: "NEW" || "NONE" || "ALL",
8484
* // },
8585
* // ],

clients/client-guardduty/src/commands/DisassociateMembersCommand.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ export interface DisassociateMembersCommandOutput extends DisassociateMembersRes
3838
* <p>With <code>autoEnableOrganizationMembers</code> configuration for your organization set to
3939
* <code>ALL</code>, you'll receive an error if you attempt to disassociate a member account
4040
* before removing them from your organization.</p>
41+
* <p>If you disassociate a member account that was added by invitation, the member account details
42+
* obtained from this API, including the associated email addresses, will be retained.
43+
* This is done so that the delegated administrator can invoke the <a href="https://docs.aws.amazon.com/guardduty/latest/APIReference/API_InviteMembers.html">InviteMembers</a> API without the need to invoke the CreateMembers API again. To
44+
* remove the details associated with a member account, the delegated administrator must invoke the
45+
* <a href="https://docs.aws.amazon.com/guardduty/latest/APIReference/API_DeleteMembers.html">DeleteMembers</a> API. </p>
46+
* <p>When the member accounts added through Organizations are later disassociated, you (administrator)
47+
* can't invite them by calling the InviteMembers API. You can create an association with these
48+
* member accounts again only by calling the CreateMembers API.</p>
4149
* @example
4250
* Use a bare-bones client and the command you need to make an API call.
4351
* ```javascript

clients/client-guardduty/src/commands/GetDetectorCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export interface GetDetectorCommandOutput extends GetDetectorResponse, __Metadat
8686
* // UpdatedAt: new Date("TIMESTAMP"),
8787
* // AdditionalConfiguration: [ // DetectorAdditionalConfigurationResults
8888
* // { // DetectorAdditionalConfigurationResult
89-
* // Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT",
89+
* // Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT" || "EC2_AGENT_MANAGEMENT",
9090
* // Status: "ENABLED" || "DISABLED",
9191
* // UpdatedAt: new Date("TIMESTAMP"),
9292
* // },

clients/client-guardduty/src/commands/GetFindingsCommand.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,7 @@ export interface GetFindingsCommandOutput extends GetFindingsResponse, __Metadat
578578
* // ThreatNames: [ // ThreatNames
579579
* // "STRING_VALUE",
580580
* // ],
581+
* // ThreatFileSha256: "STRING_VALUE",
581582
* // },
582583
* // ],
583584
* // },
@@ -744,6 +745,11 @@ export interface GetFindingsCommandOutput extends GetFindingsResponse, __Metadat
744745
* // MemoryRegions: [ // MemoryRegionsList
745746
* // "STRING_VALUE",
746747
* // ],
748+
* // ToolName: "STRING_VALUE",
749+
* // ToolCategory: "STRING_VALUE",
750+
* // ServiceName: "STRING_VALUE",
751+
* // CommandLineExample: "STRING_VALUE",
752+
* // ThreatFilePath: "STRING_VALUE",
747753
* // },
748754
* // },
749755
* // Detection: { // Detection

clients/client-guardduty/src/commands/GetMemberDetectorsCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export interface GetMemberDetectorsCommandOutput extends GetMemberDetectorsRespo
8484
* // UpdatedAt: new Date("TIMESTAMP"),
8585
* // AdditionalConfiguration: [ // MemberAdditionalConfigurationResults
8686
* // { // MemberAdditionalConfigurationResult
87-
* // Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT",
87+
* // Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT" || "EC2_AGENT_MANAGEMENT",
8888
* // Status: "ENABLED" || "DISABLED",
8989
* // UpdatedAt: new Date("TIMESTAMP"),
9090
* // },

clients/client-guardduty/src/commands/GetOrganizationStatisticsCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export interface GetOrganizationStatisticsCommandOutput extends GetOrganizationS
5454
* // EnabledAccountsCount: Number("int"),
5555
* // AdditionalConfiguration: [ // OrganizationFeatureStatisticsAdditionalConfigurations
5656
* // { // OrganizationFeatureStatisticsAdditionalConfiguration
57-
* // Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT",
57+
* // Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT" || "EC2_AGENT_MANAGEMENT",
5858
* // EnabledAccountsCount: Number("int"),
5959
* // },
6060
* // ],

clients/client-guardduty/src/commands/InviteMembersCommand.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@ export interface InviteMembersCommandOutput extends InviteMembersResponse, __Met
4545
* <a href="https://docs.aws.amazon.com/guardduty/latest/APIReference/API_CreateMembers.html">CreateMembers</a> again. To
4646
* remove the details associated with a member account, you must also invoke
4747
* <a href="https://docs.aws.amazon.com/guardduty/latest/APIReference/API_DeleteMembers.html">DeleteMembers</a>. </p>
48+
* <p>If you disassociate a member account that was added by invitation, the member account details
49+
* obtained from this API, including the associated email addresses, will be retained.
50+
* This is done so that the delegated administrator can invoke the <a href="https://docs.aws.amazon.com/guardduty/latest/APIReference/API_InviteMembers.html">InviteMembers</a> API without the need to invoke the CreateMembers API again. To
51+
* remove the details associated with a member account, the delegated administrator must invoke the
52+
* <a href="https://docs.aws.amazon.com/guardduty/latest/APIReference/API_DeleteMembers.html">DeleteMembers</a> API. </p>
53+
* <p>When the member accounts added through Organizations are later disassociated, you (administrator)
54+
* can't invite them by calling the InviteMembers API. You can create an association with these
55+
* member accounts again only by calling the CreateMembers API.</p>
4856
* @example
4957
* Use a bare-bones client and the command you need to make an API call.
5058
* ```javascript

clients/client-guardduty/src/commands/UpdateDetectorCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export interface UpdateDetectorCommandOutput extends UpdateDetectorResponse, __M
6767
* Status: "ENABLED" || "DISABLED",
6868
* AdditionalConfiguration: [ // DetectorAdditionalConfigurations
6969
* { // DetectorAdditionalConfiguration
70-
* Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT",
70+
* Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT" || "EC2_AGENT_MANAGEMENT",
7171
* Status: "ENABLED" || "DISABLED",
7272
* },
7373
* ],

clients/client-guardduty/src/commands/UpdateMemberDetectorsCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export interface UpdateMemberDetectorsCommandOutput extends UpdateMemberDetector
6868
* Status: "ENABLED" || "DISABLED",
6969
* AdditionalConfiguration: [ // MemberAdditionalConfigurations
7070
* { // MemberAdditionalConfiguration
71-
* Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT",
71+
* Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT" || "EC2_AGENT_MANAGEMENT",
7272
* Status: "ENABLED" || "DISABLED",
7373
* },
7474
* ],

clients/client-guardduty/src/commands/UpdateOrganizationConfigurationCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export interface UpdateOrganizationConfigurationCommandOutput
7474
* AutoEnable: "NEW" || "NONE" || "ALL",
7575
* AdditionalConfiguration: [ // OrganizationAdditionalConfigurations
7676
* { // OrganizationAdditionalConfiguration
77-
* Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT",
77+
* Name: "EKS_ADDON_MANAGEMENT" || "ECS_FARGATE_AGENT_MANAGEMENT" || "EC2_AGENT_MANAGEMENT",
7878
* AutoEnable: "NEW" || "NONE" || "ALL",
7979
* },
8080
* ],

clients/client-guardduty/src/models/models_0.ts

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,8 @@ export interface DnsRequestAction {
659659

660660
/**
661661
* <p>The second and top level domain involved in the
662-
* activity that prompted GuardDuty to generate this finding.</p>
662+
* activity that potentially prompted GuardDuty to generate this finding.
663+
* For a list of top-level and second-level domains, see <a href="https://publicsuffix.org/">public suffix list</a>.</p>
663664
* @public
664665
*/
665666
DomainWithSuffix?: string;
@@ -1673,13 +1674,7 @@ export const ManagementType = {
16731674
export type ManagementType = (typeof ManagementType)[keyof typeof ManagementType];
16741675

16751676
/**
1676-
* <note>
1677-
* <p>This API is also used when you use GuardDuty Runtime Monitoring
1678-
* for your Amazon EC2 instances (currently in preview
1679-
* release) and is subject to change. The use of this API is subject to Section 2 of the
1680-
* <a href="http://aws.amazon.com/service-terms/">Amazon Web Services Service Terms</a> ("Betas and Previews").</p>
1681-
* </note>
1682-
* <p>Contains information about the Amazon EC2 instance runtime
1677+
* <p>Contains information about the Amazon EC2 instance runtime
16831678
* coverage details.</p>
16841679
* @public
16851680
*/
@@ -1936,13 +1931,7 @@ export interface CoverageResourceDetails {
19361931
EcsClusterDetails?: CoverageEcsClusterDetails;
19371932

19381933
/**
1939-
* <note>
1940-
* <p>This API is also used when you use GuardDuty Runtime Monitoring
1941-
* for your Amazon EC2 instances (currently in preview
1942-
* release) and is subject to change. The use of this API is subject to Section 2 of the
1943-
* <a href="http://aws.amazon.com/service-terms/">Amazon Web Services Service Terms</a> ("Betas and Previews").</p>
1944-
* </note>
1945-
* <p>Information about the Amazon EC2 instance assessed
1934+
* <p>Information about the Amazon EC2 instance assessed
19461935
* for runtime coverage.</p>
19471936
* @public
19481937
*/
@@ -2178,6 +2167,7 @@ export interface DataSourceConfigurations {
21782167
* @enum
21792168
*/
21802169
export const FeatureAdditionalConfiguration = {
2170+
EC2_AGENT_MANAGEMENT: "EC2_AGENT_MANAGEMENT",
21812171
ECS_FARGATE_AGENT_MANAGEMENT: "ECS_FARGATE_AGENT_MANAGEMENT",
21822172
EKS_ADDON_MANAGEMENT: "EKS_ADDON_MANAGEMENT",
21832173
} as const;
@@ -3991,6 +3981,7 @@ export type OrgFeatureStatus = (typeof OrgFeatureStatus)[keyof typeof OrgFeature
39913981
* @enum
39923982
*/
39933983
export const OrgFeatureAdditionalConfiguration = {
3984+
EC2_AGENT_MANAGEMENT: "EC2_AGENT_MANAGEMENT",
39943985
ECS_FARGATE_AGENT_MANAGEMENT: "ECS_FARGATE_AGENT_MANAGEMENT",
39953986
EKS_ADDON_MANAGEMENT: "EKS_ADDON_MANAGEMENT",
39963987
} as const;
@@ -4986,6 +4977,12 @@ export interface ThreatIntelligenceDetail {
49864977
* @public
49874978
*/
49884979
ThreatNames?: string[];
4980+
4981+
/**
4982+
* <p>SHA256 of the file that generated the finding.</p>
4983+
* @public
4984+
*/
4985+
ThreatFileSha256?: string;
49894986
}
49904987

49914988
/**
@@ -6029,6 +6026,37 @@ export interface RuntimeContext {
60296026
* @public
60306027
*/
60316028
MemoryRegions?: string[];
6029+
6030+
/**
6031+
* <p>Name of the potentially suspicious tool.</p>
6032+
* @public
6033+
*/
6034+
ToolName?: string;
6035+
6036+
/**
6037+
* <p>Category that the tool belongs to. Some of the examples
6038+
* are Backdoor Tool, Pentest Tool, Network Scanner, and Network Sniffer.</p>
6039+
* @public
6040+
*/
6041+
ToolCategory?: string;
6042+
6043+
/**
6044+
* <p>Name of the security service that has been potentially disabled.</p>
6045+
* @public
6046+
*/
6047+
ServiceName?: string;
6048+
6049+
/**
6050+
* <p>Example of the command line involved in the suspicious activity.</p>
6051+
* @public
6052+
*/
6053+
CommandLineExample?: string;
6054+
6055+
/**
6056+
* <p>The suspicious file path for which the threat intelligence details were found.</p>
6057+
* @public
6058+
*/
6059+
ThreatFilePath?: string;
60326060
}
60336061

60346062
/**

clients/client-guardduty/src/protocols/Aws_restJson1.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5854,6 +5854,7 @@ const de_ResourceDetails = (output: any, context: __SerdeContext): ResourceDetai
58545854
const de_RuntimeContext = (output: any, context: __SerdeContext): RuntimeContext => {
58555855
return take(output, {
58565856
AddressFamily: [, __expectString, `addressFamily`],
5857+
CommandLineExample: [, __expectString, `commandLineExample`],
58575858
FileSystemType: [, __expectString, `fileSystemType`],
58585859
Flags: [, _json, `flags`],
58595860
IanaProtocolNumber: [, __expectInt32, `ianaProtocolNumber`],
@@ -5870,9 +5871,13 @@ const de_RuntimeContext = (output: any, context: __SerdeContext): RuntimeContext
58705871
ReleaseAgentPath: [, __expectString, `releaseAgentPath`],
58715872
RuncBinaryPath: [, __expectString, `runcBinaryPath`],
58725873
ScriptPath: [, __expectString, `scriptPath`],
5874+
ServiceName: [, __expectString, `serviceName`],
58735875
ShellHistoryFilePath: [, __expectString, `shellHistoryFilePath`],
58745876
SocketPath: [, __expectString, `socketPath`],
58755877
TargetProcess: [, (_: any) => de_ProcessDetails(_, context), `targetProcess`],
5878+
ThreatFilePath: [, __expectString, `threatFilePath`],
5879+
ToolCategory: [, __expectString, `toolCategory`],
5880+
ToolName: [, __expectString, `toolName`],
58765881
}) as any;
58775882
};
58785883

@@ -6205,6 +6210,7 @@ const de_ThreatDetectedByName = (output: any, context: __SerdeContext): ThreatDe
62056210
*/
62066211
const de_ThreatIntelligenceDetail = (output: any, context: __SerdeContext): ThreatIntelligenceDetail => {
62076212
return take(output, {
6213+
ThreatFileSha256: [, __expectString, `threatFileSha256`],
62086214
ThreatListName: [, __expectString, `threatListName`],
62096215
ThreatNames: [, _json, `threatNames`],
62106216
}) as any;

0 commit comments

Comments
 (0)