Skip to content

Commit 0d45dee

Browse files
author
Dmitriy Matrenichev
committed
chore: bump deps
- run rekres - github.com/stretchr/testify to v1.10.0 Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
1 parent 58b2f92 commit 0d45dee

8 files changed

Lines changed: 39 additions & 29 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-10-10T15:35:11Z by kres 3919238.
3+
# Generated on 2024-12-04T08:15:33Z by kres 232fe63.
44

55
name: default
66
concurrency:
@@ -77,7 +77,7 @@ jobs:
7777
run: |
7878
make unit-tests-race
7979
- name: coverage
80-
uses: codecov/codecov-action@v4
80+
uses: codecov/codecov-action@v5
8181
with:
8282
files: _out/coverage-unit-tests.txt
8383
token: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/slack-notify.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-02-16T10:24:06Z by kres latest.
3+
# Generated on 2024-12-04T08:15:33Z by kres 232fe63.
44

55
name: slack-notify
66
"on":
@@ -24,11 +24,12 @@ jobs:
2424
run: |
2525
echo pull_request_number=$(gh pr view -R ${{ github.repository }} ${{ github.event.workflow_run.head_repository.owner.login }}:${{ github.event.workflow_run.head_branch }} --json number --jq .number) >> $GITHUB_OUTPUT
2626
- name: Slack Notify
27-
uses: slackapi/slack-github-action@v1
27+
uses: slackapi/slack-github-action@v2
2828
with:
29-
channel-id: proj-talos-maintainers
29+
method: chat.postMessage
3030
payload: |
3131
{
32+
"channel": "proj-talos-maintainers",
3233
"attachments": [
3334
{
3435
"color": "${{ github.event.workflow_run.conclusion == 'success' && '#2EB886' || github.event.workflow_run.conclusion == 'failure' && '#A30002' || '#FFCC00' }}",
@@ -88,5 +89,4 @@ jobs:
8889
}
8990
]
9091
}
91-
env:
92-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
92+
token: ${{ secrets.SLACK_BOT_TOKEN }}

‎.golangci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-10-10T15:35:11Z by kres 3919238.
3+
# Generated on 2024-12-04T08:15:33Z by kres 232fe63.
44

55
# options for analysis running
66
run:
@@ -116,7 +116,6 @@ linters:
116116
- gochecknoglobals
117117
- gochecknoinits
118118
- godox
119-
- gomnd
120119
- gomoddirectives
121120
- gosec
122121
- inamedparam

‎Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# syntax = docker/dockerfile-upstream:1.10.0-labs
1+
# syntax = docker/dockerfile-upstream:1.11.1-labs
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2024-10-10T15:35:11Z by kres 3919238.
5+
# Generated on 2024-12-04T08:15:33Z by kres 232fe63.
66

77
ARG TOOLCHAIN
88

99
# cleaned up specs and compiled versions
1010
FROM scratch AS generate
1111

1212
# runs markdownlint
13-
FROM docker.io/oven/bun:1.1.29-alpine AS lint-markdown
13+
FROM docker.io/oven/bun:1.1.36-alpine AS lint-markdown
1414
WORKDIR /src
15-
RUN bun i markdownlint-cli@0.41.0 sentences-per-line@0.2.1
15+
RUN bun i markdownlint-cli@0.43.0 sentences-per-line@0.2.1
1616
COPY .markdownlint.json .
1717
COPY ./README.md ./README.md
1818
RUN bunx markdownlint --ignore "CHANGELOG.md" --ignore "**/node_modules/**" --ignore '**/hack/chglog/**' --rules node_modules/sentences-per-line/index.js .

‎Makefile‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-10-10T15:35:11Z by kres 3919238.
3+
# Generated on 2024-12-04T08:15:33Z by kres 232fe63.
44

55
# common variables
66

@@ -17,15 +17,15 @@ WITH_RACE ?= false
1717
REGISTRY ?= ghcr.io
1818
USERNAME ?= siderolabs
1919
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
20-
PROTOBUF_GO_VERSION ?= 1.34.2
20+
PROTOBUF_GO_VERSION ?= 1.35.2
2121
GRPC_GO_VERSION ?= 1.5.1
22-
GRPC_GATEWAY_VERSION ?= 2.22.0
22+
GRPC_GATEWAY_VERSION ?= 2.24.0
2323
VTPROTOBUF_VERSION ?= 0.6.0
24-
GOIMPORTS_VERSION ?= 0.25.0
24+
GOIMPORTS_VERSION ?= 0.27.0
2525
DEEPCOPY_VERSION ?= v0.5.6
26-
GOLANGCILINT_VERSION ?= v1.61.0
26+
GOLANGCILINT_VERSION ?= v1.62.0
2727
GOFUMPT_VERSION ?= v0.7.0
28-
GO_VERSION ?= 1.23.2
28+
GO_VERSION ?= 1.23.3
2929
GO_BUILDFLAGS ?=
3030
GO_LDFLAGS ?=
3131
CGO_ENABLED ?= 0
@@ -41,11 +41,13 @@ PLATFORM ?= linux/amd64
4141
PROGRESS ?= auto
4242
PUSH ?= false
4343
CI_ARGS ?=
44+
BUILDKIT_MULTI_PLATFORM ?= 1
4445
COMMON_ARGS = --file=Dockerfile
4546
COMMON_ARGS += --provenance=false
4647
COMMON_ARGS += --progress=$(PROGRESS)
4748
COMMON_ARGS += --platform=$(PLATFORM)
4849
COMMON_ARGS += --push=$(PUSH)
50+
COMMON_ARGS += --build-arg=BUILDKIT_MULTI_PLATFORM=$(BUILDKIT_MULTI_PLATFORM)
4951
COMMON_ARGS += --build-arg=ARTIFACTS="$(ARTIFACTS)"
5052
COMMON_ARGS += --build-arg=SHA="$(SHA)"
5153
COMMON_ARGS += --build-arg=TAG="$(TAG)"
@@ -145,6 +147,15 @@ target-%: ## Builds the specified target defined in the Dockerfile. The build r
145147

146148
local-%: ## Builds the specified target defined in the Dockerfile using the local output type. The build result will be output to the specified local destination.
147149
@$(MAKE) target-$* TARGET_ARGS="--output=type=local,dest=$(DEST) $(TARGET_ARGS)"
150+
@PLATFORM=$(PLATFORM) DEST=$(DEST) bash -c '\
151+
for platform in $$(tr "," "\n" <<< "$$PLATFORM"); do \
152+
echo $$platform; \
153+
directory="$${platform//\//_}"; \
154+
if [[ -d "$$DEST/$$directory" ]]; then \
155+
mv "$$DEST/$$directory/"* $$DEST; \
156+
rmdir "$$DEST/$$directory/"; \
157+
fi; \
158+
done'
148159

149160
lint-golangci-lint: ## Runs golangci-lint linter.
150161
@$(MAKE) target-$@

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/siderolabs/crypto
33
go 1.22.1
44

55
require (
6-
github.com/stretchr/testify v1.9.0
6+
github.com/stretchr/testify v1.10.0
77
gopkg.in/yaml.v3 v3.0.1
88
)
99

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
44
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
5-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
6-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
5+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
6+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
77
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
88
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
99
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎x509/x509.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ func (p *PEMEncodedKey) GetEd25519Key() (*Ed25519Key, error) {
10831083

10841084
return &Ed25519Key{
10851085
PrivateKey: ed25519Key,
1086-
PublicKey: publicKey.(ed25519.PublicKey), //nolint:forcetypeassert
1086+
PublicKey: publicKey.(ed25519.PublicKey), //nolint:forcetypeassert,errcheck
10871087
PrivateKeyPEM: p.Key,
10881088
PublicKeyPEM: pubPEM,
10891089
}, nil
@@ -1234,24 +1234,24 @@ func NewCertificateAndKey(crt *x509.Certificate, key interface{}, setters ...Opt
12341234
return nil, fmt.Errorf("failed to create new RSA key: %w", err)
12351235
}
12361236

1237-
priv = k.(*RSAKey).keyRSA //nolint:forcetypeassert
1238-
pemBytes = k.(*RSAKey).KeyPEM //nolint:forcetypeassert
1237+
priv = k.(*RSAKey).keyRSA //nolint:forcetypeassert,errcheck
1238+
pemBytes = k.(*RSAKey).KeyPEM //nolint:forcetypeassert,errcheck
12391239
case *ecdsa.PrivateKey:
12401240
k, err = NewECDSAKey()
12411241
if err != nil {
12421242
return nil, fmt.Errorf("failed to create new RSA key: %w", err)
12431243
}
12441244

1245-
priv = k.(*ECDSAKey).keyEC //nolint:forcetypeassert
1246-
pemBytes = k.(*ECDSAKey).KeyPEM //nolint:forcetypeassert
1245+
priv = k.(*ECDSAKey).keyEC //nolint:forcetypeassert,errcheck
1246+
pemBytes = k.(*ECDSAKey).KeyPEM //nolint:forcetypeassert,errcheck
12471247
case ed25519.PrivateKey:
12481248
k, err = NewEd25519Key()
12491249
if err != nil {
12501250
return nil, fmt.Errorf("failed to create new Ed25519 key: %w", err)
12511251
}
12521252

1253-
priv = k.(*Ed25519Key).PrivateKey //nolint:forcetypeassert
1254-
pemBytes = k.(*Ed25519Key).PrivateKeyPEM //nolint:forcetypeassert
1253+
priv = k.(*Ed25519Key).PrivateKey //nolint:forcetypeassert,errcheck
1254+
pemBytes = k.(*Ed25519Key).PrivateKeyPEM //nolint:forcetypeassert,errcheck
12551255
}
12561256

12571257
csr, err := NewCertificateSigningRequest(priv, setters...)

0 commit comments

Comments
 (0)