From af928966caefcc32859ef9841e875f9b651ae42d Mon Sep 17 00:00:00 2001 From: Owen Rumney Date: Mon, 29 Nov 2021 12:42:42 +0000 Subject: [PATCH 1/3] add twitter announcer --- .github/workflows/release.yml | 4 ++++ .goreleaser.yml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dddd8aa1..f83b438a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,6 +41,10 @@ jobs: args: release --rm-dist env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }} + TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }} + TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }} + TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }} - name: Release Docs run: make publish-docs diff --git a/.goreleaser.yml b/.goreleaser.yml index 82022fa3..e1b3e869 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -62,3 +62,8 @@ dockers: - "aquasec/cfsec:{{ .Tag }}" - "aquasec/cfsec:v{{ .Major }}.{{ .Minor }}" + +announce: + twitter: + enabled: true + message_template: "🎉 tfsec {{.Tag}} is available now!! See what's new here - https://github.com/aquasecurity/tfsec/releases/tag/{{.Tag}}" \ No newline at end of file From 12380a754db6e10aefe38e33732edfa4029af1f2 Mon Sep 17 00:00:00 2001 From: Owen Rumney Date: Mon, 29 Nov 2021 12:49:57 +0000 Subject: [PATCH 2/3] bump defsec version --- go.mod | 2 +- go.sum | 2 ++ vendor/github.com/aquasecurity/defsec/formatters/default.go | 4 +++- vendor/modules.txt | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0dfac7ef..d382430c 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/apparentlymart/go-cidr v1.1.0 - github.com/aquasecurity/defsec v0.0.32 + github.com/aquasecurity/defsec v0.0.33 github.com/liamg/jfather v0.0.2 github.com/liamg/tml v0.4.0 github.com/spf13/cobra v1.2.1 diff --git a/go.sum b/go.sum index e629bec4..d552b7fb 100644 --- a/go.sum +++ b/go.sum @@ -64,6 +64,8 @@ github.com/aquasecurity/defsec v0.0.31 h1:SUgl4/ZS79FPPqBLLH8VtOOMVPdo1j32AJG8yT github.com/aquasecurity/defsec v0.0.31/go.mod h1:EjSsCi122fNbpi89jctQhsR0ykh9ZwBcbHXxZ9mqOzA= github.com/aquasecurity/defsec v0.0.32 h1:aXosboXQYHTORceEGRgbCDESvrjVYiUjm0YkVHmAmgU= github.com/aquasecurity/defsec v0.0.32/go.mod h1:EjSsCi122fNbpi89jctQhsR0ykh9ZwBcbHXxZ9mqOzA= +github.com/aquasecurity/defsec v0.0.33 h1:kRs+1dtUi5wd5stz2hvYv1ltIuUDN602uo8pFod96qU= +github.com/aquasecurity/defsec v0.0.33/go.mod h1:EjSsCi122fNbpi89jctQhsR0ykh9ZwBcbHXxZ9mqOzA= github.com/aquasecurity/tfsec v0.60.1/go.mod h1:MR3uDlWu+fBTisFndR+NwjSGt06RBhkE++JzKRJ0Ggs= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= diff --git a/vendor/github.com/aquasecurity/defsec/formatters/default.go b/vendor/github.com/aquasecurity/defsec/formatters/default.go index 93b2565e..66eff532 100644 --- a/vendor/github.com/aquasecurity/defsec/formatters/default.go +++ b/vendor/github.com/aquasecurity/defsec/formatters/default.go @@ -132,8 +132,10 @@ func highlightCode(result rules.Result) (string, error) { rng := result.CodeBlockMetadata().Range() + if rng == nil { + return "", nil + } var resolvedValue string - content, err := ioutil.ReadFile(rng.GetFilename()) if err != nil { return "", err diff --git a/vendor/modules.txt b/vendor/modules.txt index fcdc404f..8f881d1c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -20,7 +20,7 @@ github.com/acomagu/bufpipe # github.com/apparentlymart/go-cidr v1.1.0 ## explicit github.com/apparentlymart/go-cidr/cidr -# github.com/aquasecurity/defsec v0.0.32 +# github.com/aquasecurity/defsec v0.0.33 ## explicit github.com/aquasecurity/defsec/cidr github.com/aquasecurity/defsec/formatters From 02572b54ae04ea4b9ab7786701280c9347484e50 Mon Sep 17 00:00:00 2001 From: Liam Galvin Date: Mon, 29 Nov 2021 12:51:12 +0000 Subject: [PATCH 3/3] Update .goreleaser.yml --- .goreleaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index e1b3e869..910c87dc 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -66,4 +66,4 @@ dockers: announce: twitter: enabled: true - message_template: "🎉 tfsec {{.Tag}} is available now!! See what's new here - https://github.com/aquasecurity/tfsec/releases/tag/{{.Tag}}" \ No newline at end of file + message_template: "🎉 cfsec {{.Tag}} is available now!! See what's new here - https://github.com/aquasecurity/cfsec/releases/tag/{{.Tag}}"