Skip to content

Commit 84e0601

Browse files
author
Marco Franceschi
committed
fix: Fixed eksCluster schema
1 parent 1714f24 commit 84e0601

2 files changed

Lines changed: 76 additions & 5 deletions

File tree

src/services/index.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import CloudGraph, {
2-
Service,
3-
Opts,
4-
ProviderData
5-
} from '@cloudgraph/sdk'
1+
import CloudGraph, { Service, Opts, ProviderData } from '@cloudgraph/sdk'
62
import { loadFilesSync } from '@graphql-tools/load-files'
73
import { mergeTypeDefs } from '@graphql-tools/merge'
84
import AWS, { Config } from 'aws-sdk'
@@ -660,6 +656,11 @@ export default class Provider extends CloudGraph.Client {
660656
let mergedRawData: rawDataInterface[] = []
661657
const tagRegion = 'aws-global'
662658
const tags = { className: 'Tag', name: 'tag', data: { [tagRegion]: [] } }
659+
const accounts = {
660+
className: 'AwsAccount',
661+
name: 'account',
662+
data: { [tagRegion]: [] },
663+
}
663664
// If the user has passed aws creds as env variables, dont use profile list
664665
if (usingEnvCreds) {
665666
rawData = await this.getRawData(
@@ -682,6 +683,10 @@ export default class Provider extends CloudGraph.Client {
682683
}
683684
}
684685
const { accountId } = await this.getIdentity(account)
686+
accounts.data[tagRegion].push({
687+
id: accountId,
688+
regions: configuredRegions.split(','),
689+
})
685690
if (!crawledAccounts.find(val => val === accountId)) {
686691
crawledAccounts.push(accountId)
687692
const newRawData = await this.getRawData(account, opts)

src/types/generated.ts

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,72 @@ export type AwsAccessLogSettings = {
128128
id?: Maybe<Scalars['ID']>;
129129
};
130130

131+
export type AwsAccount = {
132+
alb?: Maybe<Array<Maybe<AwsAlb>>>;
133+
apiGatewayRestApi?: Maybe<Array<Maybe<AwsApiGatewayRestApi>>>;
134+
apiGatewayStage?: Maybe<Array<Maybe<AwsApiGatewayStage>>>;
135+
appSync?: Maybe<Array<Maybe<AwsAppSync>>>;
136+
asg?: Maybe<Array<Maybe<AwsAsg>>>;
137+
clientVpnEndpoint?: Maybe<Array<Maybe<AwsClientVpnEndpoint>>>;
138+
cloud9Environment?: Maybe<Array<Maybe<AwsCloud9Environment>>>;
139+
cloudFormationStack?: Maybe<Array<Maybe<AwsCloudFormationStack>>>;
140+
cloudFormationStackSet?: Maybe<Array<Maybe<AwsCloudFormationStackSet>>>;
141+
cloudfront?: Maybe<Array<Maybe<AwsCloudfront>>>;
142+
cloudtrail?: Maybe<Array<Maybe<AwsCloudtrail>>>;
143+
cloudwatch?: Maybe<Array<Maybe<AwsCloudwatch>>>;
144+
codebuilds?: Maybe<Array<Maybe<AwsCodebuild>>>;
145+
cognitoIdentityPool?: Maybe<Array<Maybe<AwsCognitoIdentityPool>>>;
146+
cognitoUserPool?: Maybe<Array<Maybe<AwsCognitoUserPool>>>;
147+
customerGateway?: Maybe<Array<Maybe<AwsCustomerGateway>>>;
148+
dynamodb?: Maybe<Array<Maybe<AwsDynamoDbTable>>>;
149+
ebs?: Maybe<Array<Maybe<AwsEbs>>>;
150+
ec2Instance?: Maybe<Array<Maybe<AwsEc2>>>;
151+
ecr?: Maybe<Array<Maybe<AwsEcr>>>;
152+
ecsCluster?: Maybe<Array<Maybe<AwsEcsCluster>>>;
153+
ecsContainer?: Maybe<Array<Maybe<AwsEcsContainer>>>;
154+
ecsService?: Maybe<Array<Maybe<AwsEcsService>>>;
155+
ecsTask?: Maybe<Array<Maybe<AwsEcsTask>>>;
156+
efs?: Maybe<Array<Maybe<AwsEfs>>>;
157+
eip?: Maybe<Array<Maybe<AwsEip>>>;
158+
eksCluster?: Maybe<Array<Maybe<AwsEksCluster>>>;
159+
elastiCacheCluster?: Maybe<Array<Maybe<AwsElastiCacheCluster>>>;
160+
elastiCacheReplicationGroup?: Maybe<Array<Maybe<AwsElastiCacheReplicationGroup>>>;
161+
elasticBeanstalkApp?: Maybe<Array<Maybe<AwsElasticBeanstalkApp>>>;
162+
elasticBeanstalkEnv?: Maybe<Array<Maybe<AwsElasticBeanstalkEnv>>>;
163+
elasticSearchDomains?: Maybe<Array<Maybe<AwsElasticSearchDomain>>>;
164+
elb?: Maybe<Array<Maybe<AwsElb>>>;
165+
emrCluster?: Maybe<Array<Maybe<AwsEmrCluster>>>;
166+
flowLogs?: Maybe<Array<Maybe<AwsFlowLog>>>;
167+
guardDutyDetectors?: Maybe<Array<Maybe<AwsGuardDutyDetector>>>;
168+
iamPolicies?: Maybe<Array<Maybe<AwsIamPolicy>>>;
169+
iamRoles?: Maybe<Array<Maybe<AwsIamRole>>>;
170+
iamUsers?: Maybe<Array<Maybe<AwsIamUser>>>;
171+
id: Scalars['String'];
172+
igw?: Maybe<Array<Maybe<AwsIgw>>>;
173+
kinesisFirehose?: Maybe<Array<Maybe<AwsKinesisFirehose>>>;
174+
kms?: Maybe<Array<Maybe<AwsKms>>>;
175+
lambda?: Maybe<Array<Maybe<AwsLambda>>>;
176+
managedAirflows?: Maybe<Array<Maybe<AwsManagedAirflow>>>;
177+
nacl?: Maybe<Array<Maybe<AwsNetworkAcl>>>;
178+
natGateway?: Maybe<Array<Maybe<AwsNatGateway>>>;
179+
networkInterface?: Maybe<Array<Maybe<AwsNetworkInterface>>>;
180+
rdsCluster?: Maybe<Array<Maybe<AwsRdsCluster>>>;
181+
rdsDbInstance?: Maybe<Array<Maybe<AwsRdsDbInstance>>>;
182+
redshiftClusters?: Maybe<Array<Maybe<AwsRedshiftCluster>>>;
183+
routeTable?: Maybe<Array<Maybe<AwsRouteTable>>>;
184+
s3?: Maybe<Array<Maybe<AwsS3>>>;
185+
secretsManager?: Maybe<Array<Maybe<AwsSecretsManager>>>;
186+
securityGroups?: Maybe<Array<Maybe<AwsSecurityGroup>>>;
187+
sns?: Maybe<Array<Maybe<AwsSns>>>;
188+
sqs?: Maybe<Array<Maybe<AwsSqs>>>;
189+
subnet?: Maybe<Array<Maybe<AwsSubnet>>>;
190+
transitGateway?: Maybe<Array<Maybe<AwsTransitGateway>>>;
191+
transitGatewayAttachment?: Maybe<Array<Maybe<AwsTransitGatewayAttachment>>>;
192+
vpc?: Maybe<Array<Maybe<AwsVpc>>>;
193+
vpnConnection?: Maybe<Array<Maybe<AwsVpnConnection>>>;
194+
vpnGateway?: Maybe<Array<Maybe<AwsVpnGateway>>>;
195+
};
196+
131197
export type AwsAccountRecoverySetting = {
132198
id: Scalars['String'];
133199
name?: Maybe<Scalars['String']>;

0 commit comments

Comments
 (0)