From 1bad75facd62927eaeca4c94b4c331b7ad2cbfd0 Mon Sep 17 00:00:00 2001 From: "Jager,Petar" Date: Wed, 18 May 2022 13:06:39 +0200 Subject: [PATCH] change go module path to CLIP-HPC --- Makefile | 4 ++-- README.md | 3 +-- VERSION | 2 +- cmd/gobler/conmon.go | 4 ++-- cmd/gobler/conmon_test.go | 4 ++-- cmd/gobler/gobler.go | 12 ++++++------ cmd/gobler/monitor.go | 2 +- cmd/gobler/picker.go | 2 +- cmd/gobler/sender.go | 4 ++-- cmd/goslmailer/goslmailer.go | 10 +++++----- cmd/tgslurmbot/tgslurmbot.go | 8 ++++---- connectors/mailto/mailto.go | 4 ++-- connectors/msteams/msteams.go | 8 ++++---- connectors/telegram/telegram.go | 8 ++++---- go.mod | 2 +- internal/config/config_test.go | 2 +- internal/connectors/connectors.go | 10 +++++----- internal/connectors/connectors_test.go | 4 ++-- internal/message/message.go | 2 +- internal/renderer/renderer.go | 2 +- internal/spool/spool.go | 2 +- 21 files changed, 49 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index a0dd667..0a9cd04 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,8 @@ # ...in github actions comes from make -e version=git_ref version=$(shell cat VERSION) commit=$(shell git show --no-patch --format=format:%H HEAD) -buildVersionVar=github.com/pja237/goslmailer/internal/version.buildVersion -buildCommitVar=github.com/pja237/goslmailer/internal/version.buildCommit +buildVersionVar=github.com/CLIP-HPC/goslmailer/internal/version.buildVersion +buildCommitVar=github.com/CLIP-HPC/goslmailer/internal/version.buildCommit # various directories bindirs=$(wildcard ./cmd/*) diff --git a/README.md b/README.md index f3bed90..21a10d9 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,7 @@ Sends a message to a preconfigured ms teams channel webhook. Since MS Teams does not provide with the option to send messages to users directly, only to channel webhooks, we have devised a way using MS Power Automate framework to pick up messages from this one configured *sink* channel and deliver them via private 1on1 chats to the recipient user. -Users listed in the `--mail-user=msteams:userA,msteams:userB` will be sent as adaptive card [mention](https://github.com/pja237/goslmailer/blob/main/templates/adaptive_card_template.json#L225) entity. +Users listed in the `--mail-user=msteams:userA,msteams:userB` will be sent as adaptive card [mention](https://github.com/CLIP-HPC/goslmailer/blob/main/templates/adaptive_card_template.json#L225) entity. A [MS Power Automate workflow](https://powerautomate.microsoft.com/en-us/) monitors the configured *sink* channel, parses the received adaptive card jsons, locates the `mention` entity and delivers to it the copy of the message via private chat. See [annotated configuration example](cmd/goslmailer/goslmailer.conf.annotated_example) @@ -162,7 +162,6 @@ See [annotated configuration example](cmd/goslmailer/goslmailer.conf.annotated_e ## ToDo -See: [goslmailer project](https://github.com/users/pja237/projects/1/views/1) --- diff --git a/VERSION b/VERSION index 826e142..b02bebf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.1.1 +v2.1.4 diff --git a/cmd/gobler/conmon.go b/cmd/gobler/conmon.go index 01908e0..470cf11 100644 --- a/cmd/gobler/conmon.go +++ b/cmd/gobler/conmon.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/pja237/goslmailer/internal/connectors" - "github.com/pja237/goslmailer/internal/spool" + "github.com/CLIP-HPC/goslmailer/internal/connectors" + "github.com/CLIP-HPC/goslmailer/internal/spool" ) type conMon struct { diff --git a/cmd/gobler/conmon_test.go b/cmd/gobler/conmon_test.go index 0f3c4d8..c6a6ac7 100644 --- a/cmd/gobler/conmon_test.go +++ b/cmd/gobler/conmon_test.go @@ -8,8 +8,8 @@ import ( "sync" "testing" - "github.com/pja237/goslmailer/internal/config" - "github.com/pja237/goslmailer/internal/connectors" + "github.com/CLIP-HPC/goslmailer/internal/config" + "github.com/CLIP-HPC/goslmailer/internal/connectors" ) const con = "msteams" diff --git a/cmd/gobler/gobler.go b/cmd/gobler/gobler.go index f297cf0..e88d01f 100644 --- a/cmd/gobler/gobler.go +++ b/cmd/gobler/gobler.go @@ -5,12 +5,12 @@ import ( "os" "sync" - "github.com/pja237/goslmailer/internal/cmdline" - "github.com/pja237/goslmailer/internal/config" - "github.com/pja237/goslmailer/internal/connectors" - "github.com/pja237/goslmailer/internal/logger" - "github.com/pja237/goslmailer/internal/message" - "github.com/pja237/goslmailer/internal/version" + "github.com/CLIP-HPC/goslmailer/internal/cmdline" + "github.com/CLIP-HPC/goslmailer/internal/config" + "github.com/CLIP-HPC/goslmailer/internal/connectors" + "github.com/CLIP-HPC/goslmailer/internal/logger" + "github.com/CLIP-HPC/goslmailer/internal/message" + "github.com/CLIP-HPC/goslmailer/internal/version" ) var lock sync.Mutex diff --git a/cmd/gobler/monitor.go b/cmd/gobler/monitor.go index 370572a..e5448c4 100644 --- a/cmd/gobler/monitor.go +++ b/cmd/gobler/monitor.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/pja237/goslmailer/internal/spool" + "github.com/CLIP-HPC/goslmailer/internal/spool" ) type monitor struct { diff --git a/cmd/gobler/picker.go b/cmd/gobler/picker.go index 8f795d7..fcbcd79 100644 --- a/cmd/gobler/picker.go +++ b/cmd/gobler/picker.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/pja237/goslmailer/internal/spool" + "github.com/CLIP-HPC/goslmailer/internal/spool" ) // picker holds connector name string, msgcount map with {username:SpooledGobsCount} and pickerT polling period diff --git a/cmd/gobler/sender.go b/cmd/gobler/sender.go index 5225a9f..24cf4bb 100644 --- a/cmd/gobler/sender.go +++ b/cmd/gobler/sender.go @@ -5,8 +5,8 @@ import ( "os" "sync" - "github.com/pja237/goslmailer/internal/connectors" - "github.com/pja237/goslmailer/internal/spool" + "github.com/CLIP-HPC/goslmailer/internal/connectors" + "github.com/CLIP-HPC/goslmailer/internal/spool" ) type sender struct { diff --git a/cmd/goslmailer/goslmailer.go b/cmd/goslmailer/goslmailer.go index c7cf70c..5a51fd0 100644 --- a/cmd/goslmailer/goslmailer.go +++ b/cmd/goslmailer/goslmailer.go @@ -6,11 +6,11 @@ import ( "log" "os" - "github.com/pja237/goslmailer/internal/config" - "github.com/pja237/goslmailer/internal/connectors" - "github.com/pja237/goslmailer/internal/message" - "github.com/pja237/goslmailer/internal/slurmjob" - "github.com/pja237/goslmailer/internal/version" + "github.com/CLIP-HPC/goslmailer/internal/config" + "github.com/CLIP-HPC/goslmailer/internal/connectors" + "github.com/CLIP-HPC/goslmailer/internal/message" + "github.com/CLIP-HPC/goslmailer/internal/slurmjob" + "github.com/CLIP-HPC/goslmailer/internal/version" ) func main() { diff --git a/cmd/tgslurmbot/tgslurmbot.go b/cmd/tgslurmbot/tgslurmbot.go index a55143c..457f168 100644 --- a/cmd/tgslurmbot/tgslurmbot.go +++ b/cmd/tgslurmbot/tgslurmbot.go @@ -6,10 +6,10 @@ import ( "os" "time" - "github.com/pja237/goslmailer/internal/cmdline" - "github.com/pja237/goslmailer/internal/config" - "github.com/pja237/goslmailer/internal/logger" - "github.com/pja237/goslmailer/internal/version" + "github.com/CLIP-HPC/goslmailer/internal/cmdline" + "github.com/CLIP-HPC/goslmailer/internal/config" + "github.com/CLIP-HPC/goslmailer/internal/logger" + "github.com/CLIP-HPC/goslmailer/internal/version" tele "gopkg.in/telebot.v3" ) diff --git a/connectors/mailto/mailto.go b/connectors/mailto/mailto.go index 7cb3609..a231291 100644 --- a/connectors/mailto/mailto.go +++ b/connectors/mailto/mailto.go @@ -8,8 +8,8 @@ import ( "regexp" "text/template" - "github.com/pja237/goslmailer/internal/message" - "github.com/pja237/goslmailer/internal/renderer" + "github.com/CLIP-HPC/goslmailer/internal/message" + "github.com/CLIP-HPC/goslmailer/internal/renderer" ) func NewConnector(conf map[string]string) (*Connector, error) { diff --git a/connectors/msteams/msteams.go b/connectors/msteams/msteams.go index 92bf0fb..bed967f 100644 --- a/connectors/msteams/msteams.go +++ b/connectors/msteams/msteams.go @@ -10,10 +10,10 @@ import ( "strconv" "time" - "github.com/pja237/goslmailer/internal/lookup" - "github.com/pja237/goslmailer/internal/message" - "github.com/pja237/goslmailer/internal/renderer" - "github.com/pja237/goslmailer/internal/spool" + "github.com/CLIP-HPC/goslmailer/internal/lookup" + "github.com/CLIP-HPC/goslmailer/internal/message" + "github.com/CLIP-HPC/goslmailer/internal/renderer" + "github.com/CLIP-HPC/goslmailer/internal/spool" ) func NewConnector(conf map[string]string) (*Connector, error) { diff --git a/connectors/telegram/telegram.go b/connectors/telegram/telegram.go index b8f4e30..75c75d4 100644 --- a/connectors/telegram/telegram.go +++ b/connectors/telegram/telegram.go @@ -9,10 +9,10 @@ import ( "strconv" "time" - "github.com/pja237/goslmailer/internal/lookup" - "github.com/pja237/goslmailer/internal/message" - "github.com/pja237/goslmailer/internal/renderer" - "github.com/pja237/goslmailer/internal/spool" + "github.com/CLIP-HPC/goslmailer/internal/lookup" + "github.com/CLIP-HPC/goslmailer/internal/message" + "github.com/CLIP-HPC/goslmailer/internal/renderer" + "github.com/CLIP-HPC/goslmailer/internal/spool" telebot "gopkg.in/telebot.v3" ) diff --git a/go.mod b/go.mod index 72433fd..24fc742 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/pja237/goslmailer +module github.com/CLIP-HPC/goslmailer go 1.17 diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 2a41292..fa103af 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/pja237/goslmailer/internal/config" + "github.com/CLIP-HPC/goslmailer/internal/config" ) const testDir = "../../test_data/config_test" diff --git a/internal/connectors/connectors.go b/internal/connectors/connectors.go index b87f95c..84ee39e 100644 --- a/internal/connectors/connectors.go +++ b/internal/connectors/connectors.go @@ -3,11 +3,11 @@ package connectors import ( "log" - "github.com/pja237/goslmailer/connectors/mailto" - "github.com/pja237/goslmailer/connectors/msteams" - "github.com/pja237/goslmailer/connectors/telegram" - "github.com/pja237/goslmailer/internal/config" - "github.com/pja237/goslmailer/internal/message" + "github.com/CLIP-HPC/goslmailer/connectors/mailto" + "github.com/CLIP-HPC/goslmailer/connectors/msteams" + "github.com/CLIP-HPC/goslmailer/connectors/telegram" + "github.com/CLIP-HPC/goslmailer/internal/config" + "github.com/CLIP-HPC/goslmailer/internal/message" ) type Connector interface { diff --git a/internal/connectors/connectors_test.go b/internal/connectors/connectors_test.go index 175374f..40bc121 100644 --- a/internal/connectors/connectors_test.go +++ b/internal/connectors/connectors_test.go @@ -5,8 +5,8 @@ import ( "log" "testing" - "github.com/pja237/goslmailer/internal/config" - "github.com/pja237/goslmailer/internal/connectors" + "github.com/CLIP-HPC/goslmailer/internal/config" + "github.com/CLIP-HPC/goslmailer/internal/connectors" ) var connectorsExpected = []string{"msteams", "mailto"} diff --git a/internal/message/message.go b/internal/message/message.go index f938cfa..b7fc3df 100644 --- a/internal/message/message.go +++ b/internal/message/message.go @@ -3,7 +3,7 @@ package message import ( "time" - "github.com/pja237/goslmailer/internal/slurmjob" + "github.com/CLIP-HPC/goslmailer/internal/slurmjob" ) // MessagePack is the central data structure that holds all the data about the message that is currently being processed. diff --git a/internal/renderer/renderer.go b/internal/renderer/renderer.go index e68b9b6..47e39e0 100644 --- a/internal/renderer/renderer.go +++ b/internal/renderer/renderer.go @@ -8,8 +8,8 @@ import ( texttemplate "text/template" "time" + "github.com/CLIP-HPC/goslmailer/internal/slurmjob" "github.com/dustin/go-humanize" - "github.com/pja237/goslmailer/internal/slurmjob" ) func RenderTemplate(tfile, format string, j *slurmjob.JobContext, userid string, buf *bytes.Buffer) error { diff --git a/internal/spool/spool.go b/internal/spool/spool.go index dea81d6..4b240ee 100644 --- a/internal/spool/spool.go +++ b/internal/spool/spool.go @@ -8,7 +8,7 @@ import ( "os" "strconv" - "github.com/pja237/goslmailer/internal/message" + "github.com/CLIP-HPC/goslmailer/internal/message" ) type spool struct {