diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 3b884f3..c100e86 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -16,7 +16,7 @@ jobs: - name: set up go uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: "1.22" - name: cache go modules uses: actions/cache@v4 diff --git a/dist/CHANGELOG.md b/dist/CHANGELOG.md new file mode 100644 index 0000000..ba62ddc --- /dev/null +++ b/dist/CHANGELOG.md @@ -0,0 +1,2 @@ +## Changelog +* 96e9f8a002117f296b8d8b4eb703146a5065d3dd Bump github.com/gorilla/sessions from 1.3.0 to 1.4.0 (#118) diff --git a/dist/aggregadantur_1.65.0_darwin_amd64.tar.gz b/dist/aggregadantur_1.65.0_darwin_amd64.tar.gz new file mode 100644 index 0000000..7f3cf18 Binary files /dev/null and b/dist/aggregadantur_1.65.0_darwin_amd64.tar.gz differ diff --git a/dist/aggregadantur_1.65.0_linux_amd64.tar.gz b/dist/aggregadantur_1.65.0_linux_amd64.tar.gz new file mode 100644 index 0000000..19e53ef Binary files /dev/null and b/dist/aggregadantur_1.65.0_linux_amd64.tar.gz differ diff --git a/dist/artifacts.json b/dist/artifacts.json new file mode 100644 index 0000000..ef956f0 --- /dev/null +++ b/dist/artifacts.json @@ -0,0 +1 @@ +[{"name":"metadata.json","path":"dist/metadata.json","internal_type":30,"type":"Metadata"},{"name":"aggregadantur","path":"dist/binary_linux_amd64_v1/aggregadantur","goos":"linux","goarch":"amd64","goamd64":"v1","internal_type":4,"type":"Binary","extra":{"Binary":"aggregadantur","Ext":"","ID":"binary"}},{"name":"aggregadantur","path":"dist/binary_darwin_amd64_v1/aggregadantur","goos":"darwin","goarch":"amd64","goamd64":"v1","internal_type":4,"type":"Binary","extra":{"Binary":"aggregadantur","Ext":"","ID":"binary"}},{"name":"aggregadantur_1.65.0_darwin_amd64.tar.gz","path":"dist/aggregadantur_1.65.0_darwin_amd64.tar.gz","goos":"darwin","goarch":"amd64","goamd64":"v1","internal_type":1,"type":"Archive","extra":{"Binaries":["aggregadantur"],"Checksum":"sha256:c540156181d8af51f0151e93ef630a8c343f9b24424501c87e1e5375298c9162","Format":"tar.gz","ID":"archives","Replaces":null,"WrappedIn":"aggregadantur_1.65.0_darwin_amd64"}},{"name":"aggregadantur_1.65.0_linux_amd64.tar.gz","path":"dist/aggregadantur_1.65.0_linux_amd64.tar.gz","goos":"linux","goarch":"amd64","goamd64":"v1","internal_type":1,"type":"Archive","extra":{"Binaries":["aggregadantur"],"Checksum":"sha256:8aaaa45aeae1e7171bc7aeb4dcd1fc5fb3e2e93638f10574f89a94c7055117e7","Format":"tar.gz","ID":"archives","Replaces":null,"WrappedIn":"aggregadantur_1.65.0_linux_amd64"}},{"name":"checksums.txt","path":"dist/checksums.txt","internal_type":12,"type":"Checksum","extra":{}}] \ No newline at end of file diff --git a/dist/binary_darwin_amd64_v1/aggregadantur b/dist/binary_darwin_amd64_v1/aggregadantur new file mode 100755 index 0000000..5cbece7 Binary files /dev/null and b/dist/binary_darwin_amd64_v1/aggregadantur differ diff --git a/dist/binary_linux_amd64_v1/aggregadantur b/dist/binary_linux_amd64_v1/aggregadantur new file mode 100755 index 0000000..3ba3301 Binary files /dev/null and b/dist/binary_linux_amd64_v1/aggregadantur differ diff --git a/dist/checksums.txt b/dist/checksums.txt new file mode 100644 index 0000000..8176b07 --- /dev/null +++ b/dist/checksums.txt @@ -0,0 +1,2 @@ +c540156181d8af51f0151e93ef630a8c343f9b24424501c87e1e5375298c9162 aggregadantur_1.65.0_darwin_amd64.tar.gz +8aaaa45aeae1e7171bc7aeb4dcd1fc5fb3e2e93638f10574f89a94c7055117e7 aggregadantur_1.65.0_linux_amd64.tar.gz diff --git a/dist/config.yaml b/dist/config.yaml new file mode 100644 index 0000000..b3e9fd0 --- /dev/null +++ b/dist/config.yaml @@ -0,0 +1,119 @@ +project_name: aggregadantur +release: + github: + owner: orange-cloudfoundry + name: aggregadantur + prerelease: auto + name_template: '{{.Tag}}' +builds: + - id: binary + goos: + - linux + - darwin + goarch: + - amd64 + goarm: + - "6" + gomips: + - hardfloat + goamd64: + - v1 + targets: + - linux_amd64_v1 + - darwin_amd64_v1 + dir: ./cmd/aggregadantur + main: . + binary: aggregadantur + builder: go + gobinary: go + command: build + ldflags: + - -s + - -w + - -X github.com/prometheus/common/version.Version={{.Version}} + - -X github.com/prometheus/common/version.Revision={{.FullCommit}} + - -X github.com/prometheus/common/version.Branch={{.Branch}} + - -X github.com/prometheus/common/version.BuildUser={{.Env.USER}} + - -X github.com/prometheus/common/version.BuildDate={{.Date}} + env: + - CGO_ENABLED=0 +archives: + - id: archives + builds: + - binary + name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}' + format: tar.gz + wrap_in_directory: "true" + files: + - src: LICENSE* + - src: README* + - src: CHANGELOG* + - src: docs/* + - src: assets/* + - src: static/* + - src: templates/* +snapshot: + name_template: '{{ .Version }}-SNAPSHOT-{{ .ShortCommit }}' +checksum: + name_template: checksums.txt + algorithm: sha256 +changelog: + format: '{{ .SHA }}: {{ .Message }} ({{ with .AuthorUsername }}@{{ . }}{{ else }}{{ .AuthorName }} <{{ .AuthorEmail }}>{{ end }})' +dist: dist +env_files: + github_token: ~/.config/goreleaser/github_token + gitlab_token: ~/.config/goreleaser/gitlab_token + gitea_token: ~/.config/goreleaser/gitea_token +source: + name_template: '{{ .ProjectName }}-{{ .Version }}' + format: tar.gz +gomod: + gobinary: go +announce: + twitter: + message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}' + mastodon: + message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}' + server: "" + reddit: + title_template: '{{ .ProjectName }} {{ .Tag }} is out!' + url_template: '{{ .ReleaseURL }}' + slack: + message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}' + username: GoReleaser + discord: + message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}' + author: GoReleaser + color: "3888754" + icon_url: https://goreleaser.com/static/avatar.png + teams: + title_template: '{{ .ProjectName }} {{ .Tag }} is out!' + message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}' + color: '#2D313E' + icon_url: https://goreleaser.com/static/avatar.png + smtp: + subject_template: '{{ .ProjectName }} {{ .Tag }} is out!' + body_template: 'You can view details from: {{ .ReleaseURL }}' + mattermost: + message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}' + title_template: '{{ .ProjectName }} {{ .Tag }} is out!' + username: GoReleaser + linkedin: + message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}' + telegram: + message_template: '{{ mdv2escape .ProjectName }} {{ mdv2escape .Tag }} is out{{ mdv2escape "!" }} Check it out at {{ mdv2escape .ReleaseURL }}' + parse_mode: MarkdownV2 + webhook: + message_template: '{ "message": "{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}"}' + content_type: application/json; charset=utf-8 + opencollective: + title_template: '{{ .Tag }}' + message_template: '{{ .ProjectName }} {{ .Tag }} is out!
Check it out at {{ .ReleaseURL }}' + bluesky: + message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}' +git: + tag_sort: -version:refname +github_urls: + download: https://github.com +gitlab_urls: + download: https://gitlab.com diff --git a/dist/metadata.json b/dist/metadata.json new file mode 100644 index 0000000..1c5633a --- /dev/null +++ b/dist/metadata.json @@ -0,0 +1 @@ +{"project_name":"aggregadantur","tag":"v1.65.0","previous_tag":"v1.64.0","version":"1.65.0","commit":"96e9f8a002117f296b8d8b4eb703146a5065d3dd","date":"2024-08-21T17:07:20.514908897+02:00","runtime":{"goos":"linux","goarch":"amd64"}} \ No newline at end of file diff --git a/go.mod b/go.mod index d3e22b3..9ac7d45 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,13 @@ module github.com/orange-cloudfoundry/aggregadantur -go 1.22.3 -toolchain go1.23.0 +go 1.22.6 require ( github.com/alecthomas/kingpin/v2 v2.4.0 github.com/gobwas/glob v0.2.3 github.com/golang-jwt/jwt/v4 v4.5.0 github.com/gorilla/mux v1.8.1 - github.com/gorilla/sessions v1.4.0 + github.com/gorilla/sessions v1.3.0 github.com/onsi/ginkgo/v2 v2.20.0 github.com/onsi/gomega v1.34.1 github.com/prometheus/common v0.55.0 diff --git a/go.sum b/go.sum index 844968f..ddeb17f 100644 --- a/go.sum +++ b/go.sum @@ -789,8 +789,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= -github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ= -github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik= +github.com/gorilla/sessions v1.3.0 h1:XYlkq7KcpOB2ZhHBPv5WpjMIxrQosiZanfoy1HLZFzg= +github.com/gorilla/sessions v1.3.0/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/gravitational/trace v1.1.16-0.20220114165159-14a9a7dd6aaf/go.mod h1:zXqxTI6jXDdKnlf8s+nT+3c8LrwUEy3yNpO4XJL90lA= diff --git a/vendor/github.com/gorilla/sessions/LICENSE b/vendor/github.com/gorilla/sessions/LICENSE index 7fa9009..bb9d80b 100644 --- a/vendor/github.com/gorilla/sessions/LICENSE +++ b/vendor/github.com/gorilla/sessions/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2024 The Gorilla Authors. All rights reserved. +Copyright (c) 2023 The Gorilla Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/vendor/github.com/gorilla/sessions/README.md b/vendor/github.com/gorilla/sessions/README.md index d2cbea6..3aef6a4 100644 --- a/vendor/github.com/gorilla/sessions/README.md +++ b/vendor/github.com/gorilla/sessions/README.md @@ -1,7 +1,4 @@ -# Gorilla Sessions - -> [!IMPORTANT] -> The latest version of this repository requires go 1.23 because of the new partitioned attribute. The last version that is compatible with older versions of go is v1.3.0. +# sessions ![testing](https://github.com/gorilla/sessions/actions/workflows/test.yml/badge.svg) [![codecov](https://codecov.io/github/gorilla/sessions/branch/main/graph/badge.svg)](https://codecov.io/github/gorilla/sessions) @@ -77,7 +74,6 @@ Other implementations of the `sessions.Store` interface: - [github.com/dsoprea/go-appengine-sessioncascade](https://github.com/dsoprea/go-appengine-sessioncascade) - Memcache/Datastore/Context in AppEngine - [github.com/kidstuff/mongostore](https://github.com/kidstuff/mongostore) - MongoDB - [github.com/srinathgs/mysqlstore](https://github.com/srinathgs/mysqlstore) - MySQL -- [github.com/danielepintore/gorilla-sessions-mysql](https://github.com/danielepintore/gorilla-sessions-mysql) - MySQL - [github.com/EnumApps/clustersqlstore](https://github.com/EnumApps/clustersqlstore) - MySQL Cluster - [github.com/antonlindstrom/pgstore](https://github.com/antonlindstrom/pgstore) - PostgreSQL - [github.com/boj/redistore](https://github.com/boj/redistore) - Redis diff --git a/vendor/github.com/gorilla/sessions/cookie.go b/vendor/github.com/gorilla/sessions/cookie.go index fd6f48c..6612662 100644 --- a/vendor/github.com/gorilla/sessions/cookie.go +++ b/vendor/github.com/gorilla/sessions/cookie.go @@ -1,6 +1,5 @@ -// Copyright 2012 The Gorilla Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +//go:build !go1.11 +// +build !go1.11 package sessions @@ -9,15 +8,13 @@ import "net/http" // newCookieFromOptions returns an http.Cookie with the options set. func newCookieFromOptions(name, value string, options *Options) *http.Cookie { return &http.Cookie{ - Name: name, - Value: value, - Path: options.Path, - Domain: options.Domain, - MaxAge: options.MaxAge, - Secure: options.Secure, - HttpOnly: options.HttpOnly, - Partitioned: options.Partitioned, - SameSite: options.SameSite, + Name: name, + Value: value, + Path: options.Path, + Domain: options.Domain, + MaxAge: options.MaxAge, + Secure: options.Secure, + HttpOnly: options.HttpOnly, } } diff --git a/vendor/github.com/gorilla/sessions/cookie_go111.go b/vendor/github.com/gorilla/sessions/cookie_go111.go new file mode 100644 index 0000000..9b58828 --- /dev/null +++ b/vendor/github.com/gorilla/sessions/cookie_go111.go @@ -0,0 +1,21 @@ +//go:build go1.11 +// +build go1.11 + +package sessions + +import "net/http" + +// newCookieFromOptions returns an http.Cookie with the options set. +func newCookieFromOptions(name, value string, options *Options) *http.Cookie { + return &http.Cookie{ + Name: name, + Value: value, + Path: options.Path, + Domain: options.Domain, + MaxAge: options.MaxAge, + Secure: options.Secure, + HttpOnly: options.HttpOnly, + SameSite: options.SameSite, + } + +} diff --git a/vendor/github.com/gorilla/sessions/options.go b/vendor/github.com/gorilla/sessions/options.go index 6ed7934..d33d076 100644 --- a/vendor/github.com/gorilla/sessions/options.go +++ b/vendor/github.com/gorilla/sessions/options.go @@ -1,11 +1,8 @@ -// Copyright 2012 The Gorilla Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +//go:build !go1.11 +// +build !go1.11 package sessions -import "net/http" - // Options stores configuration for a session or session store. // // Fields are a subset of http.Cookie fields. @@ -16,9 +13,7 @@ type Options struct { // deleted after the browser session ends. // MaxAge<0 means delete cookie immediately. // MaxAge>0 means Max-Age attribute present and given in seconds. - MaxAge int - Secure bool - HttpOnly bool - Partitioned bool - SameSite http.SameSite + MaxAge int + Secure bool + HttpOnly bool } diff --git a/vendor/github.com/gorilla/sessions/options_go111.go b/vendor/github.com/gorilla/sessions/options_go111.go new file mode 100644 index 0000000..af9cdf0 --- /dev/null +++ b/vendor/github.com/gorilla/sessions/options_go111.go @@ -0,0 +1,23 @@ +//go:build go1.11 +// +build go1.11 + +package sessions + +import "net/http" + +// Options stores configuration for a session or session store. +// +// Fields are a subset of http.Cookie fields. +type Options struct { + Path string + Domain string + // MaxAge=0 means no Max-Age attribute specified and the cookie will be + // deleted after the browser session ends. + // MaxAge<0 means delete cookie immediately. + // MaxAge>0 means Max-Age attribute present and given in seconds. + MaxAge int + Secure bool + HttpOnly bool + // Defaults to http.SameSiteDefaultMode + SameSite http.SameSite +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 16bc634..c93f23d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -40,8 +40,8 @@ github.com/gorilla/mux # github.com/gorilla/securecookie v1.1.2 ## explicit; go 1.20 github.com/gorilla/securecookie -# github.com/gorilla/sessions v1.4.0 -## explicit; go 1.23 +# github.com/gorilla/sessions v1.3.0 +## explicit; go 1.20 github.com/gorilla/sessions # github.com/gorilla/websocket v1.5.1 ## explicit; go 1.20