From cafc831b922777f2c4db5dd1824a3abdbbbb4de8 Mon Sep 17 00:00:00 2001 From: Adam Hughes Date: Tue, 28 Sep 2021 12:14:39 +0000 Subject: [PATCH 1/8] ci: bump Codecov Orb version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f2ab318..c997700 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - codecov: codecov/codecov@1.2 + codecov: codecov/codecov@3 executors: node: From 8dade108b91905d9dfbdb3e4bc6f5e04bdab9aac Mon Sep 17 00:00:00 2001 From: Adam Hughes Date: Mon, 8 Nov 2021 17:00:00 +0000 Subject: [PATCH 2/8] ci: bump golangci-lint to 1.43 --- .circleci/config.yml | 2 +- .golangci.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c997700..35d87d4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ executors: - image: node:16-slim golangci-lint: docker: - - image: golangci/golangci-lint:v1.42-alpine + - image: golangci/golangci-lint:v1.43-alpine golang-previous: docker: - image: golang:1.16 diff --git a/.golangci.yml b/.golangci.yml index 896eeb6..32ee0fd 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,7 +1,9 @@ linters: disable-all: true enable: + - bidichk - bodyclose + - contextcheck - deadcode - depguard - dogsled @@ -21,14 +23,17 @@ linters: - gosimple - govet - ineffassign + - ireturn - misspell - nakedret + - nilnil - prealloc - revive - rowserrcheck - staticcheck - structcheck - stylecheck + - tenv - typecheck - unconvert - unparam From 444f98da8daca20fe32579fac8f3caf2a40995c8 Mon Sep 17 00:00:00 2001 From: Adam Hughes Date: Thu, 24 Feb 2022 23:25:56 +0000 Subject: [PATCH 3/8] chore: bump node version in CI config --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 35d87d4..6c89d80 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ orbs: executors: node: docker: - - image: node:16-slim + - image: node:17-slim golangci-lint: docker: - image: golangci/golangci-lint:v1.43-alpine From c90eee0b3156e16809769f37f95ca74911f6d3fe Mon Sep 17 00:00:00 2001 From: Adam Hughes Date: Thu, 24 Feb 2022 23:39:22 +0000 Subject: [PATCH 4/8] chore: bump golangci-lint to v1.44 --- .circleci/config.yml | 2 +- .golangci.yml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c89d80..0c953c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ executors: - image: node:17-slim golangci-lint: docker: - - image: golangci/golangci-lint:v1.43-alpine + - image: golangci/golangci-lint:v1.44-alpine golang-previous: docker: - image: golang:1.16 diff --git a/.golangci.yml b/.golangci.yml index 32ee0fd..c22dd23 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,8 +3,10 @@ linters: enable: - bidichk - bodyclose + - containedctx - contextcheck - deadcode + - decorder - depguard - dogsled - dupl @@ -12,6 +14,8 @@ linters: - funlen - gochecknoinits - gocognit + - errchkjson + - gochecknoinits - goconst - gocritic - gocyclo @@ -22,8 +26,10 @@ linters: - gosec - gosimple - govet + - grouper - ineffassign - ireturn + - maintidx - misspell - nakedret - nilnil @@ -39,3 +45,4 @@ linters: - unparam - unused - varcheck + - whitespace From b2f923d0dc96592d4afd4161a8ac6efc46156810 Mon Sep 17 00:00:00 2001 From: Adam Hughes Date: Thu, 24 Feb 2022 23:40:33 +0000 Subject: [PATCH 5/8] docs: fix up copyright lines --- LICENSE.md | 2 ++ json_response.go | 2 +- json_response_test.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 2ba3831..f1d2cf6 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,5 +1,7 @@ # LICENSE +Copyright (c) 2018-2022, Sylabs Inc. All rights reserved. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/json_response.go b/json_response.go index 753c672..a60c5fd 100644 --- a/json_response.go +++ b/json_response.go @@ -1,4 +1,4 @@ -// Copyright (c) 2018, Sylabs Inc. All rights reserved. +// Copyright (c) 2018-2021, Sylabs Inc. All rights reserved. // This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file // distributed with the sources of this project regarding your rights to use or distribute this // software. diff --git a/json_response_test.go b/json_response_test.go index ff2ad62..a60ecb2 100644 --- a/json_response_test.go +++ b/json_response_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2018, Sylabs Inc. All rights reserved. +// Copyright (c) 2018-2021, Sylabs Inc. All rights reserved. // This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file // distributed with the sources of this project regarding your rights to use or distribute this // software. From 5a3e1668d76add790e12bd9383a7b376f56131ec Mon Sep 17 00:00:00 2001 From: Adam Hughes Date: Fri, 25 Feb 2022 00:23:06 +0000 Subject: [PATCH 6/8] chore: bump Go version range to 1.17-1.18 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c953c2..259ef2e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,10 +12,10 @@ executors: - image: golangci/golangci-lint:v1.44-alpine golang-previous: docker: - - image: golang:1.16 + - image: golang:1.17 golang-latest: docker: - - image: golang:1.17 + - image: golang:1.18 jobs: lint-markdown: From 3b78fe809940a6e010b00679e7f92158369002db Mon Sep 17 00:00:00 2001 From: Adam Hughes Date: Wed, 23 Mar 2022 19:05:52 +0000 Subject: [PATCH 7/8] ci: update golangci-lint to v1.45 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 259ef2e..782c9ae 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ executors: - image: node:17-slim golangci-lint: docker: - - image: golangci/golangci-lint:v1.44-alpine + - image: golangci/golangci-lint:v1.45-alpine golang-previous: docker: - image: golang:1.17 From 7a22ceabc9f2de072a5c50d876aa2d3f91f56928 Mon Sep 17 00:00:00 2001 From: Adam Hughes <9903835+tri-adam@users.noreply.github.com> Date: Wed, 11 May 2022 20:18:22 +0000 Subject: [PATCH 8/8] chore: change master branch to main --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 464b65f..d3d52c8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![PkgGoDev](https://pkg.go.dev/badge/github.com/sylabs/json-resp)](https://pkg.go.dev/github.com/sylabs/json-resp) [![Build Status](https://circleci.com/gh/sylabs/json-resp.svg?style=shield)](https://circleci.com/gh/sylabs/workflows/json-resp) -[![Code Coverage](https://codecov.io/gh/sylabs/json-resp/branch/master/graph/badge.svg)](https://codecov.io/gh/sylabs/json-resp) +[![Code Coverage](https://codecov.io/gh/sylabs/json-resp/branch/main/graph/badge.svg)](https://codecov.io/gh/sylabs/json-resp) [![Go Report Card](https://goreportcard.com/badge/github.com/sylabs/json-resp)](https://goreportcard.com/report/github.com/sylabs/json-resp) The `json-resp` package contains a small set of functions that are used to marshall and unmarshall response data and errors in JSON format.