Skip to content

Commit 16dc8db

Browse files
This release adds GetClustersForImage API and filter updates as part of the mapping of container images to running containers feature.
1 parent ddbe55b commit 16dc8db

File tree

51 files changed

+3332
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+3332
-2
lines changed

generator/ServiceModels/inspector2/inspector2-2020-06-08.api.json

Lines changed: 198 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,22 @@
402402
{"shape":"InternalServerException"}
403403
]
404404
},
405+
"GetClustersForImage":{
406+
"name":"GetClustersForImage",
407+
"http":{
408+
"method":"POST",
409+
"requestUri":"/cluster/get",
410+
"responseCode":200
411+
},
412+
"input":{"shape":"GetClustersForImageRequest"},
413+
"output":{"shape":"GetClustersForImageResponse"},
414+
"errors":[
415+
{"shape":"ValidationException"},
416+
{"shape":"AccessDeniedException"},
417+
{"shape":"ThrottlingException"},
418+
{"shape":"InternalServerException"}
419+
]
420+
},
405421
"GetConfiguration":{
406422
"name":"GetConfiguration",
407423
"http":{
@@ -1266,6 +1282,8 @@
12661282
"architectures":{"shape":"StringFilterList"},
12671283
"imageShas":{"shape":"StringFilterList"},
12681284
"imageTags":{"shape":"StringFilterList"},
1285+
"inUseCount":{"shape":"NumberFilterList"},
1286+
"lastInUseAt":{"shape":"DateFilterList"},
12691287
"repositories":{"shape":"StringFilterList"},
12701288
"resourceIds":{"shape":"StringFilterList"},
12711289
"sortBy":{"shape":"AwsEcrContainerSortBy"},
@@ -1280,6 +1298,8 @@
12801298
"architecture":{"shape":"String"},
12811299
"imageSha":{"shape":"String"},
12821300
"imageTags":{"shape":"StringList"},
1301+
"inUseCount":{"shape":"Long"},
1302+
"lastInUseAt":{"shape":"DateTimeTimestamp"},
12831303
"repository":{"shape":"String"},
12841304
"resourceId":{"shape":"NonEmptyString"},
12851305
"severityCounts":{"shape":"SeverityCounts"}
@@ -1297,6 +1317,8 @@
12971317
"author":{"shape":"String"},
12981318
"imageHash":{"shape":"ImageHash"},
12991319
"imageTags":{"shape":"ImageTagList"},
1320+
"inUseCount":{"shape":"Long"},
1321+
"lastInUseAt":{"shape":"DateTimeTimestamp"},
13001322
"platform":{"shape":"Platform"},
13011323
"pushedAt":{"shape":"DateTimeTimestamp"},
13021324
"registry":{"shape":"NonEmptyString"},
@@ -1311,6 +1333,66 @@
13111333
"ALL"
13121334
]
13131335
},
1336+
"AwsEcsMetadataDetails":{
1337+
"type":"structure",
1338+
"required":[
1339+
"detailsGroup",
1340+
"taskDefinitionArn"
1341+
],
1342+
"members":{
1343+
"detailsGroup":{"shape":"AwsEcsMetadataDetailsDetailsGroupString"},
1344+
"taskDefinitionArn":{"shape":"AwsEcsMetadataDetailsTaskDefinitionArnString"}
1345+
}
1346+
},
1347+
"AwsEcsMetadataDetailsDetailsGroupString":{
1348+
"type":"string",
1349+
"max":256,
1350+
"min":1
1351+
},
1352+
"AwsEcsMetadataDetailsTaskDefinitionArnString":{
1353+
"type":"string",
1354+
"max":2048,
1355+
"min":1
1356+
},
1357+
"AwsEksMetadataDetails":{
1358+
"type":"structure",
1359+
"members":{
1360+
"namespace":{"shape":"AwsEksMetadataDetailsNamespaceString"},
1361+
"workloadInfoList":{"shape":"AwsEksWorkloadInfoList"}
1362+
}
1363+
},
1364+
"AwsEksMetadataDetailsNamespaceString":{
1365+
"type":"string",
1366+
"max":256,
1367+
"min":1
1368+
},
1369+
"AwsEksWorkloadInfo":{
1370+
"type":"structure",
1371+
"required":[
1372+
"name",
1373+
"type"
1374+
],
1375+
"members":{
1376+
"name":{"shape":"AwsEksWorkloadInfoNameString"},
1377+
"type":{"shape":"AwsEksWorkloadInfoTypeString"}
1378+
}
1379+
},
1380+
"AwsEksWorkloadInfoList":{
1381+
"type":"list",
1382+
"member":{"shape":"AwsEksWorkloadInfo"},
1383+
"max":100,
1384+
"min":0
1385+
},
1386+
"AwsEksWorkloadInfoNameString":{
1387+
"type":"string",
1388+
"max":256,
1389+
"min":1
1390+
},
1391+
"AwsEksWorkloadInfoTypeString":{
1392+
"type":"string",
1393+
"max":256,
1394+
"min":1
1395+
},
13141396
"AwsLambdaFunctionDetails":{
13151397
"type":"structure",
13161398
"required":[
@@ -2029,6 +2111,64 @@
20292111
"max":64,
20302112
"min":1
20312113
},
2114+
"ClusterDetails":{
2115+
"type":"structure",
2116+
"required":[
2117+
"clusterMetadata",
2118+
"lastInUse"
2119+
],
2120+
"members":{
2121+
"clusterMetadata":{"shape":"ClusterMetadata"},
2122+
"lastInUse":{"shape":"Timestamp"},
2123+
"runningUnitCount":{"shape":"Long"},
2124+
"stoppedUnitCount":{"shape":"Long"}
2125+
}
2126+
},
2127+
"ClusterForImageFilterCriteria":{
2128+
"type":"structure",
2129+
"required":["resourceId"],
2130+
"members":{
2131+
"resourceId":{"shape":"ClusterForImageFilterCriteriaResourceIdString"}
2132+
}
2133+
},
2134+
"ClusterForImageFilterCriteriaResourceIdString":{
2135+
"type":"string",
2136+
"pattern":"^arn:.*:ecr:.*:\\d{12}:repository\\/(?:[a-z0-9]+(?:[._-][a-z0-9]+)*\\/)*[a-z0-9]+(?:[._-][a-z0-9]+)*(\\/sha256:[a-z0-9]{64})?$"
2137+
},
2138+
"ClusterInformation":{
2139+
"type":"structure",
2140+
"required":["clusterArn"],
2141+
"members":{
2142+
"clusterArn":{"shape":"ClusterInformationClusterArnString"},
2143+
"clusterDetails":{"shape":"ClusterInformationClusterDetailsList"}
2144+
}
2145+
},
2146+
"ClusterInformationClusterArnString":{
2147+
"type":"string",
2148+
"max":2048,
2149+
"min":1,
2150+
"pattern":"^arn:aws(?:-[a-z0-9-]+)?:(?:ecs|eks):[a-z0-9-]+:[0-9]{12}:cluster/[a-zA-Z0-9_-]+$"
2151+
},
2152+
"ClusterInformationClusterDetailsList":{
2153+
"type":"list",
2154+
"member":{"shape":"ClusterDetails"},
2155+
"max":100,
2156+
"min":1
2157+
},
2158+
"ClusterInformationList":{
2159+
"type":"list",
2160+
"member":{"shape":"ClusterInformation"},
2161+
"max":100,
2162+
"min":1
2163+
},
2164+
"ClusterMetadata":{
2165+
"type":"structure",
2166+
"members":{
2167+
"awsEcsMetadataDetails":{"shape":"AwsEcsMetadataDetails"},
2168+
"awsEksMetadataDetails":{"shape":"AwsEksMetadataDetails"}
2169+
},
2170+
"union":true
2171+
},
20322172
"CodeFilePath":{
20332173
"type":"structure",
20342174
"required":[
@@ -2185,6 +2325,8 @@
21852325
"members":{
21862326
"accountId":{"shape":"CoverageStringFilterList"},
21872327
"ec2InstanceTags":{"shape":"CoverageMapFilterList"},
2328+
"ecrImageInUseCount":{"shape":"CoverageNumberFilterList"},
2329+
"ecrImageLastInUseAt":{"shape":"CoverageDateFilterList"},
21882330
"ecrImageTags":{"shape":"CoverageStringFilterList"},
21892331
"ecrRepositoryName":{"shape":"CoverageStringFilterList"},
21902332
"imagePulledAt":{"shape":"CoverageDateFilterList"},
@@ -2222,6 +2364,19 @@
22222364
"max":10,
22232365
"min":1
22242366
},
2367+
"CoverageNumberFilter":{
2368+
"type":"structure",
2369+
"members":{
2370+
"lowerInclusive":{"shape":"Long"},
2371+
"upperInclusive":{"shape":"Long"}
2372+
}
2373+
},
2374+
"CoverageNumberFilterList":{
2375+
"type":"list",
2376+
"member":{"shape":"CoverageNumberFilter"},
2377+
"max":10,
2378+
"min":1
2379+
},
22252380
"CoverageResourceType":{
22262381
"type":"string",
22272382
"enum":[
@@ -2750,6 +2905,7 @@
27502905
"required":["rescanDuration"],
27512906
"members":{
27522907
"pullDateRescanDuration":{"shape":"EcrPullDateRescanDuration"},
2908+
"pullDateRescanMode":{"shape":"EcrPullDateRescanMode"},
27532909
"rescanDuration":{"shape":"EcrRescanDuration"}
27542910
}
27552911
},
@@ -2763,6 +2919,8 @@
27632919
"type":"structure",
27642920
"members":{
27652921
"imagePulledAt":{"shape":"DateTimeTimestamp"},
2922+
"inUseCount":{"shape":"Long"},
2923+
"lastInUseAt":{"shape":"DateTimeTimestamp"},
27662924
"tags":{"shape":"TagList"}
27672925
}
27682926
},
@@ -2776,6 +2934,13 @@
27762934
"DAYS_180"
27772935
]
27782936
},
2937+
"EcrPullDateRescanMode":{
2938+
"type":"string",
2939+
"enum":[
2940+
"LAST_PULL_DATE",
2941+
"LAST_IN_USE_AT"
2942+
]
2943+
},
27792944
"EcrRepositoryMetadata":{
27802945
"type":"structure",
27812946
"members":{
@@ -2798,6 +2963,7 @@
27982963
"type":"structure",
27992964
"members":{
28002965
"pullDateRescanDuration":{"shape":"EcrPullDateRescanDuration"},
2966+
"pullDateRescanMode":{"shape":"EcrPullDateRescanMode"},
28012967
"rescanDuration":{"shape":"EcrRescanDuration"},
28022968
"status":{"shape":"EcrRescanDurationStatus"},
28032969
"updatedAt":{"shape":"DateTimeTimestamp"}
@@ -3055,6 +3221,8 @@
30553221
"ec2InstanceVpcId":{"shape":"StringFilterList"},
30563222
"ecrImageArchitecture":{"shape":"StringFilterList"},
30573223
"ecrImageHash":{"shape":"StringFilterList"},
3224+
"ecrImageInUseCount":{"shape":"NumberFilterList"},
3225+
"ecrImageLastInUseAt":{"shape":"DateFilterList"},
30583226
"ecrImagePushedAt":{"shape":"DateFilterList"},
30593227
"ecrImageRegistry":{"shape":"StringFilterList"},
30603228
"ecrImageRepositoryName":{"shape":"StringFilterList"},
@@ -3395,6 +3563,34 @@
33953563
"scanResultDetails":{"shape":"CisScanResultDetailsList"}
33963564
}
33973565
},
3566+
"GetClustersForImageNextToken":{
3567+
"type":"string",
3568+
"max":3000,
3569+
"min":1
3570+
},
3571+
"GetClustersForImageRequest":{
3572+
"type":"structure",
3573+
"required":["filter"],
3574+
"members":{
3575+
"filter":{"shape":"ClusterForImageFilterCriteria"},
3576+
"maxResults":{"shape":"GetClustersForImageRequestMaxResultsInteger"},
3577+
"nextToken":{"shape":"GetClustersForImageNextToken"}
3578+
}
3579+
},
3580+
"GetClustersForImageRequestMaxResultsInteger":{
3581+
"type":"integer",
3582+
"box":true,
3583+
"max":100,
3584+
"min":1
3585+
},
3586+
"GetClustersForImageResponse":{
3587+
"type":"structure",
3588+
"required":["cluster"],
3589+
"members":{
3590+
"cluster":{"shape":"ClusterInformationList"},
3591+
"nextToken":{"shape":"GetClustersForImageNextToken"}
3592+
}
3593+
},
33983594
"GetConfigurationRequest":{
33993595
"type":"structure",
34003596
"members":{
@@ -4815,7 +5011,8 @@
48155011
"DEEP_INSPECTION_COLLECTION_TIME_LIMIT_EXCEEDED",
48165012
"DEEP_INSPECTION_NO_INVENTORY",
48175013
"AGENTLESS_INSTANCE_STORAGE_LIMIT_EXCEEDED",
4818-
"AGENTLESS_INSTANCE_COLLECTION_TIME_LIMIT_EXCEEDED"
5014+
"AGENTLESS_INSTANCE_COLLECTION_TIME_LIMIT_EXCEEDED",
5015+
"PENDING_REVIVAL_SCAN"
48195016
]
48205017
},
48215018
"ScanType":{

0 commit comments

Comments
 (0)