diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index fb455c12c..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,46 +0,0 @@ -# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates -version: 2 -updates: - - package-ecosystem: "gomod" - directory: "/" - schedule: - interval: "daily" - groups: - otel: # used by e2e and integration tests to push dummy otlp data - patterns: - - "go.opentelemetry.io/otel/*" - k8s: - patterns: - - "k8s.io/*" - istio: - patterns: - - "istio.io/*" - commit-message: - prefix: "chore" - labels: - - "area/dependency" - - "kind/chore" - - - package-ecosystem: "gomod" - directory: "/internal/tools" - schedule: - interval: "daily" - commit-message: - prefix: "chore" - labels: - - "area/ci" - - "kind/chore" - - - package-ecosystem: "gomod" - directory: "/docs/user/integration/sample-app" - schedule: - interval: "daily" - commit-message: - prefix: "chore" - groups: - otel: - patterns: - - "go.opentelemetry.io/otel/*" - labels: - - "area/dependency" - - "kind/chore" diff --git a/.github/workflows/pr-github-checks.yml b/.github/workflows/pr-github-checks.yml index cc52d6bb0..a4c5479ca 100644 --- a/.github/workflows/pr-github-checks.yml +++ b/.github/workflows/pr-github-checks.yml @@ -15,49 +15,72 @@ on: - milestoned workflow_dispatch: +env: + PROJECT_NAME: "Huskies" + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_REPO: ${{ github.repository }} + NUMBER: ${{ github.event.number }} + TITLE: ${{ github.event.pull_request.title }} + GH_HOST: github.com + +permissions: write-all + jobs: - pr-milestone-check: + pr-milestone-project-check: runs-on: ubuntu-latest steps: - - name: Check for milestone - env: - MILESTONE: ${{ toJSON(github.event.pull_request.milestone) }} + - name: Set milestone + if: github.event.pull_request.milestone == null run: | - echo "${MILESTONE}" | jq -e '.!=null' || (echo "Milestone is not set"; exit 1) + # set milestone to the latest open milestone + latest_milestone=$(gh api \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + /repos/${GH_REPO}/milestones --hostname ${GH_HOST} | jq -r '.[]|.title' | sort -r | head -n 1) + # fail if there is no open milestone + if [ -z "$latest_milestone" ]; then + echo "No open milestone found" + exit 1 + fi + gh pr edit ${{ github.event.number }} --milestone "${latest_milestone}" pr-label-check: runs-on: ubuntu-latest steps: - - name: Check for area label - if: always() - run: | - gh api --jq '.labels.[].name' /repos/${REPO}/pulls/${NUMBER} | \ - grep -q '^area\/' || (echo "area label missing"; exit 1) - env: - GH_TOKEN: ${{ github.token }} - REPO: ${{ github.repository }} - NUMBER: ${{ github.event.number }} + - name: Checkout Code + uses: actions/checkout@v4 - - name: Check for kind label + - name: Add kind label based on PR title prefix if: always() run: | - gh api --jq '.labels.[].name' /repos/${REPO}/pulls/${NUMBER} | \ - grep -q '^kind\/' || (echo "kind label missing"; exit 1) - env: - GH_TOKEN: ${{ github.token }} - REPO: ${{ github.repository }} - NUMBER: ${{ github.event.number }} + # get title prefix + # get kind label + # check if kind label is the same as title prefix + # check if there is a kind label for the title prefix based on the mapping + # if label is missing, add the correct one + # if label is incorrect, remove it and add the correct one + # + prefix=$(echo "$TITLE" | grep -o '^[a-z]*') + kind_label=$( gh pr view "$NUMBER" --json labels -q '.labels[]|.name' | grep '^kind/' || true ) + prefix_to_label_file=.github/workflows/titleprefix_to_label.json + correct_kind_label=$(cat $prefix_to_label_file | jq -r ".\"$prefix\"") + if [ -z "$kind_label" ]; then + echo "Adding $correct_kind_label label" + gh pr edit "$NUMBER" --add-label $correct_kind_label + elif [ "$kind_label" != "$correct_kind_label" ]; then + echo "Removing $kind_label label" + gh pr edit "$NUMBER" --remove-label $kind_label + echo "Adding $correct_kind_label label" + gh pr edit "$NUMBER" --add-label $correct_kind_label + fi - - name: Check if kind label matches pr title prefix + - name: Check for area label if: always() run: | - kind_label=$( gh api --jq '.labels.[].name' /repos/${REPO}/pulls/${NUMBER} | grep '^kind/') - kind_label_to_pr_title_prefix='{"kind/bug":"fix","kind/feature":"feat","kind/docs":"docs","kind/chore":"chore","kind/flaky-test":"test","kind/missing-test":"test","kind/failing-test":"test","kind/deps":"deps"}' - prefix=$(echo $kind_label_to_pr_title_prefix | jq -r ".\"$kind_label\"") - echo "$TITLE" | grep '^'$prefix || (echo "PR title should start with $prefix"; exit 1) + gh api --jq '.labels.[].name' /repos/${REPO}/pulls/${NUMBER} | \ + grep -q '^area\/' || (echo "area label missing"; exit 1) env: GH_TOKEN: ${{ github.token }} - TITLE: ${{ github.event.pull_request.title }} REPO: ${{ github.repository }} NUMBER: ${{ github.event.number }} @@ -89,7 +112,6 @@ jobs: fix test requireScope: false - subjectPattern: ^([A-Z].*[^.]|bump .*)$ pr-prevent-kustomization: runs-on: ubuntu-latest diff --git a/.github/workflows/titleprefix_to_label.json b/.github/workflows/titleprefix_to_label.json new file mode 100644 index 000000000..c229de7ea --- /dev/null +++ b/.github/workflows/titleprefix_to_label.json @@ -0,0 +1,7 @@ +{ + "fix": "kind/bug", + "feat": "kind/feature", + "docs": "kind/docs", + "chore": "kind/chore", + "test": "kind/test" +} diff --git a/Makefile b/Makefile index 08b73398f..eb4e47391 100644 --- a/Makefile +++ b/Makefile @@ -56,6 +56,7 @@ WSL := $(TOOLS_BIN_DIR)/wsl K3D := $(TOOLS_BIN_DIR)/k3d POPULATE_IMAGES := $(TOOLS_BIN_DIR)/populate-images +.PHONY: $(POPULATE_IMAGES) $(POPULATE_IMAGES): cd $(TOOLS_MOD_DIR)/populateimages && go build -o $(POPULATE_IMAGES) main.go diff --git a/docs/user/integration/sample-app/Dockerfile b/docs/user/integration/sample-app/Dockerfile index f43c28e33..af4a30aed 100644 --- a/docs/user/integration/sample-app/Dockerfile +++ b/docs/user/integration/sample-app/Dockerfile @@ -1,5 +1,5 @@ # Build the app binary -FROM golang:1.23.6 AS builder +FROM golang:1.24.0 AS builder # Copy the project WORKDIR /app diff --git a/go.mod b/go.mod index 1dfea0738..e3e317593 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.62.0 github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/pdata v1.23.0 + go.opentelemetry.io/collector/pdata v1.25.0 go.uber.org/zap v1.27.0 google.golang.org/protobuf v1.36.5 gopkg.in/yaml.v3 v3.0.1 @@ -68,9 +68,9 @@ require ( golang.org/x/time v0.7.0 // indirect golang.org/x/tools v0.28.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect - google.golang.org/grpc v1.69.2 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect + google.golang.org/grpc v1.70.0 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect diff --git a/go.sum b/go.sum index 7e3b2676a..edde2617e 100644 --- a/go.sum +++ b/go.sum @@ -115,18 +115,18 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.23.0 h1:tEk0dkfB8RdSukoOMfEa8duB938gfZowdfRkrJxGDrw= -go.opentelemetry.io/collector/pdata v1.23.0/go.mod h1:I2jggpBMiO8A+7TXhzNpcJZkJtvi1cU0iVNIi+6bc+o= -go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= -go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= -go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= -go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= -go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= -go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= -go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= -go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= -go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= -go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= +go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg= +go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8= +go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= +go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= +go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= +go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= +go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= +go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= +go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= +go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= +go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= +go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -176,12 +176,12 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= -google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= -google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a h1:OAiGFfOiA0v9MRYsSidp3ubZaBnteRUyn3xB2ZQ5G/E= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a/go.mod h1:jehYqy3+AhJU9ve55aNOaSml7wUXjF9x6z2LcCfpAhY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a h1:hgh8P4EuoxpsuKMXX/To36nOFD7vixReXgn8lPGnt+o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index b113b31bd..ef3903dd9 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,20 +1,22 @@ module github.com/kyma-project/telemetry-manager/internal/tools -go 1.23.0 +go 1.24 + +toolchain go1.24.0 require ( github.com/bombsimon/wsl/v4 v4.5.0 - github.com/golangci/golangci-lint v1.64.0 + github.com/golangci/golangci-lint v1.64.4 github.com/google/yamlfmt v0.16.0 github.com/joho/godotenv v1.5.1 - github.com/k3d-io/k3d/v5 v5.8.1 + github.com/k3d-io/k3d/v5 v5.8.2 github.com/kyma-project/kyma/hack/table-gen v0.0.0-20240626075036-d374ec55c335 github.com/mikefarah/yq/v4 v4.45.1 github.com/onsi/ginkgo/v2 v2.22.2 github.com/vektra/mockery/v2 v2.52.2 github.com/vladopajic/go-test-coverage/v2 v2.11.4 golang.org/x/tools v0.30.0 - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.1 sigs.k8s.io/controller-tools v0.17.2 sigs.k8s.io/kustomize/kustomize/v5 v5.6.0 ) @@ -52,7 +54,7 @@ require ( github.com/bkielbasa/cyclop v1.2.3 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/blizzy78/varnamelen v0.8.0 // indirect - github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect + github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect github.com/braydonk/yaml v0.9.0 // indirect github.com/breml/bidichk v0.3.2 // indirect github.com/breml/errchkjson v0.4.0 // indirect @@ -94,7 +96,7 @@ require ( github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect github.com/ghostiam/protogetter v0.3.9 // indirect - github.com/go-critic/go-critic v0.11.5 // indirect + github.com/go-critic/go-critic v0.12.0 // indirect github.com/go-errors/errors v1.4.2 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -184,7 +186,7 @@ require ( github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect - github.com/mgechev/revive v1.6.0 // indirect + github.com/mgechev/revive v1.6.1 // indirect github.com/miekg/pkcs11 v1.1.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -204,7 +206,7 @@ require ( github.com/narqo/go-badge v0.0.0-20230821190521-c9a75c019a59 // indirect github.com/nishanths/exhaustive v0.12.0 // indirect github.com/nishanths/predeclared v0.2.2 // indirect - github.com/nunnatsa/ginkgolinter v0.18.4 // indirect + github.com/nunnatsa/ginkgolinter v0.19.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect @@ -294,7 +296,7 @@ require ( go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect golang.org/x/crypto v0.33.0 // indirect golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect - golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect + golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect golang.org/x/image v0.18.0 // indirect golang.org/x/mod v0.23.0 // indirect golang.org/x/net v0.35.0 // indirect @@ -312,8 +314,8 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect - honnef.co/go/tools v0.5.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + honnef.co/go/tools v0.6.0 // indirect k8s.io/api v0.32.1 // indirect k8s.io/apiextensions-apiserver v0.32.1 // indirect k8s.io/apimachinery v0.32.1 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 403ddfdf4..d721b9aad 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -80,8 +80,8 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M= github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= -github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q= -github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38= +github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bombsimon/wsl/v4 v4.5.0 h1:iZRsEvDdyhd2La0FVi5k6tYehpOR/R7qIUjmKk7N74A= github.com/bombsimon/wsl/v4 v4.5.0/go.mod h1:NOQ3aLF4nD7N5YPXMruR6ZXDOAqLoM0GEpLwTdvmOSc= @@ -202,8 +202,8 @@ github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uq github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/ghostiam/protogetter v0.3.9 h1:j+zlLLWzqLay22Cz/aYwTHKQ88GE2DQ6GkWSYFOI4lQ= github.com/ghostiam/protogetter v0.3.9/go.mod h1:WZ0nw9pfzsgxuRsPOFQomgDVSWtDLJRfQJEhsGbmQMA= -github.com/go-critic/go-critic v0.11.5 h1:TkDTOn5v7EEngMxu8KbuFqFR43USaaH8XRJLz1jhVYA= -github.com/go-critic/go-critic v0.11.5/go.mod h1:wu6U7ny9PiaHaZHcvMDmdysMqvDem162Rh3zWTrqk8M= +github.com/go-critic/go-critic v0.12.0 h1:iLosHZuye812wnkEz1Xu3aBwn5ocCPfc9yqmFG9pa6w= +github.com/go-critic/go-critic v0.12.0/go.mod h1:DpE0P6OVc6JzVYzmM5gq5jMU31zLr4am5mB/VfFK64w= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -291,8 +291,8 @@ github.com/golangci/go-printf-func-name v0.1.0 h1:dVokQP+NMTO7jwO4bwsRwLWeudOVUP github.com/golangci/go-printf-func-name v0.1.0/go.mod h1:wqhWFH5mUdJQhweRnldEywnR5021wTdZSNgwYceV14s= github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d h1:viFft9sS/dxoYY0aiOTsLKO2aZQAPT4nlQCsimGcSGE= github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d/go.mod h1:ivJ9QDg0XucIkmwhzCDsqcnxxlDStoTl89jDMIoNxKY= -github.com/golangci/golangci-lint v1.64.0 h1:bhReShr0kegQCCh4xwwSPctcMF5FEEmTDhq6QiEJqVM= -github.com/golangci/golangci-lint v1.64.0/go.mod h1:JMM1OObLvCRlTroXV4NCBhz25u8IZyftkMMl5Jb3afE= +github.com/golangci/golangci-lint v1.64.4 h1:mPN14mAW6apOq77e4AXKXojd4deMESpaXuIortJCS5o= +github.com/golangci/golangci-lint v1.64.4/go.mod h1:0ev6fvv1iDY0P52Sp+WTvEvxZbcw9O9J25KwE/PzNko= github.com/golangci/misspell v0.6.0 h1:JCle2HUTNWirNlDIAUO44hUsKhOFqGPoC4LZxlaSXDs= github.com/golangci/misspell v0.6.0/go.mod h1:keMNyY6R9isGaSAu+4Q8NMBwMPkh15Gtc8UCVoDtAWo= github.com/golangci/plugin-module-register v0.1.1 h1:TCmesur25LnyJkpsVrupv1Cdzo+2f7zX0H6Jkw1Ol6c= @@ -410,8 +410,8 @@ github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod h1:vgyd7OREkbtVE github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julz/importas v0.2.0 h1:y+MJN/UdL63QbFJHws9BVC5RpA2iq0kpjrFajTGivjQ= github.com/julz/importas v0.2.0/go.mod h1:pThlt589EnCYtMnmhmRYY/qn9lCf/frPOK+WMx3xiJY= -github.com/k3d-io/k3d/v5 v5.8.1 h1:/Iw/HtdluwQYktMUKCeT3SUzQZrWcVlikKln6Twaz/w= -github.com/k3d-io/k3d/v5 v5.8.1/go.mod h1:bFlhRV/R1cPT42ZZzQAHPHUF33CbCT8VSbjtjTr3J1Y= +github.com/k3d-io/k3d/v5 v5.8.2 h1:cknyqAa7EnigZ5zazgXDhJl+LS0eeWETAhgtaJGgnf0= +github.com/k3d-io/k3d/v5 v5.8.2/go.mod h1:bFlhRV/R1cPT42ZZzQAHPHUF33CbCT8VSbjtjTr3J1Y= github.com/karamaru-alpha/copyloopvar v1.2.1 h1:wmZaZYIjnJ0b5UoKDjUHrikcV0zuPyyxI4SVplLd2CI= github.com/karamaru-alpha/copyloopvar v1.2.1/go.mod h1:nFmMlFNlClC2BPvNaHMdkirmTJxVCY0lhxBtlfOypMM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -487,8 +487,8 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.6.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mgechev/revive v1.6.0 h1:NsdaDzYcWZd3ikrWbdbFsvk+DvEAmP6A21LAdZEomZg= -github.com/mgechev/revive v1.6.0/go.mod h1:YpafN9JKjfKxG/UDGUHU1kPJKalHx7fHIgclT04SjBs= +github.com/mgechev/revive v1.6.1 h1:ncK0ZCMWtb8GXwVAmk+IeWF2ULIDsvRxSRfg5sTwQ2w= +github.com/mgechev/revive v1.6.1/go.mod h1:/2tfHWVO8UQi/hqJsIYNEKELi+DJy/e+PQpLgTB1v88= github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU= github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= @@ -538,8 +538,8 @@ github.com/nishanths/exhaustive v0.12.0 h1:vIY9sALmw6T/yxiASewa4TQcFsVYZQQRUQJhK github.com/nishanths/exhaustive v0.12.0/go.mod h1:mEZ95wPIZW+x8kC4TgC+9YCUgiST7ecevsVDTgc2obs= github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= -github.com/nunnatsa/ginkgolinter v0.18.4 h1:zmX4KUR+6fk/vhUFt8DOP6KwznekhkmVSzzVJve2vyM= -github.com/nunnatsa/ginkgolinter v0.18.4/go.mod h1:AMEane4QQ6JwFz5GgjI5xLUM9S/CylO+UyM97fN2iBI= +github.com/nunnatsa/ginkgolinter v0.19.0 h1:CnHRFAeBS3LdLI9h+Jidbcc5KH71GKOmaBZQk8Srnto= +github.com/nunnatsa/ginkgolinter v0.19.0/go.mod h1:jkQ3naZDmxaZMXPWaS9rblH+i+GWXQCaS/JFIWcOH2s= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -833,8 +833,8 @@ golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f h1:WTyX8eCCyfdqiPYkRGm0MqElSfYFH3yR1+rl/mct9sA= -golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac h1:TSSpLIG4v+p0rPv1pNOQtl1I8knsO4S9trOxNMOLVP4= +golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ= golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -1016,8 +1016,8 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= -honnef.co/go/tools v0.5.1 h1:4bH5o3b5ZULQ4UrBmP+63W9r7qIkqJClEA9ko5YKx+I= -honnef.co/go/tools v0.5.1/go.mod h1:e9irvo83WDG9/irijV44wr3tbhcFeRnfpVlRqVwpzMs= +honnef.co/go/tools v0.6.0 h1:TAODvD3knlq75WCp2nyGJtT4LeRV/o7NN9nYPeVJXf8= +honnef.co/go/tools v0.6.0/go.mod h1:3puzxxljPCe8RGJX7BIy1plGbxEOZni5mR2aXe3/uk4= k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc= k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k= k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw= diff --git a/internal/tools/populateimages/main.go b/internal/tools/populateimages/main.go index 048dfb15e..a130ab2a2 100644 --- a/internal/tools/populateimages/main.go +++ b/internal/tools/populateimages/main.go @@ -10,14 +10,14 @@ import ( "path/filepath" "github.com/joho/godotenv" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) type secScanConfig struct { ModuleName string `yaml:"module-name"` Kind string `yaml:"kind"` BDBA []string `yaml:"bdba"` - Mend mend `yaml:"mend"` + Mend mend `yaml:"mend"` CheckmarxOne checkmarxOne `yaml:"checkmarx-one"` } @@ -178,13 +178,14 @@ func generateSecScanConfig(data map[string]string) error { defer file.Close() enc := yaml.NewEncoder(file) + enc.SetIndent(2) imgs := []string{data["ENV_IMG"], data["DEFAULT_FLUENTBIT_EXPORTER_IMAGE"], data["DEFAULT_FLUENTBIT_IMAGE"], data["DEFAULT_OTEL_COLLECTOR_IMAGE"], data["DEFAULT_SELFMONITOR_IMAGE"]} secScanCfg := secScanConfig{ ModuleName: "telemetry", Kind: "kyma", BDBA: imgs, - Mend: mend{ + Mend: mend{ Language: "golang-mod", Exclude: []string{"**/mocks/**", "**/stubs/**", "**/test/**", "**/*_test.go"}, }, diff --git a/renovate.json b/renovate.json index e86178925..2f0ab6a51 100644 --- a/renovate.json +++ b/renovate.json @@ -1,28 +1,74 @@ { - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended", + ":semanticCommits", + ":semanticCommitTypeAll(chore)", + ":semanticCommitScopeDisabled" + ], + "labels": [ + "area/dependency", + "kind/chore" + ], + "gomod": { + "postUpdateOptions": [ + "gomodTidy" ], - "labels": [ - "area/dependency", - "kind/chore" - ], - "commitMessageAction": "Bump", - "gomod": { - "enabled": false - }, - "kustomize": { - "enabled": false + "enabled": true + }, + "kustomize": { + "enabled": false + }, + "dockerfile": { + "enabled": true + }, + "helm-values": { + "enabled": false + }, + "github-actions": { + "enabled": false + }, + "packageRules": [ + { + "matchCategories": [ + "golang" + ], + "postUpdateOptions": [ + "gomodTidy" + ], + "enabled": true }, - "dockerfile": { - "enabled": false + { + "matchDatasources": [ + "golang-version" + ], + "rangeStrategy": "bump" }, - "helm-values": { - "enabled": false + { + "matchManagers": [ + "gomod" + ], + "matchDepTypes": [ + "indirect" + ], + "enabled": false }, - "github-actions": { - "enabled": false + { + "matchManagers": [ + "gomod" + ], + "matchUpdateTypes": [ + "digest" + ], + "schedule": "every month", + "enabled": false }, + { + "matchUpdateTypes": ["minor", "patch"], + "matchCurrentVersion": "!/^0/", + "automerge": true + } + ], "customManagers": [ { "customType": "regex", @@ -37,4 +83,4 @@ "depNameTemplate": "kyma-project/istio" } ] -} \ No newline at end of file +} diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index 21c243f42..a1d5d27b6 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -1,22 +1,22 @@ module-name: telemetry kind: kyma bdba: -- europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:main -- europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20250206-00da07e7 -- europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.4 -- europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.118.0-main -- europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.1.0-98bf175 + - europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:main + - europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20250206-00da07e7 + - europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.4 + - europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.118.0-main + - europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.1.0-98bf175 mend: language: golang-mod exclude: - - '**/mocks/**' - - '**/stubs/**' - - '**/test/**' - - '**/*_test.go' + - '**/mocks/**' + - '**/stubs/**' + - '**/test/**' + - '**/*_test.go' checkmarx-one: preset: go-default exclude: - - '**/mocks/**' - - '**/stubs/**' - - '**/test/**' - - '**/*_test.go' + - '**/mocks/**' + - '**/stubs/**' + - '**/test/**' + - '**/*_test.go'