Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KUBESAW-250: Updating GolangCiLint to v1.63.1 #491

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

KUBESAW-250: Updating GolangCiLint to v1.63.1 #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-golang-sbom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.60.3
version: v1.63.1
skip-pkg-cache: true
skip-build-cache: true
args: --config=./.golangci.yml --verbose
Expand Down
4 changes: 2 additions & 2 deletions pkg/configuration/configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestRegistrationService(t *testing.T) {
assert.Empty(t, regServiceCfg.Analytics().DevSpacesSegmentWriteKey())
assert.Equal(t, "https://sso.devsandbox.dev/auth/js/keycloak.js", regServiceCfg.Auth().AuthClientLibraryURL())
assert.Equal(t, "application/json; charset=utf-8", regServiceCfg.Auth().AuthClientConfigContentType())
assert.Equal(t, `{"realm": "sandbox-dev","auth-server-url": "https://sso.devsandbox.dev/auth","ssl-required": "none","resource": "sandbox-public","clientId": "sandbox-public","public-client": true, "confidential-port": 0}`,
assert.JSONEq(t, `{"realm": "sandbox-dev","auth-server-url": "https://sso.devsandbox.dev/auth","ssl-required": "none","resource": "sandbox-public","clientId": "sandbox-public","public-client": true, "confidential-port": 0}`,
regServiceCfg.Auth().AuthClientConfigRaw())
assert.Equal(t, "https://sso.devsandbox.dev/auth/realms/sandbox-dev/protocol/openid-connect/certs", regServiceCfg.Auth().AuthClientPublicKeysURL())
assert.Equal(t, "https://sso.devsandbox.dev", regServiceCfg.Auth().SSOBaseURL())
Expand Down Expand Up @@ -127,7 +127,7 @@ func TestRegistrationService(t *testing.T) {
assert.Equal(t, "keyabc", regServiceCfg.Analytics().SegmentWriteKey())
assert.Equal(t, "https://sso.openshift.com/auth/js/keycloak.js", regServiceCfg.Auth().AuthClientLibraryURL())
assert.Equal(t, "application/xml", regServiceCfg.Auth().AuthClientConfigContentType())
assert.Equal(t, `{"realm": "toolchain-private"}`, regServiceCfg.Auth().AuthClientConfigRaw())
assert.JSONEq(t, `{"realm": "toolchain-private"}`, regServiceCfg.Auth().AuthClientConfigRaw()) //using as per linter suggestion encoded-compare: use assert.JSONEq (testifylint)
assert.Equal(t, "https://sso.openshift.com/certs", regServiceCfg.Auth().AuthClientPublicKeysURL())
assert.Equal(t, "https://sso.test.org", regServiceCfg.Auth().SSOBaseURL())
assert.Equal(t, "my-realm", regServiceCfg.Auth().SSORealm())
Expand Down
2 changes: 1 addition & 1 deletion pkg/log/log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func TestLog(t *testing.T) {
buf := new(bytes.Buffer)
_, err := buf.ReadFrom(req.Body)
require.NoError(t, err, "it should still be possible to read the body after it was passed to the logs")
assert.Equal(t, `{"testing-body":"test"}`, buf.String(), "body contents should be unchanged")
assert.JSONEq(t, `{"testing-body":"test"}`, buf.String(), "body contents should be unchanged")
})

t.Run("log infof withValues", func(t *testing.T) {
Expand Down
Loading