Merge pull request #959 from suhasgumma/fix-command

fix: keep user formatting when autofixing

.gitattributes

@@ -1,2 +0,0 @@
-# Keep CRLF newlines in appropriate test files to have reproducible tests
-core/pkg/fixhandler/testdata/inserts/*-crlf-newlines.yaml text eol=crlf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,32 +2,33 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: 'bug'
+labels: ''
 assignees: ''
 
 ---
 
-# Description
-<!-- A clear and concise description of what the bug is. -->
+# Describe the bug
+A clear and concise description of what the bug is.
 
 # Environment
-OS: ` ` <!-- the OS + version you’re running Kubescape on, e.g Ubuntu 22.04 LTS  -->
-Version: ` ` <!-- the version that Kubescape reports when you run `kubescape version`  -->
- 
+OS: the OS + version you’re running Kubescape on, e.g Ubuntu 22.04 LTS
+Version: the version that Kubescape reports when you run `kubescape version`
+```
+Your current version is:
+```
+
 # Steps To Reproduce
-<!--
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
--->
 
 # Expected behavior
-<!-- A clear and concise description of what you expected to happen. -->
+A clear and concise description of what you expected to happen.
 
 # Actual Behavior
-<!-- A clear and concise description of what happened. If applicable, add screenshots to help explain your  problem. -->
+A clear and concise description of what happened. If applicable, add screenshots to help explain your problem.
 
 # Additional context
-<!-- Add any other context about the problem here. -->
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,23 +2,18 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: 'feature'
+labels: ''
 assignees: ''
 
 ---
+**Is your feature request related to a problem? Please describe.**</br>
+ > A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-## Overview
-<!-- A brief overview of the related current state -->
+**Describe the solution you'd like.**</br>
+ > A clear and concise description of what you want to happen.
 
-## Problem
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+**Describe alternatives you've considered.**</br>
+ > A clear and concise description of any alternative solutions or features you've considered.
 
-## Solution
-<!-- A clear and concise description of what you want to happen. -->
-
-## Alternatives
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-
-## Additional context
-<!-- Add any other context or screenshots about the feature request here. -->
- 
+**Additional context.**</br>
+ > Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,39 +1,13 @@
-## Overview
-<!-- Please provide a brief overview of the changes made in this pull request. e.g. current behavior/future behavior -->
+## Describe your changes
 
-<!-- 
-## Additional Information
+## Screenshots - If Any (Optional)
 
-> Any additional information that may be useful for reviewers to know 
--->
+## This PR fixes:
 
-<!--
-## How to Test
+* Resolved #
 
-> Please provide instructions on how to test the changes made in this pull request
--->
-
-<!--
-## Examples/Screenshots
-
-> Here you add related screenshots 
--->
-
-<!-- 
-## Related issues/PRs:
-
-Here you add related issues and PRs.
-If this resolved an issue, write "Resolved #<issue number>
-
-e.g. If this PR resolves issues 1 and 2, it should look as follows:
-* Resolved #1
-* Resolved #2
--->
-
-<!--
 ## Checklist before requesting a review
-
-put an [x] in the box to get it checked 
+<!-- put an [x] in the box to get it checked -->
 
 - [ ] My code follows the style guidelines of this project
 - [ ] I have commented on my code, particularly in hard-to-understand areas
@@ -42,6 +16,3 @@ put an [x] in the box to get it checked
 - [ ] New and existing unit tests pass locally with my changes
 
 **Please open the PR against the `dev` branch (Unless the PR contains only documentation changes)**
-
--->
- 

.github/workflows/01-golang-lint.yaml

@@ -1,64 +0,0 @@
-name: golangci-lint
-on:
-  push:
-    branches:
-      - dev
-  pull_request:
-    types: [ edited, opened, synchronize, reopened ]
-    branches: 
-      - 'master'
-      - 'main'
-      - 'dev'
-    paths-ignore:
-      - '**.yaml'
-      - '**.md'
-      - '**.sh'
-      - 'website/*'
-      - 'examples/*'
-      - 'docs/*'
-      - 'build/*'
-      - '.github/*'
-permissions:
-  contents: read
-  # Optional: allow read access to pull request. Use with `only-new-issues` option.
-  pull-requests: read
-jobs:
-  golangci:
-    name: lint
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.19
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Install libgit2
-        run: make libgit2
-      - name: golangci-lint
-        continue-on-error: true
-        uses: golangci/golangci-lint-action@v3
-        with:
-          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: latest
-
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          args: --timeout 10m --build-tags=static
-          #--new-from-rev dev
-
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          only-new-issues: true
-
-          # Optional: if set to true then the all caching functionality will be complete disabled,
-          #           takes precedence over all other caching options.
-          # skip-cache: true
-
-          # Optional: if set to true then the action don't cache or restore ~/go/pkg.
-          # skip-pkg-cache: true
-
-          # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
-          # skip-build-cache: true

.github/workflows/build-image.yaml

@@ -26,24 +26,14 @@ on:
         type: boolean
         description: 'support amd64/arm64'
 
-jobs:
-  check-secret:
-    name: check if QUAYIO_REGISTRY_USERNAME & QUAYIO_REGISTRY_PASSWORD is set in github secrets
-    runs-on: ubuntu-latest
-    outputs:
-      is-secret-set: ${{ steps.check-secret-set.outputs.is-secret-set }}
-    steps:
-      - name: Check whether unity activation requests should be done
-        id: check-secret-set
-        env:
-            QUAYIO_REGISTRY_USERNAME: ${{ secrets.QUAYIO_REGISTRY_USERNAME }}
-            QUAYIO_REGISTRY_PASSWORD: ${{ secrets.QUAYIO_REGISTRY_PASSWORD }}
-        run: |
-            echo "is-secret-set=${{ env.QUAYIO_REGISTRY_USERNAME != '' && env.QUAYIO_REGISTRY_PASSWORD != '' }}" >> $GITHUB_OUTPUT
+    secrets:
+      QUAYIO_REGISTRY_USERNAME:
+        required: true
+      QUAYIO_REGISTRY_PASSWORD:
+        required: true
 
+jobs:
   build-image:
-    needs: [check-secret]
-    if: needs.check-secret.outputs.is-secret-set == 'true'
     name: Build image and upload to registry
     runs-on: ubuntu-latest
     permissions:
@@ -71,10 +61,10 @@ jobs:
       - name: Build and push image
         if: ${{ inputs.support_platforms }}
         run: docker buildx build . --file build/Dockerfile --tag ${{ inputs.image_name }}:${{ inputs.image_tag }} --tag ${{ inputs.image_name }}:latest --build-arg image_version=${{ inputs.image_tag }} --build-arg client=${{ inputs.client }} --push --platform linux/amd64,linux/arm64
-
+     
       - name: Build and push image without amd64/arm64 support
         if: ${{ !inputs.support_platforms }}
-        run: docker buildx build . --file build/Dockerfile --tag ${{ inputs.image_name }}:${{ inputs.image_tag }} --tag ${{ inputs.image_name }}:latest --build-arg image_version=${{ inputs.image_tag }} --build-arg client=${{ inputs.client }} --push 
+        run: docker buildx build . --file build/Dockerfile --tag ${{ inputs.image_name }}:${{ inputs.image_tag }} --tag ${{ inputs.image_name }}:latest --build-arg image_version=${{ inputs.image_tag }} --build-arg client=${{ inputs.client }} --push
 
       - name: Install cosign
         uses: sigstore/cosign-installer@main
@@ -85,5 +75,6 @@ jobs:
         env:
           COSIGN_EXPERIMENTAL: "true"
         run: |
-            cosign sign --force ${{ inputs.image_name }}
+            cosign sign --force ${{ inputs.image_name }}:latest
+            cosign sign --force ${{ inputs.image_name }}:${{ inputs.image_tag }}
 

.github/workflows/build.yaml

@@ -2,18 +2,10 @@ name: build
 
 on:
   push:
-    branches: 
-      - 'master'
-      - 'main'
+    branches: [ master ]
     paths-ignore:
-      - '**.yaml'
+      # Do not run the pipeline if only Markdown files changed
       - '**.md'
-      - '**.sh'
-      - 'website/*'
-      - 'examples/*'
-      - 'docs/*'
-      - 'build/*'
-      - '.github/*'
 jobs:
   test:
     uses: ./.github/workflows/test.yaml
@@ -37,7 +29,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -46,7 +38,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.18
 
       - name: Install MSYS2 & libgit2 (Windows)
         shell: cmd
@@ -64,8 +56,8 @@ jobs:
           CGO_ENABLED: 1
         run: python3 --version && python3 build.py
  
-      - name: Upload release binaries (Windows / MacOS)
-        id: upload-release-asset-win-macos
+      - name: Upload release binaries
+        id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -74,22 +66,9 @@ jobs:
           asset_path: build/${{ matrix.os }}/kubescape
           asset_name: kubescape-${{ matrix.os }}
           asset_content_type: application/octet-stream
-        if: matrix.os != 'ubuntu-20.04'
 
-      - name: Upload release binaries (Linux)
-        id: upload-release-asset-linux
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: build/ubuntu-latest/kubescape
-          asset_name: kubescape-ubuntu-latest
-          asset_content_type: application/octet-stream
-        if: matrix.os == 'ubuntu-20.04'
-
-      - name: Upload release hash (Windows / MacOS)
-        id: upload-release-hash-win-macos
+      - name: Upload release hash
+        id: upload-release-hash
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -98,27 +77,15 @@ jobs:
           asset_path: build/${{ matrix.os }}/kubescape.sha256
           asset_name: kubescape-${{ matrix.os }}-sha256
           asset_content_type: application/octet-stream
-        if: matrix.os != 'ubuntu-20.04'
-
-      - name: Upload release hash (Linux)
-        id: upload-release-hash-linux
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: build/ubuntu-latest/kubescape.sha256
-          asset_name: kubescape-ubuntu-latest-sha256
-          asset_content_type: application/octet-stream     
-        if: matrix.os == 'ubuntu-20.04'
-
+  
   publish-image:
+    if: ${{ github.repository == 'kubescape/kubescape' }} # TODO
     uses: ./.github/workflows/build-image.yaml
     needs: create-release
     with:
       client: "image-release"
       image_name: "quay.io/${{ github.repository_owner }}/kubescape"
       image_tag: "v2.0.${{ github.run_number }}"
-      support_platforms: true
+      support_platforms: false
       cosign: true
     secrets: inherit

.github/workflows/build_dev.yaml

@@ -4,14 +4,8 @@ on:
   push:
     branches: [ dev ]
     paths-ignore:
-      - '**.yaml'
+      # Do not run the pipeline if only Markdown files changed
       - '**.md'
-      - '**.sh'
-      - 'website/*'
-      - 'examples/*'
-      - 'docs/*'
-      - 'build/*'
-      - '.github/*'
 jobs:
   test:
     uses: ./.github/workflows/test.yaml
@@ -19,13 +13,14 @@ jobs:
       release: "v2.0.${{ github.run_number }}"
       client: test
  
-  # publish-dev-image:
-  #   uses: ./.github/workflows/build-image.yaml
-  #   needs: test
-  #   with:
-  #     client: "image-dev"
-  #     image_name: "quay.io/${{ github.repository_owner }}/kubescape"
-  #     image_tag: "dev-v2.0.${{ github.run_number }}"
-  #     support_platforms: true
-  #     cosign: true
-  #   secrets: inherit
+  publish-dev-image:
+    if: ${{ github.repository == 'kubescape/kubescape' }} # TODO
+    uses: ./.github/workflows/build-image.yaml
+    needs: test
+    with:
+      client: "image-dev"
+      image_name: "quay.io/${{ github.repository_owner }}/kubescape"
+      image_tag: "dev-v2.0.${{ github.run_number }}"
+      support_platforms: false
+      cosign: true
+    secrets: inherit

.github/workflows/community.yml

@@ -0,0 +1,22 @@
+on:
+  fork:
+  issues:
+    types: [opened]
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened]
+  pull_request_review_comment:
+    types: [created]
+
+jobs:
+  welcome:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: EddieHubCommunity/gh-action-community/src/welcome@main
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          issue-message: '<h3>Hi! Welcome to Kubescape. Thank you for taking the time and reporting an issue</h3>'
+          pr-message: '<h3>Hi! Welcome to Kubescape. Thank you for taking the time and contributing to the open source community</h3>'
+          footer: '<h4>We will try to review as soon as possible!</h4>'

.github/workflows/post-release.yaml

@@ -3,9 +3,7 @@ name: create release digests
 on:
   release:
     types: [ published]
-    branches:
-    - 'master'
-    - 'main'
+    branches: [ master ]
   
 jobs:
   once:

.github/workflows/pr_checks.yaml

@@ -2,20 +2,12 @@ name: pr-checks
 
 on:
   pull_request:
+    branches: [ master, dev ]
     types: [ edited, opened, synchronize, reopened ]
-    branches: 
-      - 'master'
-      - 'main'
-      - 'dev'
     paths-ignore:
+      # Do not run the pipeline if only Markdown files changed
       - '**.yaml'
       - '**.md'
-      - '**.sh'
-      - 'website/*'
-      - 'examples/*'
-      - 'docs/*'
-      - 'build/*'
-      - '.github/*'
 jobs:
   test:
     uses: ./.github/workflows/test.yaml

.github/workflows/release.yaml

@@ -38,4 +38,4 @@ jobs:
           release_name: ${{ inputs.release_name }}
           draft: ${{ inputs.draft }}
           prerelease: false
-   
+   

.github/workflows/test.yaml

@@ -19,14 +19,14 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - name: Cache Go modules (Linux)
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-latest' 
         uses: actions/cache@v3
         with:
           path: |
@@ -61,7 +61,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.18
 
       - name: Install MSYS2 & libgit2 (Windows)
         shell: cmd
@@ -73,10 +73,10 @@ jobs:
         if: matrix.os != 'windows-latest'
  
       - name: Test core pkg
-        run: go test "-tags=static,gitenabled" -v ./...
+        run: go test -tags=static -v ./...
 
       - name: Test httphandler pkg
-        run: cd httphandler && go test "-tags=static,gitenabled" -v ./...
+        run: cd httphandler && go test -tags=static -v ./...
 
       - name: Build
         env:
@@ -85,16 +85,9 @@ jobs:
           CGO_ENABLED: 1
         run: python3 --version && python3 build.py
 
-      - name: Smoke Testing (Windows / MacOS)
+      - name: Smoke Testing
         env:
           RELEASE: ${{ inputs.release }} 
           KUBESCAPE_SKIP_UPDATE_CHECK: "true"
         run: python3 smoke_testing/init.py ${PWD}/build/${{ matrix.os }}/kubescape
-        if: matrix.os != 'ubuntu-20.04'
-
-      - name: Smoke Testing (Linux)
-        env:
-          RELEASE: ${{ inputs.release }} 
-          KUBESCAPE_SKIP_UPDATE_CHECK: "true"
-        run: python3 smoke_testing/init.py ${PWD}/build/ubuntu-latest/kubescape
-        if: matrix.os == 'ubuntu-20.04'        
+        

.gitignore

@@ -5,5 +5,4 @@
 *.pyc*
 .idea
 .history
-ca.srl
-*.out
+ca.srl

.golangci.yml

@@ -1,57 +0,0 @@
-linters-settings:
-  govet:
-    check-shadowing: true
-  dupl:
-    threshold: 200
-  goconst:
-    min-len: 3
-    min-occurrences: 2
-  gocognit:
-    min-complexity: 65
-
-linters:
-  enable:
-    - gosec
-    - staticcheck
-    - nolintlint
-    - gofmt
-    - unused
-    - govet
-    - bodyclose
-    - typecheck
-    - goimports
-    - ineffassign
-    - gosimple
-  disable:
-    # temporarily disabled
-    - varcheck
-    - errcheck
-    - dupl
-    - gocritic
-    - gocognit
-    - nakedret
-    - revive
-    - stylecheck
-    - unconvert
-    - unparam
-    #- forbidigo # <- see later
-    # should remain disabled
-    - deadcode   # deprecated linter
-    - maligned
-    - lll
-    - gochecknoinits
-    - gochecknoglobals
-issues:
-  exclude-rules:
-    - linters:
-      - revive
-      text: "var-naming"
-    - linters:
-      - revive
-      text: "type name will be used as (.+?) by other packages, and that stutters"
-    - linters:
-      - stylecheck
-      text: "ST1003"
-run:
-  skip-dirs:
-    - git2go

CODE_OF_CONDUCT.md

@@ -1,3 +1,127 @@
-## Code of Conduct
+# Contributor Covenant Code of Conduct
 
-The Kubescape project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement [here](mailto:ben@armosec.io).
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -4,16 +4,14 @@ First, it is awesome that you are considering contributing to Kubescape! Contrib
 
 When contributing, we categorize contributions into two:
 * Small code changes or fixes, whose scope is limited to a single or two files
-* Complex features and improvements, with potentially unlimited scope
+* Complex features and improvements, that are not limited
 
 If you have a small change, feel free to fire up a Pull Request.
 
-When planning a bigger change, please first discuss the change you wish to make via an issue,
-so the maintainers are able to help guide you and let you know if you are going in the right direction.
+When planning a bigger change, please first discuss the change you wish to make via issue,
+email, or any other method with the owners of this repository before making a change. Most likely your changes or features are great, but sometimes we might be already going in this direction (or the exact opposite ;-) ) and we don't want to waste your time.
 
-## Code of Conduct
-
-Please follow our [code of conduct](CODE_OF_CONDUCT.md) in all of your interactions within the project.
+Please note we have a code of conduct, please follow it in all your interactions with the project.
 
 ## Pull Request Process
 
@@ -24,41 +22,79 @@ Please follow our [code of conduct](CODE_OF_CONDUCT.md) in all of your interacti
 3. Open Pull Request to `dev` branch - we test the component before merging into the `master` branch
 4. We will merge the Pull Request once you have the sign-off.
 
-## Developer Certificate of Origin
+## Code of Conduct
 
-All commits to the project must be "signed off", which states that you agree to the terms of the [Developer Certificate of Origin](https://developercertificate.org/).  This is done by adding a "Signed-off-by:" line in the commit message, with your name and email address.
+### Our Pledge
 
-Commits made through the GitHub web application are automatically signed off.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
 
-### Configuring Git to sign off commits
+### Our Standards
 
-First, configure your name and email address in Git global settings:
+Examples of behavior that contributes to creating a positive environment
+include:
 
-```
-$ git config --global user.name "John Doe" 
-$ git config --global user.email johndoe@example.com
-```
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
-You can now sign off per-commit, or configure Git to always sign off commits per repository.
+Examples of unacceptable behavior by participants include:
 
-### Sign off per-commit
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
-Add [`-s`](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt--s) to your Git command line. For example:
+We will distance those who constantly adhere to unacceptable behavior.
 
-```git commit -s -m "Fix issue 64738"```
+### Our Responsibilities
 
-This is tedious, and if you forget, you'll have to [amend your commit](#f)
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective actions in
+response to any instances of unacceptable behavior.
 
-### Configure a repository to always include sign off
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
 
-There are many ways to achieve this with Git hooks, but the simplest is to do the following:
+### Scope
 
-```
-cd your-repo
-curl -Ls https://gist.githubusercontent.com/dixudx/7d7edea35b4d91e1a2a8fbf41d0954fa/raw/prepare-commit-msg -o .git/hooks/prepare-commit-msg
-chmod +x .git/hooks/prepare-commit-msg
-```
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
 
-## Fixing a commit where the DCO failed
+### Enforcement
 
-Check out [this guide](https://github.com/src-d/guide/blob/master/developer-community/fix-DCO.md).
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+### Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

MAINTAINERS.md

@@ -1,11 +1,10 @@
 # Maintainers
 
-The following table lists the Kubescape project maintainers:
+The following table lists Kubescape project maintainers 
 
-| Name | GitHub | Organization | Added/Renewed On |
-| --- | --- | --- | --- |
-| [Ben Hirschberg](https://www.linkedin.com/in/benyamin-ben-hirschberg-66141890) | [@slashben](https://github.com/slashben) | [ARMO](https://www.armosec.io/) | 2021-09-01 |
-| [Rotem Refael](https://www.linkedin.com/in/rotem-refael) | [@rotemamsa](https://github.com/rotemamsa) | [ARMO](https://www.armosec.io/) | 2021-10-11 |
-| [David Wertenteil](https://www.linkedin.com/in/david-wertenteil-0ba277b9) | [@dwertent](https://github.com/dwertent) | [ARMO](https://www.armosec.io/) | 2021-09-01 |
-| [Bezalel Brandwine](https://www.linkedin.com/in/bezalel-brandwine) | [@Bezbran](https://github.com/Bezbran) | [ARMO](https://www.armosec.io/) | 2021-09-01 |
-| [Craig Box](https://www.linkedin.com/in/crbnz/) | [@craigbox](https://github.com/craigbox) | [ARMO](https://www.armosec.io/) | 2022-10-31 |
+| Name | GitHub | Email | Organization | Role | Added/Renewed On |
+| --- | --- | --- | --- | --- | --- |
+| [Ben Hirschberg](https://www.linkedin.com/in/benyamin-ben-hirschberg-66141890) | [@slashben](https://github.com/slashben) | ben@armosec.io | [ARMO](https://www.armosec.io/) | VP R&D | 2021-09-01 |
+| [Rotem Refael](https://www.linkedin.com/in/rotem-refael) | [@rotemamsa](https://github.com/rotemamsa) | rrefael@armosec.io | [ARMO](https://www.armosec.io/) | Team Leader | 2021-10-11 |
+| [David Wertenteil](https://www.linkedin.com/in/david-wertenteil-0ba277b9) | [@dwertent](https://github.com/dwertent) | dwertent@armosec.io | [ARMO](https://www.armosec.io/) | Kubescape CLI Developer | 2021-09-01 |
+| [Bezalel Brandwine](https://www.linkedin.com/in/bezalel-brandwine) | [@Bezbran](https://github.com/Bezbran) | bbrandwine@armosec.io | [ARMO](https://www.armosec.io/) | Kubescape SaaS Developer | 2021-09-01 |

Makefile

@@ -11,7 +11,7 @@ libgit2:
 	cd git2go; make install-static
 
 # go build tags
-TAGS = "gitenabled,static"
+TAGS = "static"
 
 build:
 	go build -v -tags=$(TAGS) .

README.md

@@ -1,94 +1,471 @@
-[![Version](https://img.shields.io/github/v/release/kubescape/kubescape)](releases)
+<div align="center">
+    <img src="docs/kubescape.png" width="300" alt="logo">
+</div>
+
+---
+
 [![build](https://github.com/kubescape/kubescape/actions/workflows/build.yaml/badge.svg)](https://github.com/kubescape/kubescape/actions/workflows/build.yaml)
 [![Go Report Card](https://goreportcard.com/badge/github.com/kubescape/kubescape)](https://goreportcard.com/report/github.com/kubescape/kubescape)
 [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/kubescape/kubescape)
-[![GitHub](https://img.shields.io/github/license/kubescape/kubescape)](https://github.com/kubescape/kubescape/blob/master/LICENSE)
-[![CNCF](https://shields.io/badge/CNCF-Sandbox%20project-blue?logo=linux-foundation&style=flat)](https://landscape.cncf.io/card-mode?project=sandbox&selected=kubescape)
-[![Twitter Follow](https://img.shields.io/twitter/follow/kubescape?style=social)](https://twitter.com/kubescape)
 
-# Kubescape
+:sunglasses: [Want to contribute?](#being-a-part-of-the-team) :innocent: 
 
-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/cncf/artwork/master/projects/kubescape/stacked/white/kubescape-stacked-white.svg" width="150">
-  <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/cncf/artwork/master/projects/kubescape/stacked/color/kubescape-stacked-color.svg" width="150">
-  <img alt="Kubescape logo" align="right" src="https://raw.githubusercontent.com/cncf/artwork/master/projects/kubescape/stacked/color/kubescape-stacked-color.svg" width="150">
-</picture>
 
-_An open-source Kubernetes security platform for your IDE, CI/CD pipelines, and clusters_
+Kubescape is a K8s open-source tool providing a Kubernetes single pane of glass, including risk analysis, security compliance, RBAC visualizer, and image vulnerability scanning. 
+Kubescape scans K8s clusters, YAML files, and HELM charts, detecting misconfigurations according to multiple frameworks (such as the [NSA-CISA](https://www.armosec.io/blog/kubernetes-hardening-guidance-summary-by-armo/?utm_source=github&utm_medium=repository), [MITRE ATT&CK®](https://www.microsoft.com/security/blog/2021/03/23/secure-containerized-environments-with-updated-threat-matrix-for-kubernetes/)), software vulnerabilities, and RBAC (role-based-access-control) violations at early stages of the CI/CD pipeline, calculates risk score instantly and shows risk trends over time.
 
-Kubescape is an open-source Kubernetes security platform. It includes risk analysis, security compliance, and misconfiguration scanning. Targeted at the DevSecOps practitioner or platform engineer, it offers an easy-to-use CLI interface, flexible output formats, and automated scanning capabilities. It saves Kubernetes users and admins precious time, effort, and resources.
+It has become one of the fastest-growing Kubernetes tools among developers due to its easy-to-use CLI interface, flexible output formats, and automated scanning capabilities, saving Kubernetes users and admins precious time, effort, and resources.
+Kubescape integrates natively with other DevOps tools, including Jenkins, CircleCI, Github workflows, Prometheus, and Slack, and supports multi-cloud K8s deployments like EKS, GKE, and AKS.
 
-Kubescape scans clusters, YAML files, and Helm charts. It detects misconfigurations according to multiple frameworks (including [NSA-CISA](https://www.armosec.io/blog/kubernetes-hardening-guidance-summary-by-armo/?utm_source=github&utm_medium=repository), [MITRE ATT&CK®](https://www.microsoft.com/security/blog/2021/03/23/secure-containerized-environments-with-updated-threat-matrix-for-kubernetes/) and the [CIS Benchmark](https://www.armosec.io/blog/cis-kubernetes-benchmark-framework-scanning-tools-comparison/?utm_source=github&utm_medium=repository)).
+</br>
 
-Kubescape was created by [ARMO](https://www.armosec.io/?utm_source=github&utm_medium=repository) and is a [Cloud Native Computing Foundation (CNCF) sandbox project](https://www.cncf.io/sandbox-projects/).
+# Kubescape CLI:
+<img src="docs/demo.gif">
 
-## Demo
-<img src="docs/img/demo.gif">
-
-_Please [star ⭐](https://github.com/kubescape/kubescape/stargazers) the repo if you want us to continue developing and improving Kubescape! 😀_
-
-## Getting started
-
-Experimenting with Kubescape is as easy as:
+</br>
 
+# TL;DR
+## Install:
 ```sh
 curl -s https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash
 ```
 
-Learn more about:
+*OR:*
 
-* [Installing Kubescape](docs/getting-started.md#install-kubescape)
-* [Running your first scan](docs/getting-started.md#run-your-first-scan)
-* [Usage](docs/getting-started.md#examples)
-* [Architecture](docs/architecture.md)
-* [Building Kubescape from source](docs/building.md)
+[Install on windows](#install-on-windows)
 
-_Did you know you can use Kubescape in all these places?_
+[Install on macOS](#install-on-macos)
 
+[Install on NixOS or Linux/macOS via nix](#install-on-nixos-or-with-nix-community)
+
+## Run:
+```sh
+kubescape scan --enable-host-scan --verbose
+```
+
+<img src="docs/summary.png">
+
+</br>
+
+> Kubescape is an open source project. We welcome your feedback and ideas for improvement. We’re also aiming to collaborate with the Kubernetes community to help make the tests more robust and complete as Kubernetes develops.
+
+</br>
+
+## Architecture in short
+### [CLI](#kubescape-cli)
 <div align="center">
-    <img src="docs/img/ksfromcodetodeploy.png" alt="Places you can use Kubescape: in your IDE, CI, CD, or against a running cluster.">
+    <img src="docs/ks-cli-arch.png" width="300" alt="cli-diagram">
 </div>
 
-## Under the hood
+### [Operator](https://github.com/kubescape/helm-charts#readme)
+<div align="center">
+    <img src="docs/ks-operator-arch.png" width="300" alt="operator-diagram">
+</div>
 
-Kubescape uses [Open Policy Agent](https://github.com/open-policy-agent/opa) to verify Kubernetes objects against [a library of posture controls](https://github.com/kubescape/regolibrary).
+### Please [star ⭐](https://github.com/kubescape/kubescape/stargazers) the repo if you want us to continue developing and improving Kubescape 😀
 
-By default, the results are printed in a console-friendly manner, but they can be:
+</br>
 
-* exported to JSON or junit XML
-* rendered to HTML or PDF
-* submitted to a [cloud service](docs/providers.md)
-
-It retrieves Kubernetes objects from the API server and runs a set of [Rego snippets](https://www.openpolicyagent.org/docs/latest/policy-language/) developed by [ARMO](https://www.armosec.io?utm_source=github&utm_medium=repository).
+# Being a part of the team
 
 ## Community
+We invite you to our community! We are excited about this project and want to return the love we get.
 
-Kubescape is an open source project, we welcome your feedback and ideas for improvement. We are part of the Kubernetes community and are building more tests and controls as the ecosystem develops.
-
-We hold [community meetings](https://us02web.zoom.us/j/84020231442) on Zoom, on the first Tuesday of every month, at 14:00 GMT.
-
-The Kubescape project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+We hold community meetings in [Zoom](https://us02web.zoom.us/j/84020231442) on the first Tuesday of every month at 14:00 GMT! :sunglasses:
 
 ## Contributions 
+[Want to contribute?](https://github.com/kubescape/kubescape/blob/master/CONTRIBUTING.md) Want to discuss something? Have an issue? Please make sure that you follow our [Code Of Conduct](https://github.com/kubescape/kubescape/blob/master/CODE_OF_CONDUCT.md) . 
 
-Thanks to all our contributors!  Check out our [CONTRIBUTING](CONTRIBUTING.md) file to learn how to join them.
+* Feel free to pick a task from the [issues](https://github.com/kubescape/kubescape/issues?q=is%3Aissue+is%3Aopen+label%3A%22open+for+contribution%22), [roadmap](docs/roadmap.md) or suggest a feature of your own. [Contact us](MAINTAINERS.md) directly for more information :) 
+* [Open an issue](https://github.com/kubescape/kubescape/issues/new/choose) , we are trying to respond within 48 hours
+* [Join us](https://discord.com/invite/WKZRaCtBxN) in the discussion on our discord server!
 
-* Feel free to pick a task from the [issues](https://github.com/kubescape/kubescape/issues?q=is%3Aissue+is%3Aopen+label%3A%22open+for+contribution%22), [roadmap](docs/roadmap.md) or suggest a feature of your own.
-* [Open an issue](https://github.com/kubescape/kubescape/issues/new/choose): we aim to respond to all issues within 48 hours.
-* [Join the CNCF Slack](https://slack.cncf.io/) and then our [users](https://cloud-native.slack.com/archives/C04EY3ZF9GE) or [developers](https://cloud-native.slack.com/archives/C04GY6H082K) channel.
+[<img src="docs/discord-banner.png" width="100" alt="logo" align="center">](https://discord.com/invite/WKZRaCtBxN)
+![discord](https://img.shields.io/discord/893048809884643379)
 
-<br>
 
+# Options and examples
+
+[Kubescape docs](https://hub.armosec.io/docs?utm_source=github&utm_medium=repository)
+
+## Playground
+* [Kubescape playground](https://killercoda.com/saiyampathak/scenario/kubescape)
+
+## Tutorials
+
+* [Overview](https://youtu.be/wdBkt_0Qhbg)
+* [How To Secure Kubernetes Clusters With Kubescape And Armo](https://youtu.be/ZATGiDIDBQk)
+* [Scan Kubernetes YAML files](https://youtu.be/Ox6DaR7_4ZI)
+* [Scan container image registry](https://youtu.be/iQ_k8EnK-3s)
+* [Scan Kubescape on an air-gapped environment (offline support)](https://youtu.be/IGXL9s37smM)
+* [Managing exceptions in the Kubescape SaaS version](https://youtu.be/OzpvxGmCR80)
+* [Configure and run customized frameworks](https://youtu.be/12Sanq_rEhs)
+* Customize control configurations: 
+  - [Kubescape CLI](https://youtu.be/955psg6TVu4) 
+  - [Kubescape SaaS](https://youtu.be/lIMVSVhH33o)
+
+## Install on Windows
+
+<details><summary>Windows</summary>
+
+**Requires powershell v5.0+**
+
+``` powershell
+iwr -useb https://raw.githubusercontent.com/kubescape/kubescape/master/install.ps1 | iex
+```
+
+Note: if you get an error you might need to change the execution policy (i.e. enable Powershell) with
+
+``` powershell
+Set-ExecutionPolicy RemoteSigned -scope CurrentUser
+```
+</details>
+
+
+## Install on macOS
+
+<details><summary>MacOS</summary>
+
+1. ```sh
+    brew tap kubescape/tap
+    ```
+2. ```sh
+    brew install kubescape-cli
+    ```
+</details>
+
+## Install on NixOS or with nix (Community)
+
+<details><summary>Nix/NixOS</summary>
+
+Direct issues installing `kubescape` via `nix` through the channels mentioned [here](https://nixos.wiki/wiki/Support)
+
+You can use `nix` on Linux or macOS and on other platforms unofficially.
+
+Try it out in an ephemeral shell: `nix-shell -p kubescape`
+
+Install declarative as usual
+
+NixOS:
+
+```nix
+  # your other config ...
+  environment.systemPackages = with pkgs; [
+    # your other packages ...
+    kubescape
+  ];
+```
+
+home-manager:
+
+```nix
+  # your other config ...
+  home.packages = with pkgs; [
+    # your other packages ...
+    kubescape
+  ];
+```
+
+Or to your profile (not preferred): `nix-env --install -A nixpkgs.kubescape`
+
+</details>
+
+## Usage & Examples
+
+### Examples
+
+
+#### Scan a running Kubernetes cluster
+```
+kubescape scan --enable-host-scan  --verbose
+```
+
+> Read [here](https://hub.armosec.io/docs/host-sensor?utm_source=github&utm_medium=repository) more about the `enable-host-scan` flag
+
+#### Scan a running Kubernetes cluster with [`nsa`](https://www.nsa.gov/Press-Room/News-Highlights/Article/Article/2716980/nsa-cisa-release-kubernetes-hardening-guidance/) framework
+```
+kubescape scan framework nsa
+```
+
+
+#### Scan a running Kubernetes cluster with [`MITRE ATT&CK®`](https://www.microsoft.com/security/blog/2021/03/23/secure-containerized-environments-with-updated-threat-matrix-for-kubernetes/) framework
+```
+kubescape scan framework mitre
+```
+
+
+#### Scan a running Kubernetes cluster with a specific control using the control name or control ID. [List of controls](https://hub.armosec.io/docs/controls?utm_source=github&utm_medium=repository) 
+```
+kubescape scan control "Privileged container"
+```
+
+#### Scan using an alternative kubeconfig file
+```
+kubescape scan --kubeconfig cluster.conf
+```
+
+#### Scan specific namespaces
+```
+kubescape scan --include-namespaces development,staging,production
+```
+
+#### Scan cluster and exclude some namespaces
+```
+kubescape scan --exclude-namespaces kube-system,kube-public
+```
+
+#### Scan local `yaml`/`json` files before deploying. [Take a look at the demonstration](https://youtu.be/Ox6DaR7_4ZI).
+```
+kubescape scan *.yaml
+```
+
+#### Scan Kubernetes manifest files from a git repository 
+kubescape scan https://github.com/kubescape/kubescape
+```
+
+#### Display all scanned resources (including the resources which passed) 
+```
+kubescape scan --verbose
+```
+
+#### Output in `json` format
+
+> Add the `--format-version v2` flag 
+
+```
+kubescape scan --format json --format-version v2 --output results.json
+```
+
+#### Output in `junit xml` format
+```
+kubescape scan --format junit --output results.xml
+```
+
+#### Output in `pdf` format - Contributed by [@alegrey91](https://github.com/alegrey91)
+
+```
+kubescape scan --format pdf --output results.pdf
+```
+
+#### Output in `prometheus` metrics format - Contributed by [@Joibel](https://github.com/Joibel)
+
+```
+kubescape scan --format prometheus
+```
+
+#### Output in `html` format
+
+```
+kubescape scan --format html --output results.html
+```
+
+#### Scan with exceptions, objects with exceptions will be presented as `exclude` and not `fail`
+[Full documentation](examples/exceptions/README.md)
+```
+kubescape scan --exceptions examples/exceptions/exclude-kube-namespaces.json
+```
+
+#### Scan Helm charts 
+```
+kubescape scan </path/to/directory>
+```
+> Kubescape will load the default value file
+
+#### Scan Kustomize Directory 
+```
+kubescape scan </path/to/directory>
+```
+> Kubescape will generate Kubernetes Yaml Objects using 'Kustomize' file and scans them for security.
+
+### Offline/Air-gaped Environment Support
+
+[Video tutorial](https://youtu.be/IGXL9s37smM)
+
+It is possible to run Kubescape offline!
+#### Download all artifacts
+
+1. Download and save in local directory, if path not specified, will save all in `~/.kubescape`
+```
+kubescape download artifacts --output path/to/local/dir
+```
+2. Copy the downloaded artifacts to the air-gaped/offline environment
+
+3. Scan using the downloaded artifacts
+```
+kubescape scan --use-artifacts-from path/to/local/dir
+```
+
+#### Download a single artifact
+
+You can also download a single artifact and scan with the `--use-from` flag
+
+1. Download and save in a file, if the file name is not specified, will save in `~/.kubescape/<framework name>.json`
+```
+kubescape download framework nsa --output /path/nsa.json
+```
+2. Copy the downloaded artifacts to the air-gaped/offline environment
+
+3. Scan using the downloaded framework
+```
+kubescape scan framework nsa --use-from /path/nsa.json
+```
+
+
+## Scan Periodically using Helm 
+[Please follow the instructions here](https://hub.armosec.io/docs/installation-of-armo-in-cluster?utm_source=github&utm_medium=repository)
+[helm chart repo](https://github.com/armosec/armo-helm)
+
+# Integrations
+
+## VS Code Extension 
+
+![Visual Studio Marketplace Downloads](https://img.shields.io/visual-studio-marketplace/d/kubescape.kubescape?label=VScode) ![Open VSX](https://img.shields.io/open-vsx/dt/kubescape/kubescape?label=openVSX&color=yellowgreen)
+
+Scan the YAML files while writing them using the [vs code extension](https://github.com/armosec/vscode-kubescape/blob/master/README.md) 
+
+## Lens Extension
+
+View Kubescape scan results directly in [Lens IDE](https://k8slens.dev/) using kubescape [Lens extension](https://github.com/armosec/lens-kubescape/blob/master/README.md)
+
+
+# Building Kubescape
+
+## Build on Windows
+
+<details><summary>Windows</summary>
+
+1. Install MSYS2 & build libgit _(needed only for the first time)_
+
+    ```
+    build.bat all
+    ```
+
+> You can install MSYS2 separately by running `build.bat install` and build libgit2 separately by running `build.bat build`
+
+2. Build kubescape
+
+    ```
+    make build
+    ```
+
+    OR 
+
+    ```
+    go build -tags=static .
+    ```
+</details>
+
+## Build on Linux/MacOS
+
+<details><summary>Linux / MacOS</summary>
+
+1. Install libgit2 dependency _(needed only for the first time)_
+   
+    ```
+    make libgit2
+    ```
+
+> `cmake` is required to build libgit2. You can install it by running `sudo apt-get install cmake` (Linux) or `brew install cmake` (macOS)
+
+2. Build kubescape
+
+    ```
+    make build
+    ```
+
+    OR 
+
+    ```
+    go build -tags=static .
+    ```
+
+3. Test
+
+    ```
+    make test
+    ```
+
+</details>
+
+## Build on pre-configured killercoda's ubuntu playground
+
+* [Pre-configured Killercoda's Ubuntu Playground](https://killercoda.com/suhas-gumma/scenario/kubescape-build-for-development)
+
+<details><summary> Pre-programmed actions executed by the playground </summary>
+
+
+* Clone the official GitHub repository of `Kubescape`.
+* [Automate the build process on Linux](https://github.com/kubescape/kubescape#build-on-linuxmacos)
+* The entire process involves executing multiple commands in order and it takes around 5-6 minutes to execute them all.
+
+</details>
+
+<details>
+<summary>Instructions to use the playground</summary>
+
+* Apply changes you wish to make to the kubescape directory using text editors like `Vim`.
+* [Build on Linux](https://github.com/kubescape/kubescape#build-on-linuxmacos)
+* Now, you can use Kubescape just like a normal user. Instead of using `kubescape`, use `./kubescape`. (Make sure you are inside kubescape directory because the command will execute the binary named `kubescape` in `kubescape directory`)
+
+</details>
+
+## VS code configuration samples
+
+You can use the sample files below to setup your VS code environment for building and debugging purposes.
+
+
+<details><summary>.vscode/settings.json</summary>
+
+```json5
+// .vscode/settings.json
+{
+    "go.testTags": "static",
+    "go.buildTags": "static",
+    "go.toolsEnvVars": {
+        "CGO_ENABLED": "1"
+    }
+}
+```
+</details>
+
+<details><summary>.vscode/launch.json</summary>
+
+```json5
+// .vscode/launch.json
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Package",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/main.go",
+            "args": [
+                "scan",
+                "--logger",
+                "debug"
+            ],
+            "buildFlags": "-tags=static"
+        }
+    ]
+}
+```
+</details>
+
+# Under the hood
+
+## Technology
+Kubescape is based on the [OPA engine](https://github.com/open-policy-agent/opa) and ARMO's posture controls.
+
+The tools retrieve Kubernetes objects from the API server and run a set of [rego's snippets](https://www.openpolicyagent.org/docs/latest/policy-language/) developed by [ARMO](https://www.armosec.io?utm_source=github&utm_medium=repository).
+
+The results by default are printed in a pretty "console friendly" manner, but they can be retrieved in JSON format for further processing.
+
+Kubescape is an open source project, we welcome your feedback and ideas for improvement. We’re also aiming to collaborate with the Kubernetes community to help make the tests more robust and complete as Kubernetes develops.
+
+## Thanks to all the contributors ❤️
 <a href = "https://github.com/kubescape/kubescape/graphs/contributors">
   <img src = "https://contrib.rocks/image?repo=kubescape/kubescape"/>
 </a>
 
-## License
-
-Copyright 2021-2023, the Kubescape Authors. All rights reserved. Kubescape is released under the Apache 2.0 license. See the [LICENSE](LICENSE) file for details.
-
-Kubescape is a [Cloud Native Computing Foundation (CNCF) sandbox project](https://www.cncf.io/sandbox-projects/) and was contributed by [ARMO](https://www.armosec.io/?utm_source=github&utm_medium=repository).
-
-<div align="center">
-    <img src="https://raw.githubusercontent.com/cncf/artwork/master/other/cncf-sandbox/horizontal/color/cncf-sandbox-horizontal-color.svg" width="300" alt="CNCF Sandbox Project">
-</div>

build.py

@@ -40,7 +40,7 @@ def main():
 
     client_var = "github.com/kubescape/kubescape/v2/core/cautils.Client"
     client_name = os.getenv("CLIENT")
-
+    
     # Create build directory
     build_dir = get_build_dir()
 
@@ -56,15 +56,15 @@ def main():
         ldflags += " -X {}={}".format(build_url, release_version)
     if client_name:
         ldflags += " -X {}={}".format(client_var, client_name)
-
-    build_command = ["go", "build", "-buildmode=pie", "-tags=static,gitenabled", "-o", ks_file, "-ldflags" ,ldflags]
+ 
+    build_command = ["go", "build", "-tags=static", "-o", ks_file, "-ldflags" ,ldflags]
 
     print("Building kubescape and saving here: {}".format(ks_file))
     print("Build command: {}".format(" ".join(build_command)))
 
     status = subprocess.call(build_command)
     check_status(status, "Failed to build kubescape")
-
+    
     sha256 = hashlib.sha256()
     with open(ks_file, "rb") as kube:
         sha256.update(kube.read())
@@ -74,7 +74,7 @@ def main():
             kube_sha.write(sha256.hexdigest())
 
     print("Build Done")
-
-
+ 
+ 
 if __name__ == "__main__":
     main()

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine as builder
+FROM golang:1.18-alpine as builder
 
 ARG image_version
 ARG client
@@ -12,7 +12,7 @@ ENV CGO_ENABLED=1
 
 # Install required python/pip
 ENV PYTHONUNBUFFERED=1
-RUN apk add --update --no-cache python3 gcc make git libc-dev binutils-gold cmake pkgconfig && ln -sf python3 /usr/bin/python
+RUN apk add --update --no-cache python3 git openssl-dev musl-dev gcc make cmake pkgconfig && ln -sf python3 /usr/bin/python
 RUN python3 -m ensurepip
 RUN pip3 install --no-cache --upgrade pip setuptools
 

cmd/completion/completion.go

@@ -9,11 +9,11 @@ import (
 
 var completionCmdExamples = `
 
-  # Enable BASH shell autocompletion
-  $ source <(kubescape completion bash)
+  # Enable BASH shell autocompletion 
+  $ source <(kubescape completion bash) 
   $ echo 'source <(kubescape completion bash)' >> ~/.bashrc
 
-  # Enable ZSH shell autocompletion
+  # Enable ZSH shell autocompletion 
   $ source <(kubectl completion zsh)
   $ echo 'source <(kubectl completion zsh)' >> "${fpath[1]}/_kubectl"
 
@@ -27,7 +27,7 @@ func GetCompletionCmd() *cobra.Command {
 		Example:               completionCmdExamples,
 		DisableFlagsInUseLine: true,
 		ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
-		Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
+		Args:                  cobra.ExactValidArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
 			switch strings.ToLower(args[0]) {
 			case "bash":

cmd/download/download.go

@@ -24,8 +24,8 @@ var (
   # Download the NSA framework. Run 'kubescape list frameworks' for all frameworks names
   kubescape download framework nsa
 
-  # Download the "C-0001" control. Run 'kubescape list controls --id' for all controls ids
-  kubescape download control "C-0001"
+  # Download the "Allowed hostPath" control. Run 'kubescape list controls' for all controls names
+  kubescape download control "Allowed hostPath"
 
   # Download the "C-0001" control. Run 'kubescape list controls --id' for all controls ids
   kubescape download control C-0001
@@ -36,8 +36,6 @@ var (
   # Download the configured controls-inputs 
   kubescape download controls-inputs 
 
-  # Download the attack tracks
-  kubescape download attack-tracks
 `
 )
 
@@ -70,9 +68,7 @@ func GeDownloadCmd(ks meta.IKubescape) *cobra.Command {
 			}
 			downloadInfo.Target = args[0]
 			if len(args) >= 2 {
-
-				downloadInfo.Identifier = args[1]
-
+				downloadInfo.Name = args[1]
 			}
 			if err := ks.Download(&downloadInfo); err != nil {
 				logger.L().Fatal(err.Error())

cmd/list/list.go

@@ -20,8 +20,11 @@ var (
   # List all supported frameworks names
   kubescape list frameworks --account <account id>
 	
-  # List all supported controls names with ids
+  # List all supported controls names
   kubescape list controls
+
+  # List all supported controls ids
+  kubescape list controls --id 
   
   Control documentation:
   https://hub.armosec.io/docs/controls
@@ -64,8 +67,8 @@ func GetListCmd(ks meta.IKubescape) *cobra.Command {
 	listCmd.PersistentFlags().StringVarP(&listPolicies.Credentials.Account, "account", "", "", "Kubescape SaaS account ID. Default will load account ID from cache")
 	listCmd.PersistentFlags().StringVarP(&listPolicies.Credentials.ClientID, "client-id", "", "", "Kubescape SaaS client ID. Default will load client ID from cache, read more - https://hub.armosec.io/docs/authentication")
 	listCmd.PersistentFlags().StringVarP(&listPolicies.Credentials.SecretKey, "secret-key", "", "", "Kubescape SaaS secret key. Default will load secret key from cache, read more - https://hub.armosec.io/docs/authentication")
-	listCmd.PersistentFlags().StringVar(&listPolicies.Format, "format", "pretty-print", "output format. supported: 'pretty-print'/'json'")
-	listCmd.PersistentFlags().MarkDeprecated("id", "Control ID's are included in list outpus")
+	listCmd.PersistentFlags().StringVar(&listPolicies.Format, "format", "pretty-print", "output format. supported: 'pretty-printer'/'json'")
+	listCmd.PersistentFlags().BoolVarP(&listPolicies.ListIDs, "id", "", false, "List control ID's instead of controls names")
 
 	return listCmd
 }

cmd/root.go

@@ -28,7 +28,7 @@ var rootInfo cautils.RootInfo
 
 var ksExamples = `
   # Scan command
-  kubescape scan
+  kubescape scan --submit
 
   # List supported frameworks
   kubescape list frameworks

cmd/scan/control.go

@@ -23,7 +23,7 @@ var (
   kubescape scan control "privileged container"
 	
   # Scan list of controls separated with a comma
-  kubescape scan control "privileged container","HostPath mount"
+  kubescape scan control "privileged container","allowed hostpath"
   
   # Scan list of controls using the control ID separated with a comma
   kubescape scan control C-0058,C-0057
@@ -61,7 +61,7 @@ func getControlCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo) *cobra.Comman
 			if err := validateFrameworkScanInfo(scanInfo); err != nil {
 				return err
 			}
-
+			
 			// flagValidationControl(scanInfo)
 			scanInfo.PolicyIdentifier = []cautils.PolicyIdentifier{}
 
@@ -109,7 +109,7 @@ func getControlCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo) *cobra.Comman
 			if results.GetRiskScore() > float32(scanInfo.FailThreshold) {
 				logger.L().Fatal("scan risk-score is above permitted threshold", helpers.String("risk-score", fmt.Sprintf("%.2f", results.GetRiskScore())), helpers.String("fail-threshold", fmt.Sprintf("%.2f", scanInfo.FailThreshold)))
 			}
-			enforceSeverityThresholds(results.GetResults().SummaryDetails.GetResourcesSeverityCounters(), scanInfo, terminateOnExceedingSeverity)
+			enforceSeverityThresholds(&results.GetResults().SummaryDetails.SeverityCounters, scanInfo, terminateOnExceedingSeverity)
 
 			return nil
 		},
@@ -120,10 +120,6 @@ func getControlCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo) *cobra.Comman
 func validateControlScanInfo(scanInfo *cautils.ScanInfo) error {
 	severity := scanInfo.FailThresholdSeverity
 
-	if scanInfo.Submit && scanInfo.OmitRawResources {
-		return fmt.Errorf("you can use `omit-raw-resources` or `submit`, but not both")
-	}
-
 	if err := validateSeverity(severity); severity != "" && err != nil {
 		return err
 	}

cmd/scan/framework.go

@@ -16,13 +16,14 @@ import (
 	"github.com/kubescape/kubescape/v2/core/cautils"
 	"github.com/kubescape/kubescape/v2/core/meta"
 
+	"github.com/enescakir/emoji"
 	"github.com/spf13/cobra"
 )
 
 var (
 	frameworkExample = `
-  # Scan all frameworks
-  kubescape scan framework all
+  # Scan all frameworks and submit the results
+  kubescape scan framework all --submit
   
   # Scan the NSA framework
   kubescape scan framework nsa
@@ -34,7 +35,7 @@ var (
   kubescape scan framework all
 
   # Scan kubernetes YAML manifest files (single file or glob)
-  kubescape scan framework nsa .
+  kubescape scan framework nsa *.yaml
 
   Run 'kubescape list frameworks' for the list of supported frameworks
 `
@@ -112,13 +113,13 @@ func getFrameworkCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo) *cobra.Comm
 				logger.L().Fatal(err.Error())
 			}
 			if !scanInfo.VerboseMode {
-				cautils.SimpleDisplay(os.Stderr, "Run with '--verbose'/'-v' flag for detailed resources view\n\n")
+				cautils.SimpleDisplay(os.Stderr, "%s  Run with '--verbose'/'-v' flag for detailed resources view\n\n", emoji.Detective)
 			}
 			if results.GetRiskScore() > float32(scanInfo.FailThreshold) {
 				logger.L().Fatal("scan risk-score is above permitted threshold", helpers.String("risk-score", fmt.Sprintf("%.2f", results.GetRiskScore())), helpers.String("fail-threshold", fmt.Sprintf("%.2f", scanInfo.FailThreshold)))
 			}
 
-			enforceSeverityThresholds(results.GetData().Report.SummaryDetails.GetResourcesSeverityCounters(), scanInfo, terminateOnExceedingSeverity)
+			enforceSeverityThresholds(&results.GetData().Report.SummaryDetails.SeverityCounters, scanInfo, terminateOnExceedingSeverity)
 			return nil
 		},
 	}
@@ -135,10 +136,10 @@ func countersExceedSeverityThreshold(severityCounters reportsummary.ISeverityCou
 		SeverityName       string
 		GetFailedResources func() int
 	}{
-		{reporthandlingapis.SeverityLowString, severityCounters.NumberOfLowSeverity},
-		{reporthandlingapis.SeverityMediumString, severityCounters.NumberOfMediumSeverity},
-		{reporthandlingapis.SeverityHighString, severityCounters.NumberOfHighSeverity},
-		{reporthandlingapis.SeverityCriticalString, severityCounters.NumberOfCriticalSeverity},
+		{reporthandlingapis.SeverityLowString, severityCounters.NumberOfResourcesWithLowSeverity},
+		{reporthandlingapis.SeverityMediumString, severityCounters.NumberOfResourcesWithMediumSeverity},
+		{reporthandlingapis.SeverityHighString, severityCounters.NumberOfResourcesWithHighSeverity},
+		{reporthandlingapis.SeverityCriticalString, severityCounters.NumberOfResourcesWithCriticalSeverity},
 	}
 
 	targetSeverityIdx := 0
@@ -200,9 +201,7 @@ func validateFrameworkScanInfo(scanInfo *cautils.ScanInfo) error {
 	if 100 < scanInfo.FailThreshold || 0 > scanInfo.FailThreshold {
 		return fmt.Errorf("bad argument: out of range threshold")
 	}
-	if scanInfo.Submit && scanInfo.OmitRawResources {
-		return fmt.Errorf("you can use `omit-raw-resources` or `submit`, but not both")
-	}
+
 	severity := scanInfo.FailThresholdSeverity
 	if err := validateSeverity(severity); severity != "" && err != nil {
 		return err

cmd/scan/scan.go

@@ -17,10 +17,10 @@ var scanCmdExamples = `
   kubescape scan --enable-host-scan --verbose
 
   # Scan kubernetes YAML manifest files
-  kubescape scan .
+  kubescape scan *.yaml
 
   # Scan and save the results in the JSON format
-  kubescape scan --format json --output results.json --format-version=v2
+  kubescape scan --format json --output results.json
 
   # Display all resources
   kubescape scan --verbose
@@ -58,7 +58,6 @@ func GetScanCommand(ks meta.IKubescape) *cobra.Command {
 		},
 		PreRun: func(cmd *cobra.Command, args []string) {
 			k8sinterface.SetClusterContextName(scanInfo.KubeContext)
-
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			// TODO - revert context
@@ -66,7 +65,6 @@ func GetScanCommand(ks meta.IKubescape) *cobra.Command {
 	}
 
 	scanCmd.PersistentFlags().StringVarP(&scanInfo.Credentials.Account, "account", "", "", "Kubescape SaaS account ID. Default will load account ID from cache")
-	scanCmd.PersistentFlags().BoolVar(&scanInfo.CreateAccount, "create-account", false, "Create a Kubescape SaaS account ID account ID is not found in cache. After creating the account, the account ID will be saved in cache. In addition, the scanning results will be uploaded to the Kubescape SaaS")
 	scanCmd.PersistentFlags().StringVarP(&scanInfo.Credentials.ClientID, "client-id", "", "", "Kubescape SaaS client ID. Default will load client ID from cache, read more - https://hub.armosec.io/docs/authentication")
 	scanCmd.PersistentFlags().StringVarP(&scanInfo.Credentials.SecretKey, "secret-key", "", "", "Kubescape SaaS secret key. Default will load secret key from cache, read more - https://hub.armosec.io/docs/authentication")
 	scanCmd.PersistentFlags().StringVarP(&scanInfo.KubeContext, "kube-context", "", "", "Kube context. Default will use the current-context")
@@ -78,7 +76,7 @@ func GetScanCommand(ks meta.IKubescape) *cobra.Command {
 	scanCmd.PersistentFlags().Float32VarP(&scanInfo.FailThreshold, "fail-threshold", "t", 100, "Failure threshold is the percent above which the command fails and returns exit code 1")
 
 	scanCmd.PersistentFlags().StringVar(&scanInfo.FailThresholdSeverity, "severity-threshold", "", "Severity threshold is the severity of failed controls at which the command fails and returns exit code 1")
-	scanCmd.PersistentFlags().StringVarP(&scanInfo.Format, "format", "f", "", `Output file format. Supported formats: "pretty-printer", "json", "junit", "prometheus", "pdf", "html", "sarif"`)
+	scanCmd.PersistentFlags().StringVarP(&scanInfo.Format, "format", "f", "pretty-printer", `Output format. Supported formats: "pretty-printer", "json", "junit", "prometheus", "pdf", "html", "sarif"`)
 	scanCmd.PersistentFlags().StringVar(&scanInfo.IncludeNamespaces, "include-namespaces", "", "scan specific namespaces. e.g: --include-namespaces ns-a,ns-b")
 	scanCmd.PersistentFlags().BoolVarP(&scanInfo.Local, "keep-local", "", false, "If you do not want your Kubescape results reported to configured backend.")
 	scanCmd.PersistentFlags().StringVarP(&scanInfo.Output, "output", "o", "", "Output file. Print output to file and not stdout")
@@ -90,15 +88,11 @@ func GetScanCommand(ks meta.IKubescape) *cobra.Command {
 	scanCmd.PersistentFlags().StringVar(&scanInfo.FormatVersion, "format-version", "v1", "Output object can be different between versions, this is for maintaining backward and forward compatibility. Supported:'v1'/'v2'")
 	scanCmd.PersistentFlags().StringVar(&scanInfo.CustomClusterName, "cluster-name", "", "Set the custom name of the cluster. Not same as the kube-context flag")
 	scanCmd.PersistentFlags().BoolVarP(&scanInfo.Submit, "submit", "", false, "Submit the scan results to Kubescape SaaS where you can see the results in a user-friendly UI, choose your preferred compliance framework, check risk results history and trends, manage exceptions, get remediation recommendations and much more. By default the results are not submitted")
-	scanCmd.PersistentFlags().BoolVarP(&scanInfo.OmitRawResources, "omit-raw-resources", "", false, "Omit raw resources from the output. By default the raw resources are included in the output")
-	scanCmd.PersistentFlags().BoolVarP(&scanInfo.PrintAttackTree, "print-attack-tree", "", false, "Print attack tree")
 
 	scanCmd.PersistentFlags().MarkDeprecated("silent", "use '--logger' flag instead. Flag will be removed at 1.May.2022")
 
 	// hidden flags
 	scanCmd.PersistentFlags().MarkHidden("host-scan-yaml") // this flag should be used very cautiously. We prefer users will not use it at all unless the DaemonSet can not run pods on the nodes
-	scanCmd.PersistentFlags().MarkHidden("omit-raw-resources")
-	scanCmd.PersistentFlags().MarkHidden("print-attack-tree")
 
 	// Retrieve --kubeconfig flag from https://github.com/kubernetes/kubectl/blob/master/pkg/cmd/cmd.go
 	scanCmd.PersistentFlags().AddGoFlag(flag.Lookup("kubeconfig"))

cmd/scan/scan_test.go

@@ -24,91 +24,91 @@ func TestExceedsSeverity(t *testing.T) {
 		{
 			Description:      "Critical failed resource should exceed Critical threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "critical"},
-			SeverityCounters: &reportsummary.SeverityCounters{CriticalSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithCriticalSeverityCounter: 1},
 			Want:             true,
 		},
 		{
 			Description:      "Critical failed resource should exceed Critical threshold set as constant",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: apis.SeverityCriticalString},
-			SeverityCounters: &reportsummary.SeverityCounters{CriticalSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithCriticalSeverityCounter: 1},
 			Want:             true,
 		},
 		{
 			Description:      "High failed resource should not exceed Critical threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "critical"},
-			SeverityCounters: &reportsummary.SeverityCounters{HighSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithHighSeverityCounter: 1},
 			Want:             false,
 		},
 		{
 			Description:      "Critical failed resource exceeds High threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "high"},
-			SeverityCounters: &reportsummary.SeverityCounters{CriticalSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithCriticalSeverityCounter: 1},
 			Want:             true,
 		},
 		{
 			Description:      "High failed resource exceeds High threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "high"},
-			SeverityCounters: &reportsummary.SeverityCounters{HighSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithHighSeverityCounter: 1},
 			Want:             true,
 		},
 		{
 			Description:      "Medium failed resource does not exceed High threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "high"},
-			SeverityCounters: &reportsummary.SeverityCounters{MediumSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithMediumSeverityCounter: 1},
 			Want:             false,
 		},
 		{
 			Description:      "Critical failed resource exceeds Medium threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "medium"},
-			SeverityCounters: &reportsummary.SeverityCounters{CriticalSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithCriticalSeverityCounter: 1},
 			Want:             true,
 		},
 		{
 			Description:      "High failed resource exceeds Medium threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "medium"},
-			SeverityCounters: &reportsummary.SeverityCounters{HighSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithHighSeverityCounter: 1},
 			Want:             true,
 		},
 		{
 			Description:      "Medium failed resource exceeds Medium threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "medium"},
-			SeverityCounters: &reportsummary.SeverityCounters{MediumSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithMediumSeverityCounter: 1},
 			Want:             true,
 		},
 		{
 			Description:      "Low failed resource does not exceed Medium threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "medium"},
-			SeverityCounters: &reportsummary.SeverityCounters{LowSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithLowSeverityCounter: 1},
 			Want:             false,
 		},
 		{
 			Description:      "Critical failed resource exceeds Low threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "low"},
-			SeverityCounters: &reportsummary.SeverityCounters{CriticalSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithCriticalSeverityCounter: 1},
 			Want:             true,
 		},
 		{
 			Description:      "High failed resource exceeds Low threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "low"},
-			SeverityCounters: &reportsummary.SeverityCounters{HighSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithHighSeverityCounter: 1},
 			Want:             true,
 		},
 		{
 			Description:      "Medium failed resource exceeds Low threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "low"},
-			SeverityCounters: &reportsummary.SeverityCounters{MediumSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithMediumSeverityCounter: 1},
 			Want:             true,
 		},
 		{
 			Description:      "Low failed resource exceeds Low threshold",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "low"},
-			SeverityCounters: &reportsummary.SeverityCounters{LowSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithLowSeverityCounter: 1},
 			Want:             true,
 		},
 		{
 			Description:      "Unknown severity returns an error",
 			ScanInfo:         &cautils.ScanInfo{FailThresholdSeverity: "unknown"},
-			SeverityCounters: &reportsummary.SeverityCounters{LowSeverityCounter: 1},
+			SeverityCounters: &reportsummary.SeverityCounters{ResourcesWithLowSeverityCounter: 1},
 			Want:             false,
 			Error:            ErrUnknownSeverity,
 		},
@@ -139,7 +139,7 @@ func Test_enforceSeverityThresholds(t *testing.T) {
 	}{
 		{
 			"Exceeding Critical severity counter should call the terminating function",
-			&reportsummary.SeverityCounters{CriticalSeverityCounter: 1},
+			&reportsummary.SeverityCounters{ResourcesWithCriticalSeverityCounter: 1},
 			&cautils.ScanInfo{FailThresholdSeverity: apis.SeverityCriticalString},
 			true,
 		},

cmd/scan/validators_test.go

@@ -1,9 +1,8 @@
 package scan
 
 import (
-	"testing"
-
 	"github.com/kubescape/kubescape/v2/core/cautils"
+	"testing"
 )
 
 // Test_validateControlScanInfo tests how scan info is validated for the `scan control` command

cmd/submit/rbac.go

@@ -31,11 +31,10 @@ var (
 // getRBACCmd represents the RBAC command
 func getRBACCmd(ks meta.IKubescape, submitInfo *v1.Submit) *cobra.Command {
 	return &cobra.Command{
-		Use:        "rbac",
-		Deprecated: "This command is deprecated and will not be supported after 1/Jan/2023. Please use the 'scan' command instead.",
-		Example:    rbacExamples,
-		Short:      "Submit cluster's Role-Based Access Control(RBAC)",
-		Long:       ``,
+		Use:     "rbac",
+		Example: rbacExamples,
+		Short:   "Submit cluster's Role-Based Access Control(RBAC)",
+		Long:    ``,
 		RunE: func(cmd *cobra.Command, args []string) error {
 
 			if err := flagValidationSubmit(submitInfo); err != nil {

cmd/submit/submit.go

@@ -7,21 +7,16 @@ import (
 )
 
 var submitCmdExamples = `
-# Submit Kubescape scan results file
-kubescape submit results
 
-# Submit exceptions file to Kubescape SaaS
-kubescape submit exceptions
 `
 
 func GetSubmitCmd(ks meta.IKubescape) *cobra.Command {
 	var submitInfo metav1.Submit
 
 	submitCmd := &cobra.Command{
-		Use:     "submit <command>",
-		Short:   "Submit an object to the Kubescape SaaS version",
-		Long:    ``,
-		Example: submitCmdExamples,
+		Use:   "submit <command>",
+		Short: "Submit an object to the Kubescape SaaS version",
+		Long:  ``,
 		Run: func(cmd *cobra.Command, args []string) {
 		},
 	}

cmd/version/git_native_disabled.go

@@ -1,7 +0,0 @@
-//go:build !gitenabled
-
-package version
-
-func isGitEnabled() bool {
-	return false
-}

cmd/version/git_native_enabled.go

@@ -1,7 +0,0 @@
-//go:build gitenabled
-
-package version
-
-func isGitEnabled() bool {
-	return true
-}

cmd/version/version.go

@@ -16,11 +16,7 @@ func GetVersionCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			v := cautils.NewIVersionCheckHandler()
 			v.CheckLatestVersion(cautils.NewVersionCheckRequest(cautils.BuildNumber, "", "", "version"))
-			fmt.Fprintf(os.Stdout,
-				"Your current version is: %s [git enabled in build: %t]\n",
-				cautils.BuildNumber,
-				isGitEnabled(),
-			)
+			fmt.Fprintln(os.Stdout, "Your current version is: "+cautils.BuildNumber)
 			return nil
 		},
 	}

core/cautils/controllink.go

@@ -1,12 +0,0 @@
-package cautils
-
-import (
-	"fmt"
-	"strings"
-)
-
-func GetControlLink(controlID string) string {
-	// For CIS Controls, cis-1.1.3 will be transformed to cis-1-1-3 in documentation link.
-	docLinkID := strings.ReplaceAll(controlID, ".", "-")
-	return fmt.Sprintf("https://hub.armosec.io/docs/%s", strings.ToLower(docLinkID))
-}

core/cautils/customerloader.go

@@ -470,7 +470,10 @@ func (c *ClusterConfig) updateConfigMap() error {
 }
 
 func updateConfigFile(configObj *ConfigObj) error {
-	return os.WriteFile(ConfigFileFullPath(), configObj.Config(), 0664) //nolint:gosec
+	if err := os.WriteFile(ConfigFileFullPath(), configObj.Config(), 0664); err != nil {
+		return err
+	}
+	return nil
 }
 
 func (c *ClusterConfig) updateConfigData(configMap *corev1.ConfigMap) {

core/cautils/datastructures.go

@@ -5,7 +5,6 @@ import (
 	"github.com/kubescape/k8s-interface/workloadinterface"
 	"github.com/kubescape/opa-utils/reporthandling"
 	apis "github.com/kubescape/opa-utils/reporthandling/apis"
-	"github.com/kubescape/opa-utils/reporthandling/attacktrack/v1alpha1"
 	"github.com/kubescape/opa-utils/reporthandling/results/v1/prioritization"
 	"github.com/kubescape/opa-utils/reporthandling/results/v1/resourcesresults"
 	reporthandlingv2 "github.com/kubescape/opa-utils/reporthandling/v2"
@@ -19,21 +18,18 @@ type OPASessionObj struct {
 	K8SResources          *K8SResources                                 // input k8s objects
 	ArmoResource          *KSResources                                  // input ARMO objects
 	AllPolicies           *Policies                                     // list of all frameworks
+	Policies              []reporthandling.Framework                    // list of frameworks to scan
 	AllResources          map[string]workloadinterface.IMetadata        // all scanned resources, map[<resource ID>]<resource>
 	ResourcesResult       map[string]resourcesresults.Result            // resources scan results, map[<resource ID>]<resource result>
 	ResourceSource        map[string]reporthandling.Source              // resources sources, map[<resource ID>]<resource result>
 	ResourcesPrioritized  map[string]prioritization.PrioritizedResource // resources prioritization information, map[<resource ID>]<prioritized resource>
-	ResourceAttackTracks  map[string]v1alpha1.IAttackTrack              // resources attack tracks, map[<resource ID>]<attack track>
-	AttackTracks          map[string]v1alpha1.IAttackTrack
-	Report                *reporthandlingv2.PostureReport // scan results v2 - Remove
-	RegoInputData         RegoInputData                   // input passed to rego for scanning. map[<control name>][<input arguments>]
+	Report                *reporthandlingv2.PostureReport               // scan results v2 - Remove
+	Exceptions            []armotypes.PostureExceptionPolicy            // list of exceptions to apply on scan results
+	RegoInputData         RegoInputData                                 // input passed to rego for scanning. map[<control name>][<input arguments>]
 	Metadata              *reporthandlingv2.Metadata
-	InfoMap               map[string]apis.StatusInfo         // Map errors of resources to StatusInfo
-	ResourceToControlsMap map[string][]string                // map[<apigroup/apiversion/resource>] = [<control_IDs>]
-	SessionID             string                             // SessionID
-	Policies              []reporthandling.Framework         // list of frameworks to scan
-	Exceptions            []armotypes.PostureExceptionPolicy // list of exceptions to apply on scan results
-	OmitRawResources      bool                               // omit raw resources from output
+	InfoMap               map[string]apis.StatusInfo // Map errors of resources to StatusInfo
+	ResourceToControlsMap map[string][]string        // map[<apigroup/apiversion/resource>] = [<control_IDs>]
+	SessionID             string                     // SessionID
 }
 
 func NewOPASessionObj(frameworks []reporthandling.Framework, k8sResources *K8SResources, scanInfo *ScanInfo) *OPASessionObj {
@@ -49,7 +45,6 @@ func NewOPASessionObj(frameworks []reporthandling.Framework, k8sResources *K8SRe
 		ResourceSource:        make(map[string]reporthandling.Source),
 		SessionID:             scanInfo.ScanID,
 		Metadata:              scanInfoToScanMetadata(scanInfo),
-		OmitRawResources:      scanInfo.OmitRawResources,
 	}
 }
 
@@ -99,7 +94,6 @@ type Exception struct {
 
 type RegoInputData struct {
 	PostureControlInputs map[string][]string `json:"postureControlInputs"`
-	DataControlInputs    map[string]string   `json:"dataControlInputs"`
 	// ClusterName          string              `json:"clusterName"`
 	// K8sConfig            RegoK8sConfig       `json:"k8sconfig"`
 }

core/cautils/getter/downloadreleasedpolicy.go

@@ -1,7 +1,6 @@
 package getter
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/armosec/armoapi-go/armotypes"
@@ -25,11 +24,11 @@ func NewDownloadReleasedPolicy() *DownloadReleasedPolicy {
 	}
 }
 
-func (drp *DownloadReleasedPolicy) GetControl(ID string) (*reporthandling.Control, error) {
+func (drp *DownloadReleasedPolicy) GetControl(policyName string) (*reporthandling.Control, error) {
 	var control *reporthandling.Control
 	var err error
 
-	control, err = drp.gs.GetOPAControlByID(ID)
+	control, err = drp.gs.GetOPAControl(policyName)
 	if err != nil {
 		return nil, err
 	}
@@ -56,29 +55,13 @@ func (drp *DownloadReleasedPolicy) ListFrameworks() ([]string, error) {
 	return drp.gs.GetOPAFrameworksNamesList()
 }
 
-func (drp *DownloadReleasedPolicy) ListControls() ([]string, error) {
-	controlsIDsList, err := drp.gs.GetOPAControlsIDsList()
-	if err != nil {
-		return []string{}, err
+func (drp *DownloadReleasedPolicy) ListControls(listType ListType) ([]string, error) {
+	switch listType {
+	case ListID:
+		return drp.gs.GetOPAControlsIDsList()
+	default:
+		return drp.gs.GetOPAControlsNamesList()
 	}
-	controlsNamesList, err := drp.gs.GetOPAControlsNamesList()
-	if err != nil {
-		return []string{}, err
-	}
-	controls, err := drp.gs.GetOPAControls()
-	if err != nil {
-		return []string{}, err
-	}
-	var controlsFrameworksList [][]string
-	for _, control := range controls {
-		controlsFrameworksList = append(controlsFrameworksList, control.FrameworkNames)
-	}
-	controlsNamesWithIDsandFrameworksList := make([]string, len(controlsIDsList))
-	// by design all slices have the same lengt
-	for i := range controlsIDsList {
-		controlsNamesWithIDsandFrameworksList[i] = fmt.Sprintf("%v|%v|%v", controlsIDsList[i], controlsNamesList[i], strings.Join(controlsFrameworksList[i], ","))
-	}
-	return controlsNamesWithIDsandFrameworksList, nil
 }
 
 func (drp *DownloadReleasedPolicy) GetControlsInputs(clusterName string) (map[string][]string, error) {

core/cautils/getter/getpolicies.go

@@ -6,13 +6,19 @@ import (
 	"github.com/kubescape/opa-utils/reporthandling/attacktrack/v1alpha1"
 )
 
+// supported listing
+type ListType string
+
+const ListID ListType = "id"
+const ListName ListType = "name"
+
 type IPolicyGetter interface {
 	GetFramework(name string) (*reporthandling.Framework, error)
 	GetFrameworks() ([]reporthandling.Framework, error)
-	GetControl(ID string) (*reporthandling.Control, error)
+	GetControl(name string) (*reporthandling.Control, error)
 
 	ListFrameworks() ([]string, error)
-	ListControls() ([]string, error)
+	ListControls(ListType) ([]string, error)
 }
 
 type IExceptionsGetter interface {

core/cautils/getter/getpoliciesutils.go

@@ -2,6 +2,7 @@ package getter
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -20,19 +21,18 @@ func SaveInFile(policy interface{}, pathStr string) error {
 	if err != nil {
 		return err
 	}
-	err = os.WriteFile(pathStr, encodedData, 0644) //nolint:gosec
+	err = os.WriteFile(pathStr, []byte(fmt.Sprintf("%v", string(encodedData))), 0644)
 	if err != nil {
 		if os.IsNotExist(err) {
 			pathDir := path.Dir(pathStr)
-			// pathDir could contain subdirectories
-			if erm := os.MkdirAll(pathDir, 0755); erm != nil {
-				return erm
+			if err := os.Mkdir(pathDir, 0744); err != nil {
+				return err
 			}
 		} else {
 			return err
 
 		}
-		err = os.WriteFile(pathStr, encodedData, 0644) //nolint:gosec
+		err = os.WriteFile(pathStr, []byte(fmt.Sprintf("%v", string(encodedData))), 0644)
 		if err != nil {
 			return err
 		}
@@ -40,6 +40,13 @@ func SaveInFile(policy interface{}, pathStr string) error {
 	return nil
 }
 
+// JSONDecoder returns JSON decoder for given string
+func JSONDecoder(origin string) *json.Decoder {
+	dec := json.NewDecoder(strings.NewReader(origin))
+	dec.UseNumber()
+	return dec
+}
+
 func HttpDelete(httpClient *http.Client, fullURL string, headers map[string]string) (string, error) {
 
 	req, err := http.NewRequest("DELETE", fullURL, nil)
@@ -58,7 +65,6 @@ func HttpDelete(httpClient *http.Client, fullURL string, headers map[string]stri
 	}
 	return respStr, nil
 }
-
 func HttpGetter(httpClient *http.Client, fullURL string, headers map[string]string) (string, error) {
 
 	req, err := http.NewRequest("GET", fullURL, nil)

core/cautils/getter/json.go

@@ -1,26 +0,0 @@
-package getter
-
-import (
-	"strings"
-
-	stdjson "encoding/json"
-
-	jsoniter "github.com/json-iterator/go"
-)
-
-var (
-	json jsoniter.API
-)
-
-func init() {
-	// NOTE(fredbi): attention, this configuration rounds floats down to 6 digits
-	// For finer-grained config, see: https://pkg.go.dev/github.com/json-iterator/go#section-readme
-	json = jsoniter.ConfigFastest
-}
-
-// JSONDecoder returns JSON decoder for given string
-func JSONDecoder(origin string) *stdjson.Decoder {
-	dec := stdjson.NewDecoder(strings.NewReader(origin))
-	dec.UseNumber()
-	return dec
-}

core/cautils/getter/json_test.go

@@ -1,32 +0,0 @@
-package getter
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestJSONDecoder(t *testing.T) {
-	t.Run("should decode json string", func(t *testing.T) {
-		const input = `"xyz"`
-		d := JSONDecoder(input)
-		var receiver string
-		require.NoError(t, d.Decode(&receiver))
-		require.Equal(t, "xyz", receiver)
-	})
-
-	t.Run("should decode json number", func(t *testing.T) {
-		const input = `123.01`
-		d := JSONDecoder(input)
-		var receiver float64
-		require.NoError(t, d.Decode(&receiver))
-		require.Equal(t, 123.01, receiver)
-	})
-
-	t.Run("requires json quotes", func(t *testing.T) {
-		const input = `xyz`
-		d := JSONDecoder(input)
-		var receiver string
-		require.Error(t, d.Decode(&receiver))
-	})
-}

core/cautils/getter/kscloudapi.go

@@ -2,8 +2,9 @@ package getter
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"strings"
 	"time"
@@ -191,7 +192,7 @@ func (api *KSCloudAPI) GetFrameworks() ([]reporthandling.Framework, error) {
 	return frameworks, err
 }
 
-func (api *KSCloudAPI) GetControl(ID string) (*reporthandling.Control, error) {
+func (api *KSCloudAPI) GetControl(policyName string) (*reporthandling.Control, error) {
 	return nil, fmt.Errorf("control api is not public")
 }
 
@@ -305,7 +306,7 @@ func (api *KSCloudAPI) ListFrameworks() ([]string, error) {
 	return frameworkList, nil
 }
 
-func (api *KSCloudAPI) ListControls() ([]string, error) {
+func (api *KSCloudAPI) ListControls(l ListType) ([]string, error) {
 	return nil, fmt.Errorf("control api is not public")
 }
 
@@ -357,7 +358,7 @@ func (api *KSCloudAPI) Login() error {
 		return fmt.Errorf("error authenticating: %d", resp.StatusCode)
 	}
 
-	responseBody, err := io.ReadAll(resp.Body)
+	responseBody, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}

core/cautils/getter/kscloudapiutils.go

@@ -2,6 +2,7 @@ package getter
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/url"

core/cautils/getter/loadpolicy.go

@@ -1,7 +1,7 @@
 package getter
 
 import (
-	"errors"
+	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -9,25 +9,12 @@ import (
 
 	"github.com/armosec/armoapi-go/armotypes"
 	"github.com/kubescape/opa-utils/reporthandling"
-	"github.com/kubescape/opa-utils/reporthandling/attacktrack/v1alpha1"
 )
 
 // =======================================================================================================================
 // ============================================== LoadPolicy =============================================================
 // =======================================================================================================================
-var (
-	DefaultLocalStore = getCacheDir()
-
-	ErrNotImplemented       = errors.New("feature is currently not supported")
-	ErrNotFound             = errors.New("name not found")
-	ErrNameRequired         = errors.New("missing required input framework name")
-	ErrIDRequired           = errors.New("missing required input control ID")
-	ErrFrameworkNotMatching = errors.New("framework from file not matching")
-	ErrControlNotMatching   = errors.New("framework from file not matching")
-
-	_ IPolicyGetter     = &LoadPolicy{}
-	_ IExceptionsGetter = &LoadPolicy{}
-)
+var DefaultLocalStore = getCacheDir()
 
 func getCacheDir() string {
 	defaultDirPath := ".kubescape"
@@ -37,225 +24,125 @@ func getCacheDir() string {
 	return defaultDirPath
 }
 
-// LoadPolicy loads policies from a local repository.
+// Load policies from a local repository
 type LoadPolicy struct {
 	filePaths []string
 }
 
-// NewLoadPolicy builds a LoadPolicy.
 func NewLoadPolicy(filePaths []string) *LoadPolicy {
 	return &LoadPolicy{
 		filePaths: filePaths,
 	}
 }
 
-// GetControl returns a control from the policy file.
-func (lp *LoadPolicy) GetControl(controlID string) (*reporthandling.Control, error) {
-	if controlID == "" {
-		return nil, ErrIDRequired
-	}
+// Return control from file
+func (lp *LoadPolicy) GetControl(controlName string) (*reporthandling.Control, error) {
 
-	// NOTE: this assumes that only the first path contains either a valid control descriptor or a framework descriptor
+	control := &reporthandling.Control{}
 	filePath := lp.filePath()
-	buf, err := os.ReadFile(filePath)
-
+	f, err := os.ReadFile(filePath)
 	if err != nil {
 		return nil, err
 	}
 
-	// check if the file is a control descriptor: a ControlID field is populated.
-	var control reporthandling.Control
-	if err = json.Unmarshal(buf, &control); err == nil && control.ControlID != "" {
-		if strings.EqualFold(controlID, control.ControlID) {
-			return &control, nil
-		}
-
-		return nil, fmt.Errorf("controlID: %s: %w", controlID, ErrControlNotMatching)
+	if err = json.Unmarshal(f, control); err != nil {
+		return control, err
 	}
-
-	// check if the file is a framework descriptor
-	var framework reporthandling.Framework
-	if err = json.Unmarshal(buf, &framework); err != nil {
-		return nil, err
-	}
-
-	for _, toPin := range framework.Controls {
-		ctrl := toPin
-
-		if strings.EqualFold(ctrl.ControlID, controlID) {
-			return &ctrl, nil
+	if controlName != "" && !strings.EqualFold(controlName, control.Name) && !strings.EqualFold(controlName, control.ControlID) {
+		framework, err := lp.GetFramework(control.Name)
+		if err != nil {
+			return nil, fmt.Errorf("control from file not matching")
+		} else {
+			for _, ctrl := range framework.Controls {
+				if strings.EqualFold(ctrl.Name, controlName) || strings.EqualFold(ctrl.ControlID, controlName) {
+					control = &ctrl
+					break
+				}
+			}
 		}
 	}
-
-	return nil, fmt.Errorf("controlID: %s: %w", controlID, ErrControlNotMatching)
+	return control, err
 }
 
-// GetFramework retrieves a framework configuration from the policy paths.
 func (lp *LoadPolicy) GetFramework(frameworkName string) (*reporthandling.Framework, error) {
-	if frameworkName == "" {
-		return nil, ErrNameRequired
-	}
-
-	for _, filePath := range lp.filePaths {
-		buf, err := os.ReadFile(filePath)
-		if err != nil {
-			return nil, err
-		}
-
-		var framework reporthandling.Framework
-		if err = json.Unmarshal(buf, &framework); err != nil {
-			return nil, err
-		}
-
-		if strings.EqualFold(frameworkName, framework.Name) {
-			return &framework, nil
-		}
-	}
-
-	return nil, fmt.Errorf("framework: %s: %w", frameworkName, ErrFrameworkNotMatching)
-}
-
-// GetFrameworks returns all configured framework descriptors.
-func (lp *LoadPolicy) GetFrameworks() ([]reporthandling.Framework, error) {
-	frameworks := make([]reporthandling.Framework, 0, 10)
-	seenFws := make(map[string]struct{})
-
-	for _, f := range lp.filePaths {
-		buf, err := os.ReadFile(f)
-		if err != nil {
-			return nil, err
-		}
-
-		var framework reporthandling.Framework
-		if err = json.Unmarshal(buf, &framework); err != nil {
-			// ignore invalid framework files
-			continue
-		}
-
-		// dedupe
-		_, alreadyLoaded := seenFws[framework.Name]
-		if alreadyLoaded {
-			continue
-		}
-
-		seenFws[framework.Name] = struct{}{}
-		frameworks = append(frameworks, framework)
-	}
-
-	return frameworks, nil
-}
-
-// ListFrameworks lists the names of all configured frameworks in this policy.
-func (lp *LoadPolicy) ListFrameworks() ([]string, error) {
-	frameworkNames := make([]string, 0, 10)
-
-	for _, f := range lp.filePaths {
-		buf, err := os.ReadFile(f)
-		if err != nil {
-			return nil, err
-		}
-
-		var framework reporthandling.Framework
-		if err := json.Unmarshal(buf, &framework); err != nil {
-			continue
-		}
-
-		if framework.Name == "" || contains(frameworkNames, framework.Name) {
-			continue
-		}
-
-		frameworkNames = append(frameworkNames, framework.Name)
-	}
-
-	return frameworkNames, nil
-}
-
-// ListControls returns the list of controls for this framework.
-//
-// At this moment, controls are listed for one single configured framework.
-func (lp *LoadPolicy) ListControls() ([]string, error) {
-	controlIDs := make([]string, 0, 100)
-	filePath := lp.filePath()
-	buf, err := os.ReadFile(filePath)
-	if err != nil {
-		return nil, err
-	}
-
 	var framework reporthandling.Framework
-	if err = json.Unmarshal(buf, &framework); err != nil {
-		return nil, err
+	var err error
+	for _, filePath := range lp.filePaths {
+		framework = reporthandling.Framework{}
+		f, err := os.ReadFile(filePath)
+		if err != nil {
+			return nil, err
+		}
+		if err = json.Unmarshal(f, &framework); err != nil {
+			return nil, err
+		}
+		if strings.EqualFold(frameworkName, framework.Name) {
+			break
+		}
 	}
+	if frameworkName != "" && !strings.EqualFold(frameworkName, framework.Name) {
 
-	for _, ctrl := range framework.Controls {
-		controlIDs = append(controlIDs, ctrl.ControlID)
+		return nil, fmt.Errorf("framework from file not matching")
 	}
-
-	return controlIDs, nil
+	return &framework, err
 }
 
-// GetExceptions retrieves configured exceptions.
-//
-// NOTE: the cluster parameter is not used at this moment.
-func (lp *LoadPolicy) GetExceptions(_ /* clusterName */ string) ([]armotypes.PostureExceptionPolicy, error) {
-	// NOTE: this assumes that the first path contains a valid exceptions descriptor
-	filePath := lp.filePath()
+func (lp *LoadPolicy) GetFrameworks() ([]reporthandling.Framework, error) {
+	frameworks := []reporthandling.Framework{}
+	var err error
+	return frameworks, err
+}
 
-	buf, err := os.ReadFile(filePath)
+func (lp *LoadPolicy) ListFrameworks() ([]string, error) {
+	fwNames := []string{}
+	framework := &reporthandling.Framework{}
+	for _, f := range lp.filePaths {
+		file, err := os.ReadFile(f)
+		if err == nil {
+			if err := json.Unmarshal(file, framework); err == nil {
+				if !contains(fwNames, framework.Name) {
+					fwNames = append(fwNames, framework.Name)
+				}
+			}
+		}
+	}
+	return fwNames, nil
+}
+
+func (lp *LoadPolicy) ListControls(listType ListType) ([]string, error) {
+	// TODO - Support
+	return []string{}, fmt.Errorf("loading controls list from file is not supported")
+}
+
+func (lp *LoadPolicy) GetExceptions(clusterName string) ([]armotypes.PostureExceptionPolicy, error) {
+	filePath := lp.filePath()
+	exception := []armotypes.PostureExceptionPolicy{}
+	f, err := os.ReadFile(filePath)
 	if err != nil {
 		return nil, err
 	}
 
-	exception := make([]armotypes.PostureExceptionPolicy, 0, 300)
-	err = json.Unmarshal(buf, &exception)
-
+	err = json.Unmarshal(f, &exception)
 	return exception, err
 }
 
-// GetControlsInputs retrieves the map of control configs.
-//
-// NOTE: the cluster parameter is not used at this moment.
-func (lp *LoadPolicy) GetControlsInputs(_ /* clusterName */ string) (map[string][]string, error) {
-	// NOTE: this assumes that only the first path contains a valid control inputs descriptor
+func (lp *LoadPolicy) GetControlsInputs(clusterName string) (map[string][]string, error) {
 	filePath := lp.filePath()
+	accountConfig := &armotypes.CustomerConfig{}
+	f, err := os.ReadFile(filePath)
 	fileName := filepath.Base(filePath)
-
-	buf, err := os.ReadFile(filePath)
 	if err != nil {
-		formattedError := fmt.Errorf(
-			`Error opening %s file, "controls-config" will be downloaded from ARMO management portal`,
-			fileName,
-		)
-
+		formattedError := fmt.Errorf("Error opening %s file, \"controls-config\" will be downloaded from ARMO management portal", fileName)
 		return nil, formattedError
 	}
 
-	controlInputs := make(map[string][]string, 100) // from armotypes.Settings.PostureControlInputs
-	if err = json.Unmarshal(buf, &controlInputs); err != nil {
-		formattedError := fmt.Errorf(
-			`Error reading %s file, %v, "controls-config" will be downloaded from ARMO management portal`,
-			fileName, err,
-		)
-
-		return nil, formattedError
+	if err = json.Unmarshal(f, &accountConfig.Settings.PostureControlInputs); err == nil {
+		return accountConfig.Settings.PostureControlInputs, nil
 	}
 
-	return controlInputs, nil
-}
+	formattedError := fmt.Errorf("Error reading %s file, %s, \"controls-config\" will be downloaded from ARMO management portal", fileName, err.Error())
 
-// GetAttackTracks yields the attack tracks from a config file.
-func (lp *LoadPolicy) GetAttackTracks() ([]v1alpha1.AttackTrack, error) {
-	attackTracks := make([]v1alpha1.AttackTrack, 0, 20)
-
-	buf, err := os.ReadFile(lp.filePath())
-	if err != nil {
-		return nil, err
-	}
-
-	if err = json.Unmarshal(buf, &attackTracks); err != nil {
-		return nil, err
-	}
-
-	return attackTracks, nil
+	return nil, formattedError
 }
 
 // temporary support for a list of files

core/cautils/getter/loadpolicy_test.go

@@ -1,409 +1,13 @@
 package getter
 
 import (
-	"fmt"
-	"os"
 	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/require"
 )
 
+var mockFrameworkBasePath = filepath.Join("examples", "mocks", "frameworks")
+
 func MockNewLoadPolicy() *LoadPolicy {
 	return &LoadPolicy{
 		filePaths: []string{""},
 	}
 }
-
-func TestLoadPolicy(t *testing.T) {
-	t.Parallel()
-
-	const (
-		testFramework = "MITRE"
-		testControl   = "C-0053"
-	)
-
-	t.Run("with GetFramework", func(t *testing.T) {
-		t.Run("should retrieve named framework", func(t *testing.T) {
-			t.Parallel()
-
-			p := NewLoadPolicy([]string{testFrameworkFile(testFramework)})
-			fw, err := p.GetFramework(testFramework)
-			require.NoError(t, err)
-			require.NotNil(t, fw)
-
-			require.Equal(t, testFramework, fw.Name)
-		})
-
-		t.Run("should fail to retrieve framework", func(t *testing.T) {
-			t.Parallel()
-
-			p := NewLoadPolicy([]string{testFrameworkFile(testFramework)})
-			fw, err := p.GetFramework("wrong")
-			require.Error(t, err)
-			require.Nil(t, fw)
-		})
-
-		t.Run("edge case: should error on empty framework", func(t *testing.T) {
-			t.Parallel()
-
-			p := NewLoadPolicy([]string{testFrameworkFile(testFramework)})
-			fw, err := p.GetFramework("")
-			require.ErrorIs(t, err, ErrNameRequired)
-			require.Nil(t, fw)
-		})
-
-		t.Run("edge case: corrupted json", func(t *testing.T) {
-			t.Parallel()
-
-			const invalidFramework = "invalid-fw"
-			p := NewLoadPolicy([]string{testFrameworkFile(invalidFramework)})
-			fw, err := p.GetFramework(invalidFramework)
-			require.Error(t, err)
-			require.Nil(t, fw)
-		})
-
-		t.Run("edge case: missing json", func(t *testing.T) {
-			t.Parallel()
-
-			const invalidFramework = "nowheretobefound"
-			p := NewLoadPolicy([]string{testFrameworkFile(invalidFramework)})
-			_, err := p.GetFramework(invalidFramework)
-			require.Error(t, err)
-		})
-	})
-
-	t.Run("with GetControl", func(t *testing.T) {
-		t.Run("should retrieve named control from framework", func(t *testing.T) {
-			t.Parallel()
-
-			const (
-				expectedControlName = "Access container service account"
-			)
-			p := NewLoadPolicy([]string{testFrameworkFile(testFramework)})
-			ctrl, err := p.GetControl(testControl)
-			require.NoError(t, err)
-			require.NotNil(t, ctrl)
-
-			require.Equal(t, testControl, ctrl.ControlID)
-			require.Equal(t, expectedControlName, ctrl.Name)
-		})
-
-		t.Run("with single control descriptor", func(t *testing.T) {
-			const (
-				singleControl       = "C-0001"
-				expectedControlName = "Forbidden Container Registries"
-			)
-
-			t.Run("should retrieve named control from control descriptor", func(t *testing.T) {
-				t.Parallel()
-
-				p := NewLoadPolicy([]string{testFrameworkFile(singleControl)})
-				ctrl, err := p.GetControl(singleControl)
-				require.NoError(t, err)
-				require.NotNil(t, ctrl)
-
-				require.Equal(t, singleControl, ctrl.ControlID)
-				require.Equal(t, expectedControlName, ctrl.Name)
-			})
-
-			t.Run("should fail to retrieve named control from control descriptor", func(t *testing.T) {
-				t.Parallel()
-
-				p := NewLoadPolicy([]string{testFrameworkFile(singleControl)})
-				ctrl, err := p.GetControl("wrong")
-				require.Error(t, err)
-				require.Nil(t, ctrl)
-			})
-		})
-
-		t.Run("with framework descriptor", func(t *testing.T) {
-			t.Run("should fail to retrieve named control", func(t *testing.T) {
-				t.Parallel()
-
-				const testControl = "wrong"
-				p := NewLoadPolicy([]string{testFrameworkFile(testFramework)})
-				ctrl, err := p.GetControl(testControl)
-				require.ErrorIs(t, err, ErrControlNotMatching)
-				require.Nil(t, ctrl)
-			})
-		})
-
-		t.Run("edge case: corrupted json", func(t *testing.T) {
-			t.Parallel()
-
-			const invalidControl = "invalid-fw"
-			p := NewLoadPolicy([]string{testFrameworkFile(invalidControl)})
-			_, err := p.GetControl(invalidControl)
-			require.Error(t, err)
-		})
-
-		t.Run("edge case: missing json", func(t *testing.T) {
-			t.Parallel()
-
-			const invalidControl = "nowheretobefound"
-			p := NewLoadPolicy([]string{testFrameworkFile(invalidControl)})
-			_, err := p.GetControl(invalidControl)
-			require.Error(t, err)
-		})
-
-		t.Run("edge case: should error on empty control", func(t *testing.T) {
-			t.Parallel()
-
-			p := NewLoadPolicy([]string{testFrameworkFile(testFramework)})
-			ctrl, err := p.GetControl("")
-			require.ErrorIs(t, err, ErrIDRequired)
-			require.Nil(t, ctrl)
-		})
-	})
-
-	t.Run("with ListFrameworks", func(t *testing.T) {
-		t.Run("should return all frameworks in the policy path", func(t *testing.T) {
-			t.Parallel()
-
-			const (
-				extraFramework = "NSA"
-				attackTracks   = "attack-tracks"
-			)
-			p := NewLoadPolicy([]string{
-				testFrameworkFile(testFramework),
-				testFrameworkFile(extraFramework),
-				testFrameworkFile(extraFramework), // should  be deduped
-				testFrameworkFile(attackTracks),   // should be ignored
-			})
-			fws, err := p.ListFrameworks()
-			require.NoError(t, err)
-			require.Len(t, fws, 2)
-
-			require.Equal(t, testFramework, fws[0])
-			require.Equal(t, extraFramework, fws[1])
-		})
-
-		t.Run("should not return an empty framework", func(t *testing.T) {
-			t.Parallel()
-
-			const (
-				extraFramework = "NSA"
-				attackTracks   = "attack-tracks"
-				controlsInputs = "controls-inputs"
-			)
-			p := NewLoadPolicy([]string{
-				testFrameworkFile(testFramework),
-				testFrameworkFile(extraFramework),
-				testFrameworkFile(attackTracks),   // should be ignored
-				testFrameworkFile(controlsInputs), // should be ignored
-			})
-			fws, err := p.ListFrameworks()
-			require.NoError(t, err)
-			require.Len(t, fws, 2)
-			require.NotContains(t, fws, "")
-
-			require.Equal(t, testFramework, fws[0])
-			require.Equal(t, extraFramework, fws[1])
-		})
-
-		t.Run("should fail on file error", func(t *testing.T) {
-			t.Parallel()
-
-			const (
-				extraFramework = "NSA"
-				nowhere        = "nowheretobeseen"
-			)
-			p := NewLoadPolicy([]string{
-				testFrameworkFile(testFramework),
-				testFrameworkFile(extraFramework),
-				testFrameworkFile(nowhere), // should raise an error
-			})
-			fws, err := p.ListFrameworks()
-			require.Error(t, err)
-			require.Nil(t, fws)
-		})
-	})
-
-	t.Run("edge case: policy without path", func(t *testing.T) {
-		t.Parallel()
-
-		p := NewLoadPolicy([]string{})
-		require.Empty(t, p.filePath())
-	})
-
-	t.Run("with GetFrameworks", func(t *testing.T) {
-		const extraFramework = "NSA"
-
-		t.Run("should return all configured frameworks", func(t *testing.T) {
-			t.Parallel()
-
-			p := NewLoadPolicy([]string{
-				testFrameworkFile(testFramework),
-				testFrameworkFile(extraFramework),
-			})
-			fws, err := p.GetFrameworks()
-			require.NoError(t, err)
-			require.Len(t, fws, 2)
-
-			require.Equal(t, testFramework, fws[0].Name)
-			require.Equal(t, extraFramework, fws[1].Name)
-		})
-
-		t.Run("should return dedupe configured frameworks", func(t *testing.T) {
-			t.Parallel()
-
-			const attackTracks = "attack-tracks"
-			p := NewLoadPolicy([]string{
-				testFrameworkFile(testFramework),
-				testFrameworkFile(extraFramework),
-				testFrameworkFile(extraFramework),
-				testFrameworkFile(attackTracks), // should be ignored
-			})
-			fws, err := p.GetFrameworks()
-			require.NoError(t, err)
-			require.Len(t, fws, 2)
-
-			require.Equal(t, testFramework, fws[0].Name)
-			require.Equal(t, extraFramework, fws[1].Name)
-		})
-	})
-
-	t.Run("with ListControls", func(t *testing.T) {
-		t.Run("should return controls", func(t *testing.T) {
-			t.Parallel()
-
-			p := NewLoadPolicy([]string{testFrameworkFile(testFramework)})
-			controlIDs, err := p.ListControls()
-			require.NoError(t, err)
-			require.Greater(t, len(controlIDs), 0)
-			require.Equal(t, testControl, controlIDs[0])
-		})
-	})
-
-	t.Run("with GetAttackTracks", func(t *testing.T) {
-		t.Run("should return attack tracks", func(t *testing.T) {
-			t.Parallel()
-
-			const attackTracks = "attack-tracks"
-			p := NewLoadPolicy([]string{testFrameworkFile(attackTracks)})
-			tracks, err := p.GetAttackTracks()
-			require.NoError(t, err)
-			require.Greater(t, len(tracks), 0)
-
-			for _, track := range tracks {
-				require.Equal(t, "AttackTrack", track.Kind)
-			}
-		})
-
-		t.Run("edge case: corrupted json", func(t *testing.T) {
-			t.Parallel()
-
-			const invalidTracks = "invalid-fw"
-			p := NewLoadPolicy([]string{testFrameworkFile(invalidTracks)})
-			_, err := p.GetAttackTracks()
-			require.Error(t, err)
-		})
-
-		t.Run("edge case: missing json", func(t *testing.T) {
-			t.Parallel()
-
-			const invalidTracks = "nowheretobefound"
-			p := NewLoadPolicy([]string{testFrameworkFile(invalidTracks)})
-			_, err := p.GetAttackTracks()
-			require.Error(t, err)
-		})
-	})
-
-	t.Run("with GetControlsInputs", func(t *testing.T) {
-		const cluster = "dummy" // unused parameter at the moment
-
-		t.Run("should return control inputs for a cluster", func(t *testing.T) {
-			t.Parallel()
-
-			fixture, expected := writeTempJSONControlInputs(t)
-			t.Cleanup(func() {
-				_ = os.Remove(fixture)
-			})
-
-			p := NewLoadPolicy([]string{fixture})
-			inputs, err := p.GetControlsInputs(cluster)
-			require.NoError(t, err)
-			require.EqualValues(t, expected, inputs)
-		})
-
-		t.Run("edge case: corrupted json", func(t *testing.T) {
-			t.Parallel()
-
-			const invalidInputs = "invalid-fw"
-			p := NewLoadPolicy([]string{testFrameworkFile(invalidInputs)})
-			_, err := p.GetControlsInputs(cluster)
-			require.Error(t, err)
-		})
-
-		t.Run("edge case: missing json", func(t *testing.T) {
-			t.Parallel()
-
-			const invalidInputs = "nowheretobefound"
-			p := NewLoadPolicy([]string{testFrameworkFile(invalidInputs)})
-			_, err := p.GetControlsInputs(cluster)
-			require.Error(t, err)
-		})
-	})
-
-	t.Run("with GetExceptions", func(t *testing.T) {
-		const cluster = "dummy" // unused parameter at the moment
-
-		t.Run("should return exceptions", func(t *testing.T) {
-			t.Parallel()
-
-			const exceptions = "exceptions"
-
-			p := NewLoadPolicy([]string{testFrameworkFile(exceptions)})
-			exceptionPolicies, err := p.GetExceptions(cluster)
-			require.NoError(t, err)
-
-			require.Greater(t, len(exceptionPolicies), 0)
-			t.Logf("len=%d", len(exceptionPolicies))
-			for _, policy := range exceptionPolicies {
-				require.NotEmpty(t, policy.Name)
-			}
-		})
-
-		t.Run("edge case: corrupted json", func(t *testing.T) {
-			t.Parallel()
-
-			const invalidInputs = "invalid-fw"
-			p := NewLoadPolicy([]string{testFrameworkFile(invalidInputs)})
-			_, err := p.GetExceptions(cluster)
-			require.Error(t, err)
-		})
-
-		t.Run("edge case: missing json", func(t *testing.T) {
-			t.Parallel()
-
-			const invalidInputs = "nowheretobefound"
-			p := NewLoadPolicy([]string{testFrameworkFile(invalidInputs)})
-			_, err := p.GetExceptions(cluster)
-			require.Error(t, err)
-		})
-	})
-}
-
-func testFrameworkFile(framework string) string {
-	return filepath.Join(".", "testdata", fmt.Sprintf("%s.json", framework))
-}
-
-func writeTempJSONControlInputs(t testing.TB) (string, map[string][]string) {
-	fileName := testFrameworkFile("control-inputs")
-	mock := map[string][]string{
-		"key1": {
-			"val1", "val2",
-		},
-		"key2": {
-			"val3", "val4",
-		},
-	}
-
-	buf, err := json.Marshal(mock)
-	require.NoError(t, err)
-
-	require.NoError(t, os.WriteFile(fileName, buf, 0600))
-
-	return fileName, mock
-}

core/cautils/getter/testdata/C-0001.json

@@ -1,85 +0,0 @@
-{
-  "guid": "",
-  "name": "Forbidden Container Registries",
-  "attributes": {
-    "armoBuiltin": true,
-    "attackTracks": [
-      {
-        "attackTrack": "container",
-        "categories": [
-          "Initial access"
-        ]
-      }
-    ],
-    "controlTypeTags": [
-      "security",
-      "compliance"
-    ],
-    "microsoftMitreColumns": [
-      "Initial Access"
-    ]
-  },
-  "id": "C-0001",
-  "controlID": "C-0001",
-  "creationTime": "",
-  "description": "In cases where the Kubernetes cluster is provided by a CSP (e.g., AKS in Azure, GKE in GCP, or EKS in AWS), compromised cloud credential can lead to the cluster takeover. Attackers may abuse cloud account credentials or IAM mechanism to the cluster’s management layer.",
-  "remediation": "Limit the registries from which you pull container images from",
-  "rules": [
-    {
-      "guid": "",
-      "name": "rule-identify-blocklisted-image-registries",
-      "attributes": {
-        "armoBuiltin": true,
-        "m$K8sThreatMatrix": "Initial Access::Compromised images in registry"
-      },
-      "creationTime": "",
-      "rule": "package armo_builtins\nimport data\n# Check for images from blocklisted repos\n\nuntrustedImageRepo[msga] {\n\tpod := input[_]\n\tk := pod.kind\n\tk == \"Pod\"\n\tcontainer := pod.spec.containers[i]\n\tpath := sprintf(\"spec.containers[%v].image\", [format_int(i, 10)])\n\timage := container.image\n    untrusted_or_public_registries(image)\n\n\tmsga := {\n\t\t\"alertMessage\": sprintf(\"image '%v' in container '%s' comes from untrusted registry\", [image, container.name]),\n\t\t\"packagename\": \"armo_builtins\",\n\t\t\"alertScore\": 2,\n\t\t\"fixPaths\": [],\n\t\t\"failedPaths\": [path],\n         \"alertObject\": {\n\t\t\t\"k8sApiObjects\": [pod]\n\t\t}\n    }\n}\n\nuntrustedImageRepo[msga] {\n\twl := input[_]\n\tspec_template_spec_patterns := {\"Deployment\",\"ReplicaSet\",\"DaemonSet\",\"StatefulSet\",\"Job\"}\n\tspec_template_spec_patterns[wl.kind]\n\tcontainer := wl.spec.template.spec.containers[i]\n\tpath := sprintf(\"spec.template.spec.containers[%v].image\", [format_int(i, 10)])\n\timage := container.image\n    untrusted_or_public_registries(image)\n\n\tmsga := {\n\t\t\"alertMessage\": sprintf(\"image '%v' in container '%s' comes from untrusted registry\", [image, container.name]),\n\t\t\"packagename\": \"armo_builtins\",\n\t\t\"alertScore\": 2,\n\t\t\"fixPaths\": [],\n\t\t\"failedPaths\": [path],\n         \"alertObject\": {\n\t\t\t\"k8sApiObjects\": [wl]\n\t\t}\n    }\n}\n\nuntrustedImageRepo[msga] {\n\twl := input[_]\n\twl.kind == \"CronJob\"\n\tcontainer := wl.spec.jobTemplate.spec.template.spec.containers[i]\n\tpath := sprintf(\"spec.jobTemplate.spec.template.spec.containers[%v].image\", [format_int(i, 10)])\n\timage := container.image\n    untrusted_or_public_registries(image)\n\n\tmsga := {\n\t\t\"alertMessage\": sprintf(\"image '%v' in container '%s' comes from untrusted registry\", [image, container.name]),\n\t\t\"packagename\": \"armo_builtins\",\n\t\t\"alertScore\": 2,\n\t\t\"fixPaths\": [],\n\t\t\"failedPaths\": [path],\n        \"alertObject\": {\n\t\t\t\"k8sApiObjects\": [wl]\n\t\t}\n    }\n}\n\nuntrusted_or_public_registries(image){\n\t# see default-config-inputs.json for list values\n\tuntrusted_registries := data.postureControlInputs.untrustedRegistries\n\trepo_prefix := untrusted_registries[_]\n\tstartswith(image, repo_prefix)\n}\n\nuntrusted_or_public_registries(image){\n\t# see default-config-inputs.json for list values\n\tpublic_registries := data.postureControlInputs.publicRegistries\n\trepo_prefix := public_registries[_]\n\tstartswith(image, repo_prefix)\n}",
-      "resourceEnumerator": "",
-      "ruleLanguage": "Rego",
-      "match": [
-        {
-          "apiGroups": [
-            "*"
-          ],
-          "apiVersions": [
-            "*"
-          ],
-          "resources": [
-            "Pod",
-            "Deployment",
-            "ReplicaSet",
-            "DaemonSet",
-            "StatefulSet",
-            "Job",
-            "CronJob"
-          ]
-        }
-      ],
-      "ruleDependencies": [],
-      "configInputs": [
-        "settings.postureControlInputs.publicRegistries",
-        "settings.postureControlInputs.untrustedRegistries"
-      ],
-      "controlConfigInputs": [
-        {
-          "path": "settings.postureControlInputs.publicRegistries",
-          "name": "Public registries",
-          "description": "Kubescape checks none of these public registries are in use."
-        },
-        {
-          "path": "settings.postureControlInputs.untrustedRegistries",
-          "name": "Registries block list",
-          "description": "Kubescape checks none of the following registries are in use."
-        }
-      ],
-      "description": "Identifying if pod container images are from unallowed registries",
-      "remediation": "Use images from safe registry",
-      "ruleQuery": "",
-      "relevantCloudProviders": null
-    }
-  ],
-  "rulesIDs": [
-    ""
-  ],
-  "baseScore": 7
-}

core/cautils/getter/testdata/attack-tracks.json

@@ -1,136 +0,0 @@
-[
-  {
-    "apiVersion": "regolibrary.kubescape/v1alpha1",
-    "kind": "AttackTrack",
-    "metadata": {
-      "name": "node"
-    },
-    "spec": {
-      "data": {
-        "name": "Initial access",
-        "subSteps": [
-          {
-            "name": "Execution",
-            "subSteps": [
-              {
-                "name": "Persistence"
-              },
-              {
-                "name": "Credential access"
-              },
-              {
-                "name": "Defense evasion"
-              },
-              {
-                "name": "Discovery"
-              },
-              {
-                "name": "Lateral movement"
-              },
-              {
-                "name": "Impact - data theft"
-              },
-              {
-                "name": "Impact - data destruction"
-              },
-              {
-                "name": "Impact - service injection"
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  {
-    "apiVersion": "regolibrary.kubescape/v1alpha1",
-    "kind": "AttackTrack",
-    "metadata": {
-      "name": "kubeapi"
-    },
-    "spec": {
-      "data": {
-        "name": "Initial access",
-        "subSteps": [
-          {
-            "name": "Persistence"
-          },
-          {
-            "name": "Privilege escalation"
-          },
-          {
-            "name": "Credential access"
-          },
-          {
-            "name": "Discovery"
-          },
-          {
-            "name": "Lateral movement"
-          },
-          {
-            "name": "Defense evasion"
-          },
-          {
-            "name": "Impact - data destruction"
-          },
-          {
-            "name": "Impact - service injection"
-          }
-        ]
-      }
-    }
-  },
-  {
-    "apiVersion": "regolibrary.kubescape/v1alpha1",
-    "kind": "AttackTrack",
-    "metadata": {
-      "name": "container"
-    },
-    "spec": {
-      "data": {
-        "name": "Initial access",
-        "subSteps": [
-          {
-            "name": "Execution",
-            "subSteps": [
-              {
-                "name": "Privilege escalation"
-              },
-              {
-                "name": "Credential access",
-                "subSteps": [
-                  {
-                    "name": "Impact - service access"
-                  },
-                  {
-                    "name": "Impact - K8s API access",
-                    "subSteps": [
-                      {
-                        "name": "Defense evasion - KubeAPI"
-                      }
-                    ]
-                  }
-                ]
-              },
-              {
-                "name": "Discovery"
-              },
-              {
-                "name": "Lateral movement"
-              },
-              {
-                "name": "Impact - Data access in container"
-              },
-              {
-                "name": "Persistence"
-              }
-            ]
-          },
-          {
-            "name": "Impact - service destruction"
-          }
-        ]
-      }
-    }
-  }
-]

core/cautils/getter/testdata/controls-inputs.json

@@ -1,125 +0,0 @@
-{
-  "publicRegistries": [],
-  "untrustedRegistries": [],
-  "listOfDangerousArtifacts": [
-    "bin/bash",
-    "sbin/sh",
-    "bin/ksh",
-    "bin/tcsh",
-    "bin/zsh",
-    "usr/bin/scsh",
-    "bin/csh",
-    "bin/busybox",
-    "usr/bin/busybox"
-  ],
-  "sensitiveKeyNames": [
-    "aws_access_key_id",
-    "aws_secret_access_key",
-    "azure_batchai_storage_account",
-    "azure_batchai_storage_key",
-    "azure_batch_account",
-    "azure_batch_key",
-    "secret",
-    "key",
-    "password",
-    "pwd",
-    "token",
-    "jwt",
-    "bearer",
-    "credential"
-  ],
-  "servicesNames": [
-    "nifi-service",
-    "argo-server",
-    "minio",
-    "postgres",
-    "workflow-controller-metrics",
-    "weave-scope-app",
-    "kubernetes-dashboard"
-  ],
-  "memory_limit_max": [],
-  "cpu_request_min": [],
-  "wlKnownNames": [
-    "coredns",
-    "kube-proxy",
-    "event-exporter-gke",
-    "kube-dns",
-    "17-default-backend",
-    "metrics-server",
-    "ca-audit",
-    "ca-dashboard-aggregator",
-    "ca-notification-server",
-    "ca-ocimage",
-    "ca-oracle",
-    "ca-posture",
-    "ca-rbac",
-    "ca-vuln-scan",
-    "ca-webhook",
-    "ca-websocket",
-    "clair-clair"
-  ],
-  "sensitiveInterfaces": [
-    "nifi",
-    "argo-server",
-    "weave-scope-app",
-    "kubeflow",
-    "kubernetes-dashboard",
-    "jenkins",
-    "prometheus-deployment"
-  ],
-  "max_high_vulnerabilities": [
-    "10"
-  ],
-  "sensitiveValues": [
-    "BEGIN \\w+ PRIVATE KEY",
-    "PRIVATE KEY",
-    "eyJhbGciO",
-    "JWT",
-    "Bearer",
-    "_key_",
-    "_secret_"
-  ],
-  "memory_request_max": [],
-  "memory_request_min": [],
-  "cpu_request_max": [],
-  "cpu_limit_max": [],
-  "cpu_limit_min": [],
-  "insecureCapabilities": [
-    "SETPCAP",
-    "NET_ADMIN",
-    "NET_RAW",
-    "SYS_MODULE",
-    "SYS_RAWIO",
-    "SYS_PTRACE",
-    "SYS_ADMIN",
-    "SYS_BOOT",
-    "MAC_OVERRIDE",
-    "MAC_ADMIN",
-    "PERFMON",
-    "ALL",
-    "BPF"
-  ],
-  "max_critical_vulnerabilities": [
-    "5"
-  ],
-  "sensitiveValuesAllowed": [],
-  "memory_limit_min": [],
-  "recommendedLabels": [
-    "app",
-    "tier",
-    "phase",
-    "version",
-    "owner",
-    "env"
-  ],
-  "k8sRecommendedLabels": [
-    "app.kubernetes.io/name",
-    "app.kubernetes.io/instance",
-    "app.kubernetes.io/version",
-    "app.kubernetes.io/component",
-    "app.kubernetes.io/part-of",
-    "app.kubernetes.io/managed-by",
-    "app.kubernetes.io/created-by"
-  ],
-  "imageRepositoryAllowList": []
-}

core/cautils/getter/testdata/invalid-fw.json

@@ -1,3 +0,0 @@
-{
-  "guid": "",
-}

core/cautils/git_native_disabled.go

@@ -1,22 +0,0 @@
-//go:build !gitenabled
-
-package cautils
-
-import (
-	"errors"
-
-	"github.com/kubescape/go-git-url/apis"
-)
-
-var ErrFatalNotSupportedByBuild = errors.New(`git scan not supported by this build. Build with tag "gitenabled" to enable the git scan feature`)
-
-type gitRepository struct {
-}
-
-func newGitRepository(root string) (*gitRepository, error) {
-	return &gitRepository{}, ErrWarnNotSupportedByBuild
-}
-
-func (g *gitRepository) GetFileLastCommit(filePath string) (*apis.Commit, error) {
-	return nil, ErrFatalNotSupportedByBuild
-}

core/cautils/git_native_disabled_test.go

@@ -1,11 +0,0 @@
-//go:build !gitenabled
-
-package cautils
-
-func (s *LocalGitRepositoryTestSuite) TestGetLastCommit() {
-	s.T().Log("warn: skipped testing native git functionality [GetLastCommit]")
-}
-
-func (s *LocalGitRepositoryTestSuite) TestGetFileLastCommit() {
-	s.T().Log("warn: skipped testing native git functionality [GetFileLastCommit]")
-}

core/cautils/git_native_enabled.go

@@ -1,141 +0,0 @@
-//go:build gitenabled
-package cautils
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/kubescape/go-git-url/apis"
-	git2go "github.com/libgit2/git2go/v33"
-)
-
-type gitRepository struct {
-	git2GoRepo       *git2go.Repository
-	fileToLastCommit map[string]*git2go.Commit
-}
-
-func newGitRepository(root string) (*gitRepository, error) {
-	git2GoRepo, err := git2go.OpenRepository(root)
-	if err != nil {
-		return nil, err
-	}
-
-	return &gitRepository{
-		git2GoRepo: git2GoRepo,
-	}, nil
-}
-
-func (g *gitRepository) GetFileLastCommit(filePath string) (*apis.Commit, error) {
-	if len(g.fileToLastCommit) == 0 {
-		filePathToCommitTime := map[string]time.Time{}
-		filePathToCommit := map[string]*git2go.Commit{}
-		allCommits, _ := g.getAllCommits()
-
-		// builds a map of all files to their last commit
-		for _, commit := range allCommits {
-			// Ignore merge commits (2+ parents)
-			if commit.ParentCount() <= 1 {
-				tree, err := commit.Tree()
-				if err != nil {
-					continue
-				}
-
-				// ParentCount can be either 1 or 0 (initial commit)
-				// In case it's the initial commit, prevTree is nil
-				var prevTree *git2go.Tree
-				if commit.ParentCount() == 1 {
-					prevCommit := commit.Parent(0)
-					prevTree, err = prevCommit.Tree()
-					if err != nil {
-						continue
-					}
-				}
-
-				diff, err := g.git2GoRepo.DiffTreeToTree(prevTree, tree, nil)
-				if err != nil {
-					continue
-				}
-
-				numDeltas, err := diff.NumDeltas()
-				if err != nil {
-					continue
-				}
-
-				for i := 0; i < numDeltas; i++ {
-					delta, err := diff.Delta(i)
-					if err != nil {
-						continue
-					}
-
-					deltaFilePath := delta.NewFile.Path
-					commitTime := commit.Author().When
-
-					// In case we have the commit information for the file which is not the latest - we override it
-					if currentCommitTime, exists := filePathToCommitTime[deltaFilePath]; exists {
-						if currentCommitTime.Before(commitTime) {
-							filePathToCommitTime[deltaFilePath] = commitTime
-							filePathToCommit[deltaFilePath] = commit
-						}
-					} else {
-						filePathToCommitTime[deltaFilePath] = commitTime
-						filePathToCommit[deltaFilePath] = commit
-					}
-				}
-			}
-		}
-
-		g.fileToLastCommit = filePathToCommit
-	}
-
-	if relevantCommit, exists := g.fileToLastCommit[filePath]; exists {
-		return g.getCommit(relevantCommit), nil
-	}
-
-	return nil, fmt.Errorf("failed to get commit information for file: %s", filePath)
-}
-
-func (g *gitRepository) getAllCommits() ([]*git2go.Commit, error) {
-	logItr, itrErr := g.git2GoRepo.Walk()
-	if itrErr != nil {
-
-		return nil, itrErr
-	}
-
-	pushErr := logItr.PushHead()
-	if pushErr != nil {
-		return nil, pushErr
-	}
-
-	var allCommits []*git2go.Commit
-	err := logItr.Iterate(func(commit *git2go.Commit) bool {
-		if commit != nil {
-			allCommits = append(allCommits, commit)
-			return true
-		}
-		return false
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return allCommits, nil
-}
-
-func (g *gitRepository) getCommit(commit *git2go.Commit) *apis.Commit {
-	return &apis.Commit{
-		SHA: commit.Id().String(),
-		Author: apis.Committer{
-			Name:  commit.Author().Name,
-			Email: commit.Author().Email,
-			Date:  commit.Author().When,
-		},
-		Message:   commit.Message(),
-		Committer: apis.Committer{},
-		Files:     []apis.Files{},
-	}
-}

core/cautils/git_native_enabled_test.go

@@ -1,44 +0,0 @@
-//go:build gitenabled
-package cautils
-
-func (s *LocalGitRepositoryTestSuite) TestGetLastCommit() {
-	if localRepo, err := NewLocalGitRepository(s.gitRepositoryPaths["localrepo"]); s.NoError(err) {
-		if commit, err := localRepo.GetLastCommit(); s.NoError(err) {
-			s.Equal("7e09312b8017695fadcd606882e3779f10a5c832", commit.SHA)
-			s.Equal("Amir Malka", commit.Author.Name)
-			s.Equal("amirm@armosec.io", commit.Author.Email)
-			s.Equal("2022-05-22 19:11:57 +0300 +0300", commit.Author.Date.String())
-			s.Equal("added file B\n", commit.Message)
-		}
-	}
-}
-
-func (s *LocalGitRepositoryTestSuite) TestGetFileLastCommit() {
-	s.Run("fileA", func() {
-		if localRepo, err := NewLocalGitRepository(s.gitRepositoryPaths["localrepo"]); s.NoError(err) {
-
-			if commit, err := localRepo.GetFileLastCommit("fileA"); s.NoError(err) {
-				s.Equal("9fae4be19624297947d2b605cefbff516628612d", commit.SHA)
-				s.Equal("Amir Malka", commit.Author.Name)
-				s.Equal("amirm@armosec.io", commit.Author.Email)
-				s.Equal("2022-05-22 18:55:48 +0300 +0300", commit.Author.Date.String())
-				s.Equal("added file A\n", commit.Message)
-			}
-
-		}
-	})
-
-	s.Run("fileB", func() {
-		if localRepo, err := NewLocalGitRepository(s.gitRepositoryPaths["localrepo"]); s.NoError(err) {
-
-			if commit, err := localRepo.GetFileLastCommit("dirA/fileB"); s.NoError(err) {
-				s.Equal("7e09312b8017695fadcd606882e3779f10a5c832", commit.SHA)
-				s.Equal("Amir Malka", commit.Author.Name)
-				s.Equal("amirm@armosec.io", commit.Author.Email)
-				s.Equal("2022-05-22 19:11:57 +0300 +0300", commit.Author.Date.String())
-				s.Equal("added file B\n", commit.Message)
-			}
-
-		}
-	})
-}

core/cautils/gitparse_test.go

@@ -1,16 +0,0 @@
-package cautils
-
-import (
-	"testing"
-
-	giturl "github.com/kubescape/go-git-url"
-	"github.com/stretchr/testify/require"
-)
-
-func TestEnsureRemoteParsed(t *testing.T) {
-	const remote = "git@gitlab.com:foobar/gitlab-tests/sample-project.git"
-
-	require.NotPanics(t, func() {
-		_, _ = giturl.NewGitURL(remote)
-	})
-}

core/cautils/helmchart_test.go

@@ -3,6 +3,7 @@ package cautils
 import (
 	_ "embed"
 	"encoding/json"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -38,7 +39,7 @@ func (s *HelmChartTestSuite) SetupSuite() {
 	}
 
 	var obj interface{}
-	file, _ := os.ReadFile(filepath.Join("testdata", "helm_expected_default_values.json"))
+	file, _ := ioutil.ReadFile(filepath.Join("testdata", "helm_expected_default_values.json"))
 	_ = json.Unmarshal([]byte(file), &obj)
 	s.expectedDefaultValues = obj.(map[string]interface{})
 }

core/cautils/localgitrepository.go

@@ -1,26 +1,26 @@
 package cautils
 
 import (
-	"errors"
 	"fmt"
 	"path"
 	"strings"
+	"time"
 
+	"github.com/armosec/go-git-url/apis"
 	gitv5 "github.com/go-git/go-git/v5"
 	configv5 "github.com/go-git/go-git/v5/config"
 	plumbingv5 "github.com/go-git/go-git/v5/plumbing"
-	"github.com/kubescape/go-git-url/apis"
+	git2go "github.com/libgit2/git2go/v33"
 )
 
 type LocalGitRepository struct {
-	*gitRepository
-	goGitRepo *gitv5.Repository
-	head      *plumbingv5.Reference
-	config    *configv5.Config
+	goGitRepo        *gitv5.Repository
+	git2GoRepo       *git2go.Repository
+	head             *plumbingv5.Reference
+	config           *configv5.Config
+	fileToLastCommit map[string]*git2go.Commit
 }
 
-var ErrWarnNotSupportedByBuild = errors.New(`git commits retrieval not supported by this build. Build with tag "gitenabled" to enable the full git scan feature`)
-
 func NewLocalGitRepository(path string) (*LocalGitRepository, error) {
 	goGitRepo, err := gitv5.PlainOpenWithOptions(path, &gitv5.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
@@ -52,12 +52,11 @@ func NewLocalGitRepository(path string) (*LocalGitRepository, error) {
 	}
 
 	if repoRoot, err := l.GetRootDir(); err == nil {
-		gitRepository, err := newGitRepository(repoRoot)
-		if err != nil && !errors.Is(err, ErrWarnNotSupportedByBuild) {
+		git2GoRepo, err := git2go.OpenRepository(repoRoot)
+		if err != nil {
 			return l, err
 		}
-
-		l.gitRepository = gitRepository
+		l.git2GoRepo = git2GoRepo
 	}
 
 	return l, nil
@@ -73,10 +72,6 @@ func (g *LocalGitRepository) GetRemoteUrl() (string, error) {
 	branchName := g.GetBranchName()
 	if branchRef, branchFound := g.config.Branches[branchName]; branchFound {
 		remoteName := branchRef.Remote
-		// branchRef.Remote can be a reference to a config.Remotes entry or directly a gitUrl
-		if _, found := g.config.Remotes[remoteName]; !found {
-			return remoteName, nil
-		}
 		if len(g.config.Remotes[remoteName].URLs) == 0 {
 			return "", fmt.Errorf("expected to find URLs for remote '%s', branch '%s'", remoteName, branchName)
 		}
@@ -84,13 +79,10 @@ func (g *LocalGitRepository) GetRemoteUrl() (string, error) {
 	}
 
 	const defaultRemoteName string = "origin"
-	defaultRemote, ok := g.config.Remotes[defaultRemoteName]
-	if !ok {
-		return "", fmt.Errorf("did not find a default remote with name '%s'", defaultRemoteName)
-	} else if len(defaultRemote.URLs) == 0 {
+	if len(g.config.Remotes[defaultRemoteName].URLs) == 0 {
 		return "", fmt.Errorf("expected to find URLs for remote '%s'", defaultRemoteName)
 	}
-	return defaultRemote.URLs[0], nil
+	return g.config.Remotes[defaultRemoteName].URLs[0], nil
 }
 
 // GetName get origin name without the .git suffix
@@ -130,6 +122,120 @@ func (g *LocalGitRepository) GetLastCommit() (*apis.Commit, error) {
 	}, nil
 }
 
+func (g *LocalGitRepository) getAllCommits() ([]*git2go.Commit, error) {
+	logItr, itrErr := g.git2GoRepo.Walk()
+	if itrErr != nil {
+
+		return nil, itrErr
+	}
+
+	pushErr := logItr.PushHead()
+	if pushErr != nil {
+		return nil, pushErr
+	}
+
+	var allCommits []*git2go.Commit
+	err := logItr.Iterate(func(commit *git2go.Commit) bool {
+		if commit != nil {
+			allCommits = append(allCommits, commit)
+			return true
+		}
+		return false
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	return allCommits, nil
+}
+
+func (g *LocalGitRepository) GetFileLastCommit(filePath string) (*apis.Commit, error) {
+	if len(g.fileToLastCommit) == 0 {
+		filePathToCommitTime := map[string]time.Time{}
+		filePathToCommit := map[string]*git2go.Commit{}
+		allCommits, _ := g.getAllCommits()
+
+		// builds a map of all files to their last commit
+		for _, commit := range allCommits {
+			// Ignore merge commits (2+ parents)
+			if commit.ParentCount() <= 1 {
+				tree, err := commit.Tree()
+				if err != nil {
+					continue
+				}
+
+				// ParentCount can be either 1 or 0 (initial commit)
+				// In case it's the initial commit, prevTree is nil
+				var prevTree *git2go.Tree
+				if commit.ParentCount() == 1 {
+					prevCommit := commit.Parent(0)
+					prevTree, err = prevCommit.Tree()
+					if err != nil {
+						continue
+					}
+				}
+
+				diff, err := g.git2GoRepo.DiffTreeToTree(prevTree, tree, nil)
+				if err != nil {
+					continue
+				}
+
+				numDeltas, err := diff.NumDeltas()
+				if err != nil {
+					continue
+				}
+
+				for i := 0; i < numDeltas; i++ {
+					delta, err := diff.Delta(i)
+					if err != nil {
+						continue
+					}
+
+					deltaFilePath := delta.NewFile.Path
+					commitTime := commit.Author().When
+
+					// In case we have the commit information for the file which is not the latest - we override it
+					if currentCommitTime, exists := filePathToCommitTime[deltaFilePath]; exists {
+						if currentCommitTime.Before(commitTime) {
+							filePathToCommitTime[deltaFilePath] = commitTime
+							filePathToCommit[deltaFilePath] = commit
+						}
+					} else {
+						filePathToCommitTime[deltaFilePath] = commitTime
+						filePathToCommit[deltaFilePath] = commit
+					}
+				}
+			}
+		}
+		g.fileToLastCommit = filePathToCommit
+	}
+
+	if relevantCommit, exists := g.fileToLastCommit[filePath]; exists {
+		return g.getCommit(relevantCommit), nil
+	}
+
+	return nil, fmt.Errorf("failed to get commit information for file: %s", filePath)
+}
+
+func (g *LocalGitRepository) getCommit(commit *git2go.Commit) *apis.Commit {
+	return &apis.Commit{
+		SHA: commit.Id().String(),
+		Author: apis.Committer{
+			Name:  commit.Author().Name,
+			Email: commit.Author().Email,
+			Date:  commit.Author().When,
+		},
+		Message:   commit.Message(),
+		Committer: apis.Committer{},
+		Files:     []apis.Files{},
+	}
+}
+
 func (g *LocalGitRepository) GetRootDir() (string, error) {
 	wt, err := g.goGitRepo.Worktree()
 	if err != nil {

core/cautils/localgitrepository_test.go

@@ -9,8 +9,6 @@ import (
 	"strings"
 	"testing"
 
-	configv5 "github.com/go-git/go-git/v5/config"
-	plumbingv5 "github.com/go-git/go-git/v5/plumbing"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -28,58 +26,40 @@ func unzipFile(zipPath, destinationFolder string) (*zip.ReadCloser, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	for _, f := range archive.File {
-		filePath := filepath.Join(destinationFolder, f.Name) //nolint:gosec
+		filePath := filepath.Join(destinationFolder, f.Name)
 		if !strings.HasPrefix(filePath, filepath.Clean(destinationFolder)+string(os.PathSeparator)) {
 			return nil, fmt.Errorf("invalid file path")
 		}
-
 		if f.FileInfo().IsDir() {
 			os.MkdirAll(filePath, os.ModePerm)
 			continue
 		}
 
-		if erc := copyFileInFolder(filePath, f); erc != nil {
-			return nil, erc
+		if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil {
+			return nil, err
 		}
+
+		dstFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
+		if err != nil {
+			return nil, err
+		}
+
+		fileInArchive, err := f.Open()
+		if err != nil {
+			return nil, err
+		}
+
+		if _, err := io.Copy(dstFile, fileInArchive); err != nil {
+			return nil, err
+		}
+
+		dstFile.Close()
+		fileInArchive.Close()
 	}
 
 	return archive, err
-}
 
-func copyFileInFolder(filePath string, f *zip.File) (err error) {
-	if err = os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil {
-		return err
-	}
-
-	dstFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_ = dstFile.Close()
-	}()
-
-	fileInArchive, err := f.Open()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_ = fileInArchive.Close()
-	}()
-
-	_, err = io.Copy(dstFile, fileInArchive) //nolint:gosec
-
-	if err = dstFile.Close(); err != nil {
-		return err
-	}
-
-	if err = fileInArchive.Close(); err != nil {
-		return err
-	}
-
-	return err
 }
 
 func (s *LocalGitRepositoryTestSuite) SetupSuite() {
@@ -152,49 +132,44 @@ func (s *LocalGitRepositoryTestSuite) TestGetOriginUrl() {
 	}
 }
 
-func TestGetRemoteUrl(t *testing.T) {
-	testCases := []struct {
-		Name      string
-		LocalRepo LocalGitRepository
-		Want      string
-		WantErr   error
-	}{
-		{
-			Name: "Branch with missing upstream and missing 'origin' fallback should return an error",
-			LocalRepo: LocalGitRepository{
-				config: &configv5.Config{
-					Branches: make(map[string]*configv5.Branch),
-					Remotes:  make(map[string]*configv5.RemoteConfig),
-				},
-				head: plumbingv5.NewReferenceFromStrings("HEAD", "ref: refs/heads/v4"),
-			},
-			Want:    "",
-			WantErr: fmt.Errorf("did not find a default remote with name 'origin'"),
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.Name, func(t *testing.T) {
-			localRepo := LocalGitRepository{
-				config: &configv5.Config{
-					Branches: make(map[string]*configv5.Branch),
-					Remotes:  make(map[string]*configv5.RemoteConfig),
-				},
-				head: plumbingv5.NewReferenceFromStrings("HEAD", "ref: refs/heads/v4"),
-			}
-
-			want := tc.Want
-			wantErr := tc.WantErr
-			got, gotErr := localRepo.GetRemoteUrl()
-
-			if got != want {
-				t.Errorf("Remote URLs don’t match: got '%s', want '%s'", got, want)
-			}
-
-			if gotErr.Error() != wantErr.Error() {
-				t.Errorf("Errors don’t match: got '%v', want '%v'", gotErr, wantErr)
-			}
-		},
-		)
+func (s *LocalGitRepositoryTestSuite) TestGetLastCommit() {
+	if localRepo, err := NewLocalGitRepository(s.gitRepositoryPaths["localrepo"]); s.NoError(err) {
+		if commit, err := localRepo.GetLastCommit(); s.NoError(err) {
+			s.Equal("7e09312b8017695fadcd606882e3779f10a5c832", commit.SHA)
+			s.Equal("Amir Malka", commit.Author.Name)
+			s.Equal("amirm@armosec.io", commit.Author.Email)
+			s.Equal("2022-05-22 19:11:57 +0300 +0300", commit.Author.Date.String())
+			s.Equal("added file B\n", commit.Message)
+		}
 	}
 }
+
+func (s *LocalGitRepositoryTestSuite) TestGetFileLastCommit() {
+	s.Run("fileA", func() {
+		if localRepo, err := NewLocalGitRepository(s.gitRepositoryPaths["localrepo"]); s.NoError(err) {
+
+			if commit, err := localRepo.GetFileLastCommit("fileA"); s.NoError(err) {
+				s.Equal("9fae4be19624297947d2b605cefbff516628612d", commit.SHA)
+				s.Equal("Amir Malka", commit.Author.Name)
+				s.Equal("amirm@armosec.io", commit.Author.Email)
+				s.Equal("2022-05-22 18:55:48 +0300 +0300", commit.Author.Date.String())
+				s.Equal("added file A\n", commit.Message)
+			}
+
+		}
+	})
+
+	s.Run("fileB", func() {
+		if localRepo, err := NewLocalGitRepository(s.gitRepositoryPaths["localrepo"]); s.NoError(err) {
+
+			if commit, err := localRepo.GetFileLastCommit("dirA/fileB"); s.NoError(err) {
+				s.Equal("7e09312b8017695fadcd606882e3779f10a5c832", commit.SHA)
+				s.Equal("Amir Malka", commit.Author.Name)
+				s.Equal("amirm@armosec.io", commit.Author.Email)
+				s.Equal("2022-05-22 19:11:57 +0300 +0300", commit.Author.Date.String())
+				s.Equal("added file B\n", commit.Message)
+			}
+
+		}
+	})
+}

core/cautils/scaninfo.go

@@ -3,6 +3,7 @@ package cautils
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -10,8 +11,8 @@ import (
 	"github.com/armosec/armoapi-go/armotypes"
 	apisv1 "github.com/kubescape/opa-utils/httpserver/apis/v1"
 
-	giturl "github.com/kubescape/go-git-url"
-	"github.com/kubescape/go-logger"
+	giturl "github.com/armosec/go-git-url"
+	logger "github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/k8s-interface/k8sinterface"
 	"github.com/kubescape/kubescape/v2/core/cautils/getter"
@@ -39,8 +40,7 @@ const (
 	// ScanCluster                string = "cluster"
 	// ScanLocalFiles             string = "yaml"
 	localControlInputsFilename string = "controls-inputs.json"
-	LocalExceptionsFilename    string = "exceptions.json"
-	LocalAttackTracksFilename  string = "attack-tracks.json"
+	localExceptionsFilename    string = "exceptions.json"
 )
 
 type BoolPtrFlag struct {
@@ -94,7 +94,7 @@ const (
 )
 
 type PolicyIdentifier struct {
-	Identifier  string                        // policy Identifier e.g. c-0012 for control, nsa,mitre for frameworks
+	Name        string                        // policy name e.g. nsa,mitre,c-0012
 	Kind        apisv1.NotificationPolicyKind // policy kind e.g. Framework,Control,Rule
 	Designators armotypes.PortalDesignator
 }
@@ -104,7 +104,6 @@ type ScanInfo struct {
 	PolicyIdentifier      []PolicyIdentifier // TODO - remove from object
 	UseExceptions         string             // Load file with exceptions configuration
 	ControlsInputs        string             // Load file with inputs for controls
-	AttackTracks          string             // Load file with attack tracks
 	UseFrom               []string           // Load framework from local file (instead of download). Use when running offline
 	UseDefault            bool               // Load framework from cached file (instead of download). Use when running offline
 	UseArtifactsFrom      string             // Load artifacts from local path. Use when running offline
@@ -121,7 +120,6 @@ type ScanInfo struct {
 	FailThreshold         float32            // Failure score threshold
 	FailThresholdSeverity string             // Severity at and above which the command should fail
 	Submit                bool               // Submit results to Kubescape Cloud BE
-	CreateAccount         bool               // Create account in Kubescape Cloud BE if no account found in local cache
 	ScanID                string             // Report id of the current scan
 	HostSensorEnabled     BoolPtrFlag        // Deploy Kubescape K8s host scanner to collect data from certain controls
 	HostSensorYamlPath    string             // Path to hostsensor file
@@ -130,8 +128,6 @@ type ScanInfo struct {
 	KubeContext           string             // context name
 	FrameworkScan         bool               // false if scanning control
 	ScanAll               bool               // true if scan all frameworks
-	OmitRawResources      bool               // true if omit raw resources from the output
-	PrintAttackTree       bool               // true if print attack tree
 }
 
 type Getters struct {
@@ -143,6 +139,7 @@ type Getters struct {
 
 func (scanInfo *ScanInfo) Init() {
 	scanInfo.setUseFrom()
+	scanInfo.setOutputFile()
 	scanInfo.setUseArtifactsFrom()
 	if scanInfo.ScanID == "" {
 		scanInfo.ScanID = uuid.NewString()
@@ -162,7 +159,7 @@ func (scanInfo *ScanInfo) setUseArtifactsFrom() {
 		scanInfo.UseArtifactsFrom = dir
 	}
 	// set frameworks files
-	files, err := os.ReadDir(scanInfo.UseArtifactsFrom)
+	files, err := ioutil.ReadDir(scanInfo.UseArtifactsFrom)
 	if err != nil {
 		logger.L().Fatal("failed to read files from directory", helpers.String("dir", scanInfo.UseArtifactsFrom), helpers.Error(err))
 	}
@@ -179,27 +176,35 @@ func (scanInfo *ScanInfo) setUseArtifactsFrom() {
 	// set config-inputs file
 	scanInfo.ControlsInputs = filepath.Join(scanInfo.UseArtifactsFrom, localControlInputsFilename)
 	// set exceptions
-	scanInfo.UseExceptions = filepath.Join(scanInfo.UseArtifactsFrom, LocalExceptionsFilename)
-
-	// set attack tracks
-	scanInfo.AttackTracks = filepath.Join(scanInfo.UseArtifactsFrom, LocalAttackTracksFilename)
+	scanInfo.UseExceptions = filepath.Join(scanInfo.UseArtifactsFrom, localExceptionsFilename)
 }
 
 func (scanInfo *ScanInfo) setUseFrom() {
 	if scanInfo.UseDefault {
 		for _, policy := range scanInfo.PolicyIdentifier {
-			scanInfo.UseFrom = append(scanInfo.UseFrom, getter.GetDefaultPath(policy.Identifier+".json"))
+			scanInfo.UseFrom = append(scanInfo.UseFrom, getter.GetDefaultPath(policy.Name+".json"))
 		}
 	}
 }
 
-// Formats returns a slice of output formats that have been requested for a given scan
-func (scanInfo *ScanInfo) Formats() []string {
-	formatString := scanInfo.Format
-	if formatString != "" {
-		return strings.Split(scanInfo.Format, ",")
-	} else {
-		return []string{}
+func (scanInfo *ScanInfo) setOutputFile() {
+	if scanInfo.Output == "" {
+		return
+	}
+	if scanInfo.Format == "json" {
+		if filepath.Ext(scanInfo.Output) != ".json" {
+			scanInfo.Output += ".json"
+		}
+	}
+	if scanInfo.Format == "junit" {
+		if filepath.Ext(scanInfo.Output) != ".xml" {
+			scanInfo.Output += ".xml"
+		}
+	}
+	if scanInfo.Format == "pdf" {
+		if filepath.Ext(scanInfo.Output) != ".pdf" {
+			scanInfo.Output += ".pdf"
+		}
 	}
 }
 
@@ -208,7 +213,7 @@ func (scanInfo *ScanInfo) SetPolicyIdentifiers(policies []string, kind apisv1.No
 		if !scanInfo.contains(policy) {
 			newPolicy := PolicyIdentifier{}
 			newPolicy.Kind = kind
-			newPolicy.Identifier = policy
+			newPolicy.Name = policy
 			scanInfo.PolicyIdentifier = append(scanInfo.PolicyIdentifier, newPolicy)
 		}
 	}
@@ -216,7 +221,7 @@ func (scanInfo *ScanInfo) SetPolicyIdentifiers(policies []string, kind apisv1.No
 
 func (scanInfo *ScanInfo) contains(policyName string) bool {
 	for _, policy := range scanInfo.PolicyIdentifier {
-		if policy.Identifier == policyName {
+		if policy.Name == policyName {
 			return true
 		}
 	}
@@ -244,7 +249,7 @@ func scanInfoToScanMetadata(scanInfo *ScanInfo) *reporthandlingv2.Metadata {
 	}
 	// append frameworks
 	for _, policy := range scanInfo.PolicyIdentifier {
-		metadata.ScanMetadata.TargetNames = append(metadata.ScanMetadata.TargetNames, policy.Identifier)
+		metadata.ScanMetadata.TargetNames = append(metadata.ScanMetadata.TargetNames, policy.Name)
 	}
 
 	metadata.ScanMetadata.KubescapeVersion = BuildNumber

core/cautils/scaninfo_test.go

@@ -43,30 +43,3 @@ func TestGetScanningContext(t *testing.T) {
 	assert.Equal(t, ContextCluster, GetScanningContext(""))
 	assert.Equal(t, ContextGitURL, GetScanningContext("https://github.com/kubescape/kubescape"))
 }
-
-func TestScanInfoFormats(t *testing.T) {
-	testCases := []struct {
-		Input string
-		Want  []string
-	}{
-		{"", []string{}},
-		{"json", []string{"json"}},
-		{"pdf", []string{"pdf"}},
-		{"html", []string{"html"}},
-		{"sarif", []string{"sarif"}},
-		{"html,pdf,sarif", []string{"html", "pdf", "sarif"}},
-		{"pretty-printer,pdf,sarif", []string{"pretty-printer", "pdf", "sarif"}},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.Input, func(t *testing.T) {
-			input := tc.Input
-			want := tc.Want
-			scanInfo := &ScanInfo{Format: input}
-
-			got := scanInfo.Formats()
-
-			assert.Equal(t, want, got)
-		})
-	}
-}

core/cautils/versioncheck.go

@@ -14,9 +14,8 @@ import (
 	"golang.org/x/mod/semver"
 )
 
-const SKIP_VERSION_CHECK_DEPRECATED_ENV = "KUBESCAPE_SKIP_UPDATE_CHECK"
-const SKIP_VERSION_CHECK_ENV = "KS_SKIP_UPDATE_CHECK"
-const CLIENT_ENV = "KS_CLIENT"
+const SKIP_VERSION_CHECK_DEPRECATED = "KUBESCAPE_SKIP_UPDATE_CHECK"
+const SKIP_VERSION_CHECK = "KS_SKIP_UPDATE_CHECK"
 
 var BuildNumber string
 var Client string
@@ -32,14 +31,9 @@ func NewIVersionCheckHandler() IVersionCheckHandler {
 	if BuildNumber == "" {
 		logger.L().Warning("unknown build number, this might affect your scan results. Please make sure you are updated to latest version")
 	}
-
-	if v, ok := os.LookupEnv(CLIENT_ENV); ok && v != "" {
-		Client = v
-	}
-
-	if v, ok := os.LookupEnv(SKIP_VERSION_CHECK_ENV); ok && boolutils.StringToBool(v) {
+	if v, ok := os.LookupEnv(SKIP_VERSION_CHECK); ok && boolutils.StringToBool(v) {
 		return NewVersionCheckHandlerMock()
-	} else if v, ok := os.LookupEnv(SKIP_VERSION_CHECK_DEPRECATED_ENV); ok && boolutils.StringToBool(v) {
+	} else if v, ok := os.LookupEnv(SKIP_VERSION_CHECK_DEPRECATED); ok && boolutils.StringToBool(v) {
 		return NewVersionCheckHandlerMock()
 	}
 	return NewVersionCheckHandler()

core/cautils/workloadmappingutils.go

@@ -19,7 +19,6 @@ var (
 		"KubeletInfo",
 		"KubeProxyInfo",
 		"ControlPlaneInfo",
-		"CloudProviderInfo",
 	}
 	CloudResources = []string{
 		"ClusterDescribe",

core/core/download.go

@@ -6,28 +6,19 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/armosec/armoapi-go/armotypes"
 	logger "github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/kubescape/v2/core/cautils/getter"
 	metav1 "github.com/kubescape/kubescape/v2/core/meta/datastructures/v1"
 )
 
-const (
-	TargetControlsInputs = "controls-inputs"
-	TargetExceptions     = "exceptions"
-	TargetControl        = "control"
-	TargetFramework      = "framework"
-	TargetArtifacts      = "artifacts"
-	TargetAttackTracks   = "attack-tracks"
-)
-
 var downloadFunc = map[string]func(*metav1.DownloadInfo) error{
-	TargetControlsInputs: downloadConfigInputs,
-	TargetExceptions:     downloadExceptions,
-	TargetControl:        downloadControl,
-	TargetFramework:      downloadFramework,
-	TargetArtifacts:      downloadArtifacts,
-	TargetAttackTracks:   downloadAttackTracks,
+	"controls-inputs": downloadConfigInputs,
+	"exceptions":      downloadExceptions,
+	"control":         downloadControl,
+	"framework":       downloadFramework,
+	"artifacts":       downloadArtifacts,
 }
 
 func DownloadSupportCommands() []string {
@@ -79,7 +70,6 @@ func downloadArtifacts(downloadInfo *metav1.DownloadInfo) error {
 		"controls-inputs": downloadConfigInputs,
 		"exceptions":      downloadExceptions,
 		"framework":       downloadFramework,
-		"attack-tracks":   downloadAttackTracks,
 	}
 	for artifact := range artifacts {
 		if err := downloadArtifact(&metav1.DownloadInfo{Target: artifact, Path: downloadInfo.Path, FileName: fmt.Sprintf("%s.json", artifact)}, artifacts); err != nil {
@@ -92,7 +82,7 @@ func downloadArtifacts(downloadInfo *metav1.DownloadInfo) error {
 func downloadConfigInputs(downloadInfo *metav1.DownloadInfo) error {
 	tenant := getTenantConfig(&downloadInfo.Credentials, "", "", getKubernetesApi())
 
-	controlsInputsGetter := getConfigInputsGetter(downloadInfo.Identifier, tenant.GetAccountID(), nil)
+	controlsInputsGetter := getConfigInputsGetter(downloadInfo.Name, tenant.GetAccountID(), nil)
 	controlInputs, err := controlsInputsGetter.GetControlsInputs(tenant.GetContextName())
 	if err != nil {
 		return err
@@ -113,14 +103,17 @@ func downloadConfigInputs(downloadInfo *metav1.DownloadInfo) error {
 }
 
 func downloadExceptions(downloadInfo *metav1.DownloadInfo) error {
+	var err error
 	tenant := getTenantConfig(&downloadInfo.Credentials, "", "", getKubernetesApi())
+
 	exceptionsGetter := getExceptionsGetter("", tenant.GetAccountID(), nil)
-
-	exceptions, err := exceptionsGetter.GetExceptions(tenant.GetContextName())
-	if err != nil {
-		return err
+	exceptions := []armotypes.PostureExceptionPolicy{}
+	if tenant.GetAccountID() != "" {
+		exceptions, err = exceptionsGetter.GetExceptions(tenant.GetContextName())
+		if err != nil {
+			return err
+		}
 	}
-
 	if downloadInfo.FileName == "" {
 		downloadInfo.FileName = fmt.Sprintf("%s.json", downloadInfo.Target)
 	}
@@ -133,37 +126,13 @@ func downloadExceptions(downloadInfo *metav1.DownloadInfo) error {
 	return nil
 }
 
-func downloadAttackTracks(downloadInfo *metav1.DownloadInfo) error {
-	var err error
-	tenant := getTenantConfig(&downloadInfo.Credentials, "", "", getKubernetesApi())
-
-	attackTracksGetter := getAttackTracksGetter("", tenant.GetAccountID(), nil)
-
-	attackTracks, err := attackTracksGetter.GetAttackTracks()
-	if err != nil {
-		return err
-	}
-
-	if downloadInfo.FileName == "" {
-		downloadInfo.FileName = fmt.Sprintf("%s.json", downloadInfo.Target)
-	}
-	// save in file
-	err = getter.SaveInFile(attackTracks, filepath.Join(downloadInfo.Path, downloadInfo.FileName))
-	if err != nil {
-		return err
-	}
-	logger.L().Success("Downloaded", helpers.String("attack tracks", downloadInfo.Target), helpers.String("path", filepath.Join(downloadInfo.Path, downloadInfo.FileName)))
-	return nil
-
-}
-
 func downloadFramework(downloadInfo *metav1.DownloadInfo) error {
 
 	tenant := getTenantConfig(&downloadInfo.Credentials, "", "", getKubernetesApi())
 
 	g := getPolicyGetter(nil, tenant.GetTenantEmail(), true, nil)
 
-	if downloadInfo.Identifier == "" {
+	if downloadInfo.Name == "" {
 		// if framework name not specified - download all frameworks
 		frameworks, err := g.GetFrameworks()
 		if err != nil {
@@ -180,9 +149,9 @@ func downloadFramework(downloadInfo *metav1.DownloadInfo) error {
 		// return fmt.Errorf("missing framework name")
 	} else {
 		if downloadInfo.FileName == "" {
-			downloadInfo.FileName = fmt.Sprintf("%s.json", downloadInfo.Identifier)
+			downloadInfo.FileName = fmt.Sprintf("%s.json", downloadInfo.Name)
 		}
-		framework, err := g.GetFramework(downloadInfo.Identifier)
+		framework, err := g.GetFramework(downloadInfo.Name)
 		if err != nil {
 			return err
 		}
@@ -205,25 +174,25 @@ func downloadControl(downloadInfo *metav1.DownloadInfo) error {
 
 	g := getPolicyGetter(nil, tenant.GetTenantEmail(), false, nil)
 
-	if downloadInfo.Identifier == "" {
+	if downloadInfo.Name == "" {
 		// TODO - support
-		return fmt.Errorf("missing control ID")
+		return fmt.Errorf("missing control name")
 	}
 	if downloadInfo.FileName == "" {
-		downloadInfo.FileName = fmt.Sprintf("%s.json", downloadInfo.Identifier)
+		downloadInfo.FileName = fmt.Sprintf("%s.json", downloadInfo.Name)
 	}
-	controls, err := g.GetControl(downloadInfo.Identifier)
+	controls, err := g.GetControl(downloadInfo.Name)
 	if err != nil {
-		return fmt.Errorf("failed to download control id '%s',  %s", downloadInfo.Identifier, err.Error())
+		return err
 	}
 	if controls == nil {
-		return fmt.Errorf("failed to download control id '%s' - received an empty objects", downloadInfo.Identifier)
+		return fmt.Errorf("failed to download control - received an empty objects")
 	}
 	downloadTo := filepath.Join(downloadInfo.Path, downloadInfo.FileName)
 	err = getter.SaveInFile(controls, downloadTo)
 	if err != nil {
 		return err
 	}
-	logger.L().Success("Downloaded", helpers.String("artifact", downloadInfo.Target), helpers.String("ID", downloadInfo.Identifier), helpers.String("path", downloadTo))
+	logger.L().Success("Downloaded", helpers.String("artifact", downloadInfo.Target), helpers.String("name", downloadInfo.Name), helpers.String("path", downloadTo))
 	return nil
 }

core/core/initutils.go

@@ -2,17 +2,14 @@ package core
 
 import (
 	"fmt"
-	"os"
 
-	"github.com/kubescape/go-logger"
+	logger "github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/k8s-interface/k8sinterface"
 	"github.com/kubescape/kubescape/v2/core/cautils"
 	"github.com/kubescape/kubescape/v2/core/cautils/getter"
 	"github.com/kubescape/kubescape/v2/core/pkg/hostsensorutils"
 	"github.com/kubescape/kubescape/v2/core/pkg/resourcehandler"
-	"github.com/kubescape/kubescape/v2/core/pkg/resultshandling/printer"
-	printerv2 "github.com/kubescape/kubescape/v2/core/pkg/resultshandling/printer/v2"
 	"github.com/kubescape/kubescape/v2/core/pkg/resultshandling/reporter"
 	reporterv2 "github.com/kubescape/kubescape/v2/core/pkg/resultshandling/reporter/v2"
 
@@ -48,9 +45,8 @@ func getExceptionsGetter(useExceptions string, accountID string, downloadRelease
 	if downloadReleasedPolicy == nil {
 		downloadReleasedPolicy = getter.NewDownloadReleasedPolicy()
 	}
-	if err := downloadReleasedPolicy.SetRegoObjects(); err != nil { // if failed to pull attack tracks, fallback to cache
-		logger.L().Warning("failed to get exceptions from github release, loading attack tracks from cache", helpers.Error(err))
-		return getter.NewLoadPolicy([]string{getter.GetDefaultPath(cautils.LocalExceptionsFilename)})
+	if err := downloadReleasedPolicy.SetRegoObjects(); err != nil {
+		logger.L().Warning("failed to get exceptions from github release, this may affect the scanning results", helpers.Error(err))
 	}
 	return downloadReleasedPolicy
 
@@ -102,7 +98,7 @@ func getHostSensorHandler(scanInfo *cautils.ScanInfo, k8s *k8sinterface.Kubernet
 	// we need to determined which controls needs host scanner
 	if scanInfo.HostSensorEnabled.Get() == nil && hasHostSensorControls {
 		scanInfo.HostSensorEnabled.SetBool(false) // default - do not run host scanner
-		logger.L().Warning("Kubernetes cluster nodes scanning is disabled. This is required to collect valuable data for certain controls. You can enable it using the --enable-host-scan flag")
+		logger.L().Warning("Kubernetes cluster nodes scanning is disabled. This is required to collect valuable data for certain controls. You can enable it using  the --enable-host-scan flag")
 	}
 	if hostSensorVal := scanInfo.HostSensorEnabled.Get(); hostSensorVal != nil && *hostSensorVal {
 		hostSensorHandler, err := hostsensorutils.NewHostSensorHandler(k8s, scanInfo.HostSensorYamlPath)
@@ -125,18 +121,18 @@ func getFieldSelector(scanInfo *cautils.ScanInfo) resourcehandler.IFieldSelector
 	return &resourcehandler.EmptySelector{}
 }
 
-func policyIdentifierIdentities(pi []cautils.PolicyIdentifier) string {
-	policiesIdentities := ""
+func policyIdentifierNames(pi []cautils.PolicyIdentifier) string {
+	policiesNames := ""
 	for i := range pi {
-		policiesIdentities += pi[i].Identifier
+		policiesNames += pi[i].Name
 		if i+1 < len(pi) {
-			policiesIdentities += ","
+			policiesNames += ","
 		}
 	}
-	if policiesIdentities == "" {
-		policiesIdentities = "all"
+	if policiesNames == "" {
+		policiesNames = "all"
 	}
-	return policiesIdentities
+	return policiesNames
 }
 
 // setSubmitBehavior - Setup the desired cluster behavior regarding submitting to the Kubescape Cloud BE
@@ -182,10 +178,6 @@ func setSubmitBehavior(scanInfo *cautils.ScanInfo, tenantConfig cautils.ITenantC
 		scanInfo.Submit = true
 	}
 
-	if scanInfo.CreateAccount {
-		scanInfo.Submit = true
-	}
-
 }
 
 // setPolicyGetter set the policy getter - local file/github release/Kubescape Cloud API
@@ -247,10 +239,7 @@ func listFrameworksNames(policyGetter getter.IPolicyGetter) []string {
 	return getter.NativeFrameworks
 }
 
-func getAttackTracksGetter(attackTracks, accountID string, downloadReleasedPolicy *getter.DownloadReleasedPolicy) getter.IAttackTracksGetter {
-	if len(attackTracks) > 0 {
-		return getter.NewLoadPolicy([]string{attackTracks})
-	}
+func getAttackTracksGetter(accountID string, downloadReleasedPolicy *getter.DownloadReleasedPolicy) getter.IAttackTracksGetter {
 	if accountID != "" {
 		g := getter.GetKSCloudAPIConnector() // download attack tracks from Kubescape Cloud backend
 		return g
@@ -258,20 +247,8 @@ func getAttackTracksGetter(attackTracks, accountID string, downloadReleasedPolic
 	if downloadReleasedPolicy == nil {
 		downloadReleasedPolicy = getter.NewDownloadReleasedPolicy()
 	}
-
-	if err := downloadReleasedPolicy.SetRegoObjects(); err != nil { // if failed to pull attack tracks, fallback to cache
-		logger.L().Warning("failed to get attack tracks from github release, loading attack tracks from cache", helpers.Error(err))
-		return getter.NewLoadPolicy([]string{getter.GetDefaultPath(cautils.LocalAttackTracksFilename)})
+	if err := downloadReleasedPolicy.SetRegoObjects(); err != nil {
+		logger.L().Warning("failed to get attack tracks from github release, this may affect the scanning results", helpers.Error(err))
 	}
 	return downloadReleasedPolicy
 }
-
-// getUIPrinter returns a printer that will be used to print to the program’s UI (terminal)
-func getUIPrinter(verboseMode bool, formatVersion string, attackTree bool, viewType cautils.ViewTypes) printer.IPrinter {
-	p := printerv2.NewPrettyPrinter(verboseMode, formatVersion, attackTree, viewType)
-
-	// Since the UI of the program is a CLI (Stdout), it means that it should always print to Stdout
-	p.SetWriter(os.Stdout.Name())
-
-	return p
-}

core/core/initutils_test.go

@@ -1,39 +0,0 @@
-package core
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/kubescape/kubescape/v2/core/cautils"
-)
-
-func Test_getUIPrinter(t *testing.T) {
-	scanInfo := &cautils.ScanInfo{
-		FormatVersion: "v2",
-		VerboseMode:   true,
-		View:          "control",
-	}
-	wantFormatVersion := scanInfo.FormatVersion
-	wantVerboseMode := scanInfo.VerboseMode
-	wantViewType := cautils.ViewTypes(scanInfo.View)
-
-	got := getUIPrinter(scanInfo.VerboseMode, scanInfo.FormatVersion, scanInfo.PrintAttackTree, cautils.ViewTypes(scanInfo.View))
-
-	gotValue := reflect.ValueOf(got).Elem()
-	gotFormatVersion := gotValue.FieldByName("formatVersion").String()
-	gotVerboseMode := gotValue.FieldByName("verboseMode").Bool()
-	gotViewType := cautils.ViewTypes(gotValue.FieldByName("viewType").String())
-
-	if gotFormatVersion != wantFormatVersion {
-		t.Errorf("Got: %s, want: %s", gotFormatVersion, wantFormatVersion)
-	}
-
-	if gotVerboseMode != wantVerboseMode {
-		t.Errorf("Got: %t, want: %t", gotVerboseMode, wantVerboseMode)
-	}
-
-	if gotViewType != wantViewType {
-		t.Errorf("Got: %v, want: %v", gotViewType, wantViewType)
-	}
-
-}

core/core/list.go

@@ -6,11 +6,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/kubescape/kubescape/v2/core/cautils"
+	"github.com/kubescape/kubescape/v2/core/cautils/getter"
 	metav1 "github.com/kubescape/kubescape/v2/core/meta/datastructures/v1"
-	"github.com/kubescape/kubescape/v2/core/pkg/resultshandling/printer"
-	v2 "github.com/kubescape/kubescape/v2/core/pkg/resultshandling/printer/v2"
-	"github.com/olekukonko/tablewriter"
 )
 
 var listFunc = map[string]func(*metav1.ListPolicies) ([]string, error){
@@ -19,7 +16,7 @@ var listFunc = map[string]func(*metav1.ListPolicies) ([]string, error){
 	"exceptions": listExceptions,
 }
 
-var listFormatFunc = map[string]func(string, []string){
+var listFormatFunc = map[string]func(*metav1.ListPolicies, []string){
 	"pretty-print": prettyPrintListFormat,
 	"json":         jsonListFormat,
 }
@@ -32,18 +29,14 @@ func ListSupportActions() []string {
 	return commands
 }
 func (ks *Kubescape) List(listPolicies *metav1.ListPolicies) error {
-	if policyListerFunc, ok := listFunc[listPolicies.Target]; ok {
-		policies, err := policyListerFunc(listPolicies)
+	if f, ok := listFunc[listPolicies.Target]; ok {
+		policies, err := f(listPolicies)
 		if err != nil {
 			return err
 		}
 		sort.Strings(policies)
 
-		if listFormatFunction, ok := listFormatFunc[listPolicies.Format]; ok {
-			listFormatFunction(listPolicies.Target, policies)
-		} else {
-			return fmt.Errorf("Invalid format \"%s\", Supported formats: 'pretty-print'/'json' ", listPolicies.Format)
-		}
+		listFormatFunc[listPolicies.Format](listPolicies, policies)
 
 		return nil
 	}
@@ -52,16 +45,20 @@ func (ks *Kubescape) List(listPolicies *metav1.ListPolicies) error {
 
 func listFrameworks(listPolicies *metav1.ListPolicies) ([]string, error) {
 	tenant := getTenantConfig(&listPolicies.Credentials, "", "", getKubernetesApi()) // change k8sinterface
-	policyGetter := getPolicyGetter(nil, tenant.GetTenantEmail(), true, nil)
+	g := getPolicyGetter(nil, tenant.GetTenantEmail(), true, nil)
 
-	return listFrameworksNames(policyGetter), nil
+	return listFrameworksNames(g), nil
 }
 
 func listControls(listPolicies *metav1.ListPolicies) ([]string, error) {
 	tenant := getTenantConfig(&listPolicies.Credentials, "", "", getKubernetesApi()) // change k8sinterface
 
-	policyGetter := getPolicyGetter(nil, tenant.GetTenantEmail(), false, nil)
-	return policyGetter.ListControls()
+	g := getPolicyGetter(nil, tenant.GetTenantEmail(), false, nil)
+	l := getter.ListName
+	if listPolicies.ListIDs {
+		l = getter.ListID
+	}
+	return g.ListControls(l)
 }
 
 func listExceptions(listPolicies *metav1.ListPolicies) ([]string, error) {
@@ -80,73 +77,12 @@ func listExceptions(listPolicies *metav1.ListPolicies) ([]string, error) {
 	return exceptionsNames, nil
 }
 
-func prettyPrintListFormat(targetPolicy string, policies []string) {
-	if targetPolicy == "controls" {
-		prettyPrintControls(policies)
-		return
-	}
-
-	header := fmt.Sprintf("Supported %s", targetPolicy)
-
-	policyTable := tablewriter.NewWriter(printer.GetWriter(""))
-	policyTable.SetAutoWrapText(true)
-	policyTable.SetHeader([]string{header})
-	policyTable.SetHeaderLine(true)
-	policyTable.SetRowLine(true)
-	data := v2.Matrix{}
-
-	controlRows := generatePolicyRows(policies)
-	data = append(data, controlRows...)
-
-	policyTable.SetAlignment(tablewriter.ALIGN_CENTER)
-	policyTable.AppendBulk(data)
-	policyTable.Render()
+func prettyPrintListFormat(listPolicies *metav1.ListPolicies, policies []string) {
+	sep := "\n  * "
+	fmt.Printf("Supported %s:%s%s\n", listPolicies.Target, sep, strings.Join(policies, sep))
 }
 
-func jsonListFormat(targetPolicy string, policies []string) {
+func jsonListFormat(listPolicies *metav1.ListPolicies, policies []string) {
 	j, _ := json.MarshalIndent(policies, "", "  ")
-
 	fmt.Printf("%s\n", j)
 }
-
-func prettyPrintControls(policies []string) {
-	controlsTable := tablewriter.NewWriter(printer.GetWriter(""))
-	controlsTable.SetAutoWrapText(true)
-	controlsTable.SetHeader([]string{"Control ID", "Control Name", "Docs", "Frameworks"})
-	controlsTable.SetHeaderLine(true)
-	controlsTable.SetRowLine(true)
-	data := v2.Matrix{}
-
-	controlRows := generateControlRows(policies)
-	data = append(data, controlRows...)
-
-	controlsTable.AppendBulk(data)
-	controlsTable.Render()
-}
-
-func generateControlRows(policies []string) [][]string {
-	rows := [][]string{}
-
-	for _, control := range policies {
-		idAndControlAndFrameworks := strings.Split(control, "|")
-		id, control, framework := idAndControlAndFrameworks[0], idAndControlAndFrameworks[1], idAndControlAndFrameworks[2]
-
-		docs := cautils.GetControlLink(id)
-
-		currentRow := []string{id, control, docs, framework}
-
-		rows = append(rows, currentRow)
-	}
-
-	return rows
-}
-
-func generatePolicyRows(policies []string) [][]string {
-	rows := [][]string{}
-
-	for _, policy := range policies {
-		currentRow := []string{policy}
-		rows = append(rows, currentRow)
-	}
-	return rows
-}

core/core/scan.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/kubescape/k8s-interface/k8sinterface"
 
-	"github.com/kubescape/go-logger"
+	logger "github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/kubescape/v2/core/cautils"
 	"github.com/kubescape/kubescape/v2/core/cautils/getter"
@@ -27,8 +27,7 @@ type componentInterfaces struct {
 	tenantConfig      cautils.ITenantConfig
 	resourceHandler   resourcehandler.IResourceHandler
 	report            reporter.IReport
-	outputPrinters    []printer.IPrinter
-	uiPrinter         printer.IPrinter
+	printerHandler    printer.IPrinter
 	hostSensorHandler hostsensorutils.IHostSensor
 }
 
@@ -55,16 +54,12 @@ func getInterfaces(scanInfo *cautils.ScanInfo) componentInterfaces {
 		if err := tenantConfig.SetTenant(); err != nil {
 			logger.L().Error(err.Error())
 		}
-
-		if scanInfo.OmitRawResources {
-			logger.L().Warning("omit-raw-resources flag will be ignored in submit mode")
-		}
 	}
 
 	// ================== version testing ======================================
 
 	v := cautils.NewIVersionCheckHandler()
-	v.CheckLatestVersion(cautils.NewVersionCheckRequest(cautils.BuildNumber, policyIdentifierIdentities(scanInfo.PolicyIdentifier), "", cautils.ScanningContextToScanningScope(scanInfo.GetScanningContext())))
+	v.CheckLatestVersion(cautils.NewVersionCheckRequest(cautils.BuildNumber, policyIdentifierNames(scanInfo.PolicyIdentifier), "", cautils.ScanningContextToScanningScope(scanInfo.GetScanningContext())))
 
 	// ================== setup host scanner object ======================================
 
@@ -94,17 +89,9 @@ func getInterfaces(scanInfo *cautils.ScanInfo) componentInterfaces {
 	// reporting behavior - setup reporter
 	reportHandler := getReporter(tenantConfig, scanInfo.ScanID, scanInfo.Submit, scanInfo.FrameworkScan, scanInfo.GetScanningContext())
 
-	// setup printers
-	formats := scanInfo.Formats()
-
-	outputPrinters := make([]printer.IPrinter, 0)
-	for _, format := range formats {
-		printerHandler := resultshandling.NewPrinter(format, scanInfo.FormatVersion, scanInfo.PrintAttackTree, scanInfo.VerboseMode, cautils.ViewTypes(scanInfo.View))
-		printerHandler.SetWriter(scanInfo.Output)
-		outputPrinters = append(outputPrinters, printerHandler)
-	}
-
-	uiPrinter := getUIPrinter(scanInfo.VerboseMode, scanInfo.FormatVersion, scanInfo.PrintAttackTree, cautils.ViewTypes(scanInfo.View))
+	// setup printer
+	printerHandler := resultshandling.NewPrinter(scanInfo.Format, scanInfo.FormatVersion, scanInfo.VerboseMode, cautils.ViewTypes(scanInfo.View))
+	printerHandler.SetWriter(scanInfo.Output)
 
 	// ================== return interface ======================================
 
@@ -112,8 +99,7 @@ func getInterfaces(scanInfo *cautils.ScanInfo) componentInterfaces {
 		tenantConfig:      tenantConfig,
 		resourceHandler:   resourceHandler,
 		report:            reportHandler,
-		outputPrinters:    outputPrinters,
-		uiPrinter:         uiPrinter,
+		printerHandler:    printerHandler,
 		hostSensorHandler: hostSensorHandler,
 	}
 }
@@ -137,7 +123,7 @@ func (ks *Kubescape) Scan(scanInfo *cautils.ScanInfo) (*resultshandling.ResultsH
 	scanInfo.Getters.PolicyGetter = getPolicyGetter(scanInfo.UseFrom, interfaces.tenantConfig.GetTenantEmail(), scanInfo.FrameworkScan, downloadReleasedPolicy)
 	scanInfo.Getters.ControlsInputsGetter = getConfigInputsGetter(scanInfo.ControlsInputs, interfaces.tenantConfig.GetAccountID(), downloadReleasedPolicy)
 	scanInfo.Getters.ExceptionsGetter = getExceptionsGetter(scanInfo.UseExceptions, interfaces.tenantConfig.GetAccountID(), downloadReleasedPolicy)
-	scanInfo.Getters.AttackTracksGetter = getAttackTracksGetter(scanInfo.AttackTracks, interfaces.tenantConfig.GetAccountID(), downloadReleasedPolicy)
+	scanInfo.Getters.AttackTracksGetter = getAttackTracksGetter(interfaces.tenantConfig.GetAccountID(), downloadReleasedPolicy)
 
 	// TODO - list supported frameworks/controls
 	if scanInfo.ScanAll {
@@ -151,7 +137,7 @@ func (ks *Kubescape) Scan(scanInfo *cautils.ScanInfo) (*resultshandling.ResultsH
 		}
 	}()
 
-	resultsHandling := resultshandling.NewResultsHandler(interfaces.report, interfaces.outputPrinters, interfaces.uiPrinter)
+	resultsHandling := resultshandling.NewResultsHandler(interfaces.report, interfaces.printerHandler)
 
 	// ===================== policies & resources =====================
 	policyHandler := policyhandler.NewPolicyHandler(interfaces.resourceHandler)
@@ -170,7 +156,7 @@ func (ks *Kubescape) Scan(scanInfo *cautils.ScanInfo) (*resultshandling.ResultsH
 
 	// ======================== prioritization ===================
 
-	if priotizationHandler, err := resourcesprioritization.NewResourcesPrioritizationHandler(scanInfo.Getters.AttackTracksGetter, scanInfo.PrintAttackTree); err != nil {
+	if priotizationHandler, err := resourcesprioritization.NewResourcesPrioritizationHandler(scanInfo.Getters.AttackTracksGetter); err != nil {
 		logger.L().Warning("failed to get attack tracks, this may affect the scanning results", helpers.Error(err))
 	} else if err := priotizationHandler.PrioritizeResources(scanData); err != nil {
 		return resultsHandling, fmt.Errorf("%w", err)

core/meta/datastructures/v1/download.go

@@ -6,6 +6,6 @@ type DownloadInfo struct {
 	Path        string // directory to save artifact. Default is "~/.kubescape/"
 	FileName    string // can be empty
 	Target      string // type of artifact to download
-	Identifier  string // identifier of artifact to download
+	Name        string // name of artifact to download
 	Credentials cautils.Credentials
 }

core/meta/datastructures/v1/listpolicies.go

@@ -4,6 +4,7 @@ import "github.com/kubescape/kubescape/v2/core/cautils"
 
 type ListPolicies struct {
 	Target      string
+	ListIDs     bool
 	Format      string
 	Credentials cautils.Credentials
 }

core/mocks/loadmocks.go

@@ -8,7 +8,7 @@ import (
 	"github.com/kubescape/opa-utils/reporthandling"
 )
 
-var mockControl_0006 = `{"guid":"","name":"HostPath mount","attributes":{"armoBuiltin":true},"id":"C-0048","controlID":"C-0048","creationTime":"","description":"Mounting host directory to the container can be abused to get access to sensitive data and gain persistence on the host machine.","remediation":"Refrain from using host path mount.","rules":[{"guid":"","name":"alert-rw-hostpath","attributes":{"armoBuiltin":true,"m$K8sThreatMatrix":"Persistence::Writable hostPath mount, Lateral Movement::Writable volume mounts on the host"},"creationTime":"","rule":"package armo_builtins\n\n# input: pod\n# apiversion: v1\n# does: returns hostPath volumes\n\ndeny[msga] {\n    pod := input[_]\n    pod.kind == \"Pod\"\n    volumes := pod.spec.volumes\n    volume := volumes[_]\n    volume.hostPath\n\tcontainer := pod.spec.containers[i]\n\tvolumeMount := container.volumeMounts[k]\n\tvolumeMount.name == volume.name\n\tbegginingOfPath := \"spec.\"\n\tresult := isRWMount(volumeMount, begginingOfPath,  i, k)\n\n    podname := pod.metadata.name\n\n\tmsga := {\n\t\t\"alertMessage\": sprintf(\"pod: %v has: %v as hostPath volume\", [podname, volume.name]),\n\t\t\"packagename\": \"armo_builtins\",\n\t\t\"alertScore\": 7,\n\t\t\"failedPaths\": [result],\n\t\t\"alertObject\": {\n\t\t\t\"k8sApiObjects\": [pod]\n\t\t}\n\t}\n}\n\n#handles majority of workload resources\ndeny[msga] {\n\twl := input[_]\n\tspec_template_spec_patterns := {\"Deployment\",\"ReplicaSet\",\"DaemonSet\",\"StatefulSet\",\"Job\"}\n\tspec_template_spec_patterns[wl.kind]\n    volumes := wl.spec.template.spec.volumes\n    volume := volumes[_]\n    volume.hostPath\n\tcontainer := wl.spec.template.spec.containers[i]\n\tvolumeMount := container.volumeMounts[k]\n\tvolumeMount.name == volume.name\n\tbegginingOfPath := \"spec.template.spec.\"\n\tresult := isRWMount(volumeMount, begginingOfPath,  i, k)\n\n\tmsga := {\n\t\t\"alertMessage\": sprintf(\"%v: %v has: %v as hostPath volume\", [wl.kind, wl.metadata.name, volume.name]),\n\t\t\"packagename\": \"armo_builtins\",\n\t\t\"alertScore\": 7,\n\t\t\"failedPaths\": [result],\n\t\t\"alertObject\": {\n\t\t\t\"k8sApiObjects\": [wl]\n\t\t}\n\t\n\t}\n}\n\n#handles CronJobs\ndeny[msga] {\n\twl := input[_]\n\twl.kind == \"CronJob\"\n    volumes := wl.spec.jobTemplate.spec.template.spec.volumes\n    volume := volumes[_]\n    volume.hostPath\n\n\tcontainer = wl.spec.jobTemplate.spec.template.spec.containers[i]\n\tvolumeMount := container.volumeMounts[k]\n\tvolumeMount.name == volume.name\n\tbegginingOfPath := \"spec.jobTemplate.spec.template.spec.\"\n\tresult := isRWMount(volumeMount, begginingOfPath,  i, k)\n\n\tmsga := {\n\t\"alertMessage\": sprintf(\"%v: %v has: %v as hostPath volume\", [wl.kind, wl.metadata.name, volume.name]),\n\t\"packagename\": \"armo_builtins\",\n\t\"alertScore\": 7,\n\t\"failedPaths\": [result],\n\t\"alertObject\": {\n\t\t\t\"k8sApiObjects\": [wl]\n\t\t}\n\t}\n}\n\nisRWMount(mount, begginingOfPath,  i, k) = path {\n not mount.readOnly == true\n not mount.readOnly == false\n path = \"\"\n}\nisRWMount(mount, begginingOfPath,  i, k) = path {\n  mount.readOnly == false\n  path = sprintf(\"%vcontainers[%v].volumeMounts[%v].readOnly\", [begginingOfPath, format_int(i, 10), format_int(k, 10)])\n} ","resourceEnumerator":"","ruleLanguage":"Rego","match":[{"apiGroups":["*"],"apiVersions":["*"],"resources":["Deployment","ReplicaSet","DaemonSet","StatefulSet","Job","CronJob","Pod"]}],"ruleDependencies":[{"packageName":"cautils"},{"packageName":"kubernetes.api.client"}],"configInputs":null,"controlConfigInputs":null,"description":"determines if any workload contains a hostPath volume with rw permissions","remediation":"Set the readOnly field of the mount to true","ruleQuery":""}],"rulesIDs":[""],"baseScore":6}`
+var mockControl_0006 = `{"guid":"","name":"Allowed hostPath","attributes":{"armoBuiltin":true},"id":"C-0006","controlID":"C-0006","creationTime":"","description":"Mounting host directory to the container can be abused to get access to sensitive data and gain persistence on the host machine.","remediation":"Refrain from using host path mount.","rules":[{"guid":"","name":"alert-rw-hostpath","attributes":{"armoBuiltin":true,"m$K8sThreatMatrix":"Persistence::Writable hostPath mount, Lateral Movement::Writable volume mounts on the host"},"creationTime":"","rule":"package armo_builtins\n\n# input: pod\n# apiversion: v1\n# does: returns hostPath volumes\n\ndeny[msga] {\n    pod := input[_]\n    pod.kind == \"Pod\"\n    volumes := pod.spec.volumes\n    volume := volumes[_]\n    volume.hostPath\n\tcontainer := pod.spec.containers[i]\n\tvolumeMount := container.volumeMounts[k]\n\tvolumeMount.name == volume.name\n\tbegginingOfPath := \"spec.\"\n\tresult := isRWMount(volumeMount, begginingOfPath,  i, k)\n\n    podname := pod.metadata.name\n\n\tmsga := {\n\t\t\"alertMessage\": sprintf(\"pod: %v has: %v as hostPath volume\", [podname, volume.name]),\n\t\t\"packagename\": \"armo_builtins\",\n\t\t\"alertScore\": 7,\n\t\t\"failedPaths\": [result],\n\t\t\"alertObject\": {\n\t\t\t\"k8sApiObjects\": [pod]\n\t\t}\n\t}\n}\n\n#handles majority of workload resources\ndeny[msga] {\n\twl := input[_]\n\tspec_template_spec_patterns := {\"Deployment\",\"ReplicaSet\",\"DaemonSet\",\"StatefulSet\",\"Job\"}\n\tspec_template_spec_patterns[wl.kind]\n    volumes := wl.spec.template.spec.volumes\n    volume := volumes[_]\n    volume.hostPath\n\tcontainer := wl.spec.template.spec.containers[i]\n\tvolumeMount := container.volumeMounts[k]\n\tvolumeMount.name == volume.name\n\tbegginingOfPath := \"spec.template.spec.\"\n\tresult := isRWMount(volumeMount, begginingOfPath,  i, k)\n\n\tmsga := {\n\t\t\"alertMessage\": sprintf(\"%v: %v has: %v as hostPath volume\", [wl.kind, wl.metadata.name, volume.name]),\n\t\t\"packagename\": \"armo_builtins\",\n\t\t\"alertScore\": 7,\n\t\t\"failedPaths\": [result],\n\t\t\"alertObject\": {\n\t\t\t\"k8sApiObjects\": [wl]\n\t\t}\n\t\n\t}\n}\n\n#handles CronJobs\ndeny[msga] {\n\twl := input[_]\n\twl.kind == \"CronJob\"\n    volumes := wl.spec.jobTemplate.spec.template.spec.volumes\n    volume := volumes[_]\n    volume.hostPath\n\n\tcontainer = wl.spec.jobTemplate.spec.template.spec.containers[i]\n\tvolumeMount := container.volumeMounts[k]\n\tvolumeMount.name == volume.name\n\tbegginingOfPath := \"spec.jobTemplate.spec.template.spec.\"\n\tresult := isRWMount(volumeMount, begginingOfPath,  i, k)\n\n\tmsga := {\n\t\"alertMessage\": sprintf(\"%v: %v has: %v as hostPath volume\", [wl.kind, wl.metadata.name, volume.name]),\n\t\"packagename\": \"armo_builtins\",\n\t\"alertScore\": 7,\n\t\"failedPaths\": [result],\n\t\"alertObject\": {\n\t\t\t\"k8sApiObjects\": [wl]\n\t\t}\n\t}\n}\n\nisRWMount(mount, begginingOfPath,  i, k) = path {\n not mount.readOnly == true\n not mount.readOnly == false\n path = \"\"\n}\nisRWMount(mount, begginingOfPath,  i, k) = path {\n  mount.readOnly == false\n  path = sprintf(\"%vcontainers[%v].volumeMounts[%v].readOnly\", [begginingOfPath, format_int(i, 10), format_int(k, 10)])\n} ","resourceEnumerator":"","ruleLanguage":"Rego","match":[{"apiGroups":["*"],"apiVersions":["*"],"resources":["Deployment","ReplicaSet","DaemonSet","StatefulSet","Job","CronJob","Pod"]}],"ruleDependencies":[{"packageName":"cautils"},{"packageName":"kubernetes.api.client"}],"configInputs":null,"controlConfigInputs":null,"description":"determines if any workload contains a hostPath volume with rw permissions","remediation":"Set the readOnly field of the mount to true","ruleQuery":""}],"rulesIDs":[""],"baseScore":6}`
 
 var mockControl_0044 = `{"guid":"","name":"Container hostPort","attributes":{"armoBuiltin":true},"id":"C-0044","controlID":"C-0044","creationTime":"","description":"Configuring hostPort limits you to a particular port, and if any two workloads that specify the same HostPort they cannot be deployed to the same node. Therefore, if the number of replica of such workload is higher than the number of nodes, the deployment will fail.","remediation":"Avoid usage of hostPort unless it is absolutely necessary. Use NodePort / ClusterIP instead.","rules":[{"guid":"","name":"container-hostPort","attributes":{"armoBuiltin":true},"creationTime":"","rule":"package armo_builtins\n\n\n# Fails if pod has container with hostPort\ndeny[msga] {\n    pod := input[_]\n    pod.kind == \"Pod\"\n    container := pod.spec.containers[i]\n\tbegginingOfPath := \"spec.\"\n\tpath := isHostPort(container, i, begginingOfPath)\n\tmsga := {\n\t\t\"alertMessage\": sprintf(\"Container: %v has Host-port\", [ container.name]),\n\t\t\"packagename\": \"armo_builtins\",\n\t\t\"alertScore\": 7,\n\t\t\"failedPaths\": path,\n\t\t\"alertObject\": {\n\t\t\t\"k8sApiObjects\": [pod]\n\t\t}\n\t}\n}\n\n# Fails if workload has container with hostPort\ndeny[msga] {\n    wl := input[_]\n\tspec_template_spec_patterns := {\"Deployment\",\"ReplicaSet\",\"DaemonSet\",\"StatefulSet\",\"Job\"}\n\tspec_template_spec_patterns[wl.kind]\n    container := wl.spec.template.spec.containers[i]\n\tbegginingOfPath := \"spec.template.spec.\"\n    path := isHostPort(container, i, begginingOfPath)\n\tmsga := {\n\t\t\"alertMessage\": sprintf(\"Container: %v in %v: %v   has Host-port\", [ container.name, wl.kind, wl.metadata.name]),\n\t\t\"packagename\": \"armo_builtins\",\n\t\t\"alertScore\": 7,\n\t\t\"failedPaths\": path,\n\t\t\"alertObject\": {\n\t\t\t\"k8sApiObjects\": [wl]\n\t\t}\n\t}\n}\n\n# Fails if cronjob has container with hostPort\ndeny[msga] {\n  \twl := input[_]\n\twl.kind == \"CronJob\"\n\tcontainer = wl.spec.jobTemplate.spec.template.spec.containers[i]\n\tbegginingOfPath := \"spec.jobTemplate.spec.template.spec.\"\n    path := isHostPort(container, i, begginingOfPath)\n    msga := {\n\t\t\"alertMessage\": sprintf(\"Container: %v in %v: %v   has Host-port\", [ container.name, wl.kind, wl.metadata.name]),\n\t\t\"packagename\": \"armo_builtins\",\n\t\t\"alertScore\": 7,\n\t\t\"failedPaths\": path,\n\t\t\"alertObject\": {\n\t\t\t\"k8sApiObjects\": [wl]\n\t\t}\n\t}\n}\n\n\n\nisHostPort(container, i, begginingOfPath) = path {\n\tpath = [sprintf(\"%vcontainers[%v].ports[%v].hostPort\", [begginingOfPath, format_int(i, 10), format_int(j, 10)]) | port = container.ports[j];  port.hostPort]\n\tcount(path) > 0\n}\n","resourceEnumerator":"","ruleLanguage":"Rego","match":[{"apiGroups":["*"],"apiVersions":["*"],"resources":["Deployment","ReplicaSet","DaemonSet","StatefulSet","Job","Pod","CronJob"]}],"ruleDependencies":[],"configInputs":null,"controlConfigInputs":null,"description":"fails if container has hostPort","remediation":"Make sure you do not configure hostPort for the container, if necessary use NodePort / ClusterIP","ruleQuery":"armo_builtins"}],"rulesIDs":[""],"baseScore":4}`
 
@@ -31,7 +31,7 @@ func MockFramework_0013() *reporthandling.Framework {
 	return fw
 }
 
-// MockFramework_0006_0013 mock control 0013 and control 0006 - "Non-root containers" and "HostPath mount"
+// MockFramework_0006_0013 mock control 0013 and control 0006 - "Non-root containers" and "Allowed hostPath"
 func MockFramework_0006_0013() *reporthandling.Framework {
 	fw := &reporthandling.Framework{
 		PortalBase: armotypes.PortalBase{

core/pkg/containerscan/containerscan_mock.go

@@ -50,7 +50,7 @@ func randSeq(n int, bank []rune) string {
 
 	b := make([]rune, n)
 	for i := range b {
-		b[i] = bank[rand.Intn(len(bank))] //nolint:gosec
+		b[i] = bank[rand.Intn(len(bank))]
 	}
 	return string(b)
 }
@@ -60,7 +60,7 @@ func GenerateContainerScanLayer(layer *ScanResultLayer) {
 	layer.LayerHash = randSeq(32, hash)
 	layer.Vulnerabilities = make(VulnerabilitiesList, 0)
 	layer.Packages = make(LinuxPkgs, 0)
-	vuls := rand.Intn(10) + 1 //nolint:gosec
+	vuls := rand.Intn(10) + 1
 
 	for i := 0; i < vuls; i++ {
 		v := Vulnerability{}

core/pkg/containerscan/gojayunmarshaller.go

@@ -64,7 +64,7 @@ func (pkgs *LinuxPkgs) UnmarshalJSONArray(dec *gojay.Decoder) error {
 	return nil
 }
 
-// --------Vul fixed in----------------------------------
+//--------Vul fixed in----------------------------------
 func (fx *FixedIn) UnmarshalJSONObject(dec *gojay.Decoder, key string) (err error) {
 
 	switch key {

core/pkg/containerscan/rawdatastrucutres.go

@@ -71,19 +71,19 @@ type PackageFile struct {
 
 // types to provide unmarshalling:
 
-// VulnerabilitiesList -s.e
+//VulnerabilitiesList -s.e
 type LayersList []ScanResultLayer
 
-// VulnerabilitiesList -s.e
+//VulnerabilitiesList -s.e
 type VulnerabilitiesList []Vulnerability
 
-// LinuxPkgs - slice of linux pkgs
+//LinuxPkgs - slice of linux pkgs
 type LinuxPkgs []LinuxPackage
 
-// VulFixes - information bout when/how this vul was fixed
+//VulFixes - information bout when/how this vul was fixed
 type VulFixes []FixedIn
 
-// PkgFiles - slice of files belong to specific pkg
+//PkgFiles - slice of files belong to specific pkg
 type PkgFiles []PackageFile
 
 func (v *ScanResultReport) AsFNVHash() string {

core/pkg/fixhandler/datastructures.go

@@ -1,9 +1,6 @@
 package fixhandler
 
 import (
-	"sort"
-	"strings"
-
 	"github.com/armosec/armoapi-go/armotypes"
 	metav1 "github.com/kubescape/kubescape/v2/core/meta/datastructures/v1"
 	"github.com/kubescape/opa-utils/reporthandling"
@@ -46,7 +43,7 @@ type fixInfoMetadata struct {
 	linesToRemove       *[]linesToRemove
 }
 
-// contentToAdd holds the information about where to insert the new changes in the existing yaml file
+// ContentToAdd holds the information about where to insert the new changes in the existing yaml file
 type contentToAdd struct {
 	// Line where the fix should be applied to
 	line int
@@ -54,49 +51,6 @@ type contentToAdd struct {
 	content string
 }
 
-func withNewline(content, targetNewline string) string {
-	replaceNewlines := map[string]bool{
-		unixNewline:    true,
-		windowsNewline: true,
-		oldMacNewline:     true,
-	}
-	replaceNewlines[targetNewline] = false
-
-	newlinesToReplace := make([]string, len(replaceNewlines))
-	i := 0
-	for k := range replaceNewlines {
-		newlinesToReplace[i] = k
-		i++
-	}
-
-	// To ensure that we fully replace Windows newlines (CR LF), and not
-	// corrupt them into two new newlines (CR CR or LF LF) by partially
-	// replacing either CR or LF, we have to ensure we replace longer
-	// Windows newlines first
-	sort.Slice(newlinesToReplace, func(i int, j int) bool {
-		return len(newlinesToReplace[i]) > len(newlinesToReplace[j])
-	})
-
-	// strings.Replacer takes a flat list of (oldVal, newVal) pairs, so we
-	// need to allocate twice the space and assign accordingly
-	newlinesOldNew := make([]string, 2*len(replaceNewlines))
-	i = 0
-	for _, nl := range newlinesToReplace {
-		newlinesOldNew[2*i] = nl
-		newlinesOldNew[2*i+1] = targetNewline
-		i++
-	}
-
-	replacer := strings.NewReplacer(newlinesOldNew...)
-	return replacer.Replace(content)
-}
-
-// Content returns the content that will be added, separated by the explicitly
-// provided `targetNewline`
-func (c *contentToAdd) Content(targetNewline string) string {
-	return withNewline(c.content, targetNewline)
-}
-
 // LinesToRemove holds the line numbers to remove from the existing yaml file
 type linesToRemove struct {
 	startLine int

core/pkg/fixhandler/datastructures_test.go

@@ -1,89 +0,0 @@
-package fixhandler
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestContentNewlinesMatchTarget(t *testing.T) {
-	cases := []struct {
-		Name          string
-		InputContent  string
-		TargetNewline string
-		WantedContent string
-	}{
-		{
-			"Unix to DOS",
-			"first line\nsecond line\n",
-			"\r\n",
-			"first line\r\nsecond line\r\n",
-		},
-		{
-			"Unix to Unix",
-			"first line\nsecond line\n",
-			"\n",
-			"first line\nsecond line\n",
-		},
-		{
-			"Unix to Mac",
-			"first line\nsecond line\n",
-			"\r",
-			"first line\rsecond line\r",
-		},
-		{
-			"DOS to Unix",
-			"first line\r\nsecond line\r\n",
-			"\n",
-			"first line\nsecond line\n",
-		},
-		{
-			"DOS to DOS",
-			"first line\r\nsecond line\r\n",
-			"\r\n",
-			"first line\r\nsecond line\r\n",
-		},
-		{
-			"DOS to OldMac",
-			"first line\r\nsecond line\r\n",
-			"\r",
-			"first line\rsecond line\r",
-		},
-		{
-			"Mac to DOS",
-			"first line\rsecond line\r",
-			"\r\n",
-			"first line\r\nsecond line\r\n",
-		},
-		{
-			"Mac to Unix",
-			"first line\rsecond line\r",
-			"\n",
-			"first line\nsecond line\n",
-		},
-		{
-			"DOS, Mac to Unix",
-			"first line\r\n\rsecond line\r",
-			"\n",
-			"first line\n\nsecond line\n",
-		},
-		{
-			"Mac, DOS to Unix",
-			"first line\r\r\r\nsecond line\r",
-			"\n",
-			"first line\n\n\nsecond line\n",
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.Name, func(t *testing.T) {
-			c := &contentToAdd{content: tc.InputContent}
-			want := tc.WantedContent
-
-			got := c.Content(tc.TargetNewline)
-
-			assert.Equal(t, want, got)
-		})
-	}
-
-}

core/pkg/fixhandler/fixhandler.go

@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
-	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -25,10 +24,6 @@ import (
 
 const UserValuePrefix = "YOUR_"
 
-const windowsNewline = "\r\n"
-const unixNewline = "\n"
-const oldMacNewline = "\r"
-
 func NewFixHandler(fixInfo *metav1.FixInfo) (*FixHandler, error) {
 	jsonFile, err := os.Open(fixInfo.ReportFile)
 	if err != nil {
@@ -63,12 +58,11 @@ func NewFixHandler(fixInfo *metav1.FixInfo) (*FixHandler, error) {
 }
 
 func isSupportedScanningTarget(report *reporthandlingv2.PostureReport) error {
-	scanningTarget := report.Metadata.ScanMetadata.ScanningTarget
-	if scanningTarget == reporthandlingv2.GitLocal || scanningTarget == reporthandlingv2.Directory || scanningTarget == reporthandlingv2.File {
+	if report.Metadata.ScanMetadata.ScanningTarget == reporthandlingv2.GitLocal || report.Metadata.ScanMetadata.ScanningTarget == reporthandlingv2.Directory {
 		return nil
 	}
 
-	return fmt.Errorf("unsupported scanning target. Supported scanning targets are: a local git repo, a directory or a file")
+	return fmt.Errorf("unsupported scanning target. Only local git and directory scanning targets are supported")
 }
 
 func getLocalPath(report *reporthandlingv2.PostureReport) string {
@@ -80,10 +74,6 @@ func getLocalPath(report *reporthandlingv2.PostureReport) string {
 		return report.Metadata.ContextMetadata.DirectoryContextMetadata.BasePath
 	}
 
-	if report.Metadata.ScanMetadata.ScanningTarget == reporthandlingv2.File {
-		return filepath.Dir(report.Metadata.ContextMetadata.FileContextMetadata.FilePath)
-	}
-
 	return ""
 }
 
@@ -242,9 +232,7 @@ func (h *FixHandler) getFilePathAndIndex(filePathWithIndex string) (filePath str
 }
 
 func (h *FixHandler) ApplyFixToContent(yamlAsString, yamlExpression string) (fixedString string, err error) {
-	newline := determineNewlineSeparator(yamlAsString)
-
-	yamlLines := strings.Split(yamlAsString, newline)
+	yamlLines := strings.Split(yamlAsString, "\n")
 
 	originalRootNodes, err := decodeDocumentRoots(yamlAsString)
 
@@ -260,9 +248,9 @@ func (h *FixHandler) ApplyFixToContent(yamlAsString, yamlExpression string) (fix
 
 	fileFixInfo := getFixInfo(originalRootNodes, fixedRootNodes)
 
-	fixedYamlLines := getFixedYamlLines(yamlLines, fileFixInfo, newline)
+	fixedYamlLines := getFixedYamlLines(yamlLines, fileFixInfo)
 
-	fixedString = getStringFromSlice(fixedYamlLines, newline)
+	fixedString = getStringFromSlice(fixedYamlLines)
 
 	return fixedString, nil
 }
@@ -356,12 +344,3 @@ func writeFixesToFile(filepath, content string) error {
 
 	return nil
 }
-
-func determineNewlineSeparator(contents string) string {
-	switch {
-	case strings.Contains(contents, windowsNewline):
-		return windowsNewline
-	default:
-		return unixNewline
-	}
-}

core/pkg/fixhandler/fixhandler_test.go

@@ -98,11 +98,6 @@ func getTestCases() []indentationTestCase {
 			`select(di==0).spec.containers += {"name": "redis", "image": "redis"}`,
 			"inserts/tc-10-01-expected.yaml",
 		},
-		{
-			"inserts/tc-11-00-input-list-insert-new-mapping-crlf-newlines.yaml",
-			`select(di==0).spec.containers += {"name": "redis", "image": "redis"}`,
-			"inserts/tc-11-01-expected.yaml",
-		},
 
 		// Removal Scenarios
 		{

core/pkg/fixhandler/testdata/inserts/tc-11-00-input-list-insert-new-mapping-crlf-newlines.yaml

@@ -1,11 +0,0 @@
-# Fix to Apply:
-# select(di==0).spec.containers += {"name": "redis", "image": "redis"}
-
-apiVersion: v1
-kind: Pod
-metadata:
-  name: indented-list-insert-new-object
-spec:
-  containers:
-  - name: nginx_container
-    image: nginx

core/pkg/fixhandler/testdata/inserts/tc-11-01-expected.yaml

@@ -1,13 +0,0 @@
-# Fix to Apply:
-# select(di==0).spec.containers += {"name": "redis", "image": "redis"}
-
-apiVersion: v1
-kind: Pod
-metadata:
-  name: indented-list-insert-new-object
-spec:
-  containers:
-  - name: nginx_container
-    image: nginx
-  - name: redis
-    image: redis

core/pkg/fixhandler/yamlhandler.go

@@ -244,7 +244,7 @@ func removeNewLinesAtTheEnd(yamlLines []string) []string {
 	return yamlLines
 }
 
-func getFixedYamlLines(yamlLines []string, fileFixInfo fileFixInfo, newline string) (fixedYamlLines []string) {
+func getFixedYamlLines(yamlLines []string, fileFixInfo fileFixInfo) (fixedYamlLines []string) {
 
 	// Determining last line requires original yaml lines slice. The placeholder for last line is replaced with the real last line
 	assignLastLine(fileFixInfo.contentsToAdd, fileFixInfo.linesToRemove, &yamlLines)
@@ -267,7 +267,7 @@ func getFixedYamlLines(yamlLines []string, fileFixInfo fileFixInfo, newline stri
 			lineIdx += 1
 		}
 
-		content := (*fileFixInfo.contentsToAdd)[lineToAddIdx].Content(newline)
+		content := (*fileFixInfo.contentsToAdd)[lineToAddIdx].content
 		fixedYamlLines = append(fixedYamlLines, content)
 
 		lineToAddIdx += 1

core/pkg/fixhandler/yamlhelper.go

@@ -401,6 +401,6 @@ func updateTracker(nodeList *[]nodeInfo, tracker int) int {
 	return updatedTracker
 }
 
-func getStringFromSlice(yamlLines []string, newline string) (fixedYamlString string) {
-	return strings.Join(yamlLines, newline)
+func getStringFromSlice(yamlLines []string) (fixedYamlString string) {
+	return strings.Join(yamlLines, "\n")
 }

core/pkg/hostsensorutils/hostsensor.yaml

@@ -36,9 +36,8 @@ spec:
         effect: NoSchedule
       containers:
       - name: host-sensor
-        image: quay.io/kubescape/host-scanner:v1.0.39
+        image: quay.io/kubescape/host-scanner:v1.0.32
         securityContext:
-          allowPrivilegeEscalation: true
           privileged: true
           readOnlyRootFilesystem: true
           procMount: Unmasked

core/pkg/hostsensorutils/hostsensordeploy.go

@@ -75,7 +75,6 @@ func (hsh *HostSensorHandler) Init() error {
 	// store pod names
 	// make sure all pods are running, after X seconds treat has running anyway, and log an error on the pods not running yet
 	logger.L().Info("Installing host scanner")
-	logger.L().Debug("The host scanner is a DaemonSet that runs on each node in the cluster. The DaemonSet will be running in it's own namespace and will be deleted once the scan is completed. If you do not wish to install the host scanner, please run the scan without the --enable-host-scan flag.")
 
 	cautils.StartSpinner()
 

core/pkg/hostsensorutils/hostsensorgetfrompod.go

@@ -3,7 +3,6 @@ package hostsensorutils
 import (
 	"encoding/json"
 	"fmt"
-	"strings"
 	"sync"
 
 	logger "github.com/kubescape/go-logger"
@@ -100,30 +99,6 @@ func (hsh *HostSensorHandler) sendAllPodsHTTPGETRequest(path, requestKind string
 	return res, nil
 }
 
-// return host-scanner version
-func (hsh *HostSensorHandler) GetVersion() (string, error) {
-	// loop over pods and port-forward it to each of them
-	podList, err := hsh.getPodList()
-	if err != nil {
-		return "", fmt.Errorf("failed to sendAllPodsHTTPGETRequest: %v", err)
-	}
-
-	// initialization of the channels
-	hsh.workerPool.init(len(podList))
-	hsh.workerPool.hostSensorApplyJobs(podList, "/version", "version")
-	for job := range hsh.workerPool.jobs {
-		resBytes, err := hsh.HTTPGetToPod(job.podName, job.path)
-		if err != nil {
-			return "", err
-		} else {
-			version := strings.ReplaceAll(string(resBytes), "\"", "")
-			version = strings.ReplaceAll(version, "\n", "")
-			return version, nil
-		}
-	}
-	return "", nil
-}
-
 // return list of LinuxKernelVariables
 func (hsh *HostSensorHandler) GetKernelVariables() ([]hostsensor.HostSensorDataEnvelope, error) {
 	// loop over pods and port-forward it to each of them
@@ -160,12 +135,6 @@ func (hsh *HostSensorHandler) GetControlPlaneInfo() ([]hostsensor.HostSensorData
 	return hsh.sendAllPodsHTTPGETRequest("/controlPlaneInfo", ControlPlaneInfo)
 }
 
-// return list of KubeProxyInfo
-func (hsh *HostSensorHandler) GetCloudProviderInfo() ([]hostsensor.HostSensorDataEnvelope, error) {
-	// loop over pods and port-forward it to each of them
-	return hsh.sendAllPodsHTTPGETRequest("/cloudProviderInfo", CloudProviderInfo)
-}
-
 // return list of KubeletCommandLine
 func (hsh *HostSensorHandler) GetKubeletCommandLine() ([]hostsensor.HostSensorDataEnvelope, error) {
 	// loop over pods and port-forward it to each of them
@@ -204,9 +173,9 @@ func (hsh *HostSensorHandler) GetKubeletConfigurations() ([]hostsensor.HostSenso
 	// loop over pods and port-forward it to each of them
 	res, err := hsh.sendAllPodsHTTPGETRequest("/kubeletConfigurations", "KubeletConfiguration") // empty kind, will be overridden
 	for resIdx := range res {
-		jsonBytes, ery := yaml.YAMLToJSON(res[resIdx].Data)
-		if ery != nil {
-			logger.L().Error("failed to convert kubelet configurations from yaml to json", helpers.Error(ery))
+		jsonBytes, err := yaml.YAMLToJSON(res[resIdx].Data)
+		if err != nil {
+			logger.L().Error("failed to convert kubelet configurations from yaml to json", helpers.Error(err))
 			continue
 		}
 		res[resIdx].SetData(jsonBytes)
@@ -223,16 +192,6 @@ func (hsh *HostSensorHandler) CollectResources() ([]hostsensor.HostSensorDataEnv
 	var kcData []hostsensor.HostSensorDataEnvelope
 	var err error
 	logger.L().Debug("Accessing host scanner")
-	version, err := hsh.GetVersion()
-	if err != nil {
-		logger.L().Warning(err.Error())
-	}
-	if len(version) > 0 {
-		logger.L().Info("Host scanner version : " + version)
-	} else {
-		logger.L().Info("Unknown host scanner version")
-	}
-	//
 	kcData, err = hsh.GetKubeletConfigurations()
 	if err != nil {
 		addInfoToMap(KubeletConfiguration, infoMap, err)
@@ -326,16 +285,6 @@ func (hsh *HostSensorHandler) CollectResources() ([]hostsensor.HostSensorDataEnv
 		res = append(res, kcData...)
 	}
 
-	// GetCloudProviderInfo
-	kcData, err = hsh.GetCloudProviderInfo()
-	if err != nil {
-		addInfoToMap(CloudProviderInfo, infoMap, err)
-		logger.L().Warning(err.Error())
-	}
-	if len(kcData) > 0 {
-		res = append(res, kcData...)
-	}
-
 	logger.L().Debug("Done reading information from host scanner")
 	return res, infoMap, nil
 }

core/pkg/hostsensorutils/hostsensorworkerpool.go

@@ -32,7 +32,7 @@ func NewWorkerPool() workerPool {
 }
 
 func (wp *workerPool) init(noOfPods ...int) {
-	if len(noOfPods) > 0 && noOfPods[0] < noOfWorkers {
+	if noOfPods != nil && len(noOfPods) > 0 && noOfPods[0] < noOfWorkers {
 		wp.noOfWorkers = noOfPods[0]
 	}
 	// init the channels
@@ -82,13 +82,13 @@ func (wp *workerPool) hostSensorGetResults(result *[]hostsensor.HostSensorDataEn
 func (wp *workerPool) hostSensorApplyJobs(podList map[string]string, path, requestKind string) {
 	go func() {
 		for podName, nodeName := range podList {
-			thisJob := job{
+			job := job{
 				podName:     podName,
 				nodeName:    nodeName,
 				requestKind: requestKind,
 				path:        path,
 			}
-			wp.jobs <- thisJob
+			wp.jobs <- job
 
 		}
 		close(wp.jobs)

core/pkg/hostsensorutils/utils.go

@@ -16,7 +16,6 @@ var (
 	KubeletInfo                  = "KubeletInfo"
 	KubeProxyInfo                = "KubeProxyInfo"
 	ControlPlaneInfo             = "ControlPlaneInfo"
-	CloudProviderInfo            = "CloudProviderInfo"
 
 	MapHostSensorResourceToApiGroup = map[string]string{
 		KubeletConfiguration:         "hostdata.kubescape.cloud/v1beta0",
@@ -29,7 +28,6 @@ var (
 		KubeletInfo:                  "hostdata.kubescape.cloud/v1beta0",
 		KubeProxyInfo:                "hostdata.kubescape.cloud/v1beta0",
 		ControlPlaneInfo:             "hostdata.kubescape.cloud/v1beta0",
-		CloudProviderInfo:            "hostdata.kubescape.cloud/v1beta0",
 	}
 )
 

core/pkg/opaprocessor/processorhandler.go

@@ -35,7 +35,6 @@ type OPAProcessor struct {
 func NewOPAProcessor(sessionObj *cautils.OPASessionObj, regoDependenciesData *resources.RegoDependenciesData) *OPAProcessor {
 	if regoDependenciesData != nil && sessionObj != nil {
 		regoDependenciesData.PostureControlInputs = sessionObj.RegoInputData.PostureControlInputs
-		regoDependenciesData.DataControlInputs = sessionObj.RegoInputData.DataControlInputs
 	}
 	return &OPAProcessor{
 		OPASessionObj:        sessionObj,
@@ -69,26 +68,23 @@ func (opap *OPAProcessor) Process(policies *cautils.Policies) error {
 
 	cautils.StartSpinner()
 
-	for _, toPin := range policies.Controls {
-		control := toPin
+	var errs error
+	for _, control := range policies.Controls {
 
 		resourcesAssociatedControl, err := opap.processControl(&control)
 		if err != nil {
 			logger.L().Error(err.Error())
 		}
-
-		if len(resourcesAssociatedControl) == 0 {
-			continue
-		}
-
 		// update resources with latest results
-		for resourceID, controlResult := range resourcesAssociatedControl {
-			if _, ok := opap.ResourcesResult[resourceID]; !ok {
-				opap.ResourcesResult[resourceID] = resourcesresults.Result{ResourceID: resourceID}
+		if len(resourcesAssociatedControl) != 0 {
+			for resourceID, controlResult := range resourcesAssociatedControl {
+				if _, ok := opap.ResourcesResult[resourceID]; !ok {
+					opap.ResourcesResult[resourceID] = resourcesresults.Result{ResourceID: resourceID}
+				}
+				t := opap.ResourcesResult[resourceID]
+				t.AssociatedControls = append(t.AssociatedControls, controlResult)
+				opap.ResourcesResult[resourceID] = t
 			}
-			t := opap.ResourcesResult[resourceID]
-			t.AssociatedControls = append(t.AssociatedControls, controlResult)
-			opap.ResourcesResult[resourceID] = t
 		}
 	}
 
@@ -98,7 +94,7 @@ func (opap *OPAProcessor) Process(policies *cautils.Policies) error {
 
 	opap.loggerDoneScanning()
 
-	return nil
+	return errs
 }
 
 func (opap *OPAProcessor) loggerStartScanning() {
@@ -157,16 +153,12 @@ func (opap *OPAProcessor) processControl(control *reporthandling.Control) (map[s
 func (opap *OPAProcessor) processRule(rule *reporthandling.PolicyRule, fixedControlInputs map[string][]string) (map[string]*resourcesresults.ResourceAssociatedRule, error) {
 
 	postureControlInputs := opap.regoDependenciesData.GetFilteredPostureControlInputs(rule.ConfigInputs) // get store
-	dataControlInputs := map[string]string{"cloudProvider": opap.OPASessionObj.Report.ClusterCloudProvider}
 
 	// Merge configurable control input and fixed control input
 	for k, v := range fixedControlInputs {
 		postureControlInputs[k] = v
 	}
 
-	RuleRegoDependenciesData := resources.RegoDependenciesData{DataControlInputs: dataControlInputs,
-		PostureControlInputs: postureControlInputs}
-
 	inputResources, err := reporthandling.RegoResourcesAggregator(rule, getAllSupportedObjects(opap.K8SResources, opap.ArmoResource, opap.AllResources, rule))
 	if err != nil {
 		return nil, fmt.Errorf("error getting aggregated k8sObjects: %s", err.Error())
@@ -193,7 +185,7 @@ func (opap *OPAProcessor) processRule(rule *reporthandling.PolicyRule, fixedCont
 		opap.AllResources[inputResources[i].GetID()] = inputResources[i]
 	}
 
-	ruleResponses, err := opap.runOPAOnSingleRule(rule, inputRawResources, ruleData, RuleRegoDependenciesData)
+	ruleResponses, err := opap.runOPAOnSingleRule(rule, inputRawResources, ruleData, postureControlInputs)
 	if err != nil {
 		// TODO - Handle error
 		logger.L().Error(err.Error())
@@ -225,16 +217,16 @@ func (opap *OPAProcessor) processRule(rule *reporthandling.PolicyRule, fixedCont
 	return resources, err
 }
 
-func (opap *OPAProcessor) runOPAOnSingleRule(rule *reporthandling.PolicyRule, k8sObjects []map[string]interface{}, getRuleData func(*reporthandling.PolicyRule) string, ruleRegoDependenciesData resources.RegoDependenciesData) ([]reporthandling.RuleResponse, error) {
+func (opap *OPAProcessor) runOPAOnSingleRule(rule *reporthandling.PolicyRule, k8sObjects []map[string]interface{}, getRuleData func(*reporthandling.PolicyRule) string, postureControlInputs map[string][]string) ([]reporthandling.RuleResponse, error) {
 	switch rule.RuleLanguage {
 	case reporthandling.RegoLanguage, reporthandling.RegoLanguage2:
-		return opap.runRegoOnK8s(rule, k8sObjects, getRuleData, ruleRegoDependenciesData)
+		return opap.runRegoOnK8s(rule, k8sObjects, getRuleData, postureControlInputs)
 	default:
 		return nil, fmt.Errorf("rule: '%s', language '%v' not supported", rule.Name, rule.RuleLanguage)
 	}
 }
 
-func (opap *OPAProcessor) runRegoOnK8s(rule *reporthandling.PolicyRule, k8sObjects []map[string]interface{}, getRuleData func(*reporthandling.PolicyRule) string, ruleRegoDependenciesData resources.RegoDependenciesData) ([]reporthandling.RuleResponse, error) {
+func (opap *OPAProcessor) runRegoOnK8s(rule *reporthandling.PolicyRule, k8sObjects []map[string]interface{}, getRuleData func(*reporthandling.PolicyRule) string, postureControlInputs map[string][]string) ([]reporthandling.RuleResponse, error) {
 
 	// compile modules
 	modules, err := getRuleDependencies()
@@ -247,7 +239,7 @@ func (opap *OPAProcessor) runRegoOnK8s(rule *reporthandling.PolicyRule, k8sObjec
 		return nil, fmt.Errorf("in 'runRegoOnSingleRule', failed to compile rule, name: %s, reason: %s", rule.Name, err.Error())
 	}
 
-	store, err := ruleRegoDependenciesData.TOStorage()
+	store, err := resources.TOStorage(postureControlInputs)
 	if err != nil {
 		return nil, err
 	}
@@ -290,12 +282,8 @@ func (opap *OPAProcessor) enumerateData(rule *reporthandling.PolicyRule, k8sObje
 		return k8sObjects, nil
 	}
 	postureControlInputs := opap.regoDependenciesData.GetFilteredPostureControlInputs(rule.ConfigInputs)
-	dataControlInputs := map[string]string{"cloudProvider": opap.OPASessionObj.Report.ClusterCloudProvider}
 
-	RuleRegoDependenciesData := resources.RegoDependenciesData{DataControlInputs: dataControlInputs,
-		PostureControlInputs: postureControlInputs}
-
-	ruleResponse, err := opap.runOPAOnSingleRule(rule, k8sObjects, ruleEnumeratorData, RuleRegoDependenciesData)
+	ruleResponse, err := opap.runOPAOnSingleRule(rule, k8sObjects, ruleEnumeratorData, postureControlInputs)
 	if err != nil {
 		return nil, err
 	}

core/pkg/opaprocessor/processorhandlerutils.go

@@ -15,9 +15,9 @@ import (
 // updateResults updates the results objects and report objects. This is a critical function - DO NOT CHANGE
 //
 // The function:
-//   - removes sensible data
-//   - adds exceptions
-//   - summarizes results
+//  - removes sensible data
+//  - adds exceptions
+//  - summarizes results
 func (opap *OPAProcessor) updateResults() {
 
 	// remove data from all objects
@@ -91,6 +91,9 @@ func getKSObjects(k8sResources *cautils.KSResources, allResources map[string]wor
 					groupResources := k8sinterface.ResourceGroupToString(groups, version, resource)
 					for _, groupResource := range groupResources {
 						if k8sObj, ok := (*k8sResources)[groupResource]; ok {
+							// if k8sObj == nil {
+							// 	logger.L().Debug(fmt.Sprintf("resource '%s' is nil, probably failed to pull the resource", groupResource))
+							// }
 							for i := range k8sObj {
 								k8sObjects = append(k8sObjects, allResources[k8sObj[i]])
 							}
@@ -114,11 +117,9 @@ func getKubernetesObjects(k8sResources *cautils.K8SResources, allResources map[s
 					groupResources := k8sinterface.ResourceGroupToString(groups, version, resource)
 					for _, groupResource := range groupResources {
 						if k8sObj, ok := (*k8sResources)[groupResource]; ok {
-							/*
-								if k8sObj == nil {
-									// logger.L().Debug("skipping", helpers.String("resource", groupResource))
-								}
-							*/
+							if k8sObj == nil {
+								// logger.L().Debug("skipping", helpers.String("resource", groupResource))
+							}
 							for i := range k8sObj {
 								k8sObjects = append(k8sObjects, allResources[k8sObj[i]])
 							}

core/pkg/policyhandler/handlenotification.go

@@ -2,22 +2,10 @@ package policyhandler
 
 import (
 	"fmt"
-	"strings"
 
-	logger "github.com/kubescape/go-logger"
-	"github.com/kubescape/go-logger/helpers"
-	helpersv1 "github.com/kubescape/opa-utils/reporthandling/helpers/v1"
-
-	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-
-	cloudsupportv1 "github.com/kubescape/k8s-interface/cloudsupport/v1"
-	reportv2 "github.com/kubescape/opa-utils/reporthandling/v2"
-
-	"github.com/kubescape/k8s-interface/cloudsupport"
-	"github.com/kubescape/k8s-interface/k8sinterface"
+	"github.com/armosec/armoapi-go/armotypes"
 	"github.com/kubescape/kubescape/v2/core/cautils"
 	"github.com/kubescape/kubescape/v2/core/pkg/resourcehandler"
-	"github.com/kubescape/opa-utils/reporthandling/apis"
 )
 
 // PolicyHandler -
@@ -61,11 +49,6 @@ func (policyHandler *PolicyHandler) CollectResources(policyIdentifier []cautils.
 func (policyHandler *PolicyHandler) getResources(policyIdentifier []cautils.PolicyIdentifier, opaSessionObj *cautils.OPASessionObj, scanInfo *cautils.ScanInfo) error {
 	opaSessionObj.Report.ClusterAPIServerInfo = policyHandler.resourceHandler.GetClusterAPIServerInfo()
 
-	// set cloud metadata only when scanning a cluster
-	if opaSessionObj.Metadata.ScanMetadata.ScanningTarget == reportv2.Cluster {
-		setCloudMetadata(opaSessionObj)
-	}
-
 	resourcesMap, allResources, ksResources, err := policyHandler.resourceHandler.GetResources(opaSessionObj, &policyIdentifier[0].Designators)
 	if err != nil {
 		return err
@@ -78,80 +61,9 @@ func (policyHandler *PolicyHandler) getResources(policyIdentifier []cautils.Poli
 	return nil
 }
 
-/* unused for now
 func getDesignator(policyIdentifier []cautils.PolicyIdentifier) *armotypes.PortalDesignator {
 	if len(policyIdentifier) > 0 {
 		return &policyIdentifier[0].Designators
 	}
 	return &armotypes.PortalDesignator{}
 }
-*/
-
-func setCloudMetadata(opaSessionObj *cautils.OPASessionObj) {
-	iCloudMetadata := getCloudMetadata(opaSessionObj, k8sinterface.GetConfig())
-	if iCloudMetadata == nil {
-		return
-	}
-	cloudMetadata := reportv2.NewCloudMetadata(iCloudMetadata)
-	opaSessionObj.Metadata.ContextMetadata.ClusterContextMetadata.CloudMetadata = cloudMetadata
-	opaSessionObj.Metadata.ClusterMetadata.CloudMetadata = cloudMetadata             // deprecated - fallback
-	opaSessionObj.Report.ClusterCloudProvider = iCloudMetadata.Provider().ToString() // deprecated - fallback
-
-	logger.L().Debug("Cloud metadata", helpers.String("provider", iCloudMetadata.Provider().ToString()), helpers.String("name", iCloudMetadata.GetName()))
-}
-
-// getCloudMetadata - get cloud metadata from kubeconfig or API server
-// There are 3 options:
-// 1. Get cloud provider from API server git version (EKS, GKE)
-// 2. Get cloud provider from kubeconfig by parsing the cluster context (EKS, GKE)
-// 3. Get cloud provider from kubeconfig by parsing the server URL (AKS)
-func getCloudMetadata(opaSessionObj *cautils.OPASessionObj, config *clientcmdapi.Config) apis.ICloudParser {
-
-	if config == nil {
-		return nil
-	}
-
-	var provider string
-
-	// attempting to get cloud provider from API server git version
-	if opaSessionObj.Report.ClusterAPIServerInfo != nil {
-		provider = cloudsupport.GetCloudProvider(opaSessionObj.Report.ClusterAPIServerInfo.GitVersion)
-	}
-
-	if provider == cloudsupportv1.AKS || isAKS(config) {
-		return helpersv1.NewAKSMetadata(k8sinterface.GetContextName())
-	}
-	if provider == cloudsupportv1.EKS || isEKS(config) {
-		return helpersv1.NewEKSMetadata(k8sinterface.GetContextName())
-	}
-	if provider == cloudsupportv1.GKE || isGKE(config) {
-		return helpersv1.NewGKEMetadata(k8sinterface.GetContextName())
-	}
-
-	return nil
-}
-
-// check if the server is AKS. e.g. https://XXX.XX.XXX.azmk8s.io:443
-func isAKS(config *clientcmdapi.Config) bool {
-	const serverIdentifierAKS = "azmk8s.io"
-	if cluster, ok := config.Clusters[config.CurrentContext]; ok {
-		return strings.Contains(cluster.Server, serverIdentifierAKS)
-	}
-	return false
-}
-
-// check if the server is EKS. e.g. arn:aws:eks:eu-west-1:xxx:cluster/xxxx
-func isEKS(config *clientcmdapi.Config) bool {
-	if context, ok := config.Contexts[config.CurrentContext]; ok {
-		return strings.Contains(context.Cluster, cloudsupportv1.EKS)
-	}
-	return false
-}
-
-// check if the server is GKE. e.g. gke_xxx-xx-0000_us-central1-c_xxxx-1
-func isGKE(config *clientcmdapi.Config) bool {
-	if context, ok := config.Contexts[config.CurrentContext]; ok {
-		return strings.Contains(context.Cluster, cloudsupportv1.GKE)
-	}
-	return false
-}

core/pkg/policyhandler/handlenotification_test.go

@@ -1,262 +0,0 @@
-package policyhandler
-
-import (
-	"context"
-	_ "embed"
-	"encoding/json"
-	"testing"
-
-	"github.com/armosec/armoapi-go/armotypes"
-	"github.com/kubescape/k8s-interface/k8sinterface"
-	"github.com/kubescape/k8s-interface/workloadinterface"
-	"github.com/kubescape/kubescape/v2/core/cautils"
-	"github.com/kubescape/kubescape/v2/core/pkg/resourcehandler"
-	"github.com/kubescape/opa-utils/reporthandling/apis"
-	helpersv1 "github.com/kubescape/opa-utils/reporthandling/helpers/v1"
-	reporthandlingv2 "github.com/kubescape/opa-utils/reporthandling/v2"
-	reportv2 "github.com/kubescape/opa-utils/reporthandling/v2"
-	"github.com/stretchr/testify/assert"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/version"
-	"k8s.io/client-go/dynamic/fake"
-	fakeclientset "k8s.io/client-go/kubernetes/fake"
-	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-)
-
-var (
-	//go:embed kubeconfig_mock.json
-	kubeConfigMock string
-)
-
-
-func getKubeConfigMock() *clientcmdapi.Config {
-	kubeConfig := clientcmdapi.Config{}
-	if err := json.Unmarshal([]byte(kubeConfigMock), &kubeConfig); err != nil {
-		panic(err)
-	}
-	return &kubeConfig
-}
-func Test_getCloudMetadata(t *testing.T) {
-	type args struct {
-		context       string
-		opaSessionObj *cautils.OPASessionObj
-		kubeConfig    *clientcmdapi.Config
-	}
-	kubeConfig := getKubeConfigMock()
-	tests := []struct {
-		want apis.ICloudParser
-		args args
-		name string
-	}{
-		{
-			name: "Test_getCloudMetadata - GitVersion: GKE",
-			args: args{
-				opaSessionObj: &cautils.OPASessionObj{
-					Report: &reporthandlingv2.PostureReport{
-						ClusterAPIServerInfo: &version.Info{
-							GitVersion: "v1.25.4-gke.1600",
-						},
-					},
-				},
-				context:    "",
-				kubeConfig: kubeConfig,
-			},
-			want: helpersv1.NewGKEMetadata(""),
-		},
-		{
-			name: "Test_getCloudMetadata_context_GKE",
-			args: args{
-				opaSessionObj: &cautils.OPASessionObj{
-					Report: &reporthandlingv2.PostureReport{
-						ClusterAPIServerInfo: nil,
-					},
-				},
-				kubeConfig: kubeConfig,
-				context:    "gke_xxx-xx-0000_us-central1-c_xxxx-1",
-			},
-			want: helpersv1.NewGKEMetadata(""),
-		},
-		{
-			name: "Test_getCloudMetadata_context_EKS",
-			args: args{
-				opaSessionObj: &cautils.OPASessionObj{
-					Report: &reporthandlingv2.PostureReport{
-						ClusterAPIServerInfo: nil,
-					},
-				},
-				kubeConfig: kubeConfig,
-				context:    "arn:aws:eks:eu-west-1:xxx:cluster/xxxx",
-			},
-			want: helpersv1.NewEKSMetadata(""),
-		},
-		{
-			name: "Test_getCloudMetadata_context_AKS",
-			args: args{
-				opaSessionObj: &cautils.OPASessionObj{
-					Report: &reporthandlingv2.PostureReport{
-						ClusterAPIServerInfo: nil,
-					},
-				},
-				kubeConfig: kubeConfig,
-				context:    "xxxx-2",
-			},
-			want: helpersv1.NewAKSMetadata(""),
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tt.args.kubeConfig.CurrentContext = tt.args.context
-			got := getCloudMetadata(tt.args.opaSessionObj, tt.args.kubeConfig)
-			if got == nil {
-				t.Errorf("getCloudMetadata() = %v, want %v", got, tt.want.Provider())
-				return
-			}
-			if got.Provider() != tt.want.Provider() {
-				t.Errorf("getCloudMetadata() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_isGKE(t *testing.T) {
-	type args struct {
-		config  *clientcmdapi.Config
-		context string
-	}
-	tests := []struct {
-		name string
-		args args
-		want bool
-	}{
-		{
-			name: "Test_isGKE",
-			args: args{
-				config:  getKubeConfigMock(),
-				context: "gke_xxx-xx-0000_us-central1-c_xxxx-1",
-			},
-			want: true,
-		},
-	}
-	for _, tt := range tests {
-
-		t.Run(tt.name, func(t *testing.T) {
-			// set context
-			tt.args.config.CurrentContext = tt.args.context
-			if got := isGKE(tt.args.config); got != tt.want {
-				t.Errorf("isGKE() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_isEKS(t *testing.T) {
-	type args struct {
-		config  *clientcmdapi.Config
-		context string
-	}
-	tests := []struct {
-		name string
-		args args
-		want bool
-	}{
-		{
-			name: "Test_isEKS",
-			args: args{
-				config:  getKubeConfigMock(),
-				context: "arn:aws:eks:eu-west-1:xxx:cluster/xxxx",
-			},
-			want: true,
-		},
-	}
-	for _, tt := range tests {
-
-		t.Run(tt.name, func(t *testing.T) {
-			// set context
-			tt.args.config.CurrentContext = tt.args.context
-			if got := isEKS(tt.args.config); got != tt.want {
-				t.Errorf("isEKS() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_isAKS(t *testing.T) {
-	type args struct {
-		config  *clientcmdapi.Config
-		context string
-	}
-	tests := []struct {
-		name string
-		args args
-		want bool
-	}{
-		{
-			name: "Test_isAKS",
-			args: args{
-				config:  getKubeConfigMock(),
-				context: "xxxx-2",
-			},
-			want: true,
-		},
-	}
-	for _, tt := range tests {
-
-		t.Run(tt.name, func(t *testing.T) {
-			// set context
-			tt.args.config.CurrentContext = tt.args.context
-			if got := isAKS(tt.args.config); got != tt.want {
-				t.Errorf("isAKS() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-type iResourceHandlerMock struct{}
-
-func (*iResourceHandlerMock) GetResources(*cautils.OPASessionObj, *armotypes.PortalDesignator) (*cautils.K8SResources, map[string]workloadinterface.IMetadata, *cautils.KSResources, error) {
-	return nil, nil, nil, nil
-}
-func (*iResourceHandlerMock) GetClusterAPIServerInfo() *version.Info {
-	return nil
-}
-
-// https://github.com/kubescape/kubescape/pull/1004
-// Cluster named .*eks.* config without a cloudconfig panics whereas we just want to scan a file
-func getResourceHandlerMock() *resourcehandler.K8sResourceHandler {
-	client := fakeclientset.NewSimpleClientset()
-	fakeDiscovery := client.Discovery()
-
-	k8s := &k8sinterface.KubernetesApi{
-		KubernetesClient: client,
-		DynamicClient:    fake.NewSimpleDynamicClient(runtime.NewScheme()),
-		DiscoveryClient:  fakeDiscovery,
-		Context:          context.Background(),
-	}
-
-	return resourcehandler.NewK8sResourceHandler(k8s, &resourcehandler.EmptySelector{}, nil, nil, nil)
-}
-func Test_getResources(t *testing.T) {
-	policyHandler := &PolicyHandler{resourceHandler: getResourceHandlerMock()}
-	objSession := &cautils.OPASessionObj{
-		Metadata: &reporthandlingv2.Metadata{
-			ScanMetadata: reporthandlingv2.ScanMetadata{
-				ScanningTarget: reportv2.Cluster,
-			},
-		},
-		Report: &reporthandlingv2.PostureReport{
-			ClusterAPIServerInfo: nil,
-		},
-	}
-	policyIdentifier := []cautils.PolicyIdentifier{{}}
-
-	assert.NotPanics(t, func() {
-		policyHandler.getResources(policyIdentifier, objSession, &cautils.ScanInfo{})
-	}, "Cluster named .*eks.* without a cloud config panics on cluster scan !")
-
-	assert.NotPanics(t, func() {
-		objSession.Metadata.ScanMetadata.ScanningTarget = reportv2.File
-		policyHandler.getResources(policyIdentifier, objSession, &cautils.ScanInfo{})
-	}, "Cluster named .*eks.* without a cloud config panics on non-cluster scan !")
-
-}
-

core/pkg/policyhandler/handlepullpolicies.go

@@ -56,16 +56,14 @@ func (policyHandler *PolicyHandler) getScanPolicies(policyIdentifier []cautils.P
 	switch getScanKind(policyIdentifier) {
 	case apisv1.KindFramework: // Download frameworks
 		for _, rule := range policyIdentifier {
-			receivedFramework, err := policyHandler.getters.PolicyGetter.GetFramework(rule.Identifier)
+			receivedFramework, err := policyHandler.getters.PolicyGetter.GetFramework(rule.Name)
 			if err != nil {
 				return frameworks, policyDownloadError(err)
 			}
-			if err := validateFramework(receivedFramework); err != nil {
-				return frameworks, err
-			}
 			if receivedFramework != nil {
 				frameworks = append(frameworks, *receivedFramework)
-				cache := getter.GetDefaultPath(rule.Identifier + ".json")
+
+				cache := getter.GetDefaultPath(rule.Name + ".json")
 				if err := getter.SaveInFile(receivedFramework, cache); err != nil {
 					logger.L().Warning("failed to cache file", helpers.String("file", cache), helpers.Error(err))
 				}
@@ -75,15 +73,15 @@ func (policyHandler *PolicyHandler) getScanPolicies(policyIdentifier []cautils.P
 		f := reporthandling.Framework{}
 		var receivedControl *reporthandling.Control
 		var err error
-		for _, policy := range policyIdentifier {
-			receivedControl, err = policyHandler.getters.PolicyGetter.GetControl(policy.Identifier)
+		for _, rule := range policyIdentifier {
+			receivedControl, err = policyHandler.getters.PolicyGetter.GetControl(rule.Name)
 			if err != nil {
 				return frameworks, policyDownloadError(err)
 			}
 			if receivedControl != nil {
 				f.Controls = append(f.Controls, *receivedControl)
 
-				cache := getter.GetDefaultPath(policy.Identifier + ".json")
+				cache := getter.GetDefaultPath(rule.Name + ".json")
 				if err := getter.SaveInFile(receivedControl, cache); err != nil {
 					logger.L().Warning("failed to cache file", helpers.String("file", cache), helpers.Error(err))
 				}
@@ -100,7 +98,7 @@ func (policyHandler *PolicyHandler) getScanPolicies(policyIdentifier []cautils.P
 func policyIdentifierToSlice(rules []cautils.PolicyIdentifier) []string {
 	s := []string{}
 	for i := range rules {
-		s = append(s, fmt.Sprintf("%s: %s", rules[i].Kind, rules[i].Identifier))
+		s = append(s, fmt.Sprintf("%s: %s", rules[i].Kind, rules[i].Name))
 	}
 	return s
 }

core/pkg/policyhandler/handlepullpolicies_test.go

@@ -0,0 +1,23 @@
+package policyhandler
+
+// func TestGetPoliciesFromBackend(t *testing.T) {
+// 	notification := reporthandling.PolicyNotification{
+// 		Rules: []reporthandling.PolicyIdentifier{
+// 			{
+// 				Kind: reporthandling.KindFramework,
+// 				Name: "mitretest",
+// 			},
+// 		},
+// 	}
+// 	// os.Setenv(cacli., "")
+// 	ph := PolicyHandler{
+// 		cacli: &cacli.Cacli{},
+// 	}
+// 	f, err := ph.GetPoliciesFromBackend(&notification)
+// 	if err != nil {
+// 		t.Error(err)
+// 	}
+// 	if len(f) == 0 {
+// 		t.Errorf("empty")
+// 	}
+// }

core/pkg/policyhandler/handlepullpoliciesutils.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	apisv1 "github.com/kubescape/opa-utils/httpserver/apis/v1"
-	"github.com/kubescape/opa-utils/reporthandling"
 
 	"github.com/kubescape/kubescape/v2/core/cautils"
 )
@@ -22,16 +21,3 @@ func policyDownloadError(err error) error {
 	}
 	return err
 }
-
-// validate the framework
-func validateFramework(framework *reporthandling.Framework) error {
-	if framework == nil {
-		return fmt.Errorf("received empty framework")
-	}
-
-	// validate the controls are not empty
-	if len(framework.Controls) == 0 {
-		return fmt.Errorf("failed to load controls for framework: %s: empty list of controls", framework.Name)
-	}
-	return nil
-}

core/pkg/policyhandler/handlepullpoliciesutils_test.go

@@ -1,48 +0,0 @@
-package policyhandler
-
-import (
-	"testing"
-
-	"github.com/kubescape/opa-utils/reporthandling"
-)
-
-func Test_validateFramework(t *testing.T) {
-	type args struct {
-		framework *reporthandling.Framework
-	}
-	tests := []struct {
-		name    string
-		args    args
-		wantErr bool
-	}{
-		{
-			name: "empty framework",
-			args: args{
-				framework: &reporthandling.Framework{
-					Controls: []reporthandling.Control{},
-				},
-			},
-			wantErr: true,
-		},
-		{
-			name: "none empty framework",
-			args: args{
-				framework: &reporthandling.Framework{
-					Controls: []reporthandling.Control{
-						{
-							ControlID: "c-0001",
-						},
-					},
-				},
-			},
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if err := validateFramework(tt.args.framework); (err != nil) != tt.wantErr {
-				t.Errorf("validateControls() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}