.changes/unreleased/Added-20250313-232320.yaml

@@ -1,3 +0,0 @@
-kind: Added
-body: 'Notifications: http service added'
-time: 2025-03-13T23:23:20.130625927-05:00

.changes/unreleased/Changed-20250313-224840.yaml

@@ -1,3 +0,0 @@
-kind: Changed
-body: 'vault: initialize vault before validating config'
-time: 2025-03-13T22:48:40.584581357-05:00

pkg/backy/config.go

@@ -125,10 +125,6 @@ func (opts *ConfigOpts) ReadConfig() *ConfigOpts {
 
 	log.Info().Str("config file", opts.ConfigFilePath).Send()
 
-	if err := opts.setupVault(); err != nil {
-		log.Err(err).Send()
-	}
-
 	unmarshalConfig(backyKoanf, "commands", &opts.Cmds, opts.Logger)
 
 	getCommandEnvironments(opts)
@@ -157,6 +153,10 @@ func (opts *ConfigOpts) ReadConfig() *ConfigOpts {
 
 	opts.SetupNotify()
 
+	if err := opts.setupVault(); err != nil {
+		log.Err(err).Send()
+	}
+
 	return opts
 }
 

pkg/backy/notification.go

@@ -5,6 +5,7 @@ package backy
 
 import (
 	"fmt"
+	stdHttp "net/http"
 	"strings"
 
 	"git.andrewnw.xyz/CyberShell/backy/pkg/logging"
@@ -32,8 +33,7 @@ type MailConfig struct {
 }
 
 type HttpConfig struct {
-	URL     string              `yaml:"url"`
+	Url     string              `yaml:"url"`
-	Method  string              `yaml:"method"`
 	Headers map[string][]string `yaml:"headers"`
 }
 
@@ -66,7 +66,6 @@ func (opts *ConfigOpts) SetupNotify() {
 					continue
 				}
 				conf.Password = getExternalConfigDirectiveValue(conf.Password, opts)
-				opts.Logger.Debug().Str("list", confName).Str("id", confId).Msg("adding mail notification service")
 				mailConf := setupMail(conf)
 				services = append(services, mailConf)
 			case "matrix":
@@ -76,7 +75,6 @@ func (opts *ConfigOpts) SetupNotify() {
 					continue
 				}
 				conf.AccessToken = getExternalConfigDirectiveValue(conf.AccessToken, opts)
-				opts.Logger.Debug().Str("list", confName).Str("id", confId).Msg("adding matrix notification service")
 				mtrxConf, mtrxErr := setupMatrix(conf)
 				if mtrxErr != nil {
 					opts.Logger.Info().Str("list", confName).Err(fmt.Errorf("error: configuring matrix id %s failed during setup: %w", id, mtrxErr))
@@ -89,9 +87,9 @@ func (opts *ConfigOpts) SetupNotify() {
 					opts.Logger.Info().Err(fmt.Errorf("error: ID %s not found in http object", confId)).Str("list", confName).Send()
 					continue
 				}
-				opts.Logger.Debug().Str("list", confName).Str("id", confId).Msg("adding http notification service")
 				httpConf := setupHttp(conf)
 				services = append(services, httpConf)
+
 			default:
 				opts.Logger.Info().Err(fmt.Errorf("id %s not found", id)).Str("list", confName).Send()
 			}
@@ -121,13 +119,14 @@ func setupMail(config MailConfig) *mail.Mail {
 func setupHttp(httpConf HttpConfig) *http.Service {
 
 	httpService := http.New()
+	// httpService.AddReceiversURLs(httpConf.Url)
 	httpService.AddReceivers(&http.Webhook{
-		URL:         httpConf.URL,
+		URL:         httpConf.Url,
 		Header:      httpConf.Headers,
 		ContentType: "text/plain",
-		Method:      httpConf.Method,
+		Method:      stdHttp.MethodPost,
 		BuildPayload: func(subject, message string) (payload any) {
-			return subject + "\n\n" + message
+			return "[text/plain]: " + subject + " - " + message
 		},
 	})
 

pkg/backy/utils.go

@@ -393,6 +393,7 @@ func getExternalConfigDirectiveValue(key string, opts *ConfigOpts) string {
 		key = strings.TrimSuffix(key, externDirectiveEnd)
 		key = GetVaultKey(key, opts, opts.Logger)
 	}
+	println(key)
 
 	return key
 }
@@ -417,6 +418,7 @@ func getVaultSecret(vaultClient *vault.Client, key *VaultKey) (string, error) {
 	}
 
 	value, ok := secret.Data[key.Key].(string)
+	println(value)
 	if !ok {
 		return "", fmt.Errorf("value type assertion failed for vault key %s: %T %#v", key.Name, secret.Data[key.Name], secret.Data[key.Name])
 	}