diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d64d259..e35bc81 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,7 +9,7 @@ on: - 'v*' env: - GO_VERSION: "1.20.x" + GO_VERSION: "1.21.x" jobs: wait-for-checks: @@ -31,7 +31,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} # This check name is defined as the github actions job name (in .github/workflows/static-analysis-integration.yaml) - checkName: "Static-Analysis (1.20.x, ubuntu-latest)" + checkName: "Static-Analysis (1.21.x, ubuntu-latest)" ref: ${{ github.event.pull_request.head.sha || github.sha }} - name: Check unit, and integration test results @@ -40,7 +40,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} # This check name is defined as the github actions job name (in .github/workflows/static-analysis-integration.yaml) - checkName: "Tests (1.20.x, ubuntu-latest)" + checkName: "Tests (1.21.x, ubuntu-latest)" ref: ${{ github.event.pull_request.head.sha || github.sha }} - name: Quality gate diff --git a/.github/workflows/static-unit-integration.yaml b/.github/workflows/static-unit-integration.yaml index de55da8..f7ef305 100644 --- a/.github/workflows/static-unit-integration.yaml +++ b/.github/workflows/static-unit-integration.yaml @@ -7,7 +7,7 @@ jobs: Static-Analysis: strategy: matrix: - go-version: ["1.20.x"] + go-version: ["1.21.x"] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} steps: @@ -43,7 +43,7 @@ jobs: strategy: matrix: # test the lower bounds of support, and the latest available - go-version: ["1.20.x"] + go-version: ["1.21.x"] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} steps: diff --git a/anchore-k8s-inventory.yaml b/anchore-k8s-inventory.yaml index 22e527e..9fc63f9 100644 --- a/anchore-k8s-inventory.yaml +++ b/anchore-k8s-inventory.yaml @@ -79,9 +79,9 @@ ignore-not-running: true polling-interval-seconds: 300 anchore: - # url: $ANCHORE_K8S_INVENTORY_ANCHORE_URL - # user: $ANCHORE_K8S_INVENTORY_ANCHORE_USER - password: $ANCHORE_K8S_INVENTORY_ANCHORE_PASSWORD + url: http://127.0.0.1:8228 + user: admin + password: foobar # http: # insecure: true # timeout-seconds: 10 diff --git a/go.mod b/go.mod index e31dfdf..904385f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/anchore/k8s-inventory -go 1.20 +go 1.21.0 require ( github.com/adrg/xdg v0.4.0 diff --git a/pkg/inventory/containers.go b/pkg/inventory/containers.go index ea22936..f4c3715 100644 --- a/pkg/inventory/containers.go +++ b/pkg/inventory/containers.go @@ -10,7 +10,7 @@ import ( // Compile the regexes used for parsing once so they can be reused without having to recompile var ( - digestRegex = regexp.MustCompile(`@(sha[[:digit:]]{3}:[[:alnum:]]{32,})`) + digestRegex = regexp.MustCompile(`(sha[[:digit:]]{3}:[[:alnum:]]{32,})`) tagRegex = regexp.MustCompile(`:[\w][\w.-]{0,127}$`) )