Skip to content

Commit

Permalink
Merge pull request #8 from invopop/upgrade-deps
Browse files Browse the repository at this point in the history
Upgrading deps
  • Loading branch information
samlown authored Jun 27, 2024
2 parents 7487e1f + bd93b5b commit 0b3ceae
Show file tree
Hide file tree
Showing 9 changed files with 89 additions and 610 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v4
with:
go-version-file: "go.mod"
id: go

- name: Prepare .netrc
uses: extractions/netrc@v1
Expand All @@ -22,12 +28,7 @@ jobs:
username: ${{ secrets.GO_MOD_USER }}
password: ${{ secrets.GO_MOD_PASS }}

- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: "1.17.5"

- name: Lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.52
version: v1.55
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: "0" # make sure we get all commits!

Expand All @@ -36,7 +36,7 @@ jobs:
- name: Bump version and push tag
id: bump
if: env.COMMIT_TYPE != 'tags'
uses: anothrNick/github-tag-action@1.36.0
uses: anothrNick/github-tag-action@1.52.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RELEASE_BRANCHES: main
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Check out code
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v4
with:
go-version: "1.17.5"
go-version-file: "go.mod"
id: go

- name: Check out code
uses: actions/checkout@v2

#- name: Configure git for private modules
# run: |
# git config --global url."https://${{ secrets.GO_MOD_USER }}:${{ secrets.GO_MOD_PASS }}@github.com".insteadOf "https://github.com"
Expand Down
16 changes: 16 additions & 0 deletions .golangci.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[run]
timeout = "120s"

[output]
format = "colored-line-number"

[linters]
enable = [
"gocyclo", "unconvert", "goimports", "unused", "unused",
"vetshadow", "nakedret", "errcheck", "revive", "ineffassign",
"goconst", "vet", "unparam", "gofmt"
]

[issues]
exclude-use-default = false

6 changes: 3 additions & 3 deletions certificates.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type PrivateKeyInfo struct {
Exponent string
}

// Load creates a new Certificate from the info
// LoadCertificate creates a new Certificate instance from the info
// obtained from pkcs12 formated data stream
func LoadCertificate(path, password string) (*Certificate, error) {
data, err := os.ReadFile(path)
Expand Down Expand Up @@ -91,7 +91,7 @@ func (cert *Certificate) Fingerprint() string {
return base64.StdEncoding.EncodeToString(hasher.Sum(nil))
}

// ToPEM will return the public certificate encoded in base64 PEM
// NakedPEM will return the public certificate encoded in base64 PEM
// (without markers like "-----BEGIN CERTIFICATE-----")
func (cert *Certificate) NakedPEM() string {
return NakedPEM(cert.certificate)
Expand Down Expand Up @@ -160,7 +160,7 @@ func (cert *Certificate) PrivateKeyInfo() *PrivateKeyInfo {
}
}

// TLSConfig prepares TLS authentication connection details ready to use
// TLSAuthConfig prepares TLS authentication connection details ready to use
// with HTTP servers that require them in addition to the signatures of the
// XML-DSig signed payload.
func (cert *Certificate) TLSAuthConfig() (*tls.Config, error) {
Expand Down
26 changes: 14 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
module github.com/invopop/xmldsig

go 1.17
go 1.21

require (
github.com/beevik/etree v1.1.0
github.com/invopop/gobl v0.22.0
github.com/stretchr/testify v1.7.1
software.sslmate.com/src/go-pkcs12 v0.2.0
github.com/beevik/etree v1.4.0
github.com/invopop/gobl v0.80.0
github.com/stretchr/testify v1.8.4
software.sslmate.com/src/go-pkcs12 v0.4.0
)

require (
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 // indirect
github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
github.com/invopop/jsonschema v0.4.1-0.20220509222051-9cef489f4cb7 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/invopop/jsonschema v0.12.0 // indirect
github.com/invopop/validation v0.3.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
golang.org/x/crypto v0.24.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 0b3ceae

Please sign in to comment.