feat: trivy Image scanning module Integration #982
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Shivam-nagar23
changed the title
Shivam-nagar23
changed the title
Shivam-nagar23
changed the title
milindk8
reviewed
May 29, 2023
| getModuleConfigured(ModuleNameMap.BLOB_STORAGE), | ||
| ]).then(([ciConfig, securityInfo, moduleConfig]) => { | ||
| getModuleInfo(ModuleNameMap.SECURITY_TRIVY), | ||
| ]).then(([ciConfig, securityInfo, moduleConfig,trivysecurityInfo]) => { |
There was a problem hiding this comment.
trivySecurityInfo fix camel casing
| return { | ||
| pipelineList: ciConfig.result, | ||
| securityModuleInstalled: securityInfo?.result?.status === ModuleStatus.INSTALLED, | ||
| securityModuleInstalled: (securityInfo?.result?.status === ModuleStatus.INSTALLED || trivysecurityInfo?.result?.status === ModuleStatus.INSTALLED), |
| try { | ||
| const { result } = await getModuleInfo(ModuleNameMap.SECURITY) | ||
| if (result?.status === ModuleStatus.INSTALLED) { | ||
| const { result:result2 } =await getModuleInfo(ModuleNameMap.SECURITY_TRIVY) |
There was a problem hiding this comment.
If you need both calls data use Promise.all
| isSecurityModuleInstalled={ | ||
| initDataResults[1]?.['value']?.['result']?.status === | ||
| ModuleStatus.INSTALLED || false | ||
| (initDataResults[1]?.['value']?.['result']?.status === |
| scanned: false, | ||
| isLoading: !!artifactId, | ||
| isError: false, | ||
| ScanToolId:0, |
There was a problem hiding this comment.
0 can be an Id use null instead if you want intial state & format the code
| <button | ||
| type="button" | ||
| className="cta" | ||
| onClick={() => { |
| setSelectedModule({ | ||
| ...currentModule, | ||
| installationStatus: result.status, | ||
| moduleType:result.moduleType, |
|
|
||
| } | ||
| export interface ModuleEnableCallType{ | ||
| moduleName:string |
There was a problem hiding this comment.
is all the params are optional
| isModuleConfigurable?: boolean | ||
| isModuleConfigured?: boolean | ||
| moduleResourcesStatus?: ModuleResourceStatus[] | ||
| enabled?:boolean |
| className?: string | ||
| handleModuleCardClick?: (moduleDetails: ModuleDetails, fromDiscoverModules: boolean) => void | ||
| fromDiscoverModules?: boolean | ||
| datatestid?:string |
| setSecurityModuleInstalled(true) | ||
| } | ||
| } catch (error) {} | ||
| Promise.all([getModuleInfo(ModuleNameMap.SECURITY),getModuleInfo(ModuleNameMap.SECURITY_TRIVY)]).then(([clairResponse,trivyResponse])=>{ |
There was a problem hiding this comment.
Please format this code
| title={EMPTY_STATE_STATUS.CI_DEATILS_NO_VULNERABILITY_FOUND} | ||
| children={ | ||
| <span className="flex workflow__header dc__border-radius-24 bcn-0"> | ||
| Scanned By {securityData.ScanToolId === SCAN_TOOL_ID_TRIVY ? 'Trivy ' : 'Clair '}{' '} |
| <div className="flexbox dc__content-space"> | ||
| <span className="flex left security-tab__last-scanned ">Scanned on {mat.lastExecution} </span> | ||
| <span className="flex right"> | ||
| Scanned By{' '} |
| <div className="modal-body--scan-details"> | ||
| {this.renderHeader()} | ||
| <div className="trigger-modal__body trigger-modal__body--security-scan"> | ||
| <EmptyState> |
There was a problem hiding this comment.
Use generic empty state
| const isTrivy =(scanToolId === SCAN_TOOL_ID_TRIVY) | ||
| return ( | ||
| <> | ||
| <span className="dc__italic-font-style fw-4 dc__devtron-breadcrumb">Scanned by <span className="fw-6">{isTrivy ? IMAGE_SCAN_TOOL.Trivy : IMAGE_SCAN_TOOL.Clair}</span></span> |
| export const getSecurityModulesInfoInstalledStatus = async (): Promise<ModuleInfoResponse> => { | ||
| // getting Security Module Installation status | ||
| const [clairResponse, trivyResponse] = await Promise.all([ | ||
| getModuleInfo(ModuleNameMap.SECURITY), |
There was a problem hiding this comment.
Wrap this into try catch to handle error
vivek-devtron
approved these changes
May 31, 2023
milindk8
reviewed
Jun 1, 2023
milindk8
approved these changes
Jun 1, 2023
7 tasks
|
SonarCloud Quality Gate failed.
|
Coverage report❌ An unexpected error occurred. For more details, check console
Test suite run failedFailed tests: 17/103. Failed suites: 3/23.Report generated by 🧪jest coverage report action from 4d85725 |
kartik-579
approved these changes
Jun 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Following Changes have been done to support Image scanning tool trivy for vulnerabilities where state has been showcased when both clair and trivy are installed.
Fixes # (#AB2842)
PR- BE
Tech Doc -Tech Doc
Central-APi PR- PR
Type of change
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Checklist: