Update CHANGELOG.md

This reverts commit b7d1be495e.

.changes/0.2.4.md

@@ -0,0 +1,9 @@
+## 0.2.4 - 2023-02-18
+### Added
+* Notifications now display errors and the output of the failed command.
+* CI configs for GitHub and Woodpecker
+* Added `version` subcommand
+### Changed
+* Console logging can be disabled by setting `console-disabled` in the `logging` object
+## Fixed
+* If Host was not defined for an incomplete `hosts` object, any commands would fail as they could not look up the values in the SSH config files.

.changes/header.tpl.md

@@ -0,0 +1,6 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).

.changes/v0.3.0.md

@@ -0,0 +1,8 @@
+## v0.3.0 - 2023-01-07
+### Added
+* Getting environment variables and passwords from Vault (not tested yet)
+* Vault configuration to config (not tested yet)
+* Ability to run scripts from file on local machine on the remote host
+* Ability to get ouput in the notification of a list for individual commands or all commands
+### Changed
+* Make SSH connections close after all commands have been run; reuse previous connections if needed

.changes/v0.3.1.md

@@ -0,0 +1,3 @@
+## v0.3.1 - 2023-07-20
+### Changed
+* If an SSH session failed to be created, the command would fail. This would be caused when restarting the SSH host. The SSH connection is attempted to be created again. If successful, the command is executed normally.

.changes/v0.4.0.md

@@ -0,0 +1,13 @@
+## v0.4.0 - 2023-09-08
+
+### Added
+
+* Added `scriptEnvFile` to command object that allows one to specify an environment file (or any file really) when a `scriptFile` is run. Inspired by the practice of keeping environment variables and scripts or commands seperate.
+* Basis for listing commands
+
+### Changed
+
+* BREAKING: Notifications object now takes the form of service.id, where service can be "mail" or "matrix" and id is a unique id for the service.
+* BREAKING: Since the change to the notifications object, cmd-lists' inner map key 'notifications' must be of the form service.id. id must be defined for that service. See notifications docs for aviliable services.
+* Config parser is now the simpler Koanf - Keys are now case-sensitive
+* Log size limited to 50 Mb

.changes/v0.5.0.md

@@ -0,0 +1,9 @@
+## v0.5.0 - 2024-11-19
+### Added
+* Lists can now go in a file. See docs for more information.
+* commands.[name].type: script now opens `scriptEnvFile`.
+* Hooks for Commands.[name]. Error, success, and final. [#12]
+### Changed
+* GetKnownHosts is now a method of Host
+### Fixed
+* make command logger be used for errors, not just when running the command

.changes/v0.6.0.md

@@ -0,0 +1,4 @@
+## v0.6.0 - 2025-01-04
+### Added
+* Command Type Package - allows one to perform package operations [docs](https://backy.cybershell.xyz/config/packages/)
+* Exec subcommand `host` allows for parallel execution of commands on hosts. [See docs](https://backy.cybershell.xyz/cli/exec)

.changes/v0.6.1.md

@@ -0,0 +1,3 @@
+## v0.6.1 - 2025-01-04
+### Fixed
+* Hooks now run explicitly after the command executes. Fixed panic due to improper logic.

.changie.yaml

@@ -0,0 +1,26 @@
+changesDir: .changes
+unreleasedDir: unreleased
+headerPath: header.tpl.md
+changelogPath: CHANGELOG.md
+versionExt: md
+versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
+kindFormat: '### {{.Kind}}'
+changeFormat: '* {{.Body}}'
+kinds:
+- label: Added
+  auto: minor
+- label: Changed
+  auto: major
+- label: Deprecated
+  auto: minor
+- label: Removed
+  auto: major
+- label: Fixed
+  auto: patch
+- label: Security
+  auto: patch
+newlines:
+  afterChangelogHeader: 1
+  beforeChangelogVersion: 1
+  endOfVersion: 1
+envPrefix: CHANGIE_

.frontmatter/database/mediaDb.json

@@ -0,0 +1 @@
+{}

.frontmatter/database/taxonomyDb.json

@@ -0,0 +1 @@
+{}

.github/workflows/release.yml

@@ -0,0 +1,40 @@
+name: goreleaser
+
+on:
+  push:
+    # run only against tags
+    tags:
+      - '*'
+
+permissions:
+  contents: write
+  packages: write
+  # issues: write
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - run: git fetch --force --tags
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
+          cache: true
+      # More assembly might be required: Docker logins, GPG, etc. It all depends
+      # on your needs.
+      - name: Get tag
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+        with:
+          # Optionally strip `v` prefix
+          strip_v: false
+      - uses: goreleaser/goreleaser-action@v4
+        with:
+          distribution: goreleaser
+          version: latest
+          args: release --release-notes=".changes/${{steps.tag.outputs.tag}}.md" -f .goreleaser/github.yml --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GORELEASER_TOKEN }}

.gitignore

@@ -1,2 +1,4 @@
 
 dist/
+
+.codegpt

.gitmodules

@@ -0,0 +1,7 @@
+[submodule "docs/themes/hugo-theme-relearn"]
+	path = docs/themes/hugo-theme-relearn
+	url = https://github.com/McShelby/hugo-theme-relearn.git
+
+[submodule "docs/themes/plausible-hugo"]
+	path = docs/themes/plausible-hugo
+	url = https://github.com/divinerites/plausible-hugo.git

.goreleaser/gitea.yml

@@ -0,0 +1,44 @@
+version: 2
+before:
+  hooks:
+    # You may remove this if you don't use go modules.
+    - go mod tidy
+builds:
+  - env:
+      - CGO_ENABLED=0
+      - GOPROXY=https://goproxy.io
+    goos:
+      - freebsd
+      - linux
+    goarch:
+      - "386"
+      - amd64
+      - arm64
+
+archives:
+  - format: tar.gz
+    # this name template makes the OS and Arch compatible with the results of uname.
+    name_template: >-
+      {{ .ProjectName }}_{{ .Version }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    # use zip for windows archives
+    format_overrides:
+    - goos: windows
+      format: zip
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  version_template: "{{ incpatch .Version }}-next"
+changelog:
+  disable: false
+
+gitea_urls:
+  api: https://git.andrewnw.xyz/api/v1
+  download: https://git.andrewnw.xyz
+# The lines beneath this are called `modelines`. See `:help modeline`
+# Feel free to remove those if you don't want/use them.
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json

.goreleaser/github.yml

@@ -0,0 +1,42 @@
+# This is an example .goreleaser.yml file with some sensible defaults.
+# Make sure to check the documentation at https://goreleaser.com
+version: 2
+before:
+  hooks:
+    # You may remove this if you don't use go modules.
+    - go mod tidy
+builds:
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - freebsd
+      - linux
+    goarch:
+      - "386"
+      - amd64
+      - arm64
+
+archives:
+  - format: tar.gz
+    # this name template makes the OS and Arch compatible with the results of uname.
+    name_template: >-
+      {{ .ProjectName }}_{{ .Version }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    # use zip for windows archives
+    format_overrides:
+    - goos: windows
+      format: zip
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  version_template: "{{ incpatch .Version }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'

.goreleaser/vern.yml

@@ -1,5 +1,3 @@
-# This is an example .goreleaser.yml file with some sensible defaults.
-# Make sure to check the documentation at https://goreleaser.com
 before:
   hooks:
     # You may remove this if you don't use go modules.
@@ -8,13 +6,18 @@ builds:
   - env:
       - CGO_ENABLED=0
     goos:
+      - freebsd
       - linux
+    goarch:
+      - "386"
+      - amd64
+      - arm64
 
 archives:
-  - format: tar.gz
+  - format: binary
     # this name template makes the OS and Arch compatible with the results of uname.
     name_template: >-
-      {{ .ProjectName }}
+      {{ .ProjectName }}_{{ .Version }}_
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
@@ -36,8 +39,8 @@ changelog:
       - '^test:'
 
 gitea_urls:
-  api: https://git.andrewnw.xyz/api/v1
-  download: https://git.andrewnw.xyz
+  api: https://git.vern.cc/api/v1
+  download: https://git.vern.cc
 # The lines beneath this are called `modelines`. See `:help modeline`
 # Feel free to remove those if you don't want/use them.
 # yaml-language-server: $schema=https://goreleaser.com/static/schema.json

.vscode/settings.json

@@ -1,5 +1,12 @@
 {
     "cSpell.words": [
-        "Cmds"
+        "Cmds",
+        "knadh",
+        "koanf",
+        "mattn",
+        "maunium",
+        "mautrix",
+        "nikoksr",
+        "Strs"
     ]
 }

.woodpecker/gitea.yml

@@ -0,0 +1,12 @@
+steps:
+  release:
+    image: goreleaser/goreleaser
+    commands:
+      - goreleaser release -f .goreleaser/gitea.yml --release-notes=".changes/$(go run backy.go version -V).md"
+    secrets: [ gitea_token ]
+    when:
+      event: tag
+
+when:
+  - event: tag
+    branch: master

.woodpecker/go-lint.yml

@@ -0,0 +1,14 @@
+steps:
+  build:
+    image: golang
+    commands:
+      - go build
+      - go test
+  release:
+    image: golangci/golangci-lint:v1.53.3
+    commands:
+      - golangci-lint run -v --timeout 5m
+
+when:
+  - event: push
+    branch: develop

.woodpecker/publish-docs.yml

@@ -0,0 +1,29 @@
+steps:
+  build:
+    image: hugomods/hugo:ci
+    commands:
+      - git submodule foreach 'git fetch origin; git checkout $(git describe --tags `git rev-list --tags --max-count=1`);'
+      - cd docs
+      - hugo mod get -u github.com/divinerites/plausible-hugo
+      - hugo mod get -u github.com/McShelby/hugo-theme-relearn@7.3.1
+      - hugo
+
+  deploy:
+    image: codingkoopa/git-rsync-openssh
+    commands:
+      - cd docs
+      - echo "nameserver 1.1.1.1" > /etc/resolv.conf
+      - mkdir ~/.ssh && chmod -R 700 ~/.ssh
+      # - apt update -y && apt install openssh-client rsync -y
+      - echo "$SSH_HOST_KEY" > ~/.ssh/known_hosts
+      - echo -e '#!/bin/sh\necho "$SSH_PASSPHRASE"' | tr -d '\r' > ~/.ssh/.print_ssh_password
+      # - cat ~/.ssh/.print_ssh_password
+      - chmod 700 ~/.ssh/.print_ssh_password
+      - eval $(ssh-agent -s)
+      - echo "$SSH_DEPLOY_KEY" | tr -d '\r' | DISPLAY=":0.0" SSH_ASKPASS=~/.ssh/.print_ssh_password setsid ssh-add -
+      - rsync -atv --delete --progress public/ backy@backy.cybershell.xyz:docs
+      - rsync -atv --delete --progress vangen/ backy@backy.cybershell.xyz:vangen-go
+    secrets: [ ssh_host_key, ssh_deploy_key, ssh_passphrase ]
+
+when:
+  - branch: master

CHANGELOG.md

@@ -0,0 +1,63 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).
+
+
+## v0.6.1 - 2025-01-04
+### Fixed
+* When running a list, hooks now run explicitly after the command executes. Fixed panic due to improper logic.
+
+## v0.6.0 - 2025-01-04
+### Added
+* Command Type Package - allows one to perform package operations [docs](https://backy.cybershell.xyz/config/packages/)
+* Exec subcommand `host` allows for parallel execution of commands on hosts. [See docs](https://backy.cybershell.xyz/cli/exec)
+
+## v0.5.0 - 2024-11-19
+### Added
+* Lists can now go in a file. See docs for more information.
+* commands.[name].type: script now opens `scriptEnvFile`.
+* Hooks for Commands.[name]. Error, success, and final. [#12]
+### Changed
+* GetKnownHosts is now a method of Host
+### Fixed
+* make command logger be used for errors, not just when running the command
+
+## v0.4.0 - 2023-09-08
+
+### Added
+
+* Added `scriptEnvFile` to command object that allows one to specify an environment file (or any file really) when a `scriptFile` is run. Inspired by the practice of keeping environment variables and scripts or commands seperate.
+* Basis for listing commands
+
+### Changed
+
+* BREAKING: Notifications object now takes the form of service.id, where service can be "mail" or "matrix" and id is a unique id for the service.
+* BREAKING: Since the change to the notifications object, cmd-lists' inner map key 'notifications' must be of the form service.id. id must be defined for that service. See notifications docs for aviliable services.
+* Config parser is now the simpler Koanf - Keys are now case-sensitive
+* Log size limited to 50 Mb
+
+## v0.3.1 - 2023-07-20
+### Changed
+* If an SSH session failed to be created, the command would fail. This would be caused when restarting the SSH host. The SSH connection is attempted to be created again. If successful, the command is executed normally.
+
+## v0.3.0 - 2023-01-07
+### Added
+* Getting environment variables and passwords from Vault (not tested yet)
+* Vault configuration to config (not tested yet)
+* Ability to run scripts from file on local machine on the remote host
+* Ability to get ouput in the notification of a list for individual commands or all commands
+### Changed
+* Make SSH connections close after all commands have been run; reuse previous connections if needed
+
+## 0.2.4 - 2023-02-18
+### Added
+* Notifications now display errors and the output of the failed command.
+* CI configs for GitHub and Woodpecker
+* Added `version` subcommand
+### Changed
+* Console logging can be disabled by setting `console-disabled` in the `logging` object
+## Fixed
+* If Host was not defined for an incomplete `hosts` object, any commands would fail as they could not look up the values in the SSH config files.

Makefile

@@ -1,5 +0,0 @@
-build:
-	go build
-
-gorealeaser-build:
-	goreleaser release --snapshot --rm-dist

PLAN.md

@@ -1,3 +0,0 @@
-# Plan
-
-Find auth method, possibly using another package

README.md

@@ -1,112 +1,22 @@
+
 # Backy - an application to manage backups
 
-This app is in development, and is currently not stable. Expect core functionality to possiblly break.
+See the [install documentation](https://backy.cybershell.xyz/getting-started/install/index.html)
 
-## Installing
+## Security
 
-To install:
-
-`go install git.andrewnw.xyz/CyberShell/backy@master`
-
-This assumes you already have a working Go environment, if not please see [this page](https://golang.org/doc/install) first.
-
-You can also download binaries [here](https://git.andrewnw.xyz/CyberShell/backy/releases) and [here](https://github.com/CybersShell/backy/releases).
+The latest version is currently the only supported version.
 
 ## Features
 
-- Define lists of commands and run them
+- Allows easy configuration of executable commands
 
-- Execute commands over SSH
+- Allows for commands to be run on many hosts over SSH
 
-- More to come.
+- Commands can be grouped in list to run in specific order
 
-To run a config:
+- Notifications on completion and failure
 
-`backy backup`
+- Run in cron mode
 
-Or to use a specific file:
-```backy backup -f /path/to/file```
-
-If you leave the config path blank, the following paths will be searched in order:
-
-- `./backy.yaml`
-- `~/.config/backy.yaml`
-
-Create a file at `~/.config/backy.yaml`:
-
-```yaml
-commands:
-  stop-docker-container:
-    cmd: docker
-    Args:
-      - compose
-      - -f /some/path/to/docker-compose.yaml
-      - down
-    # if host is not defined, cmd will be run locally
-    host: some-host 
-  backup-docker-container-script:
-    cmd: /path/to/script
-    # The host has to be defined in the config file
-    host: some-host
-  shell-cmd:
-    cmd: rsync
-    shell: bash
-    Args:
-      - -av some-host:/path/to/data ~/Docker/Backups/docker-data
-  hostname:
-    cmd: hostname
-
-cmd-configs:
-  cmds-to-run: # this can be any name you want
-    # all commands have to be defined
-    order:
-      - stop-docker-container
-      - backup-docker-container-script
-      - shell-cmd
-      - hostname
-    notifications:
-      - matrix
-    name: backup-some-server
-  hostname:
-    name: hostname
-    order:
-      - hostname
-    notifications:
-      - prod-email
-
-hosts:
-  some-host:
-    hostname: some-hostname
-    config: ~/.ssh/config
-    user: user
-    privatekeypath: /path/to/private/key
-    port: 22
-    password: 
-
-
-logging:
-  verbose: true
-  file: /path/to/logs/commands.log
-  console: false
-  cmd-std-out: false
-
-
-notifications:
-  prod-email:
-    id: prod-email
-    type: mail
-    host: yourhost.tld:port
-    senderAddress: email@domain.tld
-    to:
-      - admin@domain.tld
-    username: smtp-username@domain.tld
-    password: your-password-here
-  matrix:
-    id: matrix
-    type: matrix
-    home-server: your-home-server.tld
-    room-id: room-id
-    access-token: your-access-token
-    user-id: your-user-id
-
-```
+- For any command, especially backup commands

cmd/.gitignore

@@ -1 +1,2 @@
-*.yaml
+*.yaml
+*.yml

cmd/backup.go

@@ -12,11 +12,10 @@ import (
 
 var (
 	backupCmd = &cobra.Command{
-		Use:   "backup [--lists==list1,list2]",
+		Use:   "backup [--lists=list1,list2,... | -l list1, list2,...]",
 		Short: "Runs commands defined in config file.",
-		Long: `Backup executes commands defined in config file.
-		Use the --lists flag to execute the specified commands.`,
-		Run: Backup,
+		Long:  "Backup executes commands defined in config file.\nUse the --lists or -l flag to execute the specified lists. If not flag is not given, all lists will be executed.",
+		Run:   Backup,
 	}
 )
 
@@ -25,13 +24,20 @@ var cmdLists []string
 
 func init() {
 
-	backupCmd.Flags().StringSliceVarP(&cmdLists, "lists", "l", nil, "Accepts a comma-separated names of command lists to execute.")
+	backupCmd.Flags().StringSliceVarP(&cmdLists, "lists", "l", nil, "Accepts comma-separated names of command lists to execute.")
 
 }
 
 func Backup(cmd *cobra.Command, args []string) {
 	backyConfOpts := backy.NewOpts(cfgFile, backy.AddCommandLists(cmdLists))
 	backyConfOpts.InitConfig()
-	config := backy.ReadConfig(backyConfOpts)
-	config.RunBackyConfig("")
+
+	backy.ReadConfig(backyConfOpts)
+
+	backyConfOpts.RunListConfig("")
+	for _, host := range backyConfOpts.Hosts {
+		if host.SshClient != nil {
+			host.SshClient.Close()
+		}
+	}
 }

cmd/config.go

@@ -0,0 +1,31 @@
+package cmd
+
+// import (
+// 	"git.andrewnw.xyz/CyberShell/backy/pkg/backy"
+
+// 	"github.com/spf13/cobra"
+// )
+
+// var (
+// 	configCmd = &cobra.Command{
+// 		Use:   "config list ...",
+// 		Short: "Runs commands defined in config file.",
+// 		Long:  `Cron executes commands at the time defined in config file.`,
+// 		Run:   config,
+// 	}
+
+// 	cmds  []string
+// 	lists []string
+// )
+
+// func config(cmd *cobra.Command, args []string) {
+
+// 	opts := backy.NewOpts(cfgFile, backy.cronEnabled())
+// 	opts.InitConfig()
+
+// }
+
+// func init() {
+
+// 	configCmd.PersistentFlags().StringArrayVarP(&cmds, "cmds", "c", nil, "Accepts comma-seperated list of commands to list")
+// }

cmd/cron.go

@@ -8,17 +8,17 @@ import (
 
 var (
 	cronCmd = &cobra.Command{
-		Use:   "cron command ...",
-		Short: "Runs commands defined in config file.",
-		Long:  `Cron executes commands at the time defined in config file.`,
+		Use:   "cron [flags]",
+		Short: "Starts a scheduler that runs lists defined in config file.",
+		Long:  `Cron starts a scheduler that executes command lists at the time defined in config file.`,
 		Run:   cron,
 	}
 )
 
 func cron(cmd *cobra.Command, args []string) {
 
-	opts := backy.NewOpts(cfgFile, backy.UseCron())
+	opts := backy.NewOpts(cfgFile, backy.CronEnabled())
 	opts.InitConfig()
-
-	backy.ReadConfig(opts).Cron()
+	backy.ReadConfig(opts)
+	opts.Cron()
 }

cmd/exec.go

@@ -14,21 +14,27 @@ import (
 var (
 	execCmd = &cobra.Command{
 		Use:   "exec command ...",
-		Short: "Runs commands defined in config file.",
-		Long:  `Exec executes commands defined in config file.`,
+		Short: "Runs commands defined in config file in order given.",
+		Long:  `Exec executes commands defined in config file in order given.`,
 		Run:   execute,
 	}
 )
 
-func execute(cmd *cobra.Command, args []string) {
+func init() {
+	execCmd.AddCommand(hostExecCommand)
 
+	hostExecCommand.Flags().StringSliceVarP(&hostsList, "hosts", "m", nil, "Accepts comma-separated names of hosts.")
+	hostExecCommand.Flags().StringSliceVarP(&cmdList, "commands", "c", nil, "Accepts comma-separated names of commands.")
+
+}
+
+func execute(cmd *cobra.Command, args []string) {
 	if len(args) < 1 {
-		logging.ExitWithMSG("Please provide a command to run. Pass --help to see options.", 0, nil)
+		logging.ExitWithMSG("Please provide a command to run. Pass --help to see options.", 1, nil)
 	}
 
 	opts := backy.NewOpts(cfgFile, backy.AddCommands(args))
 	opts.InitConfig()
 	// opts.InitMongo()
-	backy.ReadConfig(opts).ExecuteCmds()
-
+	backy.ReadConfig(opts).ExecuteCmds(opts)
 }

cmd/host.go

@@ -0,0 +1,60 @@
+package cmd
+
+import (
+	"git.andrewnw.xyz/CyberShell/backy/pkg/backy"
+	"git.andrewnw.xyz/CyberShell/backy/pkg/logging"
+	"github.com/spf13/cobra"
+)
+
+var (
+	hostExecCommand = &cobra.Command{
+		Use:   "host [--commands=command1,command2, ... | -c command1,command2, ...] [--hosts=host1,hosts2, ... | -m host1,host2, ...] ",
+		Short: "Runs command defined in config file on the hosts in order specified.",
+		Long:  "Host executes specified commands on the hosts defined in config file.\nUse the --commands or -c flag to choose the commands.",
+		Run:   Host,
+	}
+)
+
+// Holds command list to run
+var hostsList []string
+var cmdList []string
+
+func init() {
+
+}
+
+// cli input should be hosts and commands. Hosts are defined in config files.
+// commands can be passed by the following mutually exclusive options:
+//    1. as a list of commands defined in the config file
+//    2. stdin (on command line) (TODO)
+
+func Host(cmd *cobra.Command, args []string) {
+	backyConfOpts := backy.NewOpts(cfgFile)
+	backyConfOpts.InitConfig()
+
+	backy.ReadConfig(backyConfOpts)
+
+	// check CLI input
+	if hostsList == nil {
+		logging.ExitWithMSG("error: hosts must be specified", 1, &backyConfOpts.Logger)
+	}
+	// host is only checked when we read the SSH File
+	// so a check may not be needed here
+	for _, h := range hostsList {
+		_, hostFound := backyConfOpts.Hosts[h]
+		if !hostFound {
+			logging.ExitWithMSG("host "+h+" not found", 1, &backyConfOpts.Logger)
+		}
+	}
+	if cmdList == nil {
+		logging.ExitWithMSG("error: commands must be specified", 1, &backyConfOpts.Logger)
+	}
+	for _, c := range cmdList {
+		_, cmdFound := backyConfOpts.Cmds[c]
+		if !cmdFound {
+			logging.ExitWithMSG("cmd "+c+" not found", 1, &backyConfOpts.Logger)
+		}
+	}
+
+	backyConfOpts.ExecCmdsSSH(cmdList, hostsList)
+}

cmd/list.go

@@ -0,0 +1,49 @@
+// backup.go
+// Copyright (C) Andrew Woodlee 2023
+// License: Apache-2.0
+
+package cmd
+
+import (
+	"git.andrewnw.xyz/CyberShell/backy/pkg/backy"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	listCmd = &cobra.Command{
+		Use:   "list [--list=list1,list2,... | -l list1, list2,...] [ -cmd cmd1 cmd2 cmd3...]",
+		Short: "Lists commands, lists, or hosts defined in config file.",
+		Long:  "Backup lists commands or groups defined in config file.\nUse the --lists or -l flag to list the specified lists. If not flag is not given, all lists will be executed.",
+		Run:   List,
+	}
+)
+
+var listsToList []string
+var cmdsToList []string
+
+func init() {
+
+	listCmd.Flags().StringSliceVarP(&listsToList, "lists", "l", nil, "Accepts comma-separated names of command lists to list.")
+	listCmd.Flags().StringSliceVarP(&cmdsToList, "cmds", "c", nil, "Accepts comma-separated names of commands to list.")
+
+}
+
+func List(cmd *cobra.Command, args []string) {
+
+	// settup based on whats passed in:
+	//   - cmds
+	//   - lists
+	//   - if none, list all commands
+	if cmdLists != nil {
+
+	}
+
+	opts := backy.NewOpts(cfgFile)
+
+	opts.InitConfig()
+
+	opts = backy.ReadConfig(opts)
+
+	opts.ListCommand("rm-sn-db")
+}

cmd/root.go

@@ -36,5 +36,5 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "f", "", "config file to read from")
 	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Sets verbose level")
 
-	rootCmd.AddCommand(backupCmd, execCmd, cronCmd)
+	rootCmd.AddCommand(backupCmd, execCmd, cronCmd, versionCmd, listCmd)
 }

cmd/version.go

@@ -0,0 +1,39 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+const versionStr = "0.6.1"
+
+var (
+	versionCmd = &cobra.Command{
+		Use:   "version [flags]",
+		Short: "Prints the version and exits",
+		Long:  "Prints the version and exits. No arguments just prints the version number only.",
+		Run:   version,
+	}
+	numOnly bool
+	vPre    bool
+)
+
+func init() {
+	versionCmd.PersistentFlags().BoolVarP(&numOnly, "num", "n", false, "Output the version number only.")
+	versionCmd.PersistentFlags().BoolVarP(&vPre, "vpre", "V", false, "Output the version with v prefixed.")
+}
+
+func version(cmd *cobra.Command, args []string) {
+
+	if numOnly && !vPre {
+		fmt.Printf("%s\n", versionStr)
+	} else if vPre && !numOnly {
+		fmt.Printf("v%s\n", versionStr)
+	} else {
+		fmt.Printf("Backy version: %s\n", versionStr)
+	}
+
+	os.Exit(0)
+}

docs/.gitignore

@@ -0,0 +1,2 @@
+public/
+resources/_gen

docs/archetypes/default.md

@@ -0,0 +1,6 @@
+---
+title: "{{ replace .Name "-" " " | title }}"
+date: {{ .Date }}
+draft: true
+---
+

docs/config.yaml

@@ -0,0 +1,78 @@
+baseURL: https://backy.cybershell.xyz/
+languageCode: en-us
+title: A tool for commands
+theme:
+  - hugo-theme-relearn
+  - plausible-hugo
+outputs:
+  home:
+    - HTML
+    - RSS
+    - PRINT
+module:
+  imports:
+    - path: github.com/divinerites/plausible-hugo
+    - path: github.com/McShelby/hugo-theme-relearn
+params:
+  themeVariant:
+    - auto: []
+      identifier: relearn-auto
+      name: Relearn Light/Dark
+    - identifier: relearn-light
+    - identifier: relearn-dark
+    - identifier: relearn-bright
+    - auto:
+        - zen-light
+        - zen-dark
+      identifier: zen-auto
+      name: Zen Light/Dark
+    - identifier: zen-light
+    - identifier: zen-dark
+    - auto:
+        - learn
+        - neon
+      identifier: retro-auto
+      name: Retro Learn/Neon
+    - identifier: neon
+    - identifier: learn
+  plausible:
+    enable: true
+    domain: backy.cybershell.xyz
+    outbound_link: true
+    gitstar: false
+    selfhosted_domain: stats.andrewnw.com
+  author:
+    name: Andrew Woodlee
+    alwaysopen: false
+    editURL: ""
+    description: ""
+    showVisitedLinks: false
+    disableSearch: false
+    disableSearchHiddenPages: false
+    disableSeoHiddenPages: false
+    disableTagHiddenPages: false
+    disableAssetsBusting: false
+    disableGeneratorVersion: false
+    disableInlineCopyToClipBoard: false
+    disableShortcutsTitle: false
+    disableLandingPageButton: true
+    disableLanguageSwitchingButton: false
+    disableBreadcrumb: true
+    disableToc: false
+    math: true
+    customMathJaxURL: https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js
+    mathJaxInitialize: "{}"
+    mermaid: true
+    customMermaidURL: https://unpkg.com/mermaid/dist/mermaid.min.js
+    mermaidInitialize: '{ "theme": "default" }'
+    disableSwagger: false
+    customSwaggerURL: https://unpkg.com/rapidoc/dist/rapidoc-min.js
+    swaggerInitialize: '{ "theme": "light" }'
+    disableNextPrev: true
+    ordersectionsby: weight
+    titleSeparator: "-"
+    collapsibleMenu: true
+    additionalContentLanguage:
+      - en
+    disableExplicitIndexURLs: false
+    externalLinkTarget: _blank

docs/content/_index.md

@@ -0,0 +1,32 @@
++++
+archetype = "home"
+title = "Backy"
++++
+
+Backy is a tool for automating data backup and remote command execution. It can work over SSH, and provides completion and failure notifications, error reporting, and more.
+
+Why the name Backy? Because I wanted an app for backups.
+
+View the [changelog here](https://git.andrewnw.xyz/CyberShell/backy/src/branch/master/CHANGELOG.md).
+
+{{% notice tip %}}
+Feel free to open a [PR](https://git.andrewnw.xyz/CyberShell/backy/pulls), raise an [issue](https://git.andrewnw.xyz/CyberShell/backy/issues "Open a Gitea Issue")(s), or request new feature(s).
+{{% /notice %}}
+
+## Features
+
+- Allows easy configuration of executable commands
+
+- Allows for running package operations
+
+- Allows configuring failure, success, and final hooks
+
+- Allows for commands to be run on many hosts over SSH
+
+- Commands can be grouped in list to run in specific order
+
+- Notifications on completion and failure
+
+- Run in cron mode
+
+- For any command, especially backup commands

docs/content/cli/_index.md

@@ -0,0 +1,145 @@
+---
+title: CLI
+weight: 4
+---
+
+This page lists documentation for the CLI.
+
+## Backy 
+ 
+```
+Backy is a command-line application useful for configuring backups, or any commands run in sequence.
+
+Usage:
+  backy [command]
+
+Available Commands:
+  backup      Runs commands defined in config file.
+  completion  Generate the autocompletion script for the specified shell
+  cron        Starts a scheduler that runs lists defined in config file.
+  exec        Runs commands defined in config file in order given.
+  help        Help about any command
+  list        Lists commands, lists, or hosts defined in config file.
+  version     Prints the version and exits
+
+Flags:
+  -f, --config string   config file to read from
+  -h, --help            help for backy
+  -v, --verbose         Sets verbose level
+
+Use "backy [command] --help" for more information about a command.
+```
+ 
+# Subcommands
+
+## backup
+
+```
+Backup executes commands defined in config file.
+Use the --lists or -l flag to execute the specified lists. If not flag is not given, all lists will be executed.
+
+Usage:
+  backy backup [--lists=list1,list2,... | -l list1, list2,...] [flags]
+
+Flags:
+  -h, --help            help for backup
+  -l, --lists strings   Accepts comma-separated names of command lists to execute.
+
+Global Flags:
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level
+```
+
+## cron
+
+```
+Cron starts a scheduler that executes command lists at the time defined in config file.
+
+Usage:
+  backy cron [flags]
+
+Flags:
+  -h, --help   help for cron
+
+Global Flags:
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level
+```
+
+## exec
+
+```
+Exec executes commands defined in config file in order given.
+
+Usage:
+  backy exec command ... [flags]
+  backy exec [command]
+
+Available Commands:
+  host        Runs command defined in config file on the hosts in order specified.
+
+Flags:
+  -h, --help   help for exec
+
+Global Flags:
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level
+
+Use "backy exec [command] --help" for more information about a command.
+```
+
+### exec host
+
+```
+Host executes specified commands on the hosts defined in config file.
+Use the --commands or -c flag to choose the commands.
+
+Usage:
+  backy exec host [--commands=command1,command2, ... | -c command1,command2, ...] [--hosts=host1,hosts2, ... | -m host1,host2, ...]  [flags]
+
+Flags:
+  -c, --commands strings   Accepts comma-separated names of commands.
+  -h, --help               help for host
+  -m, --hosts strings      Accepts comma-separated names of hosts.
+
+Global Flags:
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level
+```
+
+## version
+
+```
+Prints the version and exits. No arguments just prints the version number only.
+
+Usage:
+  backy version [flags]
+
+Flags:
+  -h, --help   help for version
+  -n, --num    Output the version number only.
+  -V, --vpre   Output the version with v prefixed.
+
+Global Flags:
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level
+```
+
+## list
+
+```
+Backup lists commands or groups defined in config file.
+Use the --lists or -l flag to list the specified lists. If not flag is not given, all lists will be executed.
+
+Usage:
+  backy list [--list=list1,list2,... | -l list1, list2,...] [ -cmd cmd1 cmd2 cmd3...] [flags]
+
+Flags:
+  -c, --cmds strings    Accepts comma-separated names of commands to list.
+  -h, --help            help for list
+  -l, --lists strings   Accepts comma-separated names of command lists to list.
+
+Global Flags:
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level
+```

docs/content/cli/exec.md

@@ -0,0 +1,19 @@
+---
+title: Exec
+---
+
+The `exec` subcommand can do some things that the configuration file can't do yet. The command `exec host` can execute commands on many hosts.
+
+`exec host` takes the following arguments:
+
+```sh
+  -c, --commands strings   Accepts comma-separated names of commands.
+  -h, --help               help for host
+  -m, --hosts strings      Accepts comma-separated names of hosts.
+```
+
+The commands have to be defined in the config file. The hosts need to at least be in the ssh_config(5) file.
+
+```sh
+backy exec host [--commands=command1,command2, ... | -c command1,command2, ...] [--hosts=host1,hosts2, ... | -m host1,host2, ...]  [flags]
+```

docs/content/config/_index.md

@@ -0,0 +1,22 @@
+---
+title: "Configuring Backy"
+weight: 3
+description: >
+  This page tells you how to configure Backy.
+---
+
+This is the section on the config file.
+
+To use a specific file:
+```backy [command] -f /path/to/file```
+
+If you leave the config path blank, the following paths will be searched in order:
+
+1. `./backy.yml`
+2. `./backy.yaml`
+3. `~/.config/backy.yml`
+4. `~/.config/backy.yaml`
+
+Create a file at `~/.config/backy.yml`.
+
+See the rest of the documentation in this section to configure it.

docs/content/config/command-lists.md

@@ -0,0 +1,91 @@
+---
+title: "Command Lists"
+weight: 2
+description: >
+  This page tells you how to get started with Backy.
+---
+
+Command lists are for executing commands in sequence and getting notifications from them.
+
+The top-level object key can be anything you want but not the same as another.
+
+Lists can go in a separate file. Command lists should be in a separate file if:
+
+1. key 'cmd-lists.file' is found
+2. hosts.yml or hosts.yaml is found in the same directory as the backy config file
+
+```yaml
+  test2:
+    name: test2
+    order:
+      - test
+      - test2
+    notifications:
+      - mail.prod-email
+      - matrix.sysadmin
+    cron: "0 * * * * *"
+```
+
+| key | description | type | required
+| --- | --- | --- | --- |
+| `order` | Defines the sequence of commands to execute | `[]string` | yes |
+| `getOutput` | Command(s) output is in the notification(s) | `bool` | no |
+| `notifications` | The notification service(s) and ID(s) to use on success and failure. Must be *`service.id`*. See the [notifications documentation page](/config/notifications/) for more | `[]string` | no |
+| `name` | Optional name of the list | `string` | no |
+| `cron` | Time at which to schedule the list. Only has affect when cron subcommand is run. | `string` | no |
+
+### Order
+
+The order is an array of commands to execute in order. Each command must be defined.
+
+```yaml
+order:
+  - cmd-1
+  - cmd-2
+```
+
+### getOutput
+
+Get command output when a notification is sent.
+
+Is not required. Can be `true` or `false`. Default is `false`.
+
+### Notifications
+
+An array of notification IDs to use on success and failure. Must match any of the `notifications` object map keys.
+
+### Name
+
+Name is optional. If name is not defined, name will be the object's map key.
+
+### Cron mode
+
+Backy also has a cron mode, so one can run `backy cron` and start a process that schedules jobs to run at times defined in the configuration file.
+
+Adding `cron: 0 0 1 * * *` to a `cmd-lists` object will schedule the list at 1 in the morning. See [https://crontab.guru/](https://crontab.guru/) for reference.
+
+{{% notice tip %}}
+Note: Backy uses the second field of cron, so add anything except * to the beginning of a regular cron expression.
+{{% /notice %}}
+
+```yaml
+cmd-lists:
+  docker-container-backup: # this can be any name you want
+    # all commands have to be defined
+    order:
+      - stop-docker-container
+      - backup-docker-container-script
+      - shell-cmd
+      - hostname
+      - start-docker-container
+    notifications:
+      - matrix.id
+    name: backup-some-container
+    cron: "0 0 1 * * *"
+  hostname:
+    name: hostname
+    order:
+      - hostname
+    notifications:
+      - mail.prod-email
+```

docs/content/config/commands.md

@@ -0,0 +1,152 @@
+---
+title: "Commands"
+weight: 1
+---
+
+The yaml top-level map can be any string.
+
+The top-level name must be unique.
+
+### Example Config
+
+```yaml
+commands:
+  stop-docker-container:
+    cmd: docker
+    Args:
+      - compose
+      - -f /some/path/to/docker-compose.yaml
+      - down
+    # if host is not defined, command will be run locally
+    # The host has to be defined in either the config file or the SSH Config files
+    host: some-host
+    hooks
+      error:
+        - some-other-command-when-failing
+      success:
+        - success-command
+      final:
+        - final-command
+  backup-docker-container-script:
+    cmd: /path/to/local/script
+    # script file is input as stdin to SSH
+    type: scriptFile # also can be script
+    environment:
+      - FOO=BAR
+      - APP=$VAR
+```
+
+Values available for this section **(case-sensitive)**:
+
+| name | notes | type | required
+| --- | --- | --- | --- |
+| `cmd` | Defines the command to execute | `string` | yes |
+| `Args` | Defines the arguments to the command | `[]string` | no |
+| `environment` | Defines evironment variables for the command | `[]string` | no |
+| `type` | May be `scriptFile`, `script`, or `package`. Runs script from local machine on remote. `Package` is the only one that can be run on local and remote hosts. | `string` | no |
+| `getOutput` | Command(s) output is in the notification(s) | `bool` | no |
+| `host` | If not specified, the command will execute locally. | `string` | no |
+| `scriptEnvFile` | When type is `scriptFile` or `script`, this file is prepended to the input. | `string` | no |
+| `shell` | Run the command in the shell | `string` | no |
+| `hooks` | Hooks are used at the end of the individual command. Must have at least `error`, `success`, or `final`. | `map[string][]string` | no |
+
+#### cmd
+
+cmd must be a valid command or script to execute.
+
+#### Args
+
+args must be arguments to cmd as they would be passed on the command-line:
+
+```sh
+cmd [arg1 arg2 ...]
+```
+
+Define them in an array:
+
+```yaml
+Args:
+  - arg1
+  - arg2
+  - arg3
+```
+
+### getOutput
+
+Get command output when a notification is sent.
+
+Is not required. Can be `true` or `false`.
+
+#### host
+
+{{% notice info %}}
+If any `host` is not defined or left blank, the command will run on the local machine.
+{{% /notice %}}
+
+Host may or may not be defined in the `hosts` section.
+
+{{% notice info %}}
+If any `host` from the commands section does not match any object in the `hosts` section, the `Host` is assumed to be this value. This value will be used to search in the default SSH config files.
+
+For example, say that I have a host defined in my SSH config with the `Host` defined as `web-prod`.
+If I assign a value to host as `host: web-prod` and don't specify this value in the `hosts` object, web-prod will be used as the `Host` in searching the SSH config files.
+{{% /notice %}}
+
+### shell
+
+If shell is defined, the command will run in the specified shell.
+Make sure to escape any shell input.
+
+### scriptEnvFile
+
+Path to a file.
+
+When type is `script` or `scriptFile` , the script is appended to this file.
+
+This is useful for specifying environment variables or other things so they don't have to be included in the script.
+
+### type
+
+May be `scriptFile` or `script`. Runs script from local machine on remote host passed to the SSH session as standard input.
+
+If `type` is `script`, `cmd` is used as the script.
+
+If `type` is `scriptFile`, cmd must be a script file.
+
+If `type` is `package`, there are additional fields that must be specified.
+
+### environment
+
+The environment variables support expansion:
+
+- using escaped values `$VAR` or `${VAR}`
+
+For now, the variables have to be defined in an `.env` file in the same directory as the config file.
+
+If using it with host specified, the SSH server has to be configured to accept those env variables.
+
+If the command is run locally, the OS's environment is added.
+
+### hooks
+
+Hooks are run after the command is run.
+
+Errors are run if the command errors, success if it returns no error. Final hooks are run regardless of error condition.
+
+Values for hooks are as follows:
+
+```yaml
+command:
+  hook:
+    # these commands are defined elsewhere in the file
+    error:
+      - errcommand
+    success:
+      - successcommand
+    final:
+      - donecommand
+```
+
+### packages
+
+See the [dedicated page](/config/packages) for package configuration.

docs/content/config/notifications.md

@@ -0,0 +1,74 @@
+---
+title: "Notifications"
+weight: 3
+description: >
+  This page tells you how to get set up Backy notifications.
+---
+
+
+Notifications can be sent on command list completion and failure.
+
+The supported platforms for notifications are email (SMTP) and [Matrix](https://matrix.org/).
+
+Notifications are defined by service, with the current form following below. Ids must come after the service.
+
+```yaml
+notifications:
+  mail:
+    prod-email:
+      host: yourhost.tld
+      port: 587
+      senderaddress: email@domain.tld
+      to:
+        - admin@domain.tld
+      username: smtp-username@domain.tld
+      password: your-password-here
+
+  matrix:
+    matrix:
+      home-server: your-home-server.tld
+      room-id: room-id
+      access-token: your-access-token
+      user-id: your-user-id
+```
+
+Sections recognized are `mail` and `matrix`
+
+There must be a section with an id (eg. `mail.test-svr`) following one of these sections.
+
+### mail
+
+| key | description | type
+| --- | --- | ---
+| `host` | Specifies the SMTP host to connect to | `string`
+| `port` | Specifies the SMTP port | `uint16`
+| `senderaddress` | Address from which to send mail | `string`
+| `to` | Recipients to send emails to | `[]string`
+| `username` | SMTP username | `string`
+| `password` | SMTP password | `string`
+
+### matrix
+
+| key | description | type
+| --- | --- | ---
+| `home-server` | Specifies the Matrix server connect to | `string`
+| `room-id` | Specifies the room ID of the room to send messages to | `string`
+| `access-token` | Matrix access token | `string`
+| `user-id` | Matrix user ID | `string`
+
+To get your access token (assumes you are using [Element](https://element.io/)) :
+
+1. Log in to the account you want to get the access token for. Click on the name in the top left corner, then "Settings".
+2. Click the "Help & About" tab (left side of the dialog).
+3. Scroll to the bottom and click on `<click to reveal>` part of Access Token.
+4. Copy your access token to a safe place.
+
+To get the room ID:
+
+1. On Element or a similar client, navigate to the room.
+2. Navigate to the settings from the top menu.
+3. Click on Advanced, the room ID is there.
+
+{{% notice info %}}
+Make sure to quote the room ID, as [YAML spec defines tags using `!`](https://yaml.org/spec/1.2.2/#3212-tags).
+{{% /notice %}}

docs/content/config/packages.md

@@ -0,0 +1,77 @@
+---
+title: "Packages"
+weight: 2
+---
+
+This is dedicated to `package` commands. The command `type` field must be `package`. Package is a type that allows one to perform package operations. There are several additional options available when `type` is `package`:
+
+| name | notes | type | required |
+| --- | --- | --- | --- |
+| `packageName` | The name of a package to be modified. | `string` | yes |
+| `packageManager` | The name of the package manger to be used. | `string` | yes |
+| `packageOperation` | The type of operation to be perform. | `string` | yes |
+| `packageVersion` | The version of a package to be modified. | `string` | no |
+
+
+#### example
+
+The following is an example of a package command:
+
+```yaml
+ update-docker:
+    type: package
+    shell: zsh
+    packageName: docker-ce
+    packageManager: apt
+    packageOperation: install
+    host: debian-based-host
+```
+
+#### packageOperation
+
+The following package operations are supported:
+
+- `install`
+- `remove`
+- `upgrade`
+
+#### packageManager
+
+The following package managers are recognized:
+
+- `apt`
+- `yum`
+- `dnf`
+
+#### package command args
+
+You can add additional arguments using the standard `Args` key. This is useful for adding more packages.
+
+### Development
+
+The PackageManager interface provides an easy to enforce functions and options. There are two interfaces, `PackageManager` and `ConfigurablePackageManager` in the directory `pkg/pkgman`. Go's import-cycle "feature" caused me to implement functional options using a third interface. `PackageManagerOption`is a function that takes an interface.
+
+#### PackageManager
+
+```go
+// PackageManager is an interface used to define common package commands. This shall be implemented by every package.
+type PackageManager interface {
+	Install(pkg, version string, args []string) (string, []string)
+	Remove(pkg string, args []string) (string, []string)
+	Upgrade(pkg, version string) (string, []string) // Upgrade a specific package
+	UpgradeAll() (string, []string)
+
+	// Configure applies functional options to customize the package manager.
+	Configure(options ...pkgcommon.PackageManagerOption)
+}
+```
+
+There are a few functional options that should be implemented using the `ConfigurablePackageManager` interface:
+
+```go
+// ConfigurablePackageManager defines methods for setting configuration options.
+type ConfigurablePackageManager interface {
+	SetUseAuth(useAuth bool)
+	SetAuthCommand(authCommand string)
+}
+```

docs/content/config/vault.md

@@ -0,0 +1,26 @@
+---
+title: "Vault"
+weight: 4
+---
+
+[Vault](https://www.vaultproject.io/) is a tool for storing secrets and other data securely.
+
+Vault config can be used by prefixing `vault:` in front of a password or ENV var.
+
+This is the object in the config file:
+
+```yaml
+vault:
+  token: hvs.tXqcASvTP8wg92f7riyvGyuf
+  address: http://127.0.0.1:8200
+  enabled: false
+  keys:
+    - name: mongourl
+      mountpath: secret
+      path: mongo/url
+      type:  # KVv1 or KVv2
+    - name:
+      path:
+      type:
+      mountpath:
+```

docs/content/getting-started/_index.md

@@ -0,0 +1,10 @@
+---
+title: "Getting started"
+weight: 2
+description: >
+  This page tells you how to get started with Backy.
+---
+
+If you have not installed Backy, [see the install documentation](install).
+
+If you need to configure it, [see the config page](config).

docs/content/getting-started/config.md

@@ -0,0 +1,161 @@
+---
+title: "Config File Definitions"
+description: >
+  This page tells you how to configure Backy.
+---
+
+### Commands
+
+The commands section is for defining commands. These can be run with or without a shell and on a host or locally.
+
+See the [commands documentation](/config/commands) for further information.
+
+```yaml
+commands:
+  stop-docker-container:
+    output: true # Optional and only when run in list and notifications are sent
+    cmd: docker
+    args:
+      - compose
+      - -f /some/path/to/docker-compose.yaml
+      - down
+    # if host is not defined, cmd will be run locally
+    host: some-host 
+  backup-docker-container-script:
+    cmd: /path/to/script
+    # The host has to be defined in the config file
+    host: some-host
+    environment:
+      - FOO=BAR
+      - APP=$VAR # defined in .env file in config directory
+  shell-cmd:
+    cmd: rsync
+    shell: bash
+    args:
+      - -av
+      - some-host:/path/to/data 
+      - ~/Docker/Backups/docker-data
+  script:
+    type: scriptFile # run a local script on a remote host
+    cmd: path/to/your/script.sh
+    host: some-host  
+  hostname:
+    cmd: hostname
+```
+
+### Lists
+
+To execute groups of commands in sequence, use a list configuration.
+
+```yaml
+cmd-lists:
+  cmds-to-run: # this can be any name you want
+    # all commands have to be defined in the commands section
+    order:
+      - stop-docker-container
+      - backup-docker-container-script
+      - shell-cmd
+      - hostname
+    getOutput: true # Optional and only for when notifications are sent
+    notifications:
+      - matrix
+    name: backup-some-server
+  hostname:
+    name: hostname
+    order:
+      - hostname
+    notifications:
+      - prod-email
+```
+
+### Hosts
+
+The hosts object may or may not be defined.
+
+{{% notice info %}}
+If any `host` from a commands object does not match any `host` object, the needed values will be checked in the default SSH config files.
+{{% /notice %}}
+
+```yaml
+hosts:
+  # any needed ssh_config(5) keys/values not listed here will be looked up in the config file or the default config file
+  some-host:
+    hostname: some-hostname
+    config: ~/.ssh/config
+    user: user
+    privatekeypath: /path/to/private/key
+    port: 22
+    # can also be env:VAR or the password itself
+    password: file:/path/to/file
+    # can also be env:VAR or the password itself
+    privatekeypassword: file:/path/to/file
+    # only one is supported for now
+    proxyjump: some-proxy-host
+```
+
+### Notifications
+
+The notifications object can have two forms.
+
+For more, [see the notification object documentation](/config/notifications). The top-level map key is id that has to be referenced by the `cmd-lists` key `notifications`.
+
+```yaml
+notifications:
+  mail:
+    prod-email:
+      id: prod-email
+      type: mail
+      host: yourhost.tld
+      port: 587
+      senderAddress: email@domain.tld
+      to:
+        - admin@domain.tld
+      username: smtp-username@domain.tld
+      password: your-password-here
+  matrix:
+    matrix:
+      id: matrix
+      type: matrix
+      home-server: your-home-server.tld
+      room-id: room-id
+      access-token: your-access-token
+      user-id: your-user-id
+```
+
+### Logging
+
+cmd-std-out controls whether commands output is echoed to StdOut.
+
+If logfile is not defined, the log file will be written to the config directory in the file `backy.log`.
+
+`console-disabled` controls whether the logging messages are echoed to StdOut. Default is false.
+
+`verbose` basically does nothing as all necessary info is already output.
+
+```yaml
+logging:
+  verbose: false
+  file: path/to/log/file.log
+  console-disabled: false
+  cmd-std-out: false
+```
+
+### Vault
+
+[Vault](https://www.vaultproject.io/) can be used to get some configuration values and ENV variables securely.
+
+```
+vault:
+  token: hvs.tXqcASvTP8wg92f7riyvGyuf
+  address: http://127.0.0.1:8200
+  enabled: false
+  keys:
+    - name: mongourl
+      mountpath: secret
+      path: mongo/url
+      type:  # KVv1 or KVv2
+    - name:
+      path:
+      type:
+      mountpath: 
+```

docs/content/getting-started/install.md

@@ -0,0 +1,21 @@
+---
+title: "Install Backy"
+weight: 1
+description: >
+  This page tells you how to install Backy.
+---
+
+
+Binaries are available from the [release page](https://git.andrewnw.xyz/CyberShell/backy/releases). Make sure to get the correct version for your system, which supports x86_64, ARM64, and i386.
+
+### Source Install
+
+You can install from source. You will need [Go installed](https://go.dev/doc/install).
+
+Then run:
+
+```bash
+go install git.andrewnw.xyz/CyberShell/backy@master
+```
+
+Once set, jump over to the [config docs](/getting-started/config) and start configuring your file.

docs/content/repositories/_index.md

@@ -0,0 +1,9 @@
+---
+title: "Repositories"
+weight: 5
+---
+
+The repo mirrors are:
+
+* [https://git.andrewnw.xyz/CyberShell/backy](https://git.andrewnw.xyz/CyberShell/backy)
+* [https://github.com/CybersShell/backy](https://github.com/CybersShell/backy)

docs/go.mod

@@ -0,0 +1,8 @@
+module git.andrewnw.xyz/CyberShell/backy/docs
+
+go 1.19
+
+require (
+	github.com/McShelby/hugo-theme-relearn v0.0.0-20250103114405-80e448e5bdaa // indirect
+	github.com/divinerites/plausible-hugo v1.21.1 // indirect
+)

docs/go.sum

@@ -0,0 +1,10 @@
+github.com/McShelby/hugo-theme-relearn v0.0.0-20230209073138-890d12ea922d h1:weq1mrQ/qNAvGrNgvZVL1K8adbT3bswZf2ABLr/LCIA=
+github.com/McShelby/hugo-theme-relearn v0.0.0-20230209073138-890d12ea922d/go.mod h1:mKQQdxZNIlLvAj8X3tMq+RzntIJSr9z7XdzuMomt0IM=
+github.com/McShelby/hugo-theme-relearn v0.0.0-20241210183303-16d4de84becf h1:bMx4kwM7Q+dAzvSOWs3XWZ25o+n4mI0GPHqzbzeWb3M=
+github.com/McShelby/hugo-theme-relearn v0.0.0-20241210183303-16d4de84becf/go.mod h1:mKQQdxZNIlLvAj8X3tMq+RzntIJSr9z7XdzuMomt0IM=
+github.com/McShelby/hugo-theme-relearn v0.0.0-20250102210630-dd0597ffa4b2 h1:sWaC1/dL65v3iRvblEAaBLpKC5TIT0R9JASk1hZNET8=
+github.com/McShelby/hugo-theme-relearn v0.0.0-20250102210630-dd0597ffa4b2/go.mod h1:mKQQdxZNIlLvAj8X3tMq+RzntIJSr9z7XdzuMomt0IM=
+github.com/McShelby/hugo-theme-relearn v0.0.0-20250103114405-80e448e5bdaa h1:G+OnMEzK4XOzbbcf1SmaGyOYJ0h5idp/IJdguWs8ioU=
+github.com/McShelby/hugo-theme-relearn v0.0.0-20250103114405-80e448e5bdaa/go.mod h1:mKQQdxZNIlLvAj8X3tMq+RzntIJSr9z7XdzuMomt0IM=
+github.com/divinerites/plausible-hugo v1.21.1 h1:ZTWwjhZ0PmLMacCVGlcGiYFEZW7VaYE767tchDskOug=
+github.com/divinerites/plausible-hugo v1.21.1/go.mod h1:cxr+YB3FUwbLon8KCs4pV4Ankbkq6lJxTQUpNb5KqPo=

docs/layouts/_default/baseof.html

@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+{{- block "storeOutputFormat" . }}{{ end }}
+{{- if .IsHome }}
+  {{- $hugoVersion := "0.126.0" }}
+  {{- if lt hugo.Version $hugoVersion }}
+    {{- errorf "The Relearn theme requires Hugo %s or later" $hugoVersion }}
+  {{- end }}
+{{- end }}
+{{- if .Site.Params.description }}
+  {{- warnf "UNSUPPORTED usage of 'params.description' config parameter found, move it to the front matter of your home page; see https://mcshelby.github.io/hugo-theme-relearn/introduction/releasenotes/6/#6-0-0" }}
+{{- end }}
+<html lang="{{ .Page.Language.LanguageCode }}" dir="{{ .Page.Language.LanguageDirection | default (T "Reading-direction") | default "ltr" }}" itemscope itemtype="http://schema.org/Article" data-r-output-format="{{ with .Store.Get "relearnOutputFormat" }}{{ . }}{{ else }}html{{ end }}">
+  <head>
+    {{ partial "plausible_head.html" . }}
+    {{- partial "meta.html" . }}
+    {{- $title := partial "title.gotmpl" (dict "page" . "fullyQualified" true "reverse" true) }}
+    <title>{{ $title }}</title>
+
+    {{- /* multilingual stuff */}}
+    {{- if .IsTranslated -}}
+      {{- range $index, $trans := .AllTranslations }}
+        {{- if eq $index 0 }}
+    <link href="{{ partial "permalink.gotmpl" (dict "to" . "abs" true) }}" rel="alternate" hreflang="x-default">
+        {{- end }}
+    <link href="{{ partial "permalink.gotmpl" (dict "to" . "abs" true) }}" rel="alternate" hreflang="{{ .Language.LanguageCode }}">
+      {{- end }}
+    {{- end }}
+
+    {{- /* output formats */}}
+    {{- $page := . }}
+    {{- $link := "<link href=\"%s\" rel=\"%s\" type=\"%s\" title=\"%s\">" }}
+    {{- range .AlternativeOutputFormats }}
+      {{- if eq .Rel "canonical" }}
+    {{ (printf $link (partial "permalink.gotmpl" (dict "to" . "abs" true)) .Rel .MediaType.Type ($title | htmlEscape)) | safeHTML }}
+      {{- else if not (partial "_relearn/pageIsSpecial.gotmpl" $page) }}
+    {{ (printf $link (partial "permalink.gotmpl" (dict "to" .)) .Rel .MediaType.Type ($title | htmlEscape)) | safeHTML }}
+      {{- end }}
+    {{- end }}
+    {{- partialCached "favicon.html" . }}
+    {{- partial "stylesheet.html" . }}
+    {{- partial "dependencies.gotmpl" (dict "page" . "location" "header") }}
+    {{- partial "custom-header.html" . }}
+  </head>
+  <body class="mobile-support {{ with .Store.Get "relearnOutputFormat" }}{{ . }}{{ else }}html{{ end }}{{- if .Site.Params.disableInlineCopyToClipBoard }} disableInlineCopyToClipboard{{ end }}{{- if .Site.Params.disableHoverBlockCopyToClipBoard }} disableHoverBlockCopyToClipBoard{{ end }}" data-url="{{ partial "permalink.gotmpl" (dict "to" .) }}">
+    <div id="R-body" class="default-animation">
+      <div id="R-body-overlay"></div>
+      <nav id="R-topbar">
+        <div class="topbar-wrapper">
+          <div class="topbar-sidebar-divider"></div>
+          <div class="topbar-area topbar-area-start" data-area="start">
+            {{- partial "topbar/area/start.html" . }}
+          </div>
+          {{- $showBreadcrumb := (and (not .Params.disableBreadcrumb) (not .Site.Params.disableBreadcrumb)) }}
+          {{- if $showBreadcrumb }}
+          <ol class="topbar-breadcrumbs breadcrumbs highlightable" itemscope itemtype="http://schema.org/BreadcrumbList">
+            {{- partial "breadcrumbs.html" (dict "page" .) }}
+          </ol>
+          {{- else }}
+          <span class="topbar-breadcrumbs highlightable">
+            {{ partial "title.gotmpl" (dict "page" . "linkTitle" true) }}
+          </span>
+          {{- end }}
+          <div class="topbar-area topbar-area-end" data-area="end">
+            {{- partial "topbar/area/end.html" . }}
+          </div>
+        </div>
+      </nav>
+      <div id="R-main-overlay"></div>
+      <main id="R-body-inner" class="highlightable{{ with or .Type "default" }} {{ . }}{{ end }}" tabindex="-1">
+        <div class="flex-block-wrapper">
+{{- block "body" . }}{{ end }}
+        </div>
+      </main>
+{{- partial "custom-comments.html" . }}
+    </div>
+{{- block "menu" . }}{{ end }}
+{{- $assetBusting := partialCached "assetbusting.gotmpl" . }}
+    <script src="{{"js/clipboard.min.js" | relURL}}{{ $assetBusting }}" defer></script>
+    <script src="{{"js/perfect-scrollbar.min.js" | relURL}}{{ $assetBusting }}" defer></script>
+{{- partial "dependencies.gotmpl" (dict "page" . "location" "footer") }}
+    <script src="{{"js/theme.js" | relURL}}{{ $assetBusting }}" defer></script>
+{{- partial "custom-footer.html" . }}
+  </body>
+</html>

docs/themes/hugo-theme-relearn

@@ -0,0 +1 @@
+Subproject commit 80e448e5bdaa92c87ee0d0d86f1125c8606ebf5f

docs/themes/plausible-hugo

@@ -0,0 +1 @@
+Subproject commit 25d00b53c8ba5bac67329d4ed552b11322093811

docs/vangen.json

@@ -0,0 +1,20 @@
+{
+    "domain": "go.cybershell.xyz",
+    "docsDomain": "pkg.go.dev",
+    "repositories": [
+      {
+        "prefix": "backy",
+        "type": "git",
+        "hidden": false,
+        "url": "https://git.andrewnw.xyz/CyberShell/backy",
+        "source": {
+          "home": "https://git.andrewnw.xyz/CyberShell/backy",
+          "dir": "https://git.andrewnw.xyz/CyberShell/backy/src/branch/master/{/dir}",
+          "file": "https://git.andrewnw.xyz/CyberShell/backy/src/branch/master/{/dir}/{file}#L{line}"
+        },
+        "website": {
+          "url": "https://backy.cybershell.xyz/"
+        }
+      }
+    ]
+  }

docs/vangen/backy/index.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>go.cybershell.xyz/backy</title>
+<meta name="go-import" content="go.cybershell.xyz/backy git https://git.andrewnw.xyz/CyberShell/backy">
+<meta name="go-source" content="go.cybershell.xyz/backy https://git.andrewnw.xyz/CyberShell/backy https://git.andrewnw.xyz/CyberShell/backy/src/branch/master/{/dir} https://git.andrewnw.xyz/CyberShell/backy/src/branch/master/{/dir}/{file}#L{line}">
+<style>
+* { font-family: sans-serif; }
+body { margin-top: 0; }
+.content { display: inline-block; }
+code { display: block; font-family: monospace; font-size: 1em; background-color: #d5d5d5; padding: 1em; margin-bottom: 16px; }
+ul { margin-top: 16px; margin-bottom: 16px; }
+</style>
+</head>
+<body>
+<div class="content">
+<h2>go.cybershell.xyz/backy</h2>
+<code>go get go.cybershell.xyz/backy</code>
+<code>import "go.cybershell.xyz/backy"</code>
+Home: <a href="https://backy.cybershell.xyz/">https://backy.cybershell.xyz/</a><br/>
+Source: <a href="https://git.andrewnw.xyz/CyberShell/backy">https://git.andrewnw.xyz/CyberShell/backy</a><br/>
+</div>
+</body>
+</html>

examples/backy.yaml

@@ -6,11 +6,19 @@ commands:
       - -f /some/path/to/docker-compose.yaml
       - down
     # if host is not defined, cmd will be run locally
-    host: some-host 
+    host: some-host
+    hooks:
+      final:
+        - hostname
+      error:
+        - hostname
   backup-docker-container-script:
     cmd: /path/to/script
     # The host has to be defined in the config file
     host: some-host
+    environment:
+      - FOO=BAR
+      - APP=$VAR
   shell-cmd:
     cmd: rsync
     shell: bash
@@ -18,8 +26,13 @@ commands:
       - -av some-host:/path/to/data ~/Docker/Backups/docker-data
   hostname:
     cmd: hostname
+  update-docker:
+    type: package
+    packageManager: apt
+    packageName: docker-ce
+    packageVersion: "5:27.4.1-1~debian.12~bookworm"
 
-cmd-configs:
+cmd-lists:
   cmds-to-run: # this can be any name you want
     # all commands have to be defined
     order:
@@ -28,25 +41,30 @@ cmd-configs:
       - shell-cmd
       - hostname
     notifications:
-      - matrix
+      - matrix.matrix
     name: backup-some-server
+    cron: "0 0 1 * * *"
   hostname:
     name: hostname
     order:
       - hostname
     notifications:
-      - prod-email
+      - mail.prod-email
 
 hosts:
+  # any ssh_config(5) keys/values not listed here will be looked up in the config file or the default config file
   some-host:
     hostname: some-hostname
     config: ~/.ssh/config
     user: user
     privatekeypath: /path/to/private/key
     port: 22
-    password: 
-
+    # can also be env:VAR
+    password: file:/path/to/file
+    # only one is supported for now
+    proxyjump: some-proxy-host
 
+# optional
 logging:
   verbose: true
   file: /path/to/logs/commands.log
@@ -55,19 +73,22 @@ logging:
 
 
 notifications:
-  prod-email:
-    id: prod-email
-    type: mail
-    host: yourhost.tld:port
-    senderAddress: email@domain.tld
-    to:
-      - admin@domain.tld
-    username: smtp-username@domain.tld
-    password: your-password-here
+  mail:
+    prod-email:
+      id: prod-email
+      type: mail
+      host: yourhost.tld
+      port: 587
+      senderAddress: email@domain.tld
+      to:
+        - admin@domain.tld
+      username: smtp-username@domain.tld
+      password: your-password-here
   matrix:
-    id: matrix
-    type: matrix
-    home-server: your-home-server.tld
-    room-id: room-id
-    access-token: your-access-token
-    user-id: your-user-id
+    matrix:
+      id: matrix
+      type: matrix
+      home-server: your-home-server.tld
+      room-id: room-id
+      access-token: your-access-token
+      user-id: your-user-id

frontmatter.json

@@ -0,0 +1,67 @@
+{
+  "$schema": "https://frontmatter.codes/frontmatter.schema.json",
+  "frontMatter.taxonomy.contentTypes": [
+    {
+      "name": "default",
+      "pageBundle": false,
+      "previewPath": null,
+      "fields": [
+        {
+          "title": "Title",
+          "name": "title",
+          "type": "string"
+        },
+        {
+          "title": "Description",
+          "name": "description",
+          "type": "string"
+        },
+        {
+          "title": "Publishing date",
+          "name": "date",
+          "type": "datetime",
+          "default": "{{now}}",
+          "isPublishDate": true
+        },
+        {
+          "title": "Content preview",
+          "name": "preview",
+          "type": "image"
+        },
+        {
+          "title": "Is in draft",
+          "name": "draft",
+          "type": "draft"
+        },
+        {
+          "title": "Tags",
+          "name": "tags",
+          "type": "tags"
+        },
+        {
+          "title": "Categories",
+          "name": "categories",
+          "type": "categories"
+        }
+      ]
+    }
+  ],
+  "frontMatter.framework.id": "hugo",
+  "frontMatter.content.publicFolder": "static",
+  "frontMatter.content.pageFolders": [
+    {
+      "title": "content",
+      "path": "[[workspace]]/docs/content",
+      "originalPath": "[[workspace]]/docs/content"
+    },
+    {
+      "title": "config-main",
+      "path": "[[workspace]]/docs/content/config",
+      "originalPath": "[[workspace]]/docs/content/config"
+    },
+    {
+      "title": "gs",
+      "path": "[[workspace]]/docs/content/getting-started"
+    }
+  ]
+}

getCommandHelp

@@ -0,0 +1,67 @@
+#!/bin/bash
+CLI_PAGE="docs/content/cli/_index.md"
+echo "---
+title: "CLI"
+weight: 4
+---
+
+This page lists documentation for the CLI.
+" > _index.md
+
+BACKYCOMMAND="go run backy.go"
+
+echo "## Backy " >> _index.md
+echo " " >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo " " >> _index.md
+
+
+echo "# Subcommands" >> _index.md
+echo "" >> _index.md
+
+echo "## backup" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} backup -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo "" >> _index.md
+
+echo "## cron" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} cron -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo "" >> _index.md
+
+echo "## exec" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} exec -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo "" >> _index.md
+
+echo "### exec host" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} exec host -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo "" >> _index.md
+
+
+echo "## version" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} version -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo "" >> _index.md
+
+echo "## list" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} list -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+
+
+mv _index.md "$CLI_PAGE"

go.mod

@@ -1,60 +1,69 @@
 module git.andrewnw.xyz/CyberShell/backy
 
-go 1.19
+go 1.20
+
+replace git.andrewnw.xyz/CyberShell/backy => /home/andrew/Projects/backy
 
 require (
-	github.com/go-co-op/gocron v1.18.0
-	github.com/joho/godotenv v1.4.0
+	github.com/go-co-op/gocron v1.33.1
+	github.com/hashicorp/vault/api v1.10.0
+	github.com/joho/godotenv v1.5.1
 	github.com/kevinburke/ssh_config v1.2.0
-	github.com/mattn/go-isatty v0.0.17
-	github.com/nikoksr/notify v0.36.0
+	github.com/knadh/koanf/parsers/yaml v0.1.0
+	github.com/knadh/koanf/providers/file v0.1.0
+	github.com/knadh/koanf/v2 v2.0.1
+	github.com/mattn/go-isatty v0.0.19
+	github.com/nikoksr/notify v0.41.0
 	github.com/pkg/errors v0.9.1
-	github.com/rs/zerolog v1.28.0
-	github.com/spf13/cobra v1.6.1
-	github.com/spf13/viper v1.14.0
-	go.mongodb.org/mongo-driver v1.11.1
-	golang.org/x/crypto v0.5.0
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0
-	maunium.net/go/mautrix v0.13.0
-	mvdan.cc/sh/v3 v3.6.0
+	github.com/rs/zerolog v1.30.0
+	github.com/spf13/cobra v1.7.0
+	golang.org/x/crypto v0.13.0
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1
+	maunium.net/go/mautrix v0.16.0
+	mvdan.cc/sh/v3 v3.7.0
 )
 
 require (
+	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/golang/snappy v0.0.1 // indirect
+	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
+	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.5 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
-	github.com/spf13/afero v1.9.3 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
-	github.com/stretchr/testify v1.8.1 // indirect
-	github.com/subosito/gotenv v1.4.1 // indirect
-	github.com/tidwall/gjson v1.14.4 // indirect
+	github.com/stretchr/objx v0.5.1 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
+	github.com/tidwall/gjson v1.16.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
-	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.1.1 // indirect
-	github.com/xdg-go/stringprep v1.0.3 // indirect
-	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	golang.org/x/net v0.5.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	go.mau.fi/util v0.0.0-20230906155759-14bad39a8718 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	maunium.net/go/maulogger/v2 v2.4.1 // indirect
 )

go.sum

@@ -1,564 +1,192 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M=
+github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+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=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/go-co-op/gocron v1.18.0 h1:SxTyJ5xnSN4byCq7b10LmmszFdxQlSQJod8s3gbnXxA=
-github.com/go-co-op/gocron v1.18.0/go.mod h1:sD/a0Aadtw5CpflUJ/lpP9Vfdk979Wl1Sg33HPHg0FY=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-co-op/gocron v1.33.1 h1:wjX+Dg6Ae29a/f9BSQjY1Rl+jflTpW9aDyMqseCj78c=
+github.com/go-co-op/gocron v1.33.1/go.mod h1:NLi+bkm4rRSy1F8U7iacZOz0xPseMoIOnvabGoSe/no=
+github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
+github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
+github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
+github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
+github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=
+github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
+github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
+github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 h1:UpiO20jno/eV1eVZcxqWnUohyKRe1g8FPV/xH1s/2qs=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
+github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
+github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
+github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
+github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-sockaddr v1.0.5 h1:dvk7TIXCZpmfOlM+9mlcrWmWjw/wlKT+VDq2wMvfPJU=
+github.com/hashicorp/go-sockaddr v1.0.5/go.mod h1:uoUUmtwU7n9Dv3O4SNLeFvg0SxQ3lyjsj6+CCykpaxI=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/hashicorp/vault/api v1.10.0 h1:/US7sIjWN6Imp4o/Rj1Ce2Nr5bki/AXi9vAW3p2tOJQ=
+github.com/hashicorp/vault/api v1.10.0/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
-github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible h1:jdpOPRN1zP63Td1hDQbZW73xKmzDvZHzVdNYxhnTMDA=
 github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
+github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
+github.com/knadh/koanf/parsers/yaml v0.1.0 h1:ZZ8/iGfRLvKSaMEECEBPM1HQslrZADk8fP1XFUxVI5w=
+github.com/knadh/koanf/parsers/yaml v0.1.0/go.mod h1:cvbUDC7AL23pImuQP0oRw/hPuccrNBS2bps8asS0CwY=
+github.com/knadh/koanf/providers/file v0.1.0 h1:fs6U7nrV58d3CFAFh8VTde8TM262ObYf3ODrc//Lp+c=
+github.com/knadh/koanf/providers/file v0.1.0/go.mod h1:rjJ/nHQl64iYCtAW2QQnF0eSmDEX/YZ/eNFj5yR6BvA=
+github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g=
+github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
-github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
+github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
+github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
-github.com/nikoksr/notify v0.36.0 h1:OeO/COtxZYLjtFuxBhpeVLfCFdGt48KKgOHKu43w8H0=
-github.com/nikoksr/notify v0.36.0/go.mod h1:U5h6rVleLTcAJASy7kRdD4vtsFBBxirWQKYX8NJ4jcw=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU=
-github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
+github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
+github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/nikoksr/notify v0.41.0 h1:4LGE41GpWdHX5M3Xo6DlWRwS2WLDbOq1Rk7IzY4vjmQ=
+github.com/nikoksr/notify v0.41.0/go.mod h1:FoE0UVPeopz1Vy5nm9vQZ+JVmYjEIjQgbFstbkw+cRE=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
-github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/rogpeppe/go-internal v1.10.1-0.20230524175051-ec119421bb97 h1:3RPlVWzZ/PDqmVuf/FKHARG5EMid/tl7cv54Sw/QRVY=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c=
+github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
-github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
-github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
-github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
-github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
-github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
+github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
+github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
+github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU=
-github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0=
+github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=
-github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
-github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.16.0 h1:SyXa+dsSPpUlcwEDuKuEBJEz5vzTvOea+9rjyYodQFg=
+github.com/tidwall/gjson v1.16.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
-github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
-github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E=
-github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
-github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs=
-github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
-github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
-github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.mongodb.org/mongo-driver v1.11.1 h1:QP0znIRTuL0jf1oBQoAoM0C6ZJfBK4kx0Uumtv1A7w8=
-go.mongodb.org/mongo-driver v1.11.1/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.mau.fi/util v0.0.0-20230906155759-14bad39a8718 h1:hmm5bZqE0M8+Uvys0HJPCSbAIZIwYtTkBKYPjAWHuMM=
+go.mau.fi/util v0.0.0-20230906155759-14bad39a8718/go.mod h1:AxuJUMCxpzgJ5eV9JbPWKRH8aAJJidxetNdUj7qcb84=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
+golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
-gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-maunium.net/go/mautrix v0.13.0 h1:CRdpMFc1kDSNnCZMcqahR9/pkDy/vgRbd+fHnSCl6Yg=
-maunium.net/go/mautrix v0.13.0/go.mod h1:gYMQPsZ9lQpyKlVp+DGwOuc9LIcE/c8GZW2CvKHISgM=
-mvdan.cc/sh/v3 v3.6.0 h1:gtva4EXJ0dFNvl5bHjcUEvws+KRcDslT8VKheTYkbGU=
-mvdan.cc/sh/v3 v3.6.0/go.mod h1:U4mhtBLZ32iWhif5/lD+ygy1zrgaQhUu+XFy7C8+TTA=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+maunium.net/go/maulogger/v2 v2.4.1 h1:N7zSdd0mZkB2m2JtFUsiGTQQAdP0YeFWT7YMc80yAL8=
+maunium.net/go/maulogger/v2 v2.4.1/go.mod h1:omPuYwYBILeVQobz8uO3XC8DIRuEb5rXYlQSuqrbCho=
+maunium.net/go/mautrix v0.16.0 h1:iUqCzJE2yqBC1ddAK6eAn159My8rLb4X8g4SFtQh2Dk=
+maunium.net/go/mautrix v0.16.0/go.mod h1:XAjE9pTSGcr6vXaiNgQGiip7tddJ8FQV1a29u2QdBG4=
+mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg=
+mvdan.cc/sh/v3 v3.7.0/go.mod h1:K2gwkaesF/D7av7Kxl0HbF5kGOd2ArupNTX3X44+8l8=

pkg/backy/backy.go

@@ -11,11 +11,17 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"text/template"
+
+	"embed"
 
 	"github.com/rs/zerolog"
 )
 
-var requiredKeys = []string{"commands", "cmd-configs", "logging"}
+//go:embed templates/*.txt
+var templates embed.FS
+
+var requiredKeys = []string{"commands"}
 
 var Sprintf = fmt.Sprintf
 
@@ -23,9 +29,12 @@ var Sprintf = fmt.Sprintf
 // The environment of local commands will be the machine's environment plus any extra
 // variables specified in the Env file or Environment.
 // Dir can also be specified for local commands.
-func (command *Command) RunCmd(log *zerolog.Logger) error {
+//
+// Returns the output as a slice and an error, if any
+func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([]string, error) {
 
 	var (
+		outputArr     []string
 		ArgsStr       string
 		cmdOutBuf     bytes.Buffer
 		cmdOutWriters io.Writer
@@ -35,68 +44,34 @@ func (command *Command) RunCmd(log *zerolog.Logger) error {
 			env:  command.Environment,
 		}
 	)
-	envVars.env = append(envVars.env, os.Environ()...)
 
 	for _, v := range command.Args {
 		ArgsStr += fmt.Sprintf(" %s", v)
 	}
 
+	command = getPackageCommand(command)
+
+	var errSSH error
+	// is host defined
 	if command.Host != nil {
-		log.Info().Str("Command", fmt.Sprintf("Running command: %s %s on host %s", command.Cmd, ArgsStr, *command.Host)).Send()
-
-		sshc, err := command.RemoteHost.ConnectToSSHHost(log)
-		if err != nil {
-			return err
-		}
-		defer sshc.Close()
-		commandSession, err := sshc.NewSession()
-		if err != nil {
-			log.Err(fmt.Errorf("new ssh session: %w", err)).Send()
-			return err
-		}
-		defer commandSession.Close()
-
-		injectEnvIntoSSH(envVars, commandSession, log)
-		cmd := command.Cmd
-		for _, a := range command.Args {
-			cmd += " " + a
-		}
-		cmdOutWriters = io.MultiWriter(&cmdOutBuf)
-
-		if IsCmdStdOutEnabled() {
-			cmdOutWriters = io.MultiWriter(os.Stdout, &cmdOutBuf)
-		}
-
-		commandSession.Stdout = cmdOutWriters
-		commandSession.Stderr = cmdOutWriters
-		err = commandSession.Run(cmd)
-		outScanner := bufio.NewScanner(&cmdOutBuf)
-		for outScanner.Scan() {
-			outMap := make(map[string]interface{})
-			outMap["cmd"] = cmd
-			outMap["output"] = outScanner.Text()
-			log.Info().Fields(outMap).Send()
-		}
-
-		if err != nil {
-			log.Error().Err(fmt.Errorf("error when running cmd: %s: %w", command.Cmd, err)).Send()
-			return err
+		outputArr, errSSH = command.RunCmdSSH(cmdCtxLogger, opts)
+		if errSSH != nil {
+			return outputArr, errSSH
 		}
 	} else {
-		cmdExists := command.checkCmdExists()
-		if !cmdExists {
-			log.Info().Str(command.Cmd, "not found").Send()
-		}
 
 		var err error
 		if command.Shell != "" {
-			log.Info().Str("Command", fmt.Sprintf("Running command: %s %s on local machine in %s", command.Cmd, ArgsStr, command.Shell)).Send()
+			cmdCtxLogger.Info().Str("Command", fmt.Sprintf("Running command %s on local machine in %s", command.Name, command.Shell)).Send()
+
 			ArgsStr = fmt.Sprintf("%s %s", command.Cmd, ArgsStr)
+
 			localCMD := exec.Command(command.Shell, "-c", ArgsStr)
+
 			if command.Dir != nil {
 				localCMD.Dir = *command.Dir
 			}
-			injectEnvIntoLocalCMD(envVars, localCMD, log)
+			injectEnvIntoLocalCMD(envVars, localCMD, cmdCtxLogger)
 
 			cmdOutWriters = io.MultiWriter(&cmdOutBuf)
 
@@ -106,135 +81,347 @@ func (command *Command) RunCmd(log *zerolog.Logger) error {
 
 			localCMD.Stdout = cmdOutWriters
 			localCMD.Stderr = cmdOutWriters
+
 			err = localCMD.Run()
+
 			outScanner := bufio.NewScanner(&cmdOutBuf)
+
 			for outScanner.Scan() {
 				outMap := make(map[string]interface{})
-				outMap["cmd"] = command.Cmd
+				outMap["cmd"] = command.Name
 				outMap["output"] = outScanner.Text()
-				log.Info().Fields(outMap).Send()
+				if str, ok := outMap["output"].(string); ok {
+					outputArr = append(outputArr, str)
+				}
+				cmdCtxLogger.Info().Fields(outMap).Send()
 			}
 
 			if err != nil {
-				log.Error().Err(fmt.Errorf("error when running cmd: %s: %w", command.Cmd, err)).Send()
-				return err
+				cmdCtxLogger.Error().Err(fmt.Errorf("error when running cmd %s: %w", command.Name, err)).Send()
+				return outputArr, err
 			}
-			return nil
+			return outputArr, nil
 		}
-		log.Info().Str("Command", fmt.Sprintf("Running command: %s %s on local machine", command.Cmd, ArgsStr)).Send()
+
+		cmdCtxLogger.Info().Str("Command", fmt.Sprintf("Running command %s on local machine", command.Name)).Send()
 
 		localCMD := exec.Command(command.Cmd, command.Args...)
+
 		if command.Dir != nil {
 			localCMD.Dir = *command.Dir
 		}
-		injectEnvIntoLocalCMD(envVars, localCMD, log)
+
+		injectEnvIntoLocalCMD(envVars, localCMD, cmdCtxLogger)
+
 		cmdOutWriters = io.MultiWriter(&cmdOutBuf)
 
 		if IsCmdStdOutEnabled() {
 			cmdOutWriters = io.MultiWriter(os.Stdout, &cmdOutBuf)
 		}
+
 		localCMD.Stdout = cmdOutWriters
 		localCMD.Stderr = cmdOutWriters
+
 		err = localCMD.Run()
+
 		outScanner := bufio.NewScanner(&cmdOutBuf)
+
 		for outScanner.Scan() {
 			outMap := make(map[string]interface{})
 			outMap["cmd"] = command.Cmd
 			outMap["output"] = outScanner.Text()
-			log.Info().Fields(outMap).Send()
+
+			if str, ok := outMap["output"].(string); ok {
+				outputArr = append(outputArr, str)
+			}
+			cmdCtxLogger.Info().Fields(outMap).Send()
 		}
 		if err != nil {
-			log.Error().Err(fmt.Errorf("error when running cmd: %s: %w", command.Cmd, err)).Send()
-			return err
+			cmdCtxLogger.Error().Err(fmt.Errorf("error when running cmd %s: %w", command.Name, err)).Send()
+			return outputArr, err
 		}
 	}
-	return nil
+	return outputArr, nil
 }
 
-func cmdListWorker(id int, jobs <-chan *CmdList, config *BackyConfigFile, results chan<- string) {
+func cmdListWorker(msgTemps *msgTemplates, jobs <-chan *CmdList, results chan<- CmdResult, opts *ConfigOpts) {
 	for list := range jobs {
-		var currentCmd string
-		fieldsMap := make(map[string]interface{})
-		fieldsMap["list"] = list.Name
-		cmdLog := config.Logger.Info()
-		var count int
-		var Msg string
-		for _, cmd := range list.Order {
-			currentCmd = config.Cmds[cmd].Cmd
-			fieldsMap["cmd"] = config.Cmds[cmd].Cmd
-			cmdLog.Fields(fieldsMap).Send()
-			cmdToRun := config.Cmds[cmd]
-			cmdLogger := config.Logger.With().
-				Str("backy-cmd", cmd).
-				Logger()
-			runOutErr := cmdToRun.RunCmd(&cmdLogger)
-			count++
-			if runOutErr != nil {
-				if list.NotifyConfig != nil {
-					notifySendErr := list.NotifyConfig.Send(context.Background(), fmt.Sprintf("List %s failed on command %s ", list.Name, cmd),
-						fmt.Sprintf("List %s failed on command %s running command %s. \n Error: %v", list.Name, cmd, currentCmd, runOutErr))
-					if notifySendErr != nil {
-						config.Logger.Err(notifySendErr).Send()
-					}
-				}
-				config.Logger.Err(runOutErr).Send()
-				break
-			} else {
+		fieldsMap := map[string]interface{}{"list": list.Name}
+		var cmdLogger zerolog.Logger
+		var cmdsRan []string
+		var outStructArr []outStruct
+		var hasError bool // Tracks if any command in the list failed
 
-				if count == len(list.Order) {
-					Msg += fmt.Sprintf("%s ", cmd)
-					if list.NotifyConfig != nil {
-						err := list.NotifyConfig.Send(context.Background(), fmt.Sprintf("List %s succeded", list.Name),
-							fmt.Sprintf("Command list %s was completed successfully. The following commands ran:\n %s", list.Name, Msg))
-						if err != nil {
-							config.Logger.Err(err).Send()
-						}
-					}
-				} else {
-					Msg += fmt.Sprintf("%s, ", cmd)
+		for _, cmd := range list.Order {
+			cmdToRun := opts.Cmds[cmd]
+			currentCmd := cmdToRun.Name
+			fieldsMap["cmd"] = currentCmd
+			cmdLogger = cmdToRun.GenerateLogger(opts)
+			cmdLogger.Info().Fields(fieldsMap).Send()
+
+			outputArr, runErr := cmdToRun.RunCmd(cmdLogger, opts)
+			cmdsRan = append(cmdsRan, cmd)
+
+			if runErr != nil {
+
+				// Log the error and send a failed result
+				cmdLogger.Err(runErr).Send()
+				results <- CmdResult{CmdName: cmd, ListName: list.Name, Error: runErr}
+
+				// Execute error hooks for the failed command
+				cmdToRun.ExecuteHooks("error", opts)
+
+				// Notify failure
+				if list.NotifyConfig != nil {
+					notifyError(cmdLogger, msgTemps, list, cmdsRan, outStructArr, runErr, cmdToRun, opts)
 				}
+				hasError = true
+				break
+			}
+
+			// Collect output if required
+			if list.GetOutput || cmdToRun.GetOutput {
+				outStructArr = append(outStructArr, outStruct{
+					CmdName:     currentCmd,
+					CmdExecuted: currentCmd,
+					Output:      outputArr,
+				})
 			}
 		}
 
-		results <- "done"
+		// Notify success if no errors occurred
+		if !hasError && list.NotifyConfig != nil && (list.NotifyOnSuccess || list.GetOutput) {
+			notifySuccess(cmdLogger, msgTemps, list, cmdsRan, outStructArr)
+		}
+
+		// Execute success and final hooks for all commands
+		for _, cmd := range list.Order {
+			cmdToRun := opts.Cmds[cmd]
+
+			// Execute success hooks if the command succeeded
+			if !hasError || cmdsRanContains(cmd, cmdsRan) {
+				cmdToRun.ExecuteHooks("success", opts)
+			}
+
+			// Execute final hooks for every command
+			cmdToRun.ExecuteHooks("final", opts)
+		}
+
+		// Send the final result for the list
+		if hasError {
+			results <- CmdResult{CmdName: cmdsRan[len(cmdsRan)-1], ListName: list.Name, Error: fmt.Errorf("list execution failed")}
+		} else {
+			results <- CmdResult{CmdName: cmdsRan[len(cmdsRan)-1], ListName: list.Name, Error: nil}
+		}
 	}
 }
 
-// RunBackyConfig runs a command list from the BackyConfigFile.
-func (config *BackyConfigFile) RunBackyConfig(cron string) {
-	configListsLen := len(config.CmdConfigLists)
+// Helper to check if a command is in the list of executed commands
+func cmdsRanContains(cmd string, cmdsRan []string) bool {
+	for _, c := range cmdsRan {
+		if c == cmd {
+			return true
+		}
+	}
+	return false
+}
+
+// Helper to notify errors
+func notifyError(logger zerolog.Logger, templates *msgTemplates, list *CmdList, cmdsRan []string, outStructArr []outStruct, err error, cmd *Command, opts *ConfigOpts) {
+	errStruct := map[string]interface{}{
+		"listName":  list.Name,
+		"CmdsRan":   cmdsRan,
+		"CmdOutput": outStructArr,
+		"Err":       err,
+		"Command":   cmd.Name,
+		"Args":      cmd.Args,
+	}
+	var errMsg bytes.Buffer
+	if e := templates.err.Execute(&errMsg, errStruct); e != nil {
+		logger.Err(e).Send()
+		return
+	}
+	if e := list.NotifyConfig.Send(context.Background(), fmt.Sprintf("List %s failed", list.Name), errMsg.String()); e != nil {
+		logger.Err(e).Send()
+	}
+}
+
+// Helper to notify success
+func notifySuccess(logger zerolog.Logger, templates *msgTemplates, list *CmdList, cmdsRan []string, outStructArr []outStruct) {
+	successStruct := map[string]interface{}{
+		"listName":  list.Name,
+		"CmdsRan":   cmdsRan,
+		"CmdOutput": outStructArr,
+	}
+	var successMsg bytes.Buffer
+	if e := templates.success.Execute(&successMsg, successStruct); e != nil {
+		logger.Err(e).Send()
+		return
+	}
+	if e := list.NotifyConfig.Send(context.Background(), fmt.Sprintf("List %s succeeded", list.Name), successMsg.String()); e != nil {
+		logger.Err(e).Send()
+	}
+}
+
+// RunListConfig runs a command list from the ConfigFile.
+func (opts *ConfigOpts) RunListConfig(cron string) {
+	mTemps := &msgTemplates{
+		err:     template.Must(template.New("error.txt").ParseFS(templates, "templates/error.txt")),
+		success: template.Must(template.New("success.txt").ParseFS(templates, "templates/success.txt")),
+	}
+	configListsLen := len(opts.CmdConfigLists)
 	listChan := make(chan *CmdList, configListsLen)
-	results := make(chan string)
-
-	// This starts up 3 workers, initially blocked
-	// because there are no jobs yet.
-	for w := 1; w <= 3; w++ {
-		go cmdListWorker(w, listChan, config, results)
+	results := make(chan CmdResult, configListsLen)
 
+	// Start workers
+	for w := 1; w <= configListsLen; w++ {
+		go cmdListWorker(mTemps, listChan, results, opts)
 	}
 
-	// Here we send 5 `jobs` and then `close` that
-	// channel to indicate that's all the work we have.
-	// configChan <- config.Cmds
-	for _, cmdConfig := range config.CmdConfigLists {
-		if cron != "" {
-			if cron == cmdConfig.Cron {
-				listChan <- cmdConfig
-			}
-		} else {
+	// Enqueue jobs
+	for listName, cmdConfig := range opts.CmdConfigLists {
+		if cmdConfig.Name == "" {
+			cmdConfig.Name = listName
+		}
+		if cron == "" || cron == cmdConfig.Cron {
 			listChan <- cmdConfig
 		}
 	}
 	close(listChan)
 
+	// Process results
 	for a := 1; a <= configListsLen; a++ {
-		<-results
+		result := <-results
+		opts.Logger.Debug().Msgf("Processing result for list %s, command %s", result.ListName, result.CmdName)
+
+		// Process final hooks for the list (already handled in worker)
 	}
+	opts.closeHostConnections()
+}
+
+type CmdResult struct {
+	CmdName  string // Name of the command executed
+	ListName string // Name of the command list
+	Error    error  // Error encountered, if any
+}
+
+func (config *ConfigOpts) ExecuteCmds(opts *ConfigOpts) {
+	for _, cmd := range opts.executeCmds {
+		cmdToRun := opts.Cmds[cmd]
+		cmdLogger := cmdToRun.GenerateLogger(opts)
+		_, runErr := cmdToRun.RunCmd(cmdLogger, opts)
+		if runErr != nil {
+			opts.Logger.Err(runErr).Send()
+
+			cmdToRun.ExecuteHooks("error", opts)
+		} else {
+
+			cmdToRun.ExecuteHooks("success", opts)
+		}
+
+		cmdToRun.ExecuteHooks("final", opts)
+	}
+
+	opts.closeHostConnections()
 
 }
 
-func (config *BackyConfigFile) ExecuteCmds() {
-	for _, cmd := range config.Cmds {
-		cmd.RunCmd(&config.Logger)
+func (c *ConfigOpts) closeHostConnections() {
+	for _, host := range c.Hosts {
+		if host.isProxyHost {
+			continue
+		}
+		if host.SshClient != nil {
+			if _, err := host.SshClient.NewSession(); err == nil {
+				c.Logger.Info().Msgf("Closing host connection %s", host.HostName)
+				host.SshClient.Close()
+				host.SshClient = nil
+			}
+		}
+		for _, proxyHost := range host.ProxyHost {
+			if proxyHost.isProxyHost {
+				continue
+			}
+			if proxyHost.SshClient != nil {
+				if _, err := host.SshClient.NewSession(); err == nil {
+					c.Logger.Info().Msgf("Closing connection to proxy host %s", host.HostName)
+					host.SshClient.Close()
+					host.SshClient = nil
+				}
+			}
+		}
+	}
+	for _, host := range c.Hosts {
+		if host.SshClient != nil {
+			if _, err := host.SshClient.NewSession(); err == nil {
+				c.Logger.Info().Msgf("Closing proxy host connection %s", host.HostName)
+				host.SshClient.Close()
+				host.SshClient = nil
+			}
+		}
+	}
+}
+
+func (cmd *Command) ExecuteHooks(hookType string, opts *ConfigOpts) {
+	if cmd.Hooks == nil {
+		return
+	}
+	switch hookType {
+	case "error":
+		for _, v := range cmd.Hooks.Error {
+			errCmd := opts.Cmds[v]
+			cmdLogger := opts.Logger.With().
+				Str("backy-cmd", v).
+				Logger()
+			errCmd.RunCmd(cmdLogger, opts)
+		}
+
+	case "success":
+		for _, v := range cmd.Hooks.Success {
+			successCmd := opts.Cmds[v]
+			cmdLogger := opts.Logger.With().
+				Str("backy-cmd", v).
+				Logger()
+			successCmd.RunCmd(cmdLogger, opts)
+		}
+	case "final":
+		for _, v := range cmd.Hooks.Final {
+			finalCmd := opts.Cmds[v]
+			cmdLogger := opts.Logger.With().
+				Str("backy-cmd", v).
+				Logger()
+			finalCmd.RunCmd(cmdLogger, opts)
+		}
+	}
+}
+
+func (cmd *Command) GenerateLogger(opts *ConfigOpts) zerolog.Logger {
+	cmdLogger := opts.Logger.With().
+		Str("Backy-cmd", cmd.Name).Str("Host", "local machine").
+		Logger()
+
+	if cmd.Host != nil {
+		cmdLogger = opts.Logger.With().
+			Str("Backy-cmd", cmd.Name).Str("Host", *cmd.Host).
+			Logger()
+
+	}
+	return cmdLogger
+}
+
+func (opts *ConfigOpts) ExecCmdsSSH(cmdList []string, hostsList []string) {
+	// Iterate over hosts and exec commands
+	for _, h := range hostsList {
+		host := opts.Hosts[h]
+		for _, c := range cmdList {
+			cmd := opts.Cmds[c]
+			cmd.RemoteHost = host
+			cmd.Host = &host.Host
+			opts.Logger.Info().Str("host", h).Str("cmd", c).Send()
+			_, err := cmd.RunCmdSSH(cmd.GenerateLogger(opts), opts)
+			if err != nil {
+				opts.Logger.Err(err).Str("host", h).Str("cmd", c).Send()
+			}
+		}
 	}
 }

pkg/backy/config.go

@@ -1,6 +1,7 @@
 package backy
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -8,15 +9,72 @@ import (
 	"strings"
 
 	"git.andrewnw.xyz/CyberShell/backy/pkg/logging"
-	"github.com/joho/godotenv"
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman"
+	vault "github.com/hashicorp/vault/api"
+	"github.com/knadh/koanf/parsers/yaml"
+	"github.com/knadh/koanf/providers/file"
+	"github.com/knadh/koanf/v2"
 	"github.com/mattn/go-isatty"
 	"github.com/rs/zerolog"
-	"github.com/spf13/viper"
-	"mvdan.cc/sh/v3/shell"
 )
 
+var homeDir string
+var homeDirErr error
+var backyHomeConfDir string
+var configFiles []string
+
+const macroStart string = "%{"
+const macroEnd string = "}%"
+const envMacroStart string = "%{env:"
+const vaultMacroStart string = "%{env:"
+
+func (opts *ConfigOpts) InitConfig() {
+
+	homeDir, homeDirErr = os.UserHomeDir()
+
+	if homeDirErr != nil {
+		fmt.Println(homeDirErr)
+		logging.ExitWithMSG(homeDirErr.Error(), 1, nil)
+	}
+
+	backyHomeConfDir = homeDir + "/.config/backy/"
+
+	configFiles = []string{"./backy.yml", "./backy.yaml", backyHomeConfDir + "backy.yml", backyHomeConfDir + "backy.yaml"}
+
+	backyKoanf := koanf.New(".")
+
+	opts.ConfigFilePath = strings.TrimSpace(opts.ConfigFilePath)
+
+	if opts.ConfigFilePath != "" {
+		err := testFile(opts.ConfigFilePath)
+		if err != nil {
+			logging.ExitWithMSG(fmt.Sprintf("Could not open config file %s: %v", opts.ConfigFilePath, err), 1, nil)
+		}
+
+		if err := backyKoanf.Load(file.Provider(opts.ConfigFilePath), yaml.Parser()); err != nil {
+			logging.ExitWithMSG(fmt.Sprintf("error loading config: %v", err), 1, &opts.Logger)
+		}
+	} else {
+
+		cFileFailures := 0
+		for _, c := range configFiles {
+			if err := backyKoanf.Load(file.Provider(c), yaml.Parser()); err != nil {
+				cFileFailures++
+			} else {
+				opts.ConfigFilePath = c
+				break
+			}
+		}
+		if cFileFailures == len(configFiles) {
+			logging.ExitWithMSG(fmt.Sprintf("could not find a config file. Put one in the following paths: %v", configFiles), 1, &opts.Logger)
+		}
+	}
+
+	opts.koanf = backyKoanf
+}
+
 // ReadConfig validates and reads the config file.
-func ReadConfig(opts *BackyConfigOpts) *BackyConfigFile {
+func ReadConfig(opts *ConfigOpts) *ConfigOpts {
 
 	if isatty.IsTerminal(os.Stdout.Fd()) {
 		os.Setenv("BACKY_TERM", "enabled")
@@ -26,188 +84,247 @@ func ReadConfig(opts *BackyConfigOpts) *BackyConfigFile {
 		os.Setenv("BACKY_TERM", "disabled")
 	}
 
-	backyConfigFile := NewConfig()
-	backyViper := opts.viper
-	// loadEnv(backyViper)
-	envFileInConfigDir := fmt.Sprintf("%s/.env", path.Dir(backyViper.ConfigFileUsed()))
+	backyKoanf := opts.koanf
 
-	envFileErr := godotenv.Load()
-	if envFileErr != nil {
-		_ = godotenv.Load(envFileInConfigDir)
-	}
-	if backyViper.GetBool(getNestedConfig("logging", "cmd-std-out")) {
+	opts.loadEnv()
+
+	if backyKoanf.Bool(getNestedConfig("logging", "cmd-std-out")) {
 		os.Setenv("BACKY_STDOUT", "enabled")
 	}
 
-	CheckConfigValues(backyViper)
+	CheckConfigValues(backyKoanf, opts.ConfigFilePath)
+
+	// check for commands in file
 	for _, c := range opts.executeCmds {
-		if !backyViper.IsSet(getCmdFromConfig(c)) {
-			logging.ExitWithMSG(Sprintf("command %s is not in config file %s", c, backyViper.ConfigFileUsed()), 1, nil)
+		if !backyKoanf.Exists(getCmdFromConfig(c)) {
+			logging.ExitWithMSG(Sprintf("command %s is not in config file %s", c, opts.ConfigFilePath), 1, nil)
 		}
 	}
 
-	for _, l := range opts.executeLists {
-		if !backyViper.IsSet(getCmdListFromConfig(l)) {
-			logging.ExitWithMSG(Sprintf("list %s not found", l), 1, nil)
-		}
-	}
+	// TODO: refactor this further down the line
 
-	var backyLoggingOpts *viper.Viper
-	isBackyLoggingOptsSet := backyViper.IsSet("logging")
-	if isBackyLoggingOptsSet {
-		backyLoggingOpts = backyViper.Sub("logging")
-	}
-	verbose := backyLoggingOpts.GetBool("verbose")
+	// for _, l := range opts.executeLists {
+	// 	if !backyKoanf.Exists(getCmdListFromConfig(l)) {
+	// 		logging.ExitWithMSG(Sprintf("list %s not found", l), 1, nil)
+	// 	}
+	// }
 
-	logFile := backyLoggingOpts.GetString("file")
+	// check for verbosity, via
+	// 1. config file
+	// 2. TODO: CLI flag
+	// 3. TODO: ENV var
+
+	var (
+		isLoggingVerbose bool
+		logFile          string
+	)
+
+	isLoggingVerbose = backyKoanf.Bool(getLoggingKeyFromConfig("verbose"))
+
+	logFile = fmt.Sprintf("%s/backy.log", path.Dir(opts.ConfigFilePath)) // get full path to logfile
+
+	if backyKoanf.Exists(getLoggingKeyFromConfig("file")) {
+		logFile = backyKoanf.String(getLoggingKeyFromConfig("file"))
+	}
 
 	zerolog.SetGlobalLevel(zerolog.InfoLevel)
 
-	if verbose {
+	if isLoggingVerbose {
 		zerolog.SetGlobalLevel(zerolog.DebugLevel)
 		globalLvl := zerolog.GlobalLevel()
-		os.Setenv("BACKY_LOGLEVEL", Sprintf("%x", globalLvl))
+		os.Setenv("BACKY_LOGLEVEL", Sprintf("%v", globalLvl))
 	}
 
-	consoleLoggingEnabled := backyLoggingOpts.GetBool("console")
+	consoleLoggingDisabled := backyKoanf.Bool(getLoggingKeyFromConfig("console-disabled"))
 
+	os.Setenv("BACKY_CONSOLE_LOGGING", "enabled")
 	// Other qualifiers can go here as well
-	if consoleLoggingEnabled {
-		os.Setenv("BACKY_CONSOLE_LOGGING", "enabled")
-	} else {
+	if consoleLoggingDisabled {
 		os.Setenv("BACKY_CONSOLE_LOGGING", "")
 	}
 
-	writers := logging.SetLoggingWriters(backyLoggingOpts, logFile)
+	writers := logging.SetLoggingWriters(logFile)
 
 	log := zerolog.New(writers).With().Timestamp().Logger()
 
-	backyConfigFile.Logger = log
+	opts.Logger = log
+
+	log.Info().Str("config file", opts.ConfigFilePath).Send()
+
+	unmarshalErr := backyKoanf.UnmarshalWithConf("commands", &opts.Cmds, koanf.UnmarshalConf{Tag: "yaml"})
 
-	commandsMap := backyViper.GetStringMapString("commands")
-	commandsMapViper := backyViper.Sub("commands")
-	unmarshalErr := commandsMapViper.Unmarshal(&backyConfigFile.Cmds)
 	if unmarshalErr != nil {
-		panic(fmt.Errorf("error unmarshalling cmds struct: %w", unmarshalErr))
+
+		panic(fmt.Errorf("error unmarshaling cmds struct: %w", unmarshalErr))
+
 	}
 
-	hostConfigsMap := make(map[string]*viper.Viper)
-
-	for cmdName, cmdConf := range backyConfigFile.Cmds {
+	for cmdName, cmdConf := range opts.Cmds {
 		envFileErr := testFile(cmdConf.Env)
 		if envFileErr != nil {
-			backyConfigFile.Logger.Info().Str("cmd", cmdName).Err(envFileErr).Send()
+			opts.Logger.Info().Str("cmd", cmdName).Err(envFileErr).Send()
 			os.Exit(1)
 		}
 
-		host := cmdConf.Host
-		if host != nil {
-			if backyViper.IsSet(getNestedConfig("hosts", *host)) {
-				hostconfig := backyViper.Sub(getNestedConfig("hosts", *host))
-				hostConfigsMap[*host] = hostconfig
-			}
-		}
+		expandEnvVars(opts.backyEnv, cmdConf.Environment)
 	}
 
-	hostsMapViper := backyViper.Sub("hosts")
-	unmarshalErr = hostsMapViper.Unmarshal(&backyConfigFile.Hosts)
+	// Get host configurations from config file
+
+	unmarshalErr = backyKoanf.UnmarshalWithConf("hosts", &opts.Hosts, koanf.UnmarshalConf{Tag: "yaml"})
 	if unmarshalErr != nil {
 		panic(fmt.Errorf("error unmarshalling hosts struct: %w", unmarshalErr))
 	}
-	for _, v := range backyConfigFile.Hosts {
-
-		if v.JumpHost != "" {
-			proxyHost, defined := backyConfigFile.Hosts[v.JumpHost]
-			if defined {
-				v.ProxyHost = proxyHost
+	for hostConfigName, host := range opts.Hosts {
+		if host.Host == "" {
+			host.Host = hostConfigName
+		}
+		if host.ProxyJump != "" {
+			proxyHosts := strings.Split(host.ProxyJump, ",")
+			for hostNum, h := range proxyHosts {
+				if hostNum > 1 {
+					proxyHost, defined := opts.Hosts[h]
+					if defined {
+						host.ProxyHost = append(host.ProxyHost, proxyHost)
+					} else {
+						newProxy := &Host{Host: h}
+						host.ProxyHost = append(host.ProxyHost, newProxy)
+					}
+				} else {
+					proxyHost, defined := opts.Hosts[h]
+					if defined {
+						host.ProxyHost = append(host.ProxyHost, proxyHost)
+					} else {
+						newHost := &Host{Host: h}
+						host.ProxyHost = append(host.ProxyHost, newHost)
+					}
+				}
 			}
+
 		}
 	}
-	cmdListCfg := backyViper.Sub("cmd-configs")
-	unmarshalErr = cmdListCfg.Unmarshal(&backyConfigFile.CmdConfigLists)
-	if unmarshalErr != nil {
-		panic(fmt.Errorf("error unmarshalling cmd list struct: %w", unmarshalErr))
+
+	// get command lists
+	// command lists should still be in the same file if no:
+	// 1. key 'cmd-lists.file' is found
+	// 2. hosts.yml or hosts.yaml is found in the same directory as the backy config file
+	backyConfigFileDir := path.Dir(opts.ConfigFilePath)
+
+	listsConfig := koanf.New(".")
+
+	listConfigFiles := []string{path.Join(backyConfigFileDir, "lists.yml"), path.Join(backyConfigFileDir, "lists.yaml")}
+
+	log.Info().Strs("list config files", listConfigFiles).Send()
+	for _, l := range listConfigFiles {
+		cFileFailures := 0
+		if err := listsConfig.Load(file.Provider(l), yaml.Parser()); err != nil {
+			cFileFailures++
+		} else {
+			opts.ConfigFilePath = l
+			break
+		}
+
+		if cFileFailures == len(configFiles) {
+
+			logging.ExitWithMSG(fmt.Sprintf("could not find a config file. Put one in the following paths: %v", listConfigFiles), 1, &opts.Logger)
+
+			// logging.ExitWithMSG((fmt.Sprintf("error unmarshalling cmd list struct: %v", unmarshalErr)), 1, &opts.Logger)
+		}
+
+	}
+	_ = listsConfig.UnmarshalWithConf("cmd-lists", &opts.CmdConfigLists, koanf.UnmarshalConf{Tag: "yaml"})
+
+	if backyKoanf.Exists("cmd-lists") {
+
+		unmarshalErr = backyKoanf.UnmarshalWithConf("cmd-lists", &opts.CmdConfigLists, koanf.UnmarshalConf{Tag: "yaml"})
+		// if unmarshalErr is not nil, look for a cmd-lists.file key
+		if unmarshalErr != nil {
+
+			// if file key exists, resolve file path and try to read and unmarshal file into command lists config
+			if backyKoanf.Exists("cmd-lists.file") {
+				opts.CmdListFile = strings.TrimSpace(backyKoanf.String("cmd-lists.file"))
+
+				cmdListFilePath := path.Clean(opts.CmdListFile)
+
+				// if path is not absolute, check config directory
+				if !strings.HasPrefix(cmdListFilePath, "/") {
+					opts.CmdListFile = path.Join(backyConfigFileDir, cmdListFilePath)
+				}
+
+				err := testFile(opts.CmdListFile)
+
+				if err != nil {
+					logging.ExitWithMSG(fmt.Sprintf("Could not open config file %s: %v. \n\nThe cmd-lists config should be in the main config file or should be in a lists.yml or lists.yaml file.", opts.CmdListFile, err), 1, nil)
+				}
+
+				if err := listsConfig.Load(file.Provider(opts.CmdListFile), yaml.Parser()); err != nil {
+					logging.ExitWithMSG(fmt.Sprintf("error loading config: %v", err), 1, &opts.Logger)
+				}
+
+				log.Info().Str("using lists config file", opts.CmdListFile).Send()
+
+			}
+
+		}
+
 	}
 
 	var cmdNotFoundSliceErr []error
-	for cmdListName, cmdList := range backyConfigFile.CmdConfigLists {
-		if opts.useCron {
+	for cmdListName, cmdList := range opts.CmdConfigLists {
+		if opts.cronEnabled {
 			cron := strings.TrimSpace(cmdList.Cron)
 			if cron == "" {
-				delete(backyConfigFile.CmdConfigLists, cmdListName)
+				delete(opts.CmdConfigLists, cmdListName)
 			}
 		}
 		for _, cmdInList := range cmdList.Order {
-			_, cmdNameFound := backyConfigFile.Cmds[cmdInList]
+			_, cmdNameFound := opts.Cmds[cmdInList]
 			if !cmdNameFound {
-				cmdNotFoundStr := fmt.Sprintf("command %s in list %s is not defined in config file", cmdInList, cmdListName)
+				cmdNotFoundStr := fmt.Sprintf("command %s in list %s is not defined in commands section in config file", cmdInList, cmdListName)
 				cmdNotFoundErr := errors.New(cmdNotFoundStr)
 				cmdNotFoundSliceErr = append(cmdNotFoundSliceErr, cmdNotFoundErr)
 			}
 		}
-		for _, notificationID := range cmdList.Notifications {
-			if !backyViper.IsSet(getNestedConfig("notifications", notificationID)) {
-				logging.ExitWithMSG(fmt.Sprintf("%s in list %s not found in notifications", notificationID, cmdListName), 1, nil)
-			}
-		}
 	}
 
+	// Exit program if command is not found from list
 	if len(cmdNotFoundSliceErr) > 0 {
 		var cmdNotFoundErrorLog = log.Fatal()
 		cmdNotFoundErrorLog.Errs("commands not found", cmdNotFoundSliceErr).Send()
 	}
 
-	if opts.useCron && len(backyConfigFile.CmdConfigLists) > 0 {
-		log.Info().Msg("Starting cron mode...")
-
-	} else if opts.useCron && (len(backyConfigFile.CmdConfigLists) == 0) {
+	if opts.cronEnabled && (len(opts.CmdConfigLists) == 0) {
 		logging.ExitWithMSG("No cron fields detected in any command lists", 1, nil)
 	}
 
-	for c := range commandsMap {
-		if opts.executeCmds != nil && !contains(opts.executeCmds, c) {
-			delete(backyConfigFile.Cmds, c)
-		}
+	// process commands
+	if err := processCmds(opts); err != nil {
+		logging.ExitWithMSG(err.Error(), 1, &opts.Logger)
 	}
 
 	if len(opts.executeLists) > 0 {
-		for l := range backyConfigFile.CmdConfigLists {
+		for l := range opts.CmdConfigLists {
 			if !contains(opts.executeLists, l) {
-				delete(backyConfigFile.CmdConfigLists, l)
+				delete(opts.CmdConfigLists, l)
 			}
 		}
 	}
 
-	var notificationsMap = make(map[string]interface{})
-	if backyViper.IsSet("notifications") {
-		notificationsMap = backyViper.GetStringMap("notifications")
-		for id := range notificationsMap {
-			notifConfig := backyViper.Sub(getNestedConfig("notifications", id))
-			config := &NotificationsConfig{
-				Config:  notifConfig,
-				Enabled: true,
-			}
-			backyConfigFile.Notifications[id] = config
+	if backyKoanf.Exists("notifications") {
+
+		unmarshalErr = backyKoanf.UnmarshalWithConf("notifications", &opts.NotificationConf, koanf.UnmarshalConf{Tag: "yaml"})
+		if unmarshalErr != nil {
+			fmt.Printf("error unmarshalling notifications object: %v", unmarshalErr)
 		}
 	}
 
-	for _, cmd := range backyConfigFile.Cmds {
-		if cmd.Host != nil {
-			host, hostFound := backyConfigFile.Hosts[*cmd.Host]
-			if hostFound {
-				cmd.RemoteHost = host
-				cmd.RemoteHost.Host = host.Host
-				if host.HostName != "" {
-					cmd.RemoteHost.HostName = host.HostName
-				}
-			} else {
-				cmd.RemoteHost = &Host{Host: *cmd.Host}
-			}
-		}
+	opts.SetupNotify()
 
+	if err := opts.setupVault(); err != nil {
+		log.Err(err).Send()
 	}
-	backyConfigFile.SetupNotify()
-	return backyConfigFile
+
+	return opts
 }
 
 func getNestedConfig(nestedConfig, key string) string {
@@ -217,60 +334,226 @@ func getNestedConfig(nestedConfig, key string) string {
 func getCmdFromConfig(key string) string {
 	return fmt.Sprintf("commands.%s", key)
 }
+
+func getLoggingKeyFromConfig(key string) string {
+	if key == "" {
+		return "logging"
+	}
+	return fmt.Sprintf("logging.%s", key)
+}
+
 func getCmdListFromConfig(list string) string {
-	return fmt.Sprintf("cmd-configs.%s", list)
+	return fmt.Sprintf("cmd-lists.%s", list)
 }
 
-func (opts *BackyConfigOpts) InitConfig() {
-	if opts.viper != nil {
-		return
+func (opts *ConfigOpts) setupVault() error {
+	if !opts.koanf.Bool("vault.enabled") {
+		return nil
 	}
-	backyViper := viper.New()
+	config := vault.DefaultConfig()
 
-	if strings.TrimSpace(opts.ConfigFilePath) != "" {
-		backyViper.SetConfigFile(opts.ConfigFilePath)
+	config.Address = opts.koanf.String("vault.address")
+	if strings.TrimSpace(config.Address) == "" {
+		config.Address = os.Getenv("VAULT_ADDR")
+	}
+
+	client, err := vault.NewClient(config)
+	if err != nil {
+		return err
+	}
+
+	token := opts.koanf.String("vault.token")
+	if strings.TrimSpace(token) == "" {
+		token = os.Getenv("VAULT_TOKEN")
+	}
+	if strings.TrimSpace(token) == "" {
+		return fmt.Errorf("no token found, but one was required. \n\nSet the config key vault.token or the environment variable VAULT_TOKEN")
+	}
+
+	client.SetToken(token)
+
+	unmarshalErr := opts.koanf.UnmarshalWithConf("vault.keys", &opts.VaultKeys, koanf.UnmarshalConf{Tag: "yaml"})
+	if unmarshalErr != nil {
+		logging.ExitWithMSG(fmt.Sprintf("error unmarshalling vault.keys into struct: %v", unmarshalErr), 1, &opts.Logger)
+	}
+
+	opts.vaultClient = client
+
+	return nil
+}
+
+func getVaultSecret(vaultClient *vault.Client, key *VaultKey) (string, error) {
+	var (
+		secret *vault.KVSecret
+		err    error
+	)
+
+	if key.ValueType == "KVv2" {
+		secret, err = vaultClient.KVv2(key.MountPath).Get(context.Background(), key.Path)
+	} else if key.ValueType == "KVv1" {
+		secret, err = vaultClient.KVv1(key.MountPath).Get(context.Background(), key.Path)
+	} else if key.ValueType != "" {
+		return "", fmt.Errorf("type %s for key %s not known. Valid types are KVv1 or KVv2", key.ValueType, key.Name)
 	} else {
-		backyViper.SetConfigName("backy.yaml")          // name of config file (with extension)
-		backyViper.SetConfigType("yaml")                // REQUIRED if the config file does not have the extension in the name
-		backyViper.AddConfigPath(".")                   // optionally look for config in the working directory
-		backyViper.AddConfigPath("$HOME/.config/backy") // call multiple times to add many search paths
+		return "", fmt.Errorf("type for key %s must be specified. Valid types are KVv1 or KVv2", key.Name)
+
 	}
-	err := backyViper.ReadInConfig() // Find and read the config file
-	if err != nil {                  // Handle errors reading the config file
-		panic(fmt.Errorf("fatal error reading config file %s: %w", backyViper.ConfigFileUsed(), err))
+	if err != nil {
+		return "", fmt.Errorf("unable to read secret: %v", err)
 	}
-	opts.viper = backyViper
+
+	value, ok := secret.Data[key.Name].(string)
+	if !ok {
+		return "", fmt.Errorf("value type assertion failed: %T %#v", secret.Data[key.Name], secret.Data[key.Name])
+	}
+
+	return value, nil
 }
 
-func loadEnv(backyViper *viper.Viper) {
-	envFileInConfigDir := fmt.Sprintf("%s/.env", path.Dir(backyViper.ConfigFileUsed()))
-	var backyEnv map[string]string
-	backyEnv, envFileErr := godotenv.Read()
+func isVaultKey(str string) (string, bool) {
+	str = strings.TrimSpace(str)
+	return strings.TrimPrefix(str, "vault:"), strings.HasPrefix(str, "vault:")
+}
 
-	// envFile, envFileErr := os.Open(".env")
-	if envFileErr != nil {
-		backyEnv, _ = godotenv.Read(envFileInConfigDir)
-	}
-	envFileErr = godotenv.Load()
-	if envFileErr != nil {
-		_ = godotenv.Load(envFileInConfigDir)
+func parseVaultKey(str string, keys []*VaultKey) (*VaultKey, error) {
+	keyName, isKey := isVaultKey(str)
+	if !isKey {
+		return nil, nil
 	}
 
-	env := func(name string) string {
-		name = strings.ToUpper(name)
-		envVar, found := backyEnv[name]
-		if found {
-			return envVar
+	for _, k := range keys {
+		if k.Name == keyName {
+			return k, nil
 		}
+	}
+	return nil, fmt.Errorf("key %s not found in vault keys", keyName)
+}
+
+func GetVaultKey(str string, opts *ConfigOpts, log zerolog.Logger) string {
+	key, err := parseVaultKey(str, opts.VaultKeys)
+	if key == nil && err == nil {
+		return str
+	}
+	if err != nil && key == nil {
+		log.Err(err).Send()
 		return ""
 	}
-	envVars := []string{"APP=${BACKY_APP}"}
 
-	for indx, v := range envVars {
-		if strings.Contains(v, "$") || (strings.Contains(v, "${") && strings.Contains(v, "}")) {
-			out, _ := shell.Expand(v, env)
-			envVars[indx] = out
-			// println(out)
+	value, secretErr := getVaultSecret(opts.vaultClient, key)
+	if secretErr != nil {
+		log.Err(secretErr).Send()
+		return value
+	}
+	return value
+}
+
+func processCmds(opts *ConfigOpts) error {
+	// process commands
+	for cmdName, cmd := range opts.Cmds {
+
+		if cmd.Name == "" {
+			cmd.Name = cmdName
+		}
+		// println("Cmd.Name = " + cmd.Name)
+		hooks := cmd.Hooks
+		// resolve hooks
+		if hooks != nil {
+
+			processHookSuccess := processHooks(cmd, hooks.Error, opts, "error")
+			if processHookSuccess != nil {
+				return processHookSuccess
+			}
+			processHookSuccess = processHooks(cmd, hooks.Success, opts, "success")
+			if processHookSuccess != nil {
+				return processHookSuccess
+			}
+			processHookSuccess = processHooks(cmd, hooks.Final, opts, "final")
+			if processHookSuccess != nil {
+				return processHookSuccess
+			}
+		}
+
+		// resolve hosts
+		if cmd.Host != nil {
+			host, hostFound := opts.Hosts[*cmd.Host]
+			if hostFound {
+				cmd.RemoteHost = host
+				cmd.RemoteHost.Host = host.Host
+				if host.HostName != "" {
+					cmd.RemoteHost.HostName = host.HostName
+				}
+			} else {
+				opts.Hosts[*cmd.Host] = &Host{Host: *cmd.Host}
+				cmd.RemoteHost = &Host{Host: *cmd.Host}
+			}
+		}
+
+		// Parse package commands
+		if cmd.Type == "package" {
+			if cmd.PackageManager == "" {
+				return fmt.Errorf("package manager is required for package command %s", cmd.PackageName)
+			}
+			if cmd.PackageOperation == "" {
+				return fmt.Errorf("package operation is required for package command %s", cmd.PackageName)
+			}
+			if cmd.PackageName == "" {
+				return fmt.Errorf("package name is required for package command %s", cmd.PackageName)
+			}
+			var err error
+
+			// Validate the operation
+			switch cmd.PackageOperation {
+			case "install", "remove", "upgrade":
+				cmd.pkgMan, err = pkgman.PackageManagerFactory(cmd.PackageManager, pkgman.WithoutAuth())
+				if err != nil {
+					return err
+				}
+			default:
+				return fmt.Errorf("unsupported package operation %s for command %s", cmd.PackageOperation, cmd.Name)
+			}
+
 		}
 	}
+	return nil
+}
+
+// processHooks evaluates if hooks are valid Commands
+//
+// Takes the following arguments:
+//
+//  1. a []string of hooks
+//  2. a map of Commands as arguments
+//  3. a string hookType, must be the hook type
+//
+// The cmds.hookRef is modified in this function.
+//
+// Returns the following:
+//
+//	An error, if any, if the command is not found
+func processHooks(cmd *Command, hooks []string, opts *ConfigOpts, hookType string) error {
+
+	// initialize hook type
+	var hookCmdFound bool
+	cmd.hookRefs = map[string]map[string]*Command{}
+	cmd.hookRefs[hookType] = map[string]*Command{}
+
+	for _, hook := range hooks {
+
+		var hookCmd *Command
+		// TODO: match by Command.Name
+
+		hookCmd, hookCmdFound = opts.Cmds[hook]
+
+		if !hookCmdFound {
+			return fmt.Errorf("error in command %s hook %s list: command %s not found", cmd.Name, hookType, hook)
+		}
+
+		cmd.hookRefs[hookType][hook] = hookCmd
+
+		// Recursive, decide if this is good
+		// if hookCmd.hookRefs == nil {
+		// }
+		// hookRef[hookType][h] = hookCmd
+	}
+	return nil
 }

pkg/backy/cron.go

@@ -5,24 +5,34 @@
 package backy
 
 import (
+	"fmt"
 	"strings"
 	"time"
 
+	"git.andrewnw.xyz/CyberShell/backy/pkg/logging"
 	"github.com/go-co-op/gocron"
 )
 
-func (conf *BackyConfigFile) Cron() {
+func (opts *ConfigOpts) Cron() {
 	s := gocron.NewScheduler(time.Local)
 	s.TagsUnique()
-	for _, config := range conf.CmdConfigLists {
-		if strings.TrimSpace(config.Cron) != "" {
-			_, err := s.CronWithSeconds(config.Cron).Tag(config.Name).Do(func(cron string) {
-				conf.RunBackyConfig(cron)
-			}, config.Cron)
+	cmdLists := opts.CmdConfigLists
+	for listName, config := range cmdLists {
+		if config.Name == "" {
+			config.Name = listName
+		}
+
+		cron := strings.TrimSpace(config.Cron)
+		if cron != "" {
+			opts.Logger.Info().Str("Scheduling cron list", config.Name).Str("Time", cron).Send()
+			_, err := s.CronWithSeconds(cron).Tag(config.Name).Do(func(cron string) {
+				opts.RunListConfig(cron)
+			}, cron)
 			if err != nil {
-				panic(err)
+				logging.ExitWithMSG(fmt.Sprintf("error: %v", err), 1, &opts.Logger)
 			}
 		}
 	}
+	opts.Logger.Info().Msg("Starting cron mode...")
 	s.StartBlocking()
 }

pkg/backy/list.go

@@ -0,0 +1,68 @@
+package backy
+
+import "fmt"
+
+/*
+	Command: command [args...]
+	Host: Local or remote (list the name)
+
+	List: name
+	Commands:
+	flags: list commands
+	if listcommands: (use list command)
+		Command: command [args...]
+		Host: Local or remote (list the name)
+
+*/
+
+// ListCommand searches the commands in the file to find one
+func (opts *ConfigOpts) ListCommand(cmd string) {
+	// bool for commands not found
+	// gets set to false if a command is not found
+	// set to true if the command is found
+	var cmdFound bool = false
+	var cmdInfo *Command
+	// check commands in file against cmd
+	for _, cmdInFile := range opts.executeCmds {
+		print(cmdInFile)
+		cmdFound = false
+
+		if cmd == cmdInFile {
+			cmdFound = true
+			cmdInfo = opts.Cmds[cmd]
+			break
+		}
+	}
+
+	// print the command's information
+	if cmdFound {
+
+		print("Command: ")
+
+		print(cmdInfo.Cmd)
+		if len(cmdInfo.Args) >= 0 {
+
+			for _, v := range cmdInfo.Args {
+				print(" ") // print space between command and args
+				print(v)   // print command arg
+			}
+		}
+
+		// is is remote or local
+		if cmdInfo.Host != nil {
+
+			print("Host: ", cmdInfo.Host)
+
+		} else {
+
+			print("Host: Runs on Local Machine\n\n")
+
+		}
+
+	} else {
+
+		fmt.Printf("Command %s not found. Check spelling.\n", cmd)
+
+	}
+
+}

pkg/backy/mongo.go

@@ -1,96 +0,0 @@
-package backy
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"time"
-
-	"github.com/joho/godotenv"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-	"go.mongodb.org/mongo-driver/mongo/readpref"
-)
-
-const mongoConfigKey = "global.mongo"
-
-func (opts *BackyConfigOpts) InitMongo() {
-
-	if !opts.viper.GetBool(getMongoConfigKey("enabled")) {
-		return
-	}
-	var (
-		err    error
-		client *mongo.Client
-	)
-
-	// TODO: Get uri and creditials from config
-	host := opts.viper.GetString(getMongoConfigKey("host"))
-	port := opts.viper.GetInt32(getMongoConfigKey("port"))
-
-	client, err = mongo.NewClient(options.Client().ApplyURI(fmt.Sprintf("mongo://%s:%d", host, port)))
-	if opts.viper.GetBool(getMongoConfigKey("prod")) {
-		mongoEnvFileSet := opts.viper.IsSet(getMongoConfigKey("env"))
-		if mongoEnvFileSet {
-			getMongoConfigFromEnv(opts)
-		}
-		auth := options.Credential{}
-		auth.Password = opts.viper.GetString("global.mongo.password")
-		auth.Username = opts.viper.GetString("global.mongo.username")
-		client, err = mongo.NewClient(options.Client().SetAuth(auth).ApplyURI("mongodb://localhost:27017"))
-
-	}
-	if err != nil {
-		opts.ConfigFile.Logger.Fatal().Err(err).Send()
-	}
-	ctx, ctxCancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer ctxCancel()
-	err = client.Connect(ctx)
-	if err != nil {
-		opts.ConfigFile.Logger.Fatal().Err(err).Send()
-	}
-	defer client.Disconnect(ctx)
-	err = client.Ping(ctx, readpref.Primary())
-	if err != nil {
-		opts.ConfigFile.Logger.Fatal().Err(err).Send()
-	}
-	databases, err := client.ListDatabaseNames(ctx, bson.M{})
-	if err != nil {
-		opts.ConfigFile.Logger.Fatal().Err(err).Send()
-	}
-	fmt.Println(databases)
-	backyDB := client.Database("backy")
-	backyDB.CreateCollection(context.Background(), "cmds")
-	backyDB.CreateCollection(context.Background(), "cmd-lists")
-	backyDB.CreateCollection(context.Background(), "logs")
-	opts.DB = backyDB
-}
-
-func getMongoConfigFromEnv(opts *BackyConfigOpts) error {
-	mongoEnvFile, err := os.Open(opts.viper.GetString("global.mongo.env"))
-	if err != nil {
-		return err
-	}
-	mongoMap, mongoErr := godotenv.Parse(mongoEnvFile)
-	if mongoErr != nil {
-		return err
-	}
-	mongoPW, mongoPWFound := mongoMap["MONGO_PASSWORD"]
-	if !mongoPWFound {
-		return errors.New("MONGO_PASSWORD not set in " + mongoEnvFile.Name())
-	}
-	mongoUser, mongoUserFound := mongoMap["MONGO_USER"]
-	if !mongoUserFound {
-		return errors.New("MONGO_PASSWORD not set in " + mongoEnvFile.Name())
-	}
-	opts.viper.Set(mongoConfigKey+".password", mongoPW)
-	opts.viper.Set(mongoConfigKey+".username", mongoUser)
-
-	return nil
-}
-
-func getMongoConfigKey(key string) string {
-	return fmt.Sprintf("global.mongo.%s", key)
-}

pkg/backy/notification.go

@@ -5,67 +5,77 @@ package backy
 
 import (
 	"fmt"
+	"strings"
 
+	"git.andrewnw.xyz/CyberShell/backy/pkg/logging"
 	"github.com/nikoksr/notify"
 	"github.com/nikoksr/notify/service/mail"
 	"github.com/nikoksr/notify/service/matrix"
 	"maunium.net/go/mautrix/id"
 )
 
-type matrixStruct struct {
-	homeserver  string
-	roomid      id.RoomID
-	accessToken string
-	userId      id.UserID
+type MatrixStruct struct {
+	Homeserver  string    `yaml:"homeserver"`
+	Roomid      id.RoomID `yaml:"room-id"`
+	AccessToken string    `yaml:"access-token"`
+	UserId      id.UserID `yaml:"user-id"`
 }
 
-type mailConfig struct {
-	senderaddress string
-	host          string
-	to            []string
-	username      string
-	password      string
-	port          string
-}
-
-func SetupCommandsNotifiers(backyConfig BackyConfigFile, ids ...string) {
-
+type MailConfig struct {
+	Host          string   `yaml:"host"`
+	Port          string   `yaml:"port"`
+	Username      string   `yaml:"username"`
+	SenderAddress string   `yaml:"senderaddress"`
+	To            []string `yaml:"to"`
+	Password      string   `yaml:"password"`
 }
 
 // SetupNotify sets up notify instances for each command list.
+func (opts *ConfigOpts) SetupNotify() {
 
-func (backyConfig *BackyConfigFile) SetupNotify() {
+	// check if we have individual commands instead of lists to execute
+	if len(opts.executeCmds) != 0 {
+		return
+	}
+
+	for confName, cmdConfig := range opts.CmdConfigLists {
 
-	for _, cmdConfig := range backyConfig.CmdConfigLists {
 		var services []notify.Notifier
-		for notifyID := range backyConfig.Notifications {
-			if contains(cmdConfig.Notifications, notifyID) {
+		for _, id := range cmdConfig.Notifications {
+			if !strings.Contains(id, ".") {
+				opts.Logger.Info().Str("id", id).Str("list", cmdConfig.Name).Msg("key does not contain a \".\"  Make sure to follow the docs: https://backy.cybershell.xyz/config/notifications/")
+				logging.ExitWithMSG(fmt.Sprintf("notification id %s in cmd list %s does not contain a \".\" \nMake sure to follow the docs: https://backy.cybershell.xyz/config/notifications/", id, cmdConfig.Name), 1, &opts.Logger)
+			}
 
-				if backyConfig.Notifications[notifyID].Enabled {
-					config := backyConfig.Notifications[notifyID].Config
-					switch config.GetString("type") {
-					case "matrix":
-						mtrx := matrixStruct{
-							userId:      id.UserID(config.GetString("user-id")),
-							roomid:      id.RoomID(config.GetString("room-id")),
-							accessToken: config.GetString("access-token"),
-							homeserver:  config.GetString("homeserver"),
-						}
-						mtrxClient, _ := setupMatrix(mtrx)
-						services = append(services, mtrxClient)
-					case "mail":
-						mailCfg := mailConfig{
-							senderaddress: config.GetString("senderaddress"),
-							password:      config.GetString("password"),
-							username:      config.GetString("username"),
-							to:            config.GetStringSlice("to"),
-							host:          config.GetString("host"),
-							port:          fmt.Sprint(config.GetUint16("port")),
-						}
-						mailClient := setupMail(mailCfg)
-						services = append(services, mailClient)
-					}
+			confSplit := strings.Split(id, ".")
+			confType := confSplit[0]
+			confId := confSplit[1]
+			switch confType {
+
+			case "mail":
+				conf, ok := opts.NotificationConf.MailConfig[confId]
+				if !ok {
+					opts.Logger.Info().Err(fmt.Errorf("error: ID %s not found in mail object", confId)).Str("list", confName).Send()
+					continue
 				}
+				mailConf := setupMail(conf)
+				services = append(services, mailConf)
+			case "matrix":
+				conf, ok := opts.NotificationConf.MatrixConfig[confId]
+				if !ok {
+					opts.Logger.Info().Err(fmt.Errorf("error: ID %s not found in matrix object", confId)).Str("list", confName).Send()
+					continue
+				}
+				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))
+					continue
+				}
+				// append the services
+				services = append(services, mtrxConf)
+			// service is not recognized
+			default:
+				opts.Logger.Info().Err(fmt.Errorf("id %s not found", id)).Str("list", confName).Send()
 			}
 		}
 		cmdConfig.NotifyConfig = notify.NewWithServices(services...)
@@ -74,18 +84,18 @@ func (backyConfig *BackyConfigFile) SetupNotify() {
 	// logging.ExitWithMSG("This was a test of notifications", 0, nil)
 }
 
-func setupMatrix(config matrixStruct) (*matrix.Matrix, error) {
-	matrixClient, matrixErr := matrix.New(config.userId, config.roomid, config.homeserver, config.accessToken)
+func setupMatrix(config MatrixStruct) (*matrix.Matrix, error) {
+	matrixClient, matrixErr := matrix.New(config.UserId, config.Roomid, config.Homeserver, config.AccessToken)
 	if matrixErr != nil {
-		panic(matrixErr)
+		return nil, matrixErr
 	}
 	return matrixClient, nil
-
 }
 
-func setupMail(config mailConfig) *mail.Mail {
-	mailClient := mail.New(config.senderaddress, config.host+":"+config.port)
-	mailClient.AuthenticateSMTP("", config.username, config.password, config.host)
-	mailClient.AddReceivers(config.to...)
+func setupMail(config MailConfig) *mail.Mail {
+	mailClient := mail.New(config.SenderAddress, config.Host+":"+config.Port)
+	mailClient.AuthenticateSMTP("", config.Username, config.Password, config.Host)
+	mailClient.AddReceivers(config.To...)
+	mailClient.BodyFormat(mail.PlainText)
 	return mailClient
 }

pkg/backy/ssh.go

@@ -6,10 +6,12 @@ package backy
 
 import (
 	"bufio"
+	"bytes"
 	"fmt"
-	"log"
+	"io"
 	"os"
 	"os/user"
+	"strconv"
 	"strings"
 	"time"
 
@@ -20,144 +22,212 @@ import (
 	"golang.org/x/crypto/ssh/knownhosts"
 )
 
-var ErrPrivateKeyFileFailedToOpen = errors.New("Private key file failed to open.")
+var PrivateKeyExtraInfoErr = errors.New("Private key may be encrypted. \nIf encrypted, make sure the password is specified correctly in the correct section. This may be done in one of three ways: \n privatekeypassword: env:PR_KEY_PASS \n privatekeypassword: file:/path/to/password-file \n privatekeypassword: password (not recommended). \n ")
 var TS = strings.TrimSpace
 
-// ConnectToSSHHost connects to a host by looking up the config values in the directory ~/.ssh/config
+// ConnectToHost connects to a host by looking up the config values in the file ~/.ssh/config
 // It uses any set values and looks up an unset values in the config files
-// It returns an ssh.Client used to run commands against.
-func (remoteConfig *Host) ConnectToSSHHost(log *zerolog.Logger) (*ssh.Client, error) {
+// remoteConfig is modified directly. The *ssh.Client is returned as part of remoteConfig,
+// If configFile is empty, any required configuration is looked up in the default config files
+// If any value is not found, defaults are used
+func (remoteConfig *Host) ConnectToHost(opts *ConfigOpts) error {
 
-	var sshClient *ssh.Client
 	var connectErr error
 
-	// TODO: add JumpHost config check
-
-	// if !remoteConfig.UseConfigFiles {
-	// 	log.Info().Msg("Not using config files")
-	// }
 	if TS(remoteConfig.ConfigFilePath) == "" {
 		remoteConfig.useDefaultConfig = true
 	}
 
-	khPath, khPathErr := GetKnownHosts(remoteConfig.KnownHostsFile)
+	khPathErr := remoteConfig.GetKnownHosts()
 
 	if khPathErr != nil {
-		return nil, khPathErr
+		return khPathErr
 	}
+
 	if remoteConfig.ClientConfig == nil {
 		remoteConfig.ClientConfig = &ssh.ClientConfig{}
 	}
-	var sshConfigFile *os.File
-	var sshConfigFileOpenErr error
-	if !remoteConfig.useDefaultConfig {
 
-		sshConfigFile, sshConfigFileOpenErr = os.Open(remoteConfig.ConfigFilePath)
+	var configFile *os.File
+
+	var sshConfigFileOpenErr error
+
+	if !remoteConfig.useDefaultConfig {
+		var err error
+		remoteConfig.ConfigFilePath, err = resolveDir(remoteConfig.ConfigFilePath)
+		if err != nil {
+			return err
+		}
+		configFile, sshConfigFileOpenErr = os.Open(remoteConfig.ConfigFilePath)
 		if sshConfigFileOpenErr != nil {
-			return nil, sshConfigFileOpenErr
+			return sshConfigFileOpenErr
 		}
 	} else {
 		defaultConfig, _ := resolveDir("~/.ssh/config")
-		sshConfigFile, sshConfigFileOpenErr = os.Open(defaultConfig)
+		configFile, sshConfigFileOpenErr = os.Open(defaultConfig)
 		if sshConfigFileOpenErr != nil {
-			return nil, sshConfigFileOpenErr
+			return sshConfigFileOpenErr
 		}
 	}
+	remoteConfig.SSHConfigFile = &sshConfigFile{}
 	remoteConfig.SSHConfigFile.DefaultUserSettings = ssh_config.DefaultUserSettings
-
-	cfg, decodeErr := ssh_config.Decode(sshConfigFile)
+	var decodeErr error
+	remoteConfig.SSHConfigFile.SshConfigFile, decodeErr = ssh_config.Decode(configFile)
 	if decodeErr != nil {
-		return nil, decodeErr
-	}
-	remoteConfig.SSHConfigFile.SshConfigFile = cfg
-	remoteConfig.GetPrivateKeyFromConfig()
-	remoteConfig.GetHostNameWithPort()
-	remoteConfig.GetSshUserFromConfig()
-	log.Info().Msgf("Port: %v", remoteConfig.Port)
-	if remoteConfig.HostName == "" {
-		return nil, errors.New("No hostname found or specified")
-	}
-	err := remoteConfig.GetAuthMethods()
-	if err != nil {
-		return nil, err
+		return decodeErr
 	}
 
-	// TODO: Add value/option to config for host key and add bool to check for host key
-	hostKeyCallback, err := knownhosts.New(khPath)
+	err := remoteConfig.GetProxyJumpFromConfig(opts.Hosts)
+
 	if err != nil {
-		return nil, errors.Wrap(err, "could not create hostkeycallback function")
+		return err
+	}
+
+	if remoteConfig.ProxyHost != nil {
+		for _, proxyHost := range remoteConfig.ProxyHost {
+			err := proxyHost.GetProxyJumpConfig(opts.Hosts, opts)
+			opts.Logger.Info().Msgf("Proxy host: %s", proxyHost.Host)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	remoteConfig.ClientConfig.Timeout = time.Second * 30
+
+	remoteConfig.GetPrivateKeyFileFromConfig()
+
+	remoteConfig.GetPort()
+
+	remoteConfig.GetHostName()
+
+	remoteConfig.CombineHostNameWithPort()
+
+	remoteConfig.GetSshUserFromConfig()
+
+	if remoteConfig.HostName == "" {
+		return errors.Errorf("No hostname found or specified for host %s", remoteConfig.Host)
+	}
+
+	err = remoteConfig.GetAuthMethods(opts)
+	if err != nil {
+		return err
+	}
+
+	hostKeyCallback, err := knownhosts.New(remoteConfig.KnownHostsFile)
+	if err != nil {
+		return errors.Wrap(err, "could not create hostkeycallback function")
 	}
 	remoteConfig.ClientConfig.HostKeyCallback = hostKeyCallback
-	log.Info().Str("user", remoteConfig.ClientConfig.User).Send()
+	opts.Logger.Info().Str("user", remoteConfig.ClientConfig.User).Send()
 
-	log.Info().Msgf("Connecting to host %s", remoteConfig.HostName)
-	remoteConfig.ClientConfig.Timeout = time.Second * 30
-	sshClient, connectErr = ssh.Dial("tcp", remoteConfig.HostName, remoteConfig.ClientConfig)
+	remoteConfig.SshClient, connectErr = remoteConfig.ConnectThroughBastion(opts.Logger)
 	if connectErr != nil {
-		return nil, connectErr
+		return connectErr
 	}
-	return sshClient, nil
+	if remoteConfig.SshClient != nil {
+		opts.Hosts[remoteConfig.Host] = remoteConfig
+		return nil
+	}
+
+	opts.Logger.Info().Msgf("Connecting to host %s", remoteConfig.HostName)
+	remoteConfig.SshClient, connectErr = ssh.Dial("tcp", remoteConfig.HostName, remoteConfig.ClientConfig)
+	if connectErr != nil {
+		return connectErr
+	}
+
+	opts.Hosts[remoteConfig.Host] = remoteConfig
+	return nil
 }
 
 func (remoteHost *Host) GetSshUserFromConfig() {
+
 	if TS(remoteHost.User) == "" {
+
 		remoteHost.User, _ = remoteHost.SSHConfigFile.SshConfigFile.Get(remoteHost.Host, "User")
+
 		if TS(remoteHost.User) == "" {
+
 			remoteHost.User = remoteHost.SSHConfigFile.DefaultUserSettings.Get(remoteHost.Host, "User")
+
 			if TS(remoteHost.User) == "" {
+
 				currentUser, _ := user.Current()
+
 				remoteHost.User = currentUser.Username
 			}
 		}
 	}
 	remoteHost.ClientConfig.User = remoteHost.User
 }
-func (remoteHost *Host) GetAuthMethods() error {
+
+func (remoteHost *Host) GetAuthMethods(opts *ConfigOpts) error {
 	var signer ssh.Signer
 	var err error
 	var privateKey []byte
+
 	remoteHost.Password = strings.TrimSpace(remoteHost.Password)
+
 	remoteHost.PrivateKeyPassword = strings.TrimSpace(remoteHost.PrivateKeyPassword)
+
 	remoteHost.PrivateKeyPath = strings.TrimSpace(remoteHost.PrivateKeyPath)
+
 	if remoteHost.PrivateKeyPath != "" {
+
 		privateKey, err = os.ReadFile(remoteHost.PrivateKeyPath)
+
 		if err != nil {
 			return err
 		}
-		remoteHost.PrivateKeyPassword, err = GetPrivateKeyPassword(remoteHost.PrivateKeyPassword)
+
+		remoteHost.PrivateKeyPassword, err = GetPrivateKeyPassword(remoteHost.PrivateKeyPassword, opts, opts.Logger)
+
 		if err != nil {
 			return err
 		}
+
 		if remoteHost.PrivateKeyPassword == "" {
+
 			signer, err = ssh.ParsePrivateKey(privateKey)
+
 			if err != nil {
-				return ErrPrivateKeyFileFailedToOpen
+				return errors.Errorf("Failed to open private key file %s: %v \n\n %v", remoteHost.PrivateKeyPath, err, PrivateKeyExtraInfoErr)
 			}
+
 			remoteHost.ClientConfig.Auth = []ssh.AuthMethod{ssh.PublicKeys(signer)}
 		} else {
+
 			signer, err = ssh.ParsePrivateKeyWithPassphrase(privateKey, []byte(remoteHost.PrivateKeyPassword))
+
 			if err != nil {
-				return err
+				return errors.Errorf("Failed to open private key file %s: %v \n\n %v", remoteHost.PrivateKeyPath, err, PrivateKeyExtraInfoErr)
 			}
+
 			remoteHost.ClientConfig.Auth = []ssh.AuthMethod{ssh.PublicKeys(signer)}
 		}
 	}
+
 	if remoteHost.Password == "" {
-		remoteHost.Password, err = GetPassword(remoteHost.Password)
+
+		remoteHost.Password, err = GetPassword(remoteHost.Password, opts, opts.Logger)
+
 		if err != nil {
+
 			return err
 		}
+
 		remoteHost.ClientConfig.Auth = append(remoteHost.ClientConfig.Auth, ssh.Password(remoteHost.Password))
 	}
+
 	return nil
 }
 
 // GetPrivateKeyFromConfig checks to see if the privateKeyPath is empty.
 // If not, it keeps the value.
 // If empty, the key is looked for in the specified config file.
-// If that path is empty, the default config file is searched
+// If that path is empty, the default config file is searched.
 // If not found in the default file, the privateKeyPath is set to ~/.ssh/id_rsa
-func (remoteHost *Host) GetPrivateKeyFromConfig() {
+func (remoteHost *Host) GetPrivateKeyFileFromConfig() {
 	var identityFile string
 	if remoteHost.PrivateKeyPath == "" {
 		identityFile, _ = remoteHost.SSHConfigFile.SshConfigFile.Get(remoteHost.Host, "IdentityFile")
@@ -175,10 +245,42 @@ func (remoteHost *Host) GetPrivateKeyFromConfig() {
 	remoteHost.PrivateKeyPath, _ = resolveDir(identityFile)
 }
 
-// GetHostNameWithPort checks if the port from the config file is 0
+// GetPort checks if the port from the config file is 0
 // If it is the port is searched in the SSH config file(s)
-func (remoteHost *Host) GetHostNameWithPort() {
-	port := fmt.Sprintf("%v", remoteHost.Port)
+func (remoteHost *Host) GetPort() {
+	port := fmt.Sprintf("%d", remoteHost.Port)
+	// port specifed?
+	// port will be 0 if missing from backy config
+	if port == "0" {
+		// get port from specified SSH config file
+		port, _ = remoteHost.SSHConfigFile.SshConfigFile.Get(remoteHost.Host, "Port")
+
+		if port == "" {
+
+			// get port from default SSH config file
+			port = remoteHost.SSHConfigFile.DefaultUserSettings.Get(remoteHost.Host, "Port")
+
+			// set port to be default
+			if port == "" {
+				port = "22"
+			}
+		}
+	}
+	portNum, _ := strconv.ParseUint(port, 10, 16)
+	remoteHost.Port = uint16(portNum)
+}
+
+func (remoteHost *Host) CombineHostNameWithPort() {
+
+	// if the port is already in the HostName, leave it
+	if strings.HasSuffix(remoteHost.HostName, fmt.Sprintf(":%d", remoteHost.Port)) {
+		return
+	}
+
+	remoteHost.HostName = fmt.Sprintf("%s:%d", remoteHost.HostName, remoteHost.Port)
+}
+
+func (remoteHost *Host) GetHostName() {
 
 	if remoteHost.HostName == "" {
 		remoteHost.HostName, _ = remoteHost.SSHConfigFile.SshConfigFile.Get(remoteHost.Host, "HostName")
@@ -186,61 +288,60 @@ func (remoteHost *Host) GetHostNameWithPort() {
 			remoteHost.HostName = remoteHost.SSHConfigFile.DefaultUserSettings.Get(remoteHost.Host, "HostName")
 		}
 	}
-	// no port specifed
-	if port == "0" {
-		port, _ = remoteHost.SSHConfigFile.SshConfigFile.Get(remoteHost.Host, "Port")
-		if port == "" {
-			port = remoteHost.SSHConfigFile.DefaultUserSettings.Get(remoteHost.Host, "Port")
-			if port == "" {
-				port = "22"
-			}
-		}
-		println(port)
-	}
-	if !strings.HasSuffix(remoteHost.HostName, ":"+port) {
-		remoteHost.HostName = remoteHost.HostName + ":" + port
-	}
 }
 
-func (remoteHost *Host) ConnectThroughBastion() (*ssh.Client, error) {
+func (remoteHost *Host) ConnectThroughBastion(log zerolog.Logger) (*ssh.Client, error) {
+	if remoteHost.ProxyHost == nil {
+		return nil, nil
+	}
+
+	log.Info().Msgf("Connecting to proxy host %s", remoteHost.ProxyHost[0].HostName)
+
 	// connect to the bastion host
-	bClient, err := ssh.Dial("tcp", remoteHost.ProxyHost.HostName, remoteHost.ProxyHost.ClientConfig)
+	bClient, err := ssh.Dial("tcp", remoteHost.ProxyHost[0].HostName, remoteHost.ProxyHost[0].ClientConfig)
 	if err != nil {
 		return nil, err
 	}
+	remoteHost.ProxyHost[0].SshClient = bClient
 
 	// Dial a connection to the service host, from the bastion
 	conn, err := bClient.Dial("tcp", remoteHost.HostName)
 	if err != nil {
 		return nil, err
 	}
-
+	log.Info().Msgf("Connecting to host %s", remoteHost.HostName)
 	ncc, chans, reqs, err := ssh.NewClientConn(conn, remoteHost.HostName, remoteHost.ClientConfig)
 	if err != nil {
-		log.Fatal(err)
+		return nil, err
 	}
 
-	sClient := ssh.NewClient(ncc, chans, reqs)
 	// sClient is an ssh client connected to the service host, through the bastion host.
+	sClient := ssh.NewClient(ncc, chans, reqs)
 
 	return sClient, nil
 }
 
-func GetKnownHosts(khPath string) (string, error) {
-	if TS(khPath) != "" {
-		return resolveDir(khPath)
+// GetKnownHosts resolves the host's KnownHosts file if it is defined
+// if not defined, the default location for this file is used
+func (remotehHost *Host) GetKnownHosts() error {
+	var knownHostsFileErr error
+	if TS(remotehHost.KnownHostsFile) != "" {
+		remotehHost.KnownHostsFile, knownHostsFileErr = resolveDir(remotehHost.KnownHostsFile)
+		return knownHostsFileErr
 	}
-	return resolveDir("~/.ssh/known_hosts")
+	remotehHost.KnownHostsFile, knownHostsFileErr = resolveDir("~/.ssh/known_hosts")
+	return knownHostsFileErr
 }
 
-func GetPrivateKeyPassword(key string) (string, error) {
+func GetPrivateKeyPassword(key string, opts *ConfigOpts, log zerolog.Logger) (string, error) {
+
 	var prKeyPassword string
 	if strings.HasPrefix(key, "file:") {
 		privKeyPassFilePath := strings.TrimPrefix(key, "file:")
 		privKeyPassFilePath, _ = resolveDir(privKeyPassFilePath)
 		keyFile, keyFileErr := os.Open(privKeyPassFilePath)
 		if keyFileErr != nil {
-			return "", ErrPrivateKeyFileFailedToOpen
+			return "", errors.Errorf("Private key password file %s failed to open. \n Make sure it is accessible and correct.", privKeyPassFilePath)
 		}
 		passwordScanner := bufio.NewScanner(keyFile)
 		for passwordScanner.Scan() {
@@ -255,17 +356,20 @@ func GetPrivateKeyPassword(key string) (string, error) {
 	} else {
 		prKeyPassword = key
 	}
+	prKeyPassword = GetVaultKey(prKeyPassword, opts, opts.Logger)
 	return prKeyPassword, nil
 }
 
-func GetPassword(key string) (string, error) {
-	key = strings.TrimSpace(key)
-	if key == "" {
+// GetPassword gets any password
+func GetPassword(pass string, opts *ConfigOpts, log zerolog.Logger) (string, error) {
+
+	pass = strings.TrimSpace(pass)
+	if pass == "" {
 		return "", nil
 	}
 	var password string
-	if strings.HasPrefix(key, "file:") {
-		passFilePath := strings.TrimPrefix(key, "file:")
+	if strings.HasPrefix(pass, "file:") {
+		passFilePath := strings.TrimPrefix(pass, "file:")
 		passFilePath, _ = resolveDir(passFilePath)
 		keyFile, keyFileErr := os.Open(passFilePath)
 		if keyFileErr != nil {
@@ -275,14 +379,311 @@ func GetPassword(key string) (string, error) {
 		for passwordScanner.Scan() {
 			password = passwordScanner.Text()
 		}
-	} else if strings.HasPrefix(key, "env:") {
-		passEnv := strings.TrimPrefix(key, "env:")
+	} else if strings.HasPrefix(pass, "env:") {
+		passEnv := strings.TrimPrefix(pass, "env:")
 		passEnv = strings.TrimPrefix(passEnv, "${")
 		passEnv = strings.TrimSuffix(passEnv, "}")
 		passEnv = strings.TrimPrefix(passEnv, "$")
 		password = os.Getenv(passEnv)
 	} else {
-		password = key
+		password = pass
 	}
+	password = GetVaultKey(password, opts, opts.Logger)
+
 	return password, nil
 }
+
+func (remoteConfig *Host) GetProxyJumpFromConfig(hosts map[string]*Host) error {
+
+	proxyJump, _ := remoteConfig.SSHConfigFile.SshConfigFile.Get(remoteConfig.Host, "ProxyJump")
+	if proxyJump == "" {
+		proxyJump = remoteConfig.SSHConfigFile.DefaultUserSettings.Get(remoteConfig.Host, "ProxyJump")
+	}
+	if remoteConfig.ProxyJump == "" && proxyJump != "" {
+		remoteConfig.ProxyJump = proxyJump
+	}
+	proxyJumpHosts := strings.Split(remoteConfig.ProxyJump, ",")
+	if remoteConfig.ProxyHost == nil && len(proxyJumpHosts) == 1 {
+		remoteConfig.ProxyJump = proxyJump
+		proxyHost, proxyHostFound := hosts[proxyJump]
+		if proxyHostFound {
+			remoteConfig.ProxyHost = append(remoteConfig.ProxyHost, proxyHost)
+		} else {
+			if proxyJump != "" {
+				newProxy := &Host{Host: proxyJump}
+				remoteConfig.ProxyHost = append(remoteConfig.ProxyHost, newProxy)
+			}
+		}
+	}
+
+	return nil
+}
+
+func (remoteConfig *Host) GetProxyJumpConfig(hosts map[string]*Host, opts *ConfigOpts) error {
+
+	if TS(remoteConfig.ConfigFilePath) == "" {
+		remoteConfig.useDefaultConfig = true
+	}
+
+	khPathErr := remoteConfig.GetKnownHosts()
+
+	if khPathErr != nil {
+		return khPathErr
+	}
+	if remoteConfig.ClientConfig == nil {
+		remoteConfig.ClientConfig = &ssh.ClientConfig{}
+	}
+	var configFile *os.File
+	var sshConfigFileOpenErr error
+	if !remoteConfig.useDefaultConfig {
+
+		configFile, sshConfigFileOpenErr = os.Open(remoteConfig.ConfigFilePath)
+		if sshConfigFileOpenErr != nil {
+			return sshConfigFileOpenErr
+		}
+	} else {
+		defaultConfig, _ := resolveDir("~/.ssh/config")
+		configFile, sshConfigFileOpenErr = os.Open(defaultConfig)
+		if sshConfigFileOpenErr != nil {
+			return sshConfigFileOpenErr
+		}
+	}
+	remoteConfig.SSHConfigFile = &sshConfigFile{}
+	remoteConfig.SSHConfigFile.DefaultUserSettings = ssh_config.DefaultUserSettings
+	var decodeErr error
+	remoteConfig.SSHConfigFile.SshConfigFile, decodeErr = ssh_config.Decode(configFile)
+	if decodeErr != nil {
+		return decodeErr
+	}
+	remoteConfig.GetPrivateKeyFileFromConfig()
+	remoteConfig.GetPort()
+	remoteConfig.GetHostName()
+	remoteConfig.CombineHostNameWithPort()
+	remoteConfig.GetSshUserFromConfig()
+	remoteConfig.isProxyHost = true
+	if remoteConfig.HostName == "" {
+		return errors.Errorf("No hostname found or specified for host %s", remoteConfig.Host)
+	}
+	err := remoteConfig.GetAuthMethods(opts)
+	if err != nil {
+		return err
+	}
+
+	// TODO: Add value/option to config for host key and add bool to check for host key
+	hostKeyCallback, err := knownhosts.New(remoteConfig.KnownHostsFile)
+	if err != nil {
+		return fmt.Errorf("could not create hostkeycallback function: %v", err)
+	}
+	remoteConfig.ClientConfig.HostKeyCallback = hostKeyCallback
+	hosts[remoteConfig.Host] = remoteConfig
+
+	return nil
+}
+
+// RunCmdSSH runs commands over SSH.
+func (command *Command) RunCmdSSH(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([]string, error) {
+	var (
+		ArgsStr       string
+		cmdOutBuf     bytes.Buffer
+		cmdOutWriters io.Writer
+
+		envVars = environmentVars{
+			file: command.Env,
+			env:  command.Environment,
+		}
+	)
+
+	command.Type = strings.TrimSpace(command.Type)
+	command = getPackageCommand(command)
+
+	// Prepare command arguments
+	for _, v := range command.Args {
+		ArgsStr += fmt.Sprintf(" %s", v)
+	}
+
+	cmdCtxLogger.Info().
+		Str("Command", command.Name).
+		Str("Host", *command.Host).
+		Msgf("Running %s on host %s", getCommandTypeLabel(command.Type), *command.Host)
+
+	cmdCtxLogger.Debug().Str("cmd", command.Cmd).Strs("args", command.Args).Send()
+
+	// Ensure SSH client is connected
+	if command.RemoteHost.SshClient == nil {
+		if err := command.RemoteHost.ConnectToHost(opts); err != nil {
+			return nil, fmt.Errorf("failed to connect to host: %w", err)
+		}
+	}
+
+	// Create new SSH session
+	commandSession, err := command.createSSHSession(opts)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create SSH session: %w", err)
+	}
+	defer commandSession.Close()
+
+	// Inject environment variables
+	injectEnvIntoSSH(envVars, commandSession, opts, cmdCtxLogger)
+
+	// Set output writers
+	cmdOutWriters = io.MultiWriter(&cmdOutBuf)
+	if IsCmdStdOutEnabled() {
+		cmdOutWriters = io.MultiWriter(os.Stdout, &cmdOutBuf)
+	}
+	commandSession.Stdout = cmdOutWriters
+	commandSession.Stderr = cmdOutWriters
+
+	// Handle command execution based on type
+	switch command.Type {
+	case "script":
+		return command.runScript(commandSession, cmdCtxLogger, &cmdOutBuf)
+	case "scriptFile":
+		return command.runScriptFile(commandSession, cmdCtxLogger, &cmdOutBuf)
+	default:
+		if command.Shell != "" {
+			ArgsStr = fmt.Sprintf("%s -c '%s %s'", command.Shell, command.Cmd, ArgsStr)
+		} else {
+			ArgsStr = fmt.Sprintf("%s %s", command.Cmd, ArgsStr)
+		}
+		cmdCtxLogger.Debug().Str("cmd + args", ArgsStr).Send()
+		// Run simple command
+		if err := commandSession.Run(ArgsStr); err != nil {
+			return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger), fmt.Errorf("error running command: %w", err)
+		}
+	}
+
+	return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger), nil
+}
+
+// getCommandTypeLabel returns a human-readable label for the command type.
+func getCommandTypeLabel(commandType string) string {
+	if commandType == "" {
+		return "command"
+	}
+	return fmt.Sprintf("%s command", commandType)
+}
+
+// createSSHSession attempts to create a new SSH session and retries on failure.
+func (command *Command) createSSHSession(opts *ConfigOpts) (*ssh.Session, error) {
+	session, err := command.RemoteHost.SshClient.NewSession()
+	if err == nil {
+		return session, nil
+	}
+
+	// Retry connection and session creation
+	if connErr := command.RemoteHost.ConnectToHost(opts); connErr != nil {
+		return nil, fmt.Errorf("session creation failed: %v, connection retry failed: %v", err, connErr)
+	}
+	return command.RemoteHost.SshClient.NewSession()
+}
+
+// runScript handles the execution of inline scripts.
+func (command *Command) runScript(session *ssh.Session, cmdCtxLogger zerolog.Logger, outputBuf *bytes.Buffer) ([]string, error) {
+	script, err := command.prepareScriptBuffer()
+	if err != nil {
+		return nil, err
+	}
+	session.Stdin = script
+
+	if err := session.Shell(); err != nil {
+		return nil, fmt.Errorf("error starting shell: %w", err)
+	}
+
+	if err := session.Wait(); err != nil {
+		return collectOutput(outputBuf, command.Name, cmdCtxLogger), fmt.Errorf("error waiting for shell: %w", err)
+	}
+
+	return collectOutput(outputBuf, command.Name, cmdCtxLogger), nil
+}
+
+// runScriptFile handles the execution of script files.
+func (command *Command) runScriptFile(session *ssh.Session, cmdCtxLogger zerolog.Logger, outputBuf *bytes.Buffer) ([]string, error) {
+	script, err := command.prepareScriptFileBuffer()
+	if err != nil {
+		return nil, err
+	}
+	session.Stdin = script
+
+	if err := session.Shell(); err != nil {
+		return nil, fmt.Errorf("error starting shell: %w", err)
+	}
+
+	if err := session.Wait(); err != nil {
+		return collectOutput(outputBuf, command.Name, cmdCtxLogger), fmt.Errorf("error waiting for shell: %w", err)
+	}
+
+	return collectOutput(outputBuf, command.Name, cmdCtxLogger), nil
+}
+
+// prepareScriptBuffer prepares a buffer for inline scripts.
+func (command *Command) prepareScriptBuffer() (*bytes.Buffer, error) {
+	var buffer bytes.Buffer
+
+	if command.ScriptEnvFile != "" {
+		envBuffer, err := readFileToBuffer(command.ScriptEnvFile)
+		if err != nil {
+			return nil, err
+		}
+		buffer.Write(envBuffer.Bytes())
+		buffer.WriteByte('\n')
+	}
+
+	buffer.WriteString(command.Cmd + "\n")
+	return &buffer, nil
+}
+
+// prepareScriptFileBuffer prepares a buffer for script files.
+func (command *Command) prepareScriptFileBuffer() (*bytes.Buffer, error) {
+	var buffer bytes.Buffer
+
+	// Handle script environment file
+	if command.ScriptEnvFile != "" {
+		envBuffer, err := readFileToBuffer(command.ScriptEnvFile)
+		if err != nil {
+			return nil, err
+		}
+		buffer.Write(envBuffer.Bytes())
+		buffer.WriteByte('\n')
+	}
+
+	// Handle script file
+	scriptBuffer, err := readFileToBuffer(command.Cmd)
+	if err != nil {
+		return nil, err
+	}
+	buffer.Write(scriptBuffer.Bytes())
+
+	return &buffer, nil
+}
+
+// readFileToBuffer reads a file into a buffer.
+func readFileToBuffer(filePath string) (*bytes.Buffer, error) {
+	resolvedPath, err := resolveDir(filePath)
+	if err != nil {
+		return nil, err
+	}
+	file, err := os.Open(resolvedPath)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	var buffer bytes.Buffer
+	if _, err := io.Copy(&buffer, file); err != nil {
+		return nil, err
+	}
+
+	return &buffer, nil
+}
+
+// collectOutput collects output from a buffer and logs it.
+func collectOutput(buf *bytes.Buffer, commandName string, logger zerolog.Logger) []string {
+	var outputArr []string
+	scanner := bufio.NewScanner(buf)
+	for scanner.Scan() {
+		line := scanner.Text()
+		outputArr = append(outputArr, line)
+		logger.Info().Str("cmd", commandName).Str("output", line).Send()
+	}
+	return outputArr
+}

pkg/backy/templates/error.txt

@@ -0,0 +1,22 @@
+Command list {{.listName }} failed.
+
+The command run was {{.Cmd}}.
+
+The command executed was {{.Command}} {{ if .Args }} {{- range .Args}} {{.}} {{end}} {{end}}
+
+{{ if .Err }} The error was {{ .Err }}{{ end }}
+
+{{ if .Output }} The output was {{- range .Output}} {{.}} {{end}} {{end}}
+
+{{ if .CmdsRan }}
+The following commands ran:
+{{- range .CmdsRan}}
+    - {{. -}}
+{{end}}
+{{ end }}
+
+{{ if .CmdOutput }}{{- range .CmdOutput }}Command output for {{ .CmdName }}:
+{{- range .Output}}
+    {{ . }}
+{{ end }}{{ end }}
+{{ end }}

pkg/backy/templates/success.txt

@@ -0,0 +1,12 @@
+Command list {{ .listName }} completed successfully. 
+
+The following commands ran:
+{{- range .CmdsRan}}
+    - {{. -}}
+{{end}}
+
+{{ if .CmdOutput }}{{- range .CmdOutput }}Command output for {{ .CmdName }}:
+{{- range .Output}}
+    {{ . }}
+{{ end }}{{ end }}
+{{ end }}

pkg/backy/types.go

@@ -1,168 +1,261 @@
-// types.go
-// Copyright (C) Andrew Woodlee 2023
-// License: Apache-2.0
 package backy
 
 import (
 	"bytes"
+	"text/template"
 
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman"
+	vaultapi "github.com/hashicorp/vault/api"
 	"github.com/kevinburke/ssh_config"
+	"github.com/knadh/koanf/v2"
 	"github.com/nikoksr/notify"
 	"github.com/rs/zerolog"
-	"github.com/spf13/viper"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo"
 	"golang.org/x/crypto/ssh"
 )
 
-type CmdConfigSchema struct {
-	ID      primitive.ObjectID `bson:"_id,omitempty"`
-	CmdList []string           `bson:"command-list,omitempty"`
-	Name    string             `bson:"name,omitempty"`
-}
-type CmdSchema struct {
-	ID   primitive.ObjectID `bson:"_id,omitempty"`
-	Cmd  string             `bson:"cmd,omitempty"`
-	Args []string           `bson:"args,omitempty"`
-	Host string             `bson:"host,omitempty"`
-	Dir  string             `bson:"dir,omitempty"`
-}
+type (
 
-type Schemas struct {
-	CmdConfigSchema
-	CmdSchema
-}
+	// Host defines a host to which to connect.
+	// If not provided, the values will be looked up in the default ssh config files
+	Host struct {
+		ConfigFilePath     string `yaml:"config,omitempty"`
+		Host               string `yaml:"host,omitempty"`
+		HostName           string `yaml:"hostname,omitempty"`
+		KnownHostsFile     string `yaml:"knownhostsfile,omitempty"`
+		ClientConfig       *ssh.ClientConfig
+		SSHConfigFile      *sshConfigFile
+		SshClient          *ssh.Client
+		Port               uint16 `yaml:"port,omitempty"`
+		ProxyJump          string `yaml:"proxyjump,omitempty"`
+		Password           string `yaml:"password,omitempty"`
+		PrivateKeyPath     string `yaml:"privatekeypath,omitempty"`
+		PrivateKeyPassword string `yaml:"privatekeypassword,omitempty"`
+		useDefaultConfig   bool
+		User               string `yaml:"user,omitempty"`
+		isProxyHost        bool
+		// ProxyHost holds the configuration for a ProxyJump host
+		ProxyHost []*Host
+		// CertPath           string `yaml:"cert_path,omitempty"`
+	}
 
-// Host defines a host to which to connect.
-// If not provided, the values will be looked up in the default ssh config files
-type Host struct {
-	ConfigFilePath     string `yaml:"configfilepath,omitempty"`
-	Host               string `yaml:"host,omitempty"`
-	HostName           string `yaml:"hostname,omitempty"`
-	KnownHostsFile     string `yaml:"knownhostsfile,omitempty"`
-	ClientConfig       *ssh.ClientConfig
-	SSHConfigFile      sshConfigFile
-	Port               uint16 `yaml:"port,omitempty"`
-	JumpHost           string `yaml:"jumphost,omitempty"`
-	Password           string `yaml:"password,omitempty"`
-	PrivateKeyPath     string `yaml:"privatekeypath,omitempty"`
-	PrivateKeyPassword string `yaml:"privatekeypassword,omitempty"`
-	UseConfigFiles     bool   `yaml:"use_config_files,omitempty"`
-	useDefaultConfig   bool
-	User               string `yaml:"user,omitempty"`
-	// ProxyHost holds the configuration for a JumpHost host
-	ProxyHost *Host
-}
+	sshConfigFile struct {
+		SshConfigFile       *ssh_config.Config
+		DefaultUserSettings *ssh_config.UserSettings
+	}
 
-type sshConfigFile struct {
-	SshConfigFile       *ssh_config.Config
-	DefaultUserSettings *ssh_config.UserSettings
-}
+	Command struct {
+		Name string `yaml:"name,omitempty"`
 
-type Command struct {
-	// Remote bool `yaml:"remote,omitempty"`
+		// command to run
+		Cmd string `yaml:"cmd"`
 
-	Output BackyCommandOutput `yaml:"-"`
+		// Possible values: script, scriptFile
+		// If blank, it is regular command.
+		Type string `yaml:"type,omitempty"`
 
-	// command to run
-	Cmd string `yaml:"cmd"`
+		// host on which to run cmd
+		Host *string `yaml:"host,omitempty"`
 
-	// host on which to run cmd
-	Host *string `yaml:"host,omitempty"`
+		// Hooks are for running commands on certain events
+		Hooks *Hooks `yaml:"hooks,omitempty"`
 
-	/*
-		Shell specifies which shell to run the command in, if any.
-		Not applicable when host is defined.
-	*/
-	Shell string `yaml:"shell,omitempty"`
+		// hook refs are internal references of commands for each hook type
+		hookRefs map[string]map[string]*Command
 
-	RemoteHost *Host `yaml:"-"`
+		/*
+			Shell specifies which shell to run the command in, if any.
+			Not applicable when host is defined.
+		*/
+		Shell string `yaml:"shell,omitempty"`
 
-	// Args is an array that holds the arguments to cmd
-	Args []string `yaml:"Args,omitempty"`
+		RemoteHost *Host `yaml:"-"`
 
-	/*
-		Dir specifies a directory in which to run the command.
-		Ignored if Host is set.
-	*/
-	Dir *string `yaml:"dir,omitempty"`
+		// Args is an array that holds the arguments to cmd
+		Args []string `yaml:"args,omitempty"`
 
-	// Env points to a file containing env variables to be used with the command
-	Env string `yaml:"env,omitempty"`
+		/*
+			Dir specifies a directory in which to run the command.
+			Ignored if Host is set.
+		*/
+		Dir *string `yaml:"dir,omitempty"`
 
-	// Environment holds env variables to be used with the command
-	Environment []string `yaml:"environment,omitempty"`
-}
+		// Env points to a file containing env variables to be used with the command
+		Env string `yaml:"env,omitempty"`
 
-type BackyOptionFunc func(*BackyConfigOpts)
+		// Environment holds env variables to be used with the command
+		Environment []string `yaml:"environment,omitempty"`
 
-type CmdList struct {
-	Name          string   `yaml:"name,omitempty"`
-	Cron          string   `yaml:"cron,omitempty"`
-	Order         []string `yaml:"order,omitempty"`
-	Notifications []string `yaml:"notifications,omitempty"`
-	NotifyConfig  *notify.Notify
-	// NotificationsConfig map[string]*NotificationsConfig
-	// NotifyConfig        map[string]*notify.Notify
-}
+		// Output determines if output is requested.
+		// Only works if command is in a list.
+		GetOutput bool `yaml:"getOutput,omitempty"`
 
-type BackyConfigFile struct {
+		ScriptEnvFile string `yaml:"scriptEnvFile"`
 
-	// Cmds holds the commands for a list.
-	// Key is the name of the command,
-	Cmds map[string]*Command `yaml:"commands"`
+		PackageManager string `yaml:"packageManager,omitempty"`
 
-	// CmdConfigLists holds the lists of commands to be run in order.
-	// Key is the command list name.
-	CmdConfigLists map[string]*CmdList `yaml:"cmd-configs"`
+		PackageName string `yaml:"packageName,omitempty"`
 
-	// Hosts holds the Host config.
-	// key is the host.
-	Hosts map[string]*Host `yaml:"hosts"`
+		// Version specifies the desired version for package execution
+		PackageVersion string `yaml:"packageVersion,omitempty"`
 
-	// Notifications holds the config for different notifications.
-	Notifications map[string]*NotificationsConfig
+		// PackageOperation specifies the action for package-related commands (e.g., "install" or "remove")
+		PackageOperation string `yaml:"packageOperation,omitempty"`
 
-	Logger zerolog.Logger
-}
+		pkgMan pkgman.PackageManager
 
-type BackyConfigOpts struct {
-	// Global log level
-	BackyLogLvl *string
-	// Holds config file
-	ConfigFile *BackyConfigFile
-	// Holds config file
-	ConfigFilePath string
+		packageCmdSet bool
 
-	Schemas
+		// RemoteSource specifies a URL to fetch the command or configuration remotely
+		RemoteSource string `yaml:"remoteSource,omitempty"`
 
-	DB *mongo.Database
-	// use command lists using cron
-	useCron bool
-	// Holds commands to execute for the exec command
-	executeCmds []string
-	// Holds commands to execute for the exec command
-	executeLists []string
+		// FetchBeforeExecution determines if the remoteSource should be fetched before running
+		FetchBeforeExecution bool `yaml:"fetchBeforeExecution,omitempty"`
 
-	viper *viper.Viper
-}
+		// Username specifies the username for user creation or related operations
+		Username string `yaml:"username,omitempty"`
 
-type NotificationsConfig struct {
-	Config  *viper.Viper
-	Enabled bool
-}
+		// Groups specifies the groups to add the user to
+		Groups []string `yaml:"groups,omitempty"`
 
-type CmdOutput struct {
-	Err    error
-	Output bytes.Buffer
-}
+		// Home specifies the home directory for the user
+		Home string `yaml:"home,omitempty"`
 
-type BackyCommandOutput interface {
-	Error() error
-	GetOutput() CmdOutput
-}
+		// System specifies whether the user is a system account
+		System bool `yaml:"system,omitempty"`
 
-type environmentVars struct {
-	file string
-	env  []string
-}
+		// Password specifies the password for the user (can be file: or plain text)
+		Password string `yaml:"password,omitempty"`
+
+		// Operation specifies the action for user-related commands (e.g., "create" or "remove")
+		Operation string `yaml:"operation,omitempty"`
+	}
+
+	RemoteSource struct {
+		URL  string `yaml:"url"`
+		Type string `yaml:"type"` // e.g., yaml
+		Auth struct {
+			AccessKey string `yaml:"accessKey"`
+			SecretKey string `yaml:"secretKey"`
+		} `yaml:"auth"`
+	}
+
+	BackyOptionFunc func(*ConfigOpts)
+
+	CmdList struct {
+		Name            string   `yaml:"name,omitempty"`
+		Cron            string   `yaml:"cron,omitempty"`
+		RunCmdOnFailure string   `yaml:"runCmdOnFailure,omitempty"`
+		Order           []string `yaml:"order,omitempty"`
+		Notifications   []string `yaml:"notifications,omitempty"`
+		GetOutput       bool     `yaml:"getOutput,omitempty"`
+		NotifyOnSuccess bool     `yaml:"notifyOnSuccess,omitempty"`
+
+		NotifyConfig *notify.Notify
+		Source       string `yaml:"source"` // URL to fetch remote commands
+		Type         string `yaml:"type"`
+	}
+
+	ConfigOpts struct {
+		// Cmds holds the commands for a list.
+		// Key is the name of the command,
+		Cmds map[string]*Command `yaml:"commands"`
+
+		// CmdConfigLists holds the lists of commands to be run in order.
+		// Key is the command list name.
+		CmdConfigLists map[string]*CmdList `yaml:"cmd-lists"`
+
+		// Hosts holds the Host config.
+		// key is the host.
+		Hosts map[string]*Host `yaml:"hosts"`
+
+		Logger zerolog.Logger
+
+		// Global log level
+		BackyLogLvl *string
+
+		// Holds config file
+		ConfigFilePath string
+
+		// for command list file
+		CmdListFile string
+
+		// use command lists using cron
+		cronEnabled bool
+		// Holds commands to execute for the exec command
+		executeCmds []string
+		// Holds lists to execute for the backup command
+		executeLists []string
+
+		// Holds env vars from .env file
+		backyEnv map[string]string
+
+		vaultClient *vaultapi.Client
+
+		List ListConfig
+
+		VaultKeys []*VaultKey `yaml:"keys"`
+
+		koanf *koanf.Koanf
+
+		NotificationConf *Notifications `yaml:"notifications"`
+	}
+
+	outStruct struct {
+		CmdName     string
+		CmdExecuted string
+		Output      []string
+	}
+
+	VaultKey struct {
+		Name      string `yaml:"name"`
+		Path      string `yaml:"path"`
+		ValueType string `yaml:"type"`
+		MountPath string `yaml:"mountpath"`
+	}
+
+	VaultConfig struct {
+		Token   string      `yaml:"token"`
+		Address string      `yaml:"address"`
+		Enabled string      `yaml:"enabled"`
+		Keys    []*VaultKey `yaml:"keys"`
+	}
+
+	Notifications struct {
+		MailConfig   map[string]MailConfig   `yaml:"mail,omitempty"`
+		MatrixConfig map[string]MatrixStruct `yaml:"matrix,omitempty"`
+	}
+
+	CmdOutput struct {
+		Err    error
+		Output bytes.Buffer
+	}
+
+	environmentVars struct {
+		file string
+		env  []string
+	}
+
+	msgTemplates struct {
+		success *template.Template
+		err     *template.Template
+	}
+
+	ListConfig struct {
+		Lists    []string
+		Commands []string
+		Hosts    []string
+	}
+
+	Hooks struct {
+		Error   []string `yaml:"error,omitempty"`
+		Success []string `yaml:"success,omitempty"`
+		Final   []string `yaml:"final,omitempty"`
+	}
+
+	CmdListResults struct {
+		// name of the list
+		ListName string
+		// command that caused the list to fail
+		ErrCmd string
+	}
+)

pkg/backy/utils.go

@@ -9,17 +9,72 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
 	"strings"
 
 	"git.andrewnw.xyz/CyberShell/backy/pkg/logging"
 	"github.com/joho/godotenv"
+	"github.com/knadh/koanf/v2"
 	"github.com/rs/zerolog"
-	"github.com/spf13/viper"
 	"golang.org/x/crypto/ssh"
+	"mvdan.cc/sh/v3/shell"
 )
 
-func injectEnvIntoSSH(envVarsToInject environmentVars, process *ssh.Session, log *zerolog.Logger) {
+func (c *ConfigOpts) LogLvl(level string) BackyOptionFunc {
+
+	return func(bco *ConfigOpts) {
+		c.BackyLogLvl = &level
+	}
+}
+
+// AddCommands adds commands to ConfigOpts
+func AddCommands(commands []string) BackyOptionFunc {
+	return func(bco *ConfigOpts) {
+		bco.executeCmds = append(bco.executeCmds, commands...)
+	}
+}
+
+// AddCommandLists adds lists to ConfigOpts
+func AddCommandLists(lists []string) BackyOptionFunc {
+	return func(bco *ConfigOpts) {
+		bco.executeLists = append(bco.executeLists, lists...)
+	}
+}
+
+// AddPrintLists adds lists to print out
+func SetListsToSearch(lists []string) BackyOptionFunc {
+	return func(bco *ConfigOpts) {
+		bco.List.Lists = append(bco.List.Lists, lists...)
+	}
+}
+
+// AddPrintLists adds lists to print out
+func SetCmdsToSearch(cmds []string) BackyOptionFunc {
+	return func(bco *ConfigOpts) {
+		bco.List.Commands = append(bco.List.Commands, cmds...)
+	}
+}
+
+// cronEnabled enables the execution of command lists at specified times
+func CronEnabled() BackyOptionFunc {
+	return func(bco *ConfigOpts) {
+		bco.cronEnabled = true
+	}
+}
+
+func NewOpts(configFilePath string, opts ...BackyOptionFunc) *ConfigOpts {
+	b := &ConfigOpts{}
+	b.ConfigFilePath = configFilePath
+	for _, opt := range opts {
+		if opt != nil {
+			opt(b)
+		}
+	}
+	return b
+}
+
+func injectEnvIntoSSH(envVarsToInject environmentVars, process *ssh.Session, opts *ConfigOpts, log zerolog.Logger) {
 	if envVarsToInject.file != "" {
 		envPath, envPathErr := resolveDir(envVarsToInject.file)
 		if envPathErr != nil {
@@ -37,30 +92,31 @@ func injectEnvIntoSSH(envVarsToInject environmentVars, process *ssh.Session, log
 			goto errEnvFile
 		}
 		for key, val := range envMap {
-			process.Setenv(key, val)
+			process.Setenv(key, GetVaultKey(val, opts, log))
 		}
 	}
 
 errEnvFile:
-	if len(envVarsToInject.env) > 0 {
-		for _, envVal := range envVarsToInject.env {
-			// don't append env Vars for Backy
-			if strings.Contains(envVal, "=") && !strings.HasPrefix(envVal, "BACKY_") {
-				envVarArr := strings.Split(envVal, "=")
-				process.Setenv(envVarArr[0], envVarArr[1])
-			}
+	// fmt.Printf("%v", envVarsToInject.env)
+	for _, envVal := range envVarsToInject.env {
+		// don't append env Vars for Backy
+		if strings.Contains(envVal, "=") {
+			envVarArr := strings.Split(envVal, "=")
+
+			process.Setenv(envVarArr[0], GetVaultKey(envVarArr[1], opts, log))
 		}
 	}
 }
 
-func injectEnvIntoLocalCMD(envVarsToInject environmentVars, process *exec.Cmd, log *zerolog.Logger) {
+func injectEnvIntoLocalCMD(envVarsToInject environmentVars, process *exec.Cmd, log zerolog.Logger) {
 	if envVarsToInject.file != "" {
 		envPath, _ := resolveDir(envVarsToInject.file)
 
-		file, _ := os.Open(envPath)
-		// if err != nil {
-		// 	log.Fatal().Str("envFile", envPath).Err(err).Send()
-		// }
+		file, fileErr := os.Open(envPath)
+		if fileErr != nil {
+			log.Error().Str("envFile", envPath).Err(fileErr).Send()
+			goto errEnvFile
+		}
 		defer file.Close()
 		envMap, err := godotenv.Parse(file)
 		if err != nil {
@@ -73,19 +129,13 @@ func injectEnvIntoLocalCMD(envVarsToInject environmentVars, process *exec.Cmd, l
 
 	}
 errEnvFile:
-	if len(envVarsToInject.env) > 0 {
-		for _, envVal := range envVarsToInject.env {
-			if strings.Contains(envVal, "=") {
-				process.Env = append(process.Env, envVal)
-			}
+
+	for _, envVal := range envVarsToInject.env {
+		if strings.Contains(envVal, "=") {
+			process.Env = append(process.Env, envVal)
 		}
 	}
-	envVarsToInject.env = append(envVarsToInject.env, os.Environ()...)
-}
-
-func (cmd *Command) checkCmdExists() bool {
-	_, err := exec.LookPath(cmd.Cmd)
-	return err == nil
+	process.Env = append(process.Env, os.Environ()...)
 }
 
 func contains(s []string, e string) bool {
@@ -97,14 +147,13 @@ func contains(s []string, e string) bool {
 	return false
 }
 
-func CheckConfigValues(config *viper.Viper) {
+func CheckConfigValues(config *koanf.Koanf, file string) {
 
 	for _, key := range requiredKeys {
-		isKeySet := config.IsSet(key)
+		isKeySet := config.Exists(key)
 		if !isKeySet {
-			logging.ExitWithMSG(Sprintf("Config key %s is not defined in %s", key, config.ConfigFileUsed()), 1, nil)
+			logging.ExitWithMSG(Sprintf("Config key %s is not defined in %s. Please make sure this value is set and has the appropriate keys set.", key, file), 1, nil)
 		}
-
 	}
 }
 
@@ -115,71 +164,11 @@ func testFile(c string) error {
 		if errors.Is(fileOpenErr, os.ErrNotExist) {
 			return fileOpenErr
 		}
-
-		fmt.Printf("%s\t\t%v", c, fileOpenErr)
 	}
 
 	return nil
 }
 
-func (c *BackyConfigOpts) LogLvl(level string) BackyOptionFunc {
-
-	return func(bco *BackyConfigOpts) {
-		c.BackyLogLvl = &level
-	}
-}
-
-// AddCommands adds commands to BackyConfigOpts
-func AddCommands(commands []string) BackyOptionFunc {
-	return func(bco *BackyConfigOpts) {
-		bco.executeCmds = append(bco.executeCmds, commands...)
-	}
-}
-
-// AddCommandLists adds lists to BackyConfigOpts
-func AddCommandLists(lists []string) BackyOptionFunc {
-	return func(bco *BackyConfigOpts) {
-		bco.executeLists = append(bco.executeLists, lists...)
-	}
-}
-
-// UseCron enables the execution of command lists at specified times
-func UseCron() BackyOptionFunc {
-	return func(bco *BackyConfigOpts) {
-		bco.useCron = true
-	}
-}
-
-// UseCron enables the execution of command lists at specified times
-func (c *BackyConfigOpts) AddViper(v *viper.Viper) BackyOptionFunc {
-	return func(bco *BackyConfigOpts) {
-		c.viper = v
-	}
-}
-
-func NewOpts(configFilePath string, opts ...BackyOptionFunc) *BackyConfigOpts {
-	b := &BackyConfigOpts{}
-	b.ConfigFilePath = configFilePath
-	for _, opt := range opts {
-		if opt != nil {
-			opt(b)
-		}
-	}
-	return b
-}
-
-/*
-NewConfig initializes new config that holds information	from the config file
-*/
-func NewConfig() *BackyConfigFile {
-	return &BackyConfigFile{
-		Cmds:           make(map[string]*Command),
-		CmdConfigLists: make(map[string]*CmdList),
-		Hosts:          make(map[string]*Host),
-		Notifications:  make(map[string]*NotificationsConfig),
-	}
-}
-
 func IsTerminalActive() bool {
 	return os.Getenv("BACKY_TERM") == "enabled"
 }
@@ -207,3 +196,60 @@ func resolveDir(path string) (string, error) {
 	}
 	return path, nil
 }
+
+// loadEnv loads a .env file from the config file directory
+func (opts *ConfigOpts) loadEnv() {
+	envFileInConfigDir := fmt.Sprintf("%s/.env", path.Dir(opts.ConfigFilePath))
+	var backyEnv map[string]string
+	backyEnv, envFileErr := godotenv.Read(envFileInConfigDir)
+	if envFileErr != nil {
+		return
+	}
+
+	opts.backyEnv = backyEnv
+}
+
+// expandEnvVars expands environment variables with the env used in the config
+func expandEnvVars(backyEnv map[string]string, envVars []string) {
+
+	env := func(name string) string {
+		name = strings.ToUpper(name)
+		envVar, found := backyEnv[name]
+		if found {
+			return envVar
+		}
+		return ""
+	}
+
+	// parse env variables using new macros
+	for indx, v := range envVars {
+		if strings.HasPrefix(v, macroStart) && strings.HasSuffix(v, macroEnd) {
+			if strings.HasPrefix(v, envMacroStart) {
+				v = strings.TrimPrefix(v, envMacroStart)
+				v = strings.TrimRight(v, macroEnd)
+				out, _ := shell.Expand(v, env)
+				envVars[indx] = out
+			}
+		}
+	}
+}
+
+// getPackageCommand checks for command type of package and if the command has already been set
+// Returns the modified Command with the packageManager command as Cmd and the packageOperation as args, plus any additional Args
+func getPackageCommand(command *Command) *Command {
+
+	if command.Type == "package" && !command.packageCmdSet {
+		command.packageCmdSet = true
+		switch command.PackageOperation {
+		case "install":
+			command.Cmd, command.Args = command.pkgMan.Install(command.PackageName, command.PackageVersion, command.Args)
+		case "remove":
+			command.Cmd, command.Args = command.pkgMan.Remove(command.PackageName, command.Args)
+		case "upgrade":
+			command.Cmd, command.Args = command.pkgMan.Upgrade(command.PackageName, command.PackageVersion)
+		}
+	} else if command.Type != "package" {
+		command.packageCmdSet = false
+	}
+	return command
+}

pkg/logging/logging.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/rs/zerolog"
-	"github.com/spf13/viper"
 	"gopkg.in/natefinch/lumberjack.v2"
 )
 
@@ -25,7 +24,7 @@ func ExitWithMSG(msg string, code int, log *zerolog.Logger) {
 	os.Exit(code)
 }
 
-func SetLoggingWriters(v *viper.Viper, logFile string) (writers zerolog.LevelWriter) {
+func SetLoggingWriters(logFile string) (writers zerolog.LevelWriter) {
 
 	console := zerolog.ConsoleWriter{}
 	if IsConsoleLoggingEnabled() {
@@ -50,17 +49,12 @@ func SetLoggingWriters(v *viper.Viper, logFile string) (writers zerolog.LevelWri
 	}
 
 	fileLogger := &lumberjack.Logger{
-		MaxSize:    500, // megabytes
+		MaxSize:    50, // megabytes
 		MaxBackups: 3,
 		MaxAge:     28,   //days
 		Compress:   true, // disabled by default
 	}
-	if strings.TrimSpace(logFile) != "" {
-		fileLogger.Filename = logFile
-	} else {
-		fileLogger.Filename = "./backy.log"
-	}
-
+	fileLogger.Filename = logFile
 	// UNIX Time is faster and smaller than most timestamps
 	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
 	// zerolog.TimeFieldFormat = time.RFC1123
@@ -75,3 +69,7 @@ func SetLoggingWriters(v *viper.Viper, logFile string) (writers zerolog.LevelWri
 func IsConsoleLoggingEnabled() bool {
 	return os.Getenv("BACKY_CONSOLE_LOGGING") == "enabled"
 }
+
+// func IsTerminal() bool {
+// 	return os.Getenv("BACKY_TERM") == "enabled"
+// }

pkg/pkgman/apt/apt.go

@@ -0,0 +1,95 @@
+package apt
+
+import (
+	"fmt"
+
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/pkgcommon"
+)
+
+// AptManager implements PackageManager for systems using APT.
+type AptManager struct {
+	useAuth     bool   // Whether to use an authentication command
+	authCommand string // The authentication command, e.g., "sudo"
+}
+
+// DefaultAuthCommand is the default command used for authentication.
+const DefaultAuthCommand = "sudo"
+
+const DefaultPackageCommand = "apt-get"
+
+// NewAptManager creates a new AptManager with default settings.
+func NewAptManager() *AptManager {
+	return &AptManager{
+		useAuth:     true,
+		authCommand: DefaultAuthCommand,
+	}
+}
+
+// Install returns the command and arguments for installing a package.
+func (a *AptManager) Install(pkg, version string, args []string) (string, []string) {
+	baseCmd := a.prependAuthCommand(DefaultPackageCommand)
+	baseArgs := []string{"update", "&&", baseCmd, "install", "-y"}
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s=%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
+	}
+	if args != nil {
+		baseArgs = append(baseArgs, args...)
+	}
+	return baseCmd, baseArgs
+}
+
+// Remove returns the command and arguments for removing a package.
+func (a *AptManager) Remove(pkg string, args []string) (string, []string) {
+	baseCmd := a.prependAuthCommand(DefaultPackageCommand)
+	baseArgs := []string{"remove", "-y", pkg}
+	if args != nil {
+		baseArgs = append(baseArgs, args...)
+	}
+	return baseCmd, baseArgs
+}
+
+// Upgrade returns the command and arguments for upgrading a specific package.
+func (a *AptManager) Upgrade(pkg, version string) (string, []string) {
+	baseCmd := a.prependAuthCommand(DefaultPackageCommand)
+	baseArgs := []string{"update", "&&", baseCmd, "install", "--only-upgrade", "-y "}
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s=%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
+	}
+	return baseCmd, baseArgs
+}
+
+// UpgradeAll returns the command and arguments for upgrading all packages.
+func (a *AptManager) UpgradeAll() (string, []string) {
+	baseCmd := a.prependAuthCommand(DefaultPackageCommand)
+	baseArgs := []string{"update", "&&", baseCmd, "upgrade", "-y"}
+	return baseCmd, baseArgs
+}
+
+// Configure applies functional options to customize the package manager.
+func (a *AptManager) Configure(options ...pkgcommon.PackageManagerOption) {
+	for _, opt := range options {
+		opt(a)
+	}
+}
+
+// prependAuthCommand prepends the authentication command if UseAuth is true.
+func (a *AptManager) prependAuthCommand(baseCmd string) string {
+	if a.useAuth {
+		return a.authCommand + " " + baseCmd
+	}
+	return baseCmd
+}
+
+// SetUseAuth enables or disables authentication.
+func (a *AptManager) SetUseAuth(useAuth bool) {
+	a.useAuth = useAuth
+}
+
+// SetAuthCommand sets the authentication command.
+func (a *AptManager) SetAuthCommand(authCommand string) {
+	a.authCommand = authCommand
+}

pkg/pkgman/dnf/dnf.go

@@ -0,0 +1,93 @@
+package dnf
+
+import (
+	"fmt"
+
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/pkgcommon"
+)
+
+// DnfManager implements PackageManager for systems using YUM.
+type DnfManager struct {
+	useAuth     bool   // Whether to use an authentication command
+	authCommand string // The authentication command, e.g., "sudo"
+}
+
+// DefaultAuthCommand is the default command used for authentication.
+const DefaultAuthCommand = "sudo"
+
+// NewDnfManager creates a new DnfManager with default settings.
+func NewDnfManager() *DnfManager {
+	return &DnfManager{
+		useAuth:     true,
+		authCommand: DefaultAuthCommand,
+	}
+}
+
+// Configure applies functional options to customize the package manager.
+func (y *DnfManager) Configure(options ...pkgcommon.PackageManagerOption) {
+	for _, opt := range options {
+		opt(y)
+	}
+}
+
+// Install returns the command and arguments for installing a package.
+func (y *DnfManager) Install(pkg, version string, args []string) (string, []string) {
+	baseCmd := y.prependAuthCommand("dnf")
+	baseArgs := []string{"install", "-y"}
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s-%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
+	}
+	if args != nil {
+		baseArgs = append(baseArgs, args...)
+	}
+	return baseCmd, baseArgs
+}
+
+// Remove returns the command and arguments for removing a package.
+func (y *DnfManager) Remove(pkg string, args []string) (string, []string) {
+	baseCmd := y.prependAuthCommand("dnf")
+	baseArgs := []string{"remove", "-y", pkg}
+	if args != nil {
+		baseArgs = append(baseArgs, args...)
+	}
+	return baseCmd, baseArgs
+}
+
+// Upgrade returns the command and arguments for upgrading a specific package.
+func (y *DnfManager) Upgrade(pkg, version string) (string, []string) {
+	baseCmd := y.prependAuthCommand("dnf")
+	baseArgs := []string{"update", "-y"}
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s-%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
+	}
+	return baseCmd, baseArgs
+}
+
+// UpgradeAll returns the command and arguments for upgrading all packages.
+func (y *DnfManager) UpgradeAll() (string, []string) {
+	baseCmd := y.prependAuthCommand("dnf")
+	baseArgs := []string{"update", "-y"}
+	return baseCmd, baseArgs
+}
+
+// prependAuthCommand prepends the authentication command if UseAuth is true.
+func (y *DnfManager) prependAuthCommand(baseCmd string) string {
+	if y.useAuth {
+		return y.authCommand + " " + baseCmd
+	}
+	return baseCmd
+}
+
+// SetUseAuth enables or disables authentication.
+func (y *DnfManager) SetUseAuth(useAuth bool) {
+	y.useAuth = useAuth
+}
+
+// SetAuthCommand sets the authentication command.
+func (y *DnfManager) SetAuthCommand(authCommand string) {
+	y.authCommand = authCommand
+}

pkg/pkgman/pkgcommon/options.go

@@ -0,0 +1,4 @@
+package pkgcommon
+
+// PackageManagerOption defines a functional option for configuring a PackageManager.
+type PackageManagerOption func(interface{})

pkg/pkgman/pkgman.go

@@ -0,0 +1,72 @@
+package pkgman
+
+import (
+	"fmt"
+
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/apt"
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/dnf"
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/pkgcommon"
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/yum"
+)
+
+// PackageManager is an interface used to define common package commands. This shall be implemented by every package.
+type PackageManager interface {
+	Install(pkg, version string, args []string) (string, []string)
+	Remove(pkg string, args []string) (string, []string)
+	Upgrade(pkg, version string) (string, []string) // Upgrade a specific package
+	UpgradeAll() (string, []string)
+
+	// Configure applies functional options to customize the package manager.
+	Configure(options ...pkgcommon.PackageManagerOption)
+}
+
+// PackageManagerFactory returns the appropriate PackageManager based on the package tool.
+// Takes variable number of options.
+func PackageManagerFactory(managerType string, options ...pkgcommon.PackageManagerOption) (PackageManager, error) {
+	var manager PackageManager
+
+	switch managerType {
+	case "apt":
+		manager = apt.NewAptManager()
+	case "yum":
+		manager = yum.NewYumManager()
+	case "dnf":
+		manager = dnf.NewDnfManager()
+	default:
+		return nil, fmt.Errorf("unsupported package manager: %s", managerType)
+	}
+
+	// Apply options to the manager
+	manager.Configure(options...)
+	return manager, nil
+}
+
+// WithAuth enables authentication and sets the authentication command.
+func WithAuth(authCommand string) pkgcommon.PackageManagerOption {
+	return func(manager interface{}) {
+		if configurable, ok := manager.(interface {
+			SetUseAuth(bool)
+			SetAuthCommand(string)
+		}); ok {
+			configurable.SetUseAuth(true)
+			configurable.SetAuthCommand(authCommand)
+		}
+	}
+}
+
+// WithoutAuth disables authentication.
+func WithoutAuth() pkgcommon.PackageManagerOption {
+	return func(manager interface{}) {
+		if configurable, ok := manager.(interface {
+			SetUseAuth(bool)
+		}); ok {
+			configurable.SetUseAuth(false)
+		}
+	}
+}
+
+// ConfigurablePackageManager defines methods for setting configuration options.
+type ConfigurablePackageManager interface {
+	SetUseAuth(useAuth bool)
+	SetAuthCommand(authCommand string)
+}

pkg/pkgman/yum/yum.go

@@ -0,0 +1,93 @@
+package yum
+
+import (
+	"fmt"
+
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/pkgcommon"
+)
+
+// YumManager implements PackageManager for systems using YUM.
+type YumManager struct {
+	useAuth     bool   // Whether to use an authentication command
+	authCommand string // The authentication command, e.g., "sudo"
+}
+
+// DefaultAuthCommand is the default command used for authentication.
+const DefaultAuthCommand = "sudo"
+
+// NewYumManager creates a new YumManager with default settings.
+func NewYumManager() *YumManager {
+	return &YumManager{
+		useAuth:     true,
+		authCommand: DefaultAuthCommand,
+	}
+}
+
+// Configure applies functional options to customize the package manager.
+func (y *YumManager) Configure(options ...pkgcommon.PackageManagerOption) {
+	for _, opt := range options {
+		opt(y)
+	}
+}
+
+// Install returns the command and arguments for installing a package.
+func (y *YumManager) Install(pkg, version string, args []string) (string, []string) {
+	baseCmd := y.prependAuthCommand("yum")
+	baseArgs := []string{"install", "-y"}
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s-%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
+	}
+	if args != nil {
+		baseArgs = append(baseArgs, args...)
+	}
+	return baseCmd, baseArgs
+}
+
+// Remove returns the command and arguments for removing a package.
+func (y *YumManager) Remove(pkg string, args []string) (string, []string) {
+	baseCmd := y.prependAuthCommand("yum")
+	baseArgs := []string{"remove", "-y", pkg}
+	if args != nil {
+		baseArgs = append(baseArgs, args...)
+	}
+	return baseCmd, baseArgs
+}
+
+// Upgrade returns the command and arguments for upgrading a specific package.
+func (y *YumManager) Upgrade(pkg, version string) (string, []string) {
+	baseCmd := y.prependAuthCommand("yum")
+	baseArgs := []string{"update", "-y"}
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s-%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
+	}
+	return baseCmd, baseArgs
+}
+
+// UpgradeAll returns the command and arguments for upgrading all packages.
+func (y *YumManager) UpgradeAll() (string, []string) {
+	baseCmd := y.prependAuthCommand("yum")
+	baseArgs := []string{"update", "-y"}
+	return baseCmd, baseArgs
+}
+
+// prependAuthCommand prepends the authentication command if UseAuth is true.
+func (y *YumManager) prependAuthCommand(baseCmd string) string {
+	if y.useAuth {
+		return y.authCommand + " " + baseCmd
+	}
+	return baseCmd
+}
+
+// SetUseAuth enables or disables authentication.
+func (y *YumManager) SetUseAuth(useAuth bool) {
+	y.useAuth = useAuth
+}
+
+// SetAuthCommand sets the authentication command.
+func (y *YumManager) SetAuthCommand(authCommand string) {
+	y.authCommand = authCommand
+}

release

@@ -1,4 +1,6 @@
 #!/bin/bash
-git tag "$(svu next)"
-git push --tags
-goreleaser --rm-dist
+# export GORELEASER_CURRENT_TAG="$(go run backy.go version -V)"
+git tag "$(go run backy.go version -V)"
+git push all
+git push all --tags
+# goreleaser release -f .goreleaser/gitea.yml --clean --release-notes=".changes/$(go run backy.go version -V).md"