FAI-10727 | AWS V2 query grabs external vuln id (#1460)

faros-ai · May 15, 2024 · 94aa543 · 94aa543
1 parent e2664af
commit 94aa543
Show file tree

Hide file tree

Showing 9 changed files with 210 additions and 61 deletions.
diff --git a/destinations/airbyte-faros-destination/src/converters/vanta/README.md b/destinations/airbyte-faros-destination/src/converters/vanta/README.md
@@ -31,7 +31,9 @@ query vcsRepositoryQuery($vcsRepoNames: [String], $limit: Int) {
 ```
 
 This query shows that the returned vcs_Repository objects need to have their names correspond to the
-input query names. The vcsRepoNames are constructed out of the "repositoryName" field from the streams.
+input query names. The vcsRepoNames are constructed out of the "repositoryName" field from the streams
+coming from the source.
+
 
 # The source vanta GraphQL Queries and types (sources/vanta-source/resources/*.gql)
 

diff --git a/destinations/airbyte-faros-destination/src/converters/vanta/types.ts b/destinations/airbyte-faros-destination/src/converters/vanta/types.ts
@@ -3,7 +3,7 @@ type OptBool = boolean | null | undefined;
 type OptNumber = number | null | undefined;
 
 export interface BaseVulnerabilityType {
-  uid: OptString;
+  uid: string;
   displayName: OptString;
   createdAt: OptString;
   externalURL: OptString;
@@ -23,7 +23,7 @@ export interface GithubSecurityAdvisory {
 }
 
 export interface GithubVulnerabilityData {
-  uid: OptString;
+  uid: string;
   displayName: OptString;
   createdAt: OptString;
   externalURL: OptString;
@@ -41,7 +41,7 @@ export interface AWSFindings {
 }
 
 export interface AWSVulnerabilityData {
-  uid: OptString;
+  uid: string;
   displayName: OptString;
   createdAt: OptString;
   externalURL: OptString;
@@ -52,6 +52,7 @@ export interface AWSVulnerabilityData {
   repositoryName: OptString;
   repositoryArn: OptString;
   findings: AWSFindings[];
+  imageTags: string[];
 }
 
 export interface AWSV2Ignored {
@@ -65,12 +66,12 @@ export interface AWSV2Asset {
 }
 
 export interface AWSV2VulnerabilityData {
-  uid: OptString;
+  uid: string;
   displayName: OptString;
   createdAt: OptString;
   externalURL: OptString;
   severity: OptString;
-
+  externalVulnerabilityId: OptString;
   packageName: OptString;
   packageIdentifier: OptString;
   description: OptString;
@@ -83,6 +84,8 @@ export interface AWSV2VulnerabilityData {
   imageDigest: OptString;
 }
 
+export type BaseAWSVuln = AWSVulnerabilityData | AWSV2VulnerabilityData;
+
 export const vulnTypeOptions: string[] = ['git', 'aws', 'awsv2'];
 
 export interface VcsOrgKey {