Skip to content

Commit

Permalink
Merge pull request #2 from CLIP-HPC/go_module_path_migration
Browse files Browse the repository at this point in the history
change go module path to CLIP-HPC
  • Loading branch information
pja237 authored May 18, 2022
2 parents befab4b + 1bad75f commit 4a92f00
Show file tree
Hide file tree
Showing 21 changed files with 49 additions and 50 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/*)
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)

---

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.1.1
v2.1.4
4 changes: 2 additions & 2 deletions cmd/gobler/conmon.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions cmd/gobler/conmon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions cmd/gobler/gobler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/gobler/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync"
"time"

"github.com/pja237/goslmailer/internal/spool"
"github.com/CLIP-HPC/goslmailer/internal/spool"
)

type monitor struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/gobler/picker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmd/gobler/sender.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions cmd/goslmailer/goslmailer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions cmd/tgslurmbot/tgslurmbot.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions connectors/mailto/mailto.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions connectors/msteams/msteams.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions connectors/telegram/telegram.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/pja237/goslmailer
module github.com/CLIP-HPC/goslmailer

go 1.17

Expand Down
2 changes: 1 addition & 1 deletion internal/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions internal/connectors/connectors.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions internal/connectors/connectors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion internal/message/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/renderer/renderer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/spool/spool.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"strconv"

"github.com/pja237/goslmailer/internal/message"
"github.com/CLIP-HPC/goslmailer/internal/message"
)

type spool struct {
Expand Down

0 comments on commit 4a92f00

Please sign in to comment.