Update packages (#16 )

Reviewed-on: #16 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
tsk-14: Update go (#15 )
2025-12-26 22:08:10 +00:00 · 2025-11-24 20:21:39 +00:00 · 2025-11-16 01:22:14 +00:00
14 changed files with 194 additions and 337 deletions
@@ -14,9 +14,9 @@ jobs:
    - uses: actions/checkout@v5

    - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v6
      with:
-        go-version: '1.25.3' # You can specify a specific version or 'stable'
+        go-version: '1.25.4' # You can specify a specific version or 'stable'

    - name: Build
      run: |
@@ -24,7 +24,7 @@ jobs:
        mkdir -p ~/.ssh
        echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender_models_deploy_key
        chmod 600 ~/.ssh/textsender_models_deploy_key
-        ssh-keyscan ${{ vars.MY_HOST }} >> ~/.ssh/known_hosts
+        ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
 
        eval $(ssh-agent -s)
        ssh-add -v ~/.ssh/textsender_models_deploy_key
@@ -1,36 +0,0 @@
-# This file is a template, and might need editing before it works on your project.
-# You can copy and paste this template into a new `.gitlab-ci.yml` file.
-# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword.
-#
-# To contribute improvements to CI/CD templates, please follow the Development guide at:
-# https://docs.gitlab.com/ee/development/cicd/templates.html
-# This specific template is located at:
-# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Go.gitlab-ci.yml
-
-image: golang:1.25.3
-
-stages:
-  - test
-  - build
-  # - deploy
-
-format:
-  stage: test
-  script:
-    - go fmt $(go list ./... | grep -v /vendor/)
-    - go vet $(go list ./... | grep -v /vendor/)
-    - go test -race $(go list ./... | grep -v /vendor/)
-
-compile:
-  stage: build
-  script:
-    - make build
-
-  artifacts:
-    paths:
-      - mybinaries
-
-# deploy:
-  # stage: deploy
-  # script: echo "Define your deployment script!"
-  # environment: production
@@ -6,16 +6,16 @@ GO_VERSION ?= $(shell go version | awk '{print $$3}')
 .PHONY: build
 build:
 	go build -ldflags="\
-		-X 'git.kundeng.us/phoenix/sender/version.Version=$(VERSION)' \
-		-X 'git.kundeng.us/phoenix/sender/version.BuildTime=$(BUILD_TIME)' \
-		-X 'git.kundeng.us/phoenix/sender/version.Commit=$(COMMIT)' \
-		-X 'git.kundeng.us/phoenix/sender/version.GoVersion=$(GO_VERSION)'" \
-		-o sender main.go
+		-X 'git.kundeng.us/phoenix/sender/internal/version.Version=$(VERSION)' \
+		-X 'git.kundeng.us/phoenix/sender/internal/version.BuildTime=$(BUILD_TIME)' \
+		-X 'git.kundeng.us/phoenix/sender/internal/version.Commit=$(COMMIT)' \
+		-X 'git.kundeng.us/phoenix/sender/internal/version.GoVersion=$(GO_VERSION)'" \
+		-o sender cmd/sender/main.go

 .PHONY: install
 install:
 	go install -ldflags="\
-		-X 'git.kundeng.us/phoenix/sender/version.Version=$(VERSION)' \
-		-X 'git.kundeng.us/phoenix/sender/version.BuildTime=$(BUILD_TIME)' \
-		-X 'git.kundeng.us/phoenix/sender/version.Commit=$(COMMIT)' \
-		-X 'git.kundeng.us/phoenix/sender/version.GoVersion=$(GO_VERSION)'"
+		-X 'git.kundeng.us/phoenix/sender/internal/version.Version=$(VERSION)' \
+		-X 'git.kundeng.us/phoenix/sender/internal/version.BuildTime=$(BUILD_TIME)' \
+		-X 'git.kundeng.us/phoenix/sender/internal/version.Commit=$(COMMIT)' \
+		-X 'git.kundeng.us/phoenix/sender/internal/version.GoVersion=$(GO_VERSION)'"
@@ -0,0 +1,62 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+
+	"git.kundeng.us/phoenix/sender/internal/config"
+	"git.kundeng.us/phoenix/sender/internal/messaging"
+	"git.kundeng.us/phoenix/sender/internal/util"
+	"git.kundeng.us/phoenix/sender/internal/version"
+)
+
+func main() {
+	myArgs := os.Args
+	argCount := len(myArgs)
+
+	if config.IsVersionFlagPresent() {
+		fmt.Println(config.App_Name)
+		fmt.Println(version.String())
+		return
+	} else if argCount < 4 {
+		log.Printf("Argument count: %v\n", argCount)
+		log.Fatal("Provide argument to config file and number file")
+	}
+
+	configPath, numberPath, messagePath := util.GetPaths(myArgs)
+
+	log.Printf("Config file path: %s\n", configPath)
+	log.Println("Numbers file path:", numberPath)
+	log.Println("Message path:", messagePath)
+
+	cfg, _ := config.ParseConfig(configPath)
+	cfg.PrintConfig()
+
+	numbers, err := util.ParseNumbers(numberPath)
+	if err != nil {
+		log.Println("Error:", err)
+		return
+	}
+
+	prepMessage, err := util.ParseMessage(messagePath)
+	if err != nil {
+		log.Println("Error:", err)
+		return
+	}
+
+	if len(numbers) == 0 || prepMessage.Content == "" {
+		if len(numbers) == 0 {
+			log.Println("No numbers to send")
+			os.Exit(-1)
+		} else {
+			log.Println("No message to send")
+			os.Exit(-1)
+		}
+	}
+
+	fmt.Println("")
+	log.Println("Message:", prepMessage.Content)
+
+	messaging.SendMessages(cfg, numbers, *prepMessage, 5)
+}
@@ -1,10 +1,10 @@
 module git.kundeng.us/phoenix/sender

-go 1.25.3
+go 1.25.4

 require (
-	git.kundeng.us/phoenix/swoosh v0.0.1-main-3a21426ae1-556
-	git.kundeng.us/phoenix/textsender-models v0.0.7-5-9bc1743bd9-556
+	git.kundeng.us/phoenix/swoosh v0.0.12
+	git.kundeng.us/phoenix/textsender-models v0.0.12
 )

 require (
@@ -12,5 +12,5 @@ require (
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/twilio/twilio-go v1.28.6 // indirect
+	github.com/twilio/twilio-go v1.28.8 // indirect
 )
@@ -1,7 +1,7 @@
-git.kundeng.us/phoenix/swoosh v0.0.1-main-3a21426ae1-556 h1:HkaufrT0yaZA0VYS/eItPb0MAErCfnzsIqFlZKaQPtw=
-git.kundeng.us/phoenix/swoosh v0.0.1-main-3a21426ae1-556/go.mod h1:P47q3zXiy5FVKrm6liOk9/gdn/bsJoAu27gnKiAaZos=
-git.kundeng.us/phoenix/textsender-models v0.0.7-5-9bc1743bd9-556 h1:/tIswN4wEFioG++uo25iBY1jPNdHjhH07l8Vh4qUDQo=
-git.kundeng.us/phoenix/textsender-models v0.0.7-5-9bc1743bd9-556/go.mod h1:lx5MCnOgGgsdpwzrfi9uph5xmkeb6H8AuexUNGss2no=
+git.kundeng.us/phoenix/swoosh v0.0.12 h1:OtGUYJzakpzJ0fF2BP/z+maCtEfG+avQUJiCY9LMix8=
+git.kundeng.us/phoenix/swoosh v0.0.12/go.mod h1:5J/URwiWcjksaPmczelvBEeLdwB1mACFuhUdtWTheDg=
+git.kundeng.us/phoenix/textsender-models v0.0.12 h1:ps9H3FS5LyCwQhAiIvg4vYyfLZZ64dex1y9ytb0o9C4=
+git.kundeng.us/phoenix/textsender-models v0.0.12/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -27,8 +27,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/twilio/twilio-go v1.28.6 h1:L/pikXkARmPOzF/gUMeZPP/Lu5mY/wA4XC7sRzS86W4=
-github.com/twilio/twilio-go v1.28.6/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
+github.com/twilio/twilio-go v1.28.8 h1:wbFz7Wt4S5mCEaes6FcM/ddcJGIhdjwp/9CHb9e+4fk=
+github.com/twilio/twilio-go v1.28.8/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -3,10 +3,10 @@ package config
 import (
 	"encoding/json"
 	"flag"
-	"fmt"
+	"log"
 	"os"

-	"git.kundeng.us/phoenix/textsender-models/pkg/config"
+	"git.kundeng.us/phoenix/textsender-models/tx0/config"
 )

 const (
@@ -24,22 +24,21 @@ func IsVersionFlagPresent() bool {
 	}
 }

-func ParseConfig(filepath string) (config config.TwiloConfig, success bool) {
+func ParseConfig(filepath string) (config config.TwilioConfig, success bool) {
 	content, err := os.ReadFile(filepath)

-	fmt.Println("Reading config file...")
-	fmt.Printf("%s\n", filepath)
+	log.Println("Reading config file...")
+	log.Println(filepath)

 	if err != nil {
-		fmt.Println("An error reading the file")
-
+		log.Println("An error reading the file")
 		return
 	}

 	err = json.Unmarshal(content, &config)

 	if err != nil {
-		fmt.Println("An error occurred")
+		log.Println("An error occurred")
 		return config, false
 	}

@@ -0,0 +1,46 @@
+package messaging
+
+import (
+	"encoding/json"
+	"log"
+	"time"
+
+	"git.kundeng.us/phoenix/swoosh/swoop/send"
+	cnfg "git.kundeng.us/phoenix/textsender-models/tx0/config"
+	"git.kundeng.us/phoenix/textsender-models/tx0/contact"
+	msg "git.kundeng.us/phoenix/textsender-models/tx0/message"
+)
+
+func SendMessages(config cnfg.TwilioConfig, numbers [](contact.Contact), message msg.Message, secondInterval int) {
+	log.Println("Sending message")
+
+	longSleepLimit := 5
+	count := 0
+
+	var snr send.MessageSender
+	snr.Config = &config
+
+	for _, number := range numbers {
+		numberToSend := number
+		log.Println("Sending to: " + numberToSend.PhoneNumber)
+
+		if resp, err := snr.Send(message, number, nil); err != nil {
+			log.Println("Error sending:", err)
+		} else {
+			if response, err := json.Marshal(*resp); err != nil {
+				log.Println("Error parsing:", err)
+			} else {
+				log.Println("Response:", string(response))
+			}
+		}
+
+		log.Println("Sleeping")
+		if count%longSleepLimit == 0 {
+			// sleep for X seconds
+			tme := 1 * time.Second
+			time.Sleep(tme)
+		} else {
+			time.Sleep(time.Second)
+		}
+	}
+}
@@ -0,0 +1,57 @@
+package util
+
+import (
+	"encoding/json"
+	"log"
+	"os"
+
+	"git.kundeng.us/phoenix/textsender-models/tx0/contact"
+	"git.kundeng.us/phoenix/textsender-models/tx0/message"
+)
+
+func GetPaths(args []string) (configPath string, numberPath string, messagePath string) {
+	configPath = args[1]
+	numberPath = args[2]
+	messagePath = args[3]
+
+	return
+}
+
+func ParseNumbers(filepath string) (numbers [](contact.Contact), err error) {
+	var nmbrs []contact.Contact
+
+	content, err := os.ReadFile(filepath)
+
+	if err != nil {
+		log.Println("An error occurred")
+		return numbers, err
+	} else {
+		if err = json.Unmarshal(content, &nmbrs); err != nil {
+			log.Println("An error occurred:", err)
+			return numbers, err
+		} else {
+			return nmbrs, nil
+		}
+	}
+
+}
+
+func ParseMessage(filepath string) (*message.Message, error) {
+	var msg message.Message
+
+	content, err := os.ReadFile(filepath)
+
+	if err != nil {
+		log.Println("An error occurred")
+		return nil, err
+	}
+
+	err = json.Unmarshal(content, &msg)
+
+	if err != nil {
+		log.Println("An error occurred")
+		return nil, err
+	}
+
+	return &msg, nil
+}
@@ -1,76 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/contact"
-	"git.kundeng.us/phoenix/textsender-models/pkg/message"
-
-	"git.kundeng.us/phoenix/sender/config"
-	"git.kundeng.us/phoenix/sender/messaging"
-	"git.kundeng.us/phoenix/sender/util"
-	"git.kundeng.us/phoenix/sender/version"
-)
-
-func main() {
-	myArgs := os.Args
-	argCount := len(myArgs)
-
-	if config.IsVersionFlagPresent() {
-		fmt.Println(config.App_Name)
-		fmt.Println(version.String())
-		return
-	} else if argCount < 4 {
-		fmt.Printf("Argument count: %v\n", argCount)
-		fmt.Println("Provide argument to config file and number file")
-		os.Exit(-1)
-	}
-
-	configPath, numberPath, messagePath := util.GetPaths(myArgs)
-
-	fmt.Printf("Config file path: %s\n", configPath)
-	fmt.Println("Numbers file path:", numberPath)
-	fmt.Println("Message path:", messagePath)
-
-	cfg, _ := config.ParseConfig(configPath)
-	cfg.PrintConfig()
-
-	numbers := util.ParseNumbers(numberPath)
-	prepMessage := util.ParseMessage(messagePath)
-
-	if len(numbers) == 0 || prepMessage.IsEmpty() {
-		if len(numbers) == 0 {
-			fmt.Println("No numbers to send")
-			os.Exit(-1)
-		} else {
-			fmt.Println("No message to send")
-			os.Exit(-1)
-		}
-	}
-
-	fmt.Println("")
-	prepMessage.Print()
-
-	convertedContacts, err := util.Convert(numbers, 1)
-	if err != nil {
-		fmt.Println("Error converting numbers: Error:", err)
-		os.Exit(-1)
-	}
-
-	convertedMessage, err := util.Convert(prepMessage, 0)
-	if err != nil {
-		fmt.Println("Error converting message")
-		os.Exit(-1)
-	}
-
-	if contacts, ok := convertedContacts.([]contact.Contact); ok {
-		if msg, ok := convertedMessage.(message.Message); ok {
-			messaging.SendMessages(cfg, contacts, msg, 5)
-		} else {
-			fmt.Println("Could not convert message")
-		}
-	} else {
-		fmt.Println("Could not convert numbers")
-	}
-}
@@ -1,45 +0,0 @@
-package messaging
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"git.kundeng.us/phoenix/swoosh/swoop/send"
-	cnfg "git.kundeng.us/phoenix/textsender-models/pkg/config"
-	"git.kundeng.us/phoenix/textsender-models/pkg/contact"
-	msg "git.kundeng.us/phoenix/textsender-models/pkg/message"
-)
-
-func SendMessages(config cnfg.TwiloConfig, numbers [](contact.Contact), message msg.Message, secondInterval int) {
-	fmt.Println("Sending message")
-
-	longSleepLimit := 5
-	count := 0
-
-	var snr send.MessageSender
-	snr.Config = config
-
-	for _, number := range numbers {
-		numberToSend := number
-		fmt.Println("Sending to: " + numberToSend.PhoneNumber)
-
-		if resp, err := snr.Send(message, number, nil); err != nil {
-			fmt.Println("Error sending:", err)
-		} else {
-			if response, err := json.Marshal(*resp); err != nil {
-				fmt.Println("Error parsing:", err)
-			} else {
-				fmt.Println("Response:", string(response))
-			}
-		}
-
-		if count%longSleepLimit == 0 {
-			// sleep for X seconds
-			tme := 1 * time.Second
-			time.Sleep(tme)
-		} else {
-			time.Sleep(time.Second)
-		}
-	}
-}
@@ -1,45 +0,0 @@
-package models
-
-import (
-	"fmt"
-
-	cnfg "git.kundeng.us/phoenix/textsender-models/pkg/config"
-)
-
-type Number struct {
-	PhoneNumber string `json:"number"`
-}
-
-func (nbr Number) IsEmpty() bool {
-	if nbr.PhoneNumber == "" {
-		return true
-	} else {
-		return false
-	}
-}
-
-func PrintNumbers(numbers [](Number)) {
-	for _, element := range numbers {
-		fmt.Println("Phone number:", element.PhoneNumber)
-	}
-}
-
-type Message struct {
-	Text string `json:"text"`
-}
-
-func (msg Message) IsEmpty() bool {
-	if msg.Text == "" {
-		return true
-	} else {
-		return false
-	}
-}
-
-func (msg Message) Print() {
-	fmt.Println("Message:", msg.Text)
-}
-
-func Init() cnfg.TwiloConfig {
-	return cnfg.TwiloConfig{}
-}
@@ -1,105 +0,0 @@
-package util
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"strings"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/contact"
-	"git.kundeng.us/phoenix/textsender-models/pkg/message"
-
-	"git.kundeng.us/phoenix/sender/models"
-)
-
-func GetPaths(args []string) (configPath string, numberPath string, messagePath string) {
-	configPath = args[1]
-	numberPath = args[2]
-	messagePath = args[3]
-
-	return
-}
-
-func ParseNumbers(filepath string) (numbers [](models.Number)) {
-	nmbrs := [](string){}
-
-	content, err := os.ReadFile(filepath)
-
-	if err != nil {
-		fmt.Println("An error occurred")
-		return numbers
-	}
-
-	err = json.Unmarshal(content, &nmbrs)
-
-	if err != nil {
-		fmt.Println("An error occurred")
-		return numbers
-	}
-
-	for _, nbr := range nmbrs {
-		var number models.Number
-		number.PhoneNumber = nbr
-		numbers = append(numbers, number)
-	}
-
-	return numbers
-}
-
-func ParseMessage(filepath string) (message models.Message) {
-	msg := [](string){""}
-
-	content, err := os.ReadFile(filepath)
-
-	if err != nil {
-		fmt.Println("An error occurred")
-		return
-	}
-
-	err = json.Unmarshal(content, &msg)
-
-	if err != nil {
-		fmt.Println("An error occurred")
-		return
-	}
-
-	message.Text = strings.Join(msg, "")
-
-	return
-}
-
-func Convert(data interface{}, msgOrNumber int) (interface{}, error) {
-	switch msgOrNumber {
-	case 0:
-		{
-			if msg, ok := data.(models.Message); ok {
-				return message.Message{Content: msg.Text}, nil
-			} else {
-				return nil, fmt.Errorf("Could not resolve value")
-			}
-		}
-	case 1:
-		{
-			var items []contact.Contact
-
-			switch nbrs := data.(type) {
-			case []models.Number:
-				for _, number := range nbrs {
-					if !number.IsEmpty() {
-						items = append(items, contact.Contact{PhoneNumber: number.PhoneNumber})
-					}
-				}
-			default:
-				return nil, fmt.Errorf("Unrecognized type")
-			}
-
-			if len(items) == 0 {
-				return nil, fmt.Errorf("Failure converting")
-			} else {
-				return items, nil
-			}
-		}
-	default:
-		return nil, fmt.Errorf("Invalid msgOrNumber")
-	}
-}