Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2026-03-11 07:02:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidated all post-fork updates including dependency bumps and workflow changes

Browse source
This commit is contained in:
dependabot[bot] 2023-10-04 12:17:38 +02:00 • committed by Nick Fedor
parent 2abaa47fd3
commit 6b62d53797
No known key found for this signature in database
GPG key ID: A167CBEDE64D29CB
100 changed files with 1503 additions and 1264 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/notifications/email.go
View file

@ -6,7 +6,7 @@ import (
"github.com/spf13/cobra"
shoutrrrSmtp "github.com/containrrr/shoutrrr/pkg/services/smtp"
t "github.com/containrrr/watchtower/pkg/types"
t "github.com/nicholas-fedor/watchtower/pkg/types"
log "github.com/sirupsen/logrus"
)

2
pkg/notifications/gotify.go
View file

@ -5,7 +5,7 @@ import (
"strings"
shoutrrrGotify "github.com/containrrr/shoutrrr/pkg/services/gotify"
t "github.com/containrrr/watchtower/pkg/types"
t "github.com/nicholas-fedor/watchtower/pkg/types"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/pflag"

2
pkg/notifications/json.go
View file

@ -3,7 +3,7 @@ package notifications
import (
"encoding/json"
t "github.com/containrrr/watchtower/pkg/types"
t "github.com/nicholas-fedor/watchtower/pkg/types"
)
type jsonMap = map[string]interface{}

2
pkg/notifications/json_test.go
View file

@ -1,7 +1,7 @@
package notifications
import (
s "github.com/containrrr/watchtower/pkg/session"
s "github.com/nicholas-fedor/watchtower/pkg/session"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
pkg/notifications/model.go
View file

@ -1,7 +1,7 @@
package notifications
import (
t "github.com/containrrr/watchtower/pkg/types"
t "github.com/nicholas-fedor/watchtower/pkg/types"
log "github.com/sirupsen/logrus"
)

2
pkg/notifications/msteams.go
View file

@ -4,7 +4,7 @@ import (
"net/url"
shoutrrrTeams "github.com/containrrr/shoutrrr/pkg/services/teams"
t "github.com/containrrr/watchtower/pkg/types"
t "github.com/nicholas-fedor/watchtower/pkg/types"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)

2
pkg/notifications/notifier.go
View file

@ -5,7 +5,7 @@ import (
"strings"
"time"
ty "github.com/containrrr/watchtower/pkg/types"
ty "github.com/nicholas-fedor/watchtower/pkg/types"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)

6
pkg/notifications/notifier_test.go
View file

@ -5,9 +5,9 @@ import (
"net/url"
"time"
"github.com/containrrr/watchtower/cmd"
"github.com/containrrr/watchtower/internal/flags"
"github.com/containrrr/watchtower/pkg/notifications"
"github.com/nicholas-fedor/watchtower/cmd"
"github.com/nicholas-fedor/watchtower/internal/flags"
"github.com/nicholas-fedor/watchtower/pkg/notifications"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
pkg/notifications/preview/data/data.go
View file

@ -7,7 +7,7 @@ import (
"strconv"
"time"
"github.com/containrrr/watchtower/pkg/types"
"github.com/nicholas-fedor/watchtower/pkg/types"
)
type previewData struct {

2
pkg/notifications/preview/data/report.go
View file

@ -3,7 +3,7 @@ package data
import (
"sort"
"github.com/containrrr/watchtower/pkg/types"
"github.com/nicholas-fedor/watchtower/pkg/types"
)
// State is the outcome of a container in a session report

2
pkg/notifications/preview/data/status.go
View file

@ -1,6 +1,6 @@
package data
import wt "github.com/containrrr/watchtower/pkg/types"
import wt "github.com/nicholas-fedor/watchtower/pkg/types"
type containerStatus struct {
containerID wt.ContainerID

8
pkg/notifications/preview/tplprev.go
View file

@ -5,8 +5,8 @@ import (
"strings"
"text/template"
"github.com/containrrr/watchtower/pkg/notifications/preview/data"
"github.com/containrrr/watchtower/pkg/notifications/templates"
"github.com/nicholas-fedor/watchtower/pkg/notifications/preview/data"
"github.com/nicholas-fedor/watchtower/pkg/notifications/templates"
)
func Render(input string, states []data.State, loglevels []data.LogLevel) (string, error) {
@ -15,7 +15,7 @@ func Render(input string, states []data.State, loglevels []data.LogLevel) (strin
tpl, err := template.New("").Funcs(templates.Funcs).Parse(input)
if err != nil {
return "", fmt.Errorf("failed to parse template: %e", err)
return "", fmt.Errorf("failed to parse %v", err)
}
for _, state := range states {
@ -29,7 +29,7 @@ func Render(input string, states []data.State, loglevels []data.LogLevel) (strin
var buf strings.Builder
err = tpl.Execute(&buf, data)
if err != nil {
return "", fmt.Errorf("failed to execute template: %e", err)
return "", fmt.Errorf("failed to execute template: %v", err)
}
return buf.String(), nil

8
pkg/notifications/shoutrrr.go
View file

@ -10,8 +10,8 @@ import (
"github.com/containrrr/shoutrrr"
"github.com/containrrr/shoutrrr/pkg/types"
"github.com/containrrr/watchtower/pkg/notifications/templates"
t "github.com/containrrr/watchtower/pkg/types"
"github.com/nicholas-fedor/watchtower/pkg/notifications/templates"
t "github.com/nicholas-fedor/watchtower/pkg/types"
log "github.com/sirupsen/logrus"
)
@ -60,7 +60,7 @@ func (n *shoutrrrTypeNotifier) GetNames() []string {
return names
}
// GetNames returns a list of URLs for notification services that has been added
// GetURLs returns a list of URLs for notification services that has been added
func (n *shoutrrrTypeNotifier) GetURLs() []string {
return n.Urls
}
@ -73,7 +73,7 @@ func (n *shoutrrrTypeNotifier) AddLogHook() {
n.receiving = true
log.AddHook(n)
// Do the sending in a separate goroutine so we don't block the main process.
// Do the sending in a separate goroutine, so we don't block the main process.
go sendNotifications(n)
}

6
pkg/notifications/shoutrrr_test.go
View file

@ -4,9 +4,9 @@ import (
"time"
"github.com/containrrr/shoutrrr/pkg/types"
"github.com/containrrr/watchtower/internal/actions/mocks"
"github.com/containrrr/watchtower/internal/flags"
s "github.com/containrrr/watchtower/pkg/session"
"github.com/nicholas-fedor/watchtower/internal/actions/mocks"
"github.com/nicholas-fedor/watchtower/internal/flags"
s "github.com/nicholas-fedor/watchtower/pkg/session"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gbytes"

2
pkg/notifications/slack.go
View file

@ -5,7 +5,7 @@ import (
shoutrrrDisco "github.com/containrrr/shoutrrr/pkg/services/discord"
shoutrrrSlack "github.com/containrrr/shoutrrr/pkg/services/slack"
t "github.com/containrrr/watchtower/pkg/types"
t "github.com/nicholas-fedor/watchtower/pkg/types"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)