From 573d85d7705e0cf4e4dcf9dc4e49b290dd07432f Mon Sep 17 00:00:00 2001 From: Ben Hirschberg Date: Sun, 5 Sep 2021 15:37:18 +0300 Subject: [PATCH 1/9] returning master push run --- .github/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3edea7de..49a187e1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,6 +1,8 @@ name: build on: + push: + branches: [ master ] pull_request: branches: [ master ] types: [ closed ] From 80c5fd74397a7886cfe5afeadb1fc9f2c521becb Mon Sep 17 00:00:00 2001 From: Ben Hirschberg Date: Sun, 5 Sep 2021 16:46:13 +0300 Subject: [PATCH 2/9] moving to alexellis/upload-assets --- .github/workflows/build.yaml | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 49a187e1..d1f723fa 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,27 +40,14 @@ jobs: go-version: 1.16 - name: Build - run: mkdir -p build/${{ matrix.os }} && go mod tidy && go build -ldflags "-w -s" -o build/${{ matrix.os }}/kubescape && md5sum build/${{ matrix.os }}/kubescape > build/${{ matrix.os }}/kubescape.md5 + run: mkdir -p build/${{ matrix.os }} && go mod tidy && go build -ldflags "-w -s" -o build/${{ matrix.os }}/kubescape-${{ matrix.os }} && md5sum build/${{ matrix.os }}/kubescape-${{ matrix.os }} > build/${{ matrix.os }}/kubescape-${{ matrix.os }}.md5 - name: Upload Release binaries id: upload-release-asset - uses: actions/upload-release-asset@v1 + uses: alexellis/upload-assets@0.2.2 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ needs.once.outputs.upload_url }} - asset_path: build/${{ matrix.os }}/kubescape - asset_name: kubescape-${{ matrix.os }} + asset_paths: '["build/${{ matrix.os }}/kubescape*"]' asset_content_type: application/octet-stream - - - name: Upload Release md5 digest - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.once.outputs.upload_url }} - asset_path: build/${{ matrix.os }}/kubescape.md5 - asset_name: kubescape-${{ matrix.os }} - asset_content_type: application/octet-stream - From 228e7703a8e76cdefaa93eb2f2fa1dff4e9343f7 Mon Sep 17 00:00:00 2001 From: Ben Hirschberg Date: Sun, 5 Sep 2021 16:51:00 +0300 Subject: [PATCH 3/9] removing unneeded fields --- .github/workflows/build.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d1f723fa..1d638608 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,6 +48,4 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} with: - upload_url: ${{ needs.once.outputs.upload_url }} asset_paths: '["build/${{ matrix.os }}/kubescape*"]' - asset_content_type: application/octet-stream From 6a0ee6e0d71c9ffc657b72e95bd0a572cc8eec31 Mon Sep 17 00:00:00 2001 From: Ben Hirschberg Date: Sun, 5 Sep 2021 16:59:55 +0300 Subject: [PATCH 4/9] specific upload files --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1d638608..0dc64520 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,4 +48,4 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} with: - asset_paths: '["build/${{ matrix.os }}/kubescape*"]' + asset_paths: '["build/${{ matrix.os }}/kubescape-${{ matrix.os }}","build/${{ matrix.os }}/kubescape-${{ matrix.os }}.md5"]' From 3a4a58fdd54e0b494c875eb2f840e31ee858486f Mon Sep 17 00:00:00 2001 From: David Wertenteil <64066841+dwertent@users.noreply.github.com> Date: Sun, 5 Sep 2021 17:36:41 +0300 Subject: [PATCH 5/9] remove deffer func (#60) --- opaprocessor/processorhandler.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/opaprocessor/processorhandler.go b/opaprocessor/processorhandler.go index 8c8ee884..3be0c4ca 100644 --- a/opaprocessor/processorhandler.go +++ b/opaprocessor/processorhandler.go @@ -56,12 +56,6 @@ func NewOPAProcessorHandler(processedPolicy, reportResults *chan *cautils.OPASes } func (opaHandler *OPAProcessorHandler) ProcessRulesListenner() { - // recover - defer func() { - if err := recover(); err != nil { - glog.Errorf("RECOVER in ProcessRulesListenner, reason: %v", err) - } - }() for { opaSessionObj := <-*opaHandler.processedPolicy From fca862b2c72f5daf4f32180c45708131c4aadc56 Mon Sep 17 00:00:00 2001 From: Shauli Rozen <73478182+chmod-777-shauli@users.noreply.github.com> Date: Tue, 7 Sep 2021 21:10:27 +0300 Subject: [PATCH 6/9] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d9ae5510..641d6193 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ logo [![build](https://github.com/armosec/kubescape/actions/workflows/build.yaml/badge.svg)](https://github.com/armosec/kubescape/actions/workflows/build.yaml) -[![Github All Releases](https://img.shields.io/github/downloads/armosec/kubescape/total.svg)](https://github.com/armosec/kubescape) [![Go Report Card](https://goreportcard.com/badge/github.com/armosec/kubescape)](https://goreportcard.com/report/github.com/armosec/kubescape) Kubescape is the first tool for testing if Kubernetes is deployed securely as defined in [Kubernetes Hardening Guidance by NSA and CISA](https://www.nsa.gov/News-Features/Feature-Stories/Article-View/Article/2716980/nsa-cisa-release-kubernetes-hardening-guidance/) From 985c6868c174a3440a32e0663ee002696076c35b Mon Sep 17 00:00:00 2001 From: Benyamin Hirschberg <59160382+BenHirschbergCa@users.noreply.github.com> Date: Wed, 8 Sep 2021 21:21:25 +0300 Subject: [PATCH 7/9] Fixing URL typo --- cautils/getter/armoapi.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cautils/getter/armoapi.go b/cautils/getter/armoapi.go index d80cfa19..f0e515ec 100644 --- a/cautils/getter/armoapi.go +++ b/cautils/getter/armoapi.go @@ -22,7 +22,7 @@ type ArmoAPI struct { func NewArmoAPI() *ArmoAPI { return &ArmoAPI{ httpClient: &http.Client{}, - baseURL: "https://dashbe.auprod1.cyberarmorsoft.com", + baseURL: "https://dashbe.euprod1.cyberarmorsoft.com", } } func (armoAPI *ArmoAPI) GetFramework(name string) (*opapolicy.Framework, error) { From 82f3d62de51b430bce076a8a3cc01bc8f608acf1 Mon Sep 17 00:00:00 2001 From: Ben Hirschberg Date: Wed, 8 Sep 2021 21:29:21 +0300 Subject: [PATCH 8/9] clean up build file --- .github/workflows/build.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 74f0481a..17592e0d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -52,14 +52,3 @@ jobs: asset_path: build/${{ matrix.os }}/kubescape asset_name: kubescape-${{ matrix.os }} asset_content_type: application/octet-stream - - # - name: Upload Release md5 digest - # id: upload-release-asset - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ needs.once.outputs.upload_url }} - # asset_path: build/${{ matrix.os }}/kubescape.md5 - # asset_name: kubescape-${{ matrix.os }} - # asset_content_type: application/octet-stream From 679238ec13b78eb029f06874bea00e172ddf6b3b Mon Sep 17 00:00:00 2001 From: dwertent Date: Thu, 9 Sep 2021 09:53:08 +0300 Subject: [PATCH 9/9] download from release --- cmd/download.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/download.go b/cmd/download.go index d9d67e2e..5131ea33 100644 --- a/cmd/download.go +++ b/cmd/download.go @@ -22,7 +22,7 @@ var downloadCmd = &cobra.Command{ }, RunE: func(cmd *cobra.Command, args []string) error { downloadInfo.FrameworkName = args[1] - g := getter.NewArmoAPI() + g := getter.NewDownloadReleasedPolicy() if downloadInfo.Path == "" { downloadInfo.Path = getter.GetDefaultPath(downloadInfo.FrameworkName) }