Skip to content

Commit c9a27e7

Browse files
authored
Merge branch 'main' into fix/gitlab-license-property
2 parents ba135e4 + 1eebaad commit c9a27e7

69 files changed

Lines changed: 2832 additions & 884 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/boilerplates.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Check out code
4444
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4545

46-
- uses: chainguard-dev/actions/boilerplate@e1c4977ad9cb32b12c5b222ec0134a22bec60bd5 # v1.6.25
46+
- uses: chainguard-dev/actions/boilerplate@f0be69916b439d0fcced2451b23d0f27cd46d545 # v1.6.26
4747
with:
4848
extension: ${{ matrix.extension }}
4949
language: ${{ matrix.language }}

.github/workflows/chart-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
3434
with:
3535
go-version-file: 'go.mod'
36-
- uses: ko-build/setup-ko@d006021bd0c28d1ce33a07e7943d48b079944c8d # v0.9
36+
- uses: ko-build/setup-ko@61b4d1d396f5b2e7d6bb6fefdce3dc38d1a13445 # v0.10
3737
with:
3838
version: v0.16.0
3939
- uses: azure/setup-helm@9bc31f4ebc9c6b171d7bfbaa5d006ae7abdb4310 # v5.0.1

.github/workflows/compose-migrate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
go-version-file: 'go.mod'
2020
- name: Install ko
21-
uses: ko-build/setup-ko@d006021bd0c28d1ce33a07e7943d48b079944c8d # v0.9
21+
uses: ko-build/setup-ko@61b4d1d396f5b2e7d6bb6fefdce3dc38d1a13445 # v0.10
2222
with:
2323
version: v0.16.0
2424
- name: Copy server-config.yaml

.github/workflows/image-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
1515
with:
1616
go-version-file: 'go.mod'
17-
- uses: ko-build/setup-ko@d006021bd0c28d1ce33a07e7943d48b079944c8d # v0.9
17+
- uses: ko-build/setup-ko@61b4d1d396f5b2e7d6bb6fefdce3dc38d1a13445 # v0.10
1818
with:
1919
version: v0.16.0
2020
- run: |
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
3838
with:
3939
go-version-file: 'go.mod'
40-
- uses: ko-build/setup-ko@d006021bd0c28d1ce33a07e7943d48b079944c8d # v0.9
40+
- uses: ko-build/setup-ko@61b4d1d396f5b2e7d6bb6fefdce3dc38d1a13445 # v0.10
4141
with:
4242
version: v0.16.0
4343
- uses: azure/setup-helm@9bc31f4ebc9c6b171d7bfbaa5d006ae7abdb4310 # v5.0.1

.github/workflows/lint.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ jobs:
2626
go-version-file: 'go.mod'
2727
cache: false
2828
- name: golangci-lint
29-
uses: golangci/golangci-lint-action@82606bf257cbaff209d206a39f5134f0cfbfd2ee # v9.2.1
29+
uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0
3030
with:
31+
version: v2.11.4
3132
only-new-issues: true
3233

3334
check-go-mod-tidy-and-make-gen:

.github/workflows/releaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
6161
- name: Run GoReleaser
6262
id: run-goreleaser
63-
uses: goreleaser/goreleaser-action@5daf1e915a5f0af01ddbcd89a43b8061ff4f1a89 # v7.2.2
63+
uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7.2.3
6464
with:
6565
distribution: goreleaser
6666
version: "~> v2"

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ jobs:
3636
retention-days: 5
3737

3838
- name: "Upload to code-scanning"
39-
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 #v4.35.1
39+
uses: github/codeql-action/upload-sarif@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a #v4.36.3
4040
with:
4141
sarif_file: results.sarif

.golangci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ linters:
4242
goconst:
4343
min-len: 6
4444
min-occurrences: 5
45-
# Tests can be clearer with string literals
46-
ignore-tests: true
4745
gocyclo:
4846
min-complexity: 15
4947
gosec:
@@ -85,6 +83,7 @@ linters:
8583
generated: lax
8684
rules:
8785
- linters:
86+
- goconst
8887
- lll
8988
- gosec
9089
path: (.+)_test\.go

.goreleaser.yaml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ before:
1717
- go generate ./...
1818
# This section defines the build matrix.
1919
builds:
20-
- env:
20+
- id: minder
21+
binary: minder
22+
env:
2123
- GO111MODULE=on
2224
- CGO_ENABLED=0
2325
flags:
@@ -37,6 +39,27 @@ builds:
3739
- amd64
3840
- arm64
3941
main: ./cmd/cli
42+
- id: mindev
43+
binary: mindev
44+
env:
45+
- GO111MODULE=on
46+
- CGO_ENABLED=0
47+
flags:
48+
- -trimpath
49+
- -tags=netgo
50+
ldflags:
51+
- "-X main.Version={{ .Env.VERSION }}"
52+
- "-X main.Commit={{ .Env.COMMIT }}"
53+
- "-X main.CommitDate={{ .Env.COMMIT_DATE }}"
54+
- "-X main.TreeState={{ .Env.TREE_STATE }}"
55+
goos:
56+
- linux
57+
- windows
58+
- darwin
59+
goarch:
60+
- amd64
61+
- arm64
62+
main: ./cmd/dev
4063
# This section defines the release format.
4164
archives:
4265
- format: tar.gz # we can use binary, but it seems there's an issue where goreleaser skips the sboms

cmd/cli/app/ruletype/common.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import (
1313
"slices"
1414
"strings"
1515

16+
"github.com/spf13/cobra"
17+
1618
"github.com/mindersec/minder/internal/util"
1719
"github.com/mindersec/minder/internal/util/cli"
1820
"github.com/mindersec/minder/internal/util/cli/table"
@@ -82,6 +84,12 @@ func validateFilesArg(files []string) error {
8284
return nil
8385
}
8486

87+
func printWarnings(cmd *cobra.Command, warnings []string) {
88+
for _, warning := range warnings {
89+
cmd.PrintErrf("Warning: %s\n", warning)
90+
}
91+
}
92+
8593
func shouldSkipFile(f string) bool {
8694
// if the file is not json or yaml, skip it
8795
// Get file extension

0 commit comments

Comments
 (0)