Skip to content

Commit 4216f07

Browse files
tyler-dunkeltyler-dunkel
authored
Merge pull request #48 from cloudgraphdev/alpha
BETA Release: 0.80.0-beta-1
2 parents ca13d40 + 87e939d commit 4216f07

30 files changed

Lines changed: 255 additions & 76 deletions

‎CHANGELOG.md‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,102 @@
1+
# [0.80.0-alpha.5](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.80.0-alpha.4...0.80.0-alpha.5) (2022-05-02)
2+
3+
4+
### Features
5+
6+
* Add cloudfront connection to cloudwatch service ([d2936d6](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/d2936d654189e56a021da946c76ab51b82b76276))
7+
8+
# [0.80.0-alpha.4](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.80.0-alpha.3...0.80.0-alpha.4) (2022-05-02)
9+
10+
11+
### Features
12+
13+
* Add Additional data to transit gateway attachment ([35a560c](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/35a560cdd4eb408767275adee309d95a6badae73))
14+
15+
16+
### Reverts
17+
18+
* Revert "feat: Add cloudfront connection to cloudwatch service" ([7ae11b8](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/7ae11b853f7c62f07aa12471cd1f6f00326942e6))
19+
* Revert "Update README file conenctions" ([b27810f](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/b27810fb62fee7926ffd9fb1e6e74f2f53479649))
20+
21+
# [0.80.0-alpha.3](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.80.0-alpha.2...0.80.0-alpha.3) (2022-04-28)
22+
23+
24+
### Bug Fixes
25+
26+
* Fixed some duplication issues without destroying data first ([7d798b4](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/7d798b48fede8baa1b5cfb2c6f30a9096a6937a3))
27+
28+
29+
### Features
30+
31+
* Add cloudfront connection to cloudwatch service ([4fdf50c](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/4fdf50c98ca9b4f0aeb6b2322771d75c6f3084a5))
32+
33+
# [0.80.0-alpha.2](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.80.0-alpha.1...0.80.0-alpha.2) (2022-04-25)
34+
35+
36+
### Bug Fixes
37+
38+
* Included rawPolicy for aws services ([6ee5cef](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/6ee5cef489b35613c4bf47f0c3b5d9d4a06fcbfa))
39+
40+
# [0.80.0-alpha.1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.79.0...0.80.0-alpha.1) (2022-04-25)
41+
42+
43+
### Features
44+
45+
* Add restrictionType to Cloudfront, geoRestriction ([a51e670](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/a51e67087ab2721026cbcc32e96ecb089852468c))
46+
47+
# [0.79.0](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.78.1...0.79.0) (2022-04-22)
48+
49+
50+
### Bug Fixes
51+
52+
* add connection between nacl and subnet services ([6ed6dee](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/6ed6dee345daa6342f651e5c00bb92178b259954))
53+
* add connection between networkInterface and securityGroup services ([8efe2aa](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/8efe2aa8e15536df124a666b05d5e08eec8e2f87))
54+
* Added iamRole connection to kinesisFirehose service ([dc17214](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/dc1721403a6d86aa1d7a00542dff237011514654))
55+
* Added iamRole to lambda service ([ae6177d](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/ae6177de995975ab5194c5d2fcc8aaf98ec8d06d))
56+
* Added missing connections to managedAirflow ([dbb9405](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/dbb94058dd22c0b538b4f9491e6874031747480f))
57+
* Added missing connections to RDS DB Instance ([206bd29](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/206bd29fd9189d10ab628c07f206e5e6a4725bf6))
58+
* Added missing connections to waf ([623537b](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/623537b01ccfe4123e8aec1c56ad3c0037cc6efa))
59+
* Created iamRole connection for emrCluster ([80a39e1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/80a39e19046ad46a2897f667171b271b5a1f9cc7))
60+
* **ec2:** fix connection field to elasticBeanstalkEnv ([e2fd077](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/e2fd07799b82213abcd5a0776f34a6c1b7d3d215))
61+
* **elasticBeanstalkApp:** add connection to iamRole, fixes to iamRole ([d5af1af](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/d5af1af67656058e42874dd0260b7d1bf63310f5))
62+
* **elasticBeanstalkEnv:** add connections with alb, elb, ec2 and sqs services ([fe21ecd](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/fe21ecd924695395dde77a8704bf0e7edcb26c36))
63+
* **elasticSearchDomain:** add cloudwatchLogs, cognitoIdentityPool, cognitoUserPool, iamRole connections ([694d298](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/694d298af419a8f18f55ccebb5fc21b06574c930))
64+
* Fixed error scanning iamUsers without enough permissions ([43b7d22](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/43b7d22c4b3c8b0056ec302f7ec8e7ec9646fa0f))
65+
* Generated ARN for flowLogs ([1d372a9](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/1d372a93083dbc2d1ae9e6ef3f4cd32a720fbf1a))
66+
* Generated ARN for guardDuty ([39f43b5](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/39f43b5dff9449a860823aa9b1effc6e6b271a59))
67+
* iamInstanceProfile never returning when there's a permission's error ([63e6d4a](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/63e6d4a3b8622c5d14a082cc3d9f2eef338c670c))
68+
* removed duplicate declaration introduced on merge ([dd14cf8](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/dd14cf87e01c0b8f7e15bcd0b34135d1646bc3d2))
69+
* Renamed base class name for some services ([7b19d61](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/7b19d6172b943ced574757d53dff00133206bb8e))
70+
* Standardized aws service schemas using base schema ([f0f7cfd](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/f0f7cfdc3b71a202f211ed7255ea6b0aa1e4988d))
71+
* transitGatewayAttachment failed to insert data because duplicate XID found ([f88537c](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/f88537c381311d0d803f981a5dd119459f8c0061))
72+
73+
74+
### Features
75+
76+
* Added iamInstanceProfile connection ([652f2f7](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/652f2f7b9bf551cab37afa2893bea5bb504699c9))
77+
* Added IamRole connection to ec2 ([4ff22ec](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/4ff22ecb130345de06cd6afd06c15f2978c8a4c7))
78+
* **appSync:** add iamRole/wafV2WebAcl connections ([36b90f2](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/36b90f256445568dd33d9f0fcbed8dc66531407a))
79+
* **asg:** add iam role connection ([06285db](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/06285db82a8b2feb821d95446e3e0fe87c54cd51))
80+
* **cloudFormationStackSet:** add iam role connection ([e25bffb](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/e25bffb1f467706ff6a0cc752804a6b3738f6c8b))
81+
* **cognitoIdentityPool:** add iamRole/iamOpenIdConnectProvider/iamSamlProvider connections, generate arn ([3ba9610](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/3ba9610af535f9b84f229ce6abcfcf1e43664d45))
82+
* Handle TODOs for dynamoDB ([d2b42ce](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/d2b42cec491776ecebbedc30f691a49960cfd47e))
83+
* Handle TODOs for dynamoDB ([9b3ae42](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/9b3ae425097f06972f292f3c82930bd7f97bb5ac))
84+
* Handle TODOs for dynamoDB ([625701e](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/625701ea2a47b6be8bdf1fe910a541fd6f1ed132))
85+
* Handle TODOs for dynamoDB ([2911751](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/2911751e96908793dc1b042b07c28bba340f1134))
86+
* Handle TODOs for EC2 ([832fc7b](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/832fc7bdff1a02d89fbdbf50d1d030669d7568b9))
87+
* Handle TODOs for ecs cluster ([554dff7](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/554dff7785dc2c69403a41416c7739625fd02263))
88+
* Handle TODOs for ecs task ([b469773](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/b469773e9364edd65a2f2dd6c9728c3b0536e944))
89+
* Handle TODOs for secrets manager ([d7a975d](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/d7a975dc2a5ffdb784eef36c4a827d553e7ac1c3))
90+
* **rds:** add kms connection cluster/dbInstance ([f501a4e](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/f501a4e079503d10841f1af32d3a12f13d277aa2))
91+
* **rdsCluster:** add route53HostedZone connection ([6480e7f](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/6480e7f16c404ebb2c7f2f458aa95ae2db93f0dc))
92+
* **rdsCluster:** add subnet connection, add missing properties ([7706a02](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/7706a0243384d949f1c4adaf7ec0fa6dd1d4cd57))
93+
* **s3:** Add connections to iamRole, lambda, sns and sqs services ([1ca01fd](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/1ca01fd9b1dabc110b87e0c74e3e63b5c0cb1099))
94+
* **s3:** Add connections to iamRole, lambda, sns and sqs services ([22a8cfd](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/22a8cfdbd1365a5b94fdbc91d54886b1135c9682))
95+
* Update kms connection ([1e3e66d](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/1e3e66d41e886bbb39ad9f000167fa93c7313b26))
96+
* Update README file ([0ddf442](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/0ddf44211fe3f324371e6a21c6d5df3bc69facfb))
97+
* Updated README connections ([f536b73](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/f536b73f97c1f0ddbea687588e5d10f089fd2500))
98+
* Updated README file ([5187b76](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/5187b76b550b5bcfed36a4e6e2fa3b45920864b2))
99+
1100
# [0.79.0-beta.1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.78.1...0.79.0-beta.1) (2022-04-21)
2101

3102

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ CloudGraph AWS Provider will ask you what regions you would like to crawl and wi
8080
| cloud9 | |
8181
| cloudformationStack | cloudformationStack, iamRole, sns |
8282
| cloudformationStackSet | iamRole |
83-
| cloudfront | elb, s3 |
83+
| cloudfront | cloudwatch, elb, s3 |
8484
| cloudtrail | cloudwatch, cloudwatchLog, kms, s3, sns |
85-
| cloudwatch | cloudtrail, cloudwatchLog, sns |
85+
| cloudwatch | cloudfront, cloudtrail, cloudwatchLog, sns |
8686
| cloudwatchLog | cloudtrail, cloudwatch, ecsCluster, elasticSearchDomain, kms, managedAirflow, rdsDbInstance |
8787
| codebuild | iamRole, kms, vpc, securityGroup, subnet |
8888
| cognitoIdentityPool | iamRole, iamOpenIdConnectProvider, iamSamlProvider, elasticSearchDomain |

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cloudgraph/cg-provider-aws",
3-
"version": "0.79.0-beta.1",
3+
"version": "0.80.0-alpha.5",
44
"description": "cloud-graph provider plugin for AWS used to fetch AWS cloud data.",
55
"publishConfig": {
66
"registry": "https://registry.npmjs.org/",

‎src/services/apiGatewayRestApi/format.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export default ({
3434
arn,
3535
region,
3636
description,
37+
rawPolicy: policy,
3738
policy: formatIamJsonPolicy(policy),
3839
endpointConfiguration,
3940
apiKeySource,

‎src/services/apiGatewayRestApi/schema.graphql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ type awsApiGatewayEndpointConfiguration {
66

77
type awsApiGatewayRestApi implements awsBaseService @key(fields: "arn") {
88
description: String @search(by: [hash, regexp, fulltext])
9+
rawPolicy: String @search(by: [hash, regexp])
910
policy: awsIamJSONPolicy
1011
endpointConfiguration: awsApiGatewayEndpointConfiguration
1112
apiKeySource: String @search(by: [hash])

‎src/services/billing/mutation.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default `mutation($input: [AddawsBillingInput!]!) {
2-
addawsBilling(input: $input) {
2+
addawsBilling(input: $input, upsert: true) {
33
numUids
44
}
5-
}`
5+
}`

‎src/services/billing/schema.graphql‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
type awsBilling {
2-
id: String! @id @search(by: [hash])
3-
accountId: String! @id @search(by: [hash])
1+
type awsBilling implements awsOptionalService @key(fields: "id") {
42
totalCostMonthToDate: awsTotalBillingInfo
53
totalCostLast30Days: awsTotalBillingInfo
64
monthToDateDailyAverage: [awsServiceBillingInfo]

‎src/services/cloudfront/format.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {
44
Origin,
55
} from 'aws-sdk/clients/cloudfront'
66
import cuid from 'cuid'
7-
import isEmpty from 'lodash/isEmpty'
87

98
import t from '../../properties/translations'
109
import { formatTagsFromMap } from '../../utils/format'
@@ -118,7 +117,7 @@ export default ({
118117
CallerReference: callerReference,
119118
DefaultRootObject: defaultRootObject,
120119
HttpVersion: httpVersion,
121-
Restrictions: { GeoRestriction: { Items: geoRestrictions = [] } } = {
120+
Restrictions: { GeoRestriction: { Items: locations = [], RestrictionType: restrictionType = ''} } = {
122121
GeoRestriction: { RestrictionType: '', Items: [], Quantity: 0 },
123122
},
124123
Logging: logging,
@@ -237,9 +236,10 @@ export default ({
237236
domainName,
238237
enabled: enabled ? t.yes : t.no,
239238
etag,
240-
geoRestrictions: !isEmpty(geoRestrictions)
241-
? geoRestrictions.join(',')
242-
: 'none',
239+
geoRestriction: {
240+
restrictionType,
241+
locations,
242+
},
243243
httpVersion,
244244
ipv6Enabled: isIpv6Enabled ? t.yes : t.no,
245245
lastModified: lastModified.toISOString(),

‎src/services/cloudfront/schema.graphql‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type awsCloudfront implements awsBaseService @key(fields: "id") {
1010
ipv6Enabled: String @search(by: [hash])
1111
defaultRootObject: String @search(by: [hash])
1212
webAclId: String @search(by: [hash])
13-
geoRestrictions: String @search(by: [hash, regexp])
13+
geoRestriction: awsCloudfrontGeoRestriction
1414
customErrorResponses: [awsCloudfrontCustomErrorResponse]
1515
defaultCacheBehavior: awsCloudfrontCacheBehavior
1616
orderedCacheBehaviors: [awsCloudfrontCacheBehavior]
@@ -21,6 +21,7 @@ type awsCloudfront implements awsBaseService @key(fields: "id") {
2121
s3: [awsS3] @hasInverse(field: cloudfrontDistributions)
2222
tags: [awsRawTag]
2323
webAcl: [awsWafV2WebAcl] @hasInverse(field: cloudfront)
24+
cloudwatch: [awsCloudwatch] @hasInverse(field: cloudfront)
2425
}
2526

2627
type awsCloudfrontOriginData {
@@ -94,3 +95,8 @@ type awsCloudfrontLoggingConfig {
9495
bucket: String @search(by: [hash, regexp])
9596
prefix: String @search(by: [hash, regexp])
9697
}
98+
99+
type awsCloudfrontGeoRestriction {
100+
restrictionType: String @search(by: [hash, regexp])
101+
locations: [String] @search(by: [hash, regexp])
102+
}

‎src/services/cloudwatch/connections.ts‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { ServiceConnection } from '@cloudgraph/sdk'
22
import { isEmpty } from 'lodash'
33
import { RawAwsCloudwatch } from './data'
4+
import { RawAwsCloudfront } from '../cloudfront/data'
45
import services from '../../enums/services'
6+
import { globalRegionName } from '../../enums/regions'
57

68
export default ({
79
service: cloudwatch,
@@ -15,7 +17,11 @@ export default ({
1517
}): {
1618
[property: string]: ServiceConnection[]
1719
} => {
18-
const { AlarmName: id, AlarmActions: alarmActions } = cloudwatch
20+
const {
21+
AlarmName: id,
22+
AlarmActions: alarmActions,
23+
Dimensions: dimensions,
24+
} = cloudwatch
1925
const connections: ServiceConnection[] = []
2026

2127
/**
@@ -40,6 +46,33 @@ export default ({
4046
}
4147
}
4248

49+
/**
50+
* Find Cloudfront
51+
* related to the cloudwatch
52+
*/
53+
const cloudfronts = data.find(({ name }) => name === services.cloudfront)
54+
if (cloudfronts?.data?.[globalRegionName]) {
55+
const cloudfrontsInRegion: RawAwsCloudfront[] = cloudfronts.data[
56+
globalRegionName
57+
].filter(({ summary: { Id: cloudfrontId } }: RawAwsCloudfront) =>
58+
dimensions?.some(d => d.Value === cloudfrontId)
59+
)
60+
61+
if (!isEmpty(cloudfrontsInRegion)) {
62+
for (const cf of cloudfrontsInRegion) {
63+
const {
64+
summary: { Id: cloudfrontId },
65+
}: RawAwsCloudfront = cf
66+
connections.push({
67+
id: cloudfrontId,
68+
resourceType: services.cloudfront,
69+
relation: 'child',
70+
field: 'cloudfront',
71+
})
72+
}
73+
}
74+
}
75+
4376
const result = {
4477
[id]: connections,
4578
}

0 commit comments

Comments
 (0)