Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rego title in OSS defsec Part2 #1386

Merged
merged 4 commits into from
Jul 28, 2023

Conversation

mjshastha
Copy link
Contributor

@mjshastha mjshastha commented Jul 14, 2023

we introduced three new rego checks to the oss. These checks are currently part of the commercial but not included in the oss.
Additionally, there are certain checks in the oss where two checks are combined into a single check. However, in the commercial, these checks are treated as two separate checks. Therefore, we will be splitting the combined checks from the oss into two distinct checks to align with the commercial implementation.

Resolves: SLK-69409

@CLAassistant
Copy link

CLAassistant commented Jul 14, 2023

CLA assistant check
All committers have signed the CLA.

@mjshastha mjshastha force-pushed the MS_SLK-69409-new_rego_additions branch from 22d8c10 to 58ccd85 Compare July 14, 2023 07:11
@simar7 simar7 requested review from chen-keinan and removed request for giorod3 July 16, 2023 08:16
@simar7
Copy link
Member

simar7 commented Jul 16, 2023

@chen-keinan PTAL after you are back, thanks.

@mjshastha mjshastha force-pushed the MS_SLK-69409-new_rego_additions branch from 58ccd85 to c5ae09c Compare July 17, 2023 09:11
Copy link
Contributor

@dheerajkadri dheerajkadri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!!

@mjshastha mjshastha force-pushed the MS_SLK-69409-new_rego_additions branch from c5ae09c to 2c6c5a8 Compare July 17, 2023 09:36
@chen-keinan
Copy link
Contributor

lgtm

chen-keinan
chen-keinan previously approved these changes Jul 26, 2023
@simar7
Copy link
Member

simar7 commented Jul 27, 2023

Looks like tests are failing and there's a merge conflict with upstream after the first PR was merged.

ManojShastha and others added 2 commits July 28, 2023 10:44
…ently part of the commercial but not included in the oss.

Additionally, there are certain checks in the oss where two checks are combined into a single check.
However, in the commercial, these checks are treated as two separate checks.
Therefore, we will be splitting the combined checks from the oss into two distinct checks to align with the commercial implementation.
@simar7 simar7 force-pushed the MS_SLK-69409-new_rego_additions branch from b1e1569 to b818199 Compare July 28, 2023 17:05
@simar7 simar7 merged commit 0d4c4b5 into aquasecurity:master Jul 28, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants