General updates along with a bugfix where slower IO will cause the removal of accounts to fail

Author: rickmills

.gitignore

@@ -17,4 +17,6 @@ dist/*
 *.out
 vendor/
 *.tar.gz
-build.sh
+github.com/
+golang.org/
+gopkg.in/

.gitmodules

@@ -2,7 +2,4 @@
 
 ## [2.0.0] - 2020-07-20
 ### Added
-- New release system using Go Releaser
-- Support for Server Monitoring Added
-- Reworked the codebase to move to using Go Modules
-
+- New release system

.goreleaser.yml

@@ -23,7 +23,8 @@ package cmd
 
 import (
 	"os/user"
-
+    "fmt"
+    "time"
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -42,6 +43,13 @@ var removeCmd = &cobra.Command{
 			return
 		}
 
+        // Sleep for 1 second.
+        time.Sleep(1 * time.Second)
+
+		if err := viper.ReadInConfig(); err != nil {
+        	fmt.Println("Failed to read the config file:", viper.ConfigFileUsed())
+        }
+
 		// Load existing accounts from config
 		var accounts []Account
 		configErr := viper.UnmarshalKey("accounts", &accounts)
@@ -50,6 +58,7 @@ var removeCmd = &cobra.Command{
 			panic("There was a problem setting up the user account. Please try again or contact ServerAuth for assistance")
 		}
 
+
 		// Remove the account and update the config
 		// Loop over accounts and search for the username
 		var updatedAccounts []Account
@@ -61,6 +70,10 @@ var removeCmd = &cobra.Command{
 
 		// Save the updated accounts list
 		viper.Set("accounts", updatedAccounts)
+
+		// Sleep for 1 second to allow the config to be written on slower systems
+        time.Sleep(1 * time.Second)
+
 		viper.WriteConfig()
 		color.Green("\nThe selected account has been removed from ServerAuth.")
 		color.Green("\nThe authorized_keys file has been left in tact to allow you to manually update it.")
@@ -72,5 +85,5 @@ func init() {
 
 	// User flag
 	removeCmd.Flags().StringVarP(&username, "username", "u", "", "The username of the system account to add to ServerAuth")
-	removeCmd.MarkFlagRequired("user")
+	removeCmd.MarkFlagRequired("username")
 }

CHANGELOG.md

@@ -33,8 +33,8 @@ import (
 var cfgFile string
 
 type Account struct {
-	Username string
-	ApiKey   string
+	Username string `yaml:"username"`
+	ApiKey   string `yaml:"apiKey"`
 }
 
 var keysFileTemplate = []byte(`# This file is managed by ServerAuth.\n

LICENSE

@@ -1,15 +1,37 @@
-module github.com/serverauth-com/serverauth-agent/v2
+module github.com/serverauth-com/serverauth-agent
 
-go 1.14
+go 1.17
 
-require github.com/fatih/color v1.9.0
-
-require github.com/spf13/cobra v1.0.0
+require (
+	github.com/fatih/color v1.15.0
+	github.com/fsnotify/fsnotify v1.6.0
+	github.com/mattn/go-colorable v0.1.13
+	github.com/mattn/go-isatty v0.0.19
+	github.com/shirou/gopsutil v3.21.11+incompatible
+	github.com/spf13/cobra v1.7.0
+	github.com/spf13/pflag v1.0.5
+	github.com/spf13/viper v1.16.0
+	github.com/stretchr/testify v1.8.4
+	github.com/subosito/gotenv v1.4.2
+	golang.org/x/sys v0.10.0
+)
 
 require (
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
-	github.com/go-ole/go-ole v1.2.4 // indirect
-	github.com/shirou/gopsutil v2.20.6+incompatible
-	github.com/spf13/viper v1.7.0
-	golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.11 // indirect
+	github.com/tklauser/numcpus v0.6.0 // indirect
+	github.com/yusufpapurcu/wmi v1.2.3 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

README.md

@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 package main
 
-import "github.com/serverauth-com/serverauth-agent/v2/cmd"
+import "github.com/serverauth-com/serverauth-agent/cmd"
 
 func main() {
 	cmd.Execute()

cmd/add.go

@@ -0,0 +1,42 @@
+# /bin/bash
+
+if [ ! -t 0 ]; then x-terminal-emulator -e "$0"; exit 0; fi
+echo "Before proceeding please ensure you have installed Golang. In addition this file should be run from the top level of the git repository."
+read -n1 -r -p "Press any key to start build process..." key
+echo "What version do you want to tag this as? Please use the format of x.x.x (e.g 1.1.0)"
+read version
+echo "Downloading required modules"
+go mod download
+
+
+go get github.com/fatih/color
+go get github.com/spf13/cobra
+go get github.com/spf13/viper
+
+echo "Building Linux 64bit package"
+env GOOS=linux GOARCH=amd64 go build -o serverauth ./main.go
+echo "Creating archive of Linux 64bit package"
+tar zcvf serverauth-agent-v"$version"-linux-64bit.tar.gz ./serverauth
+
+echo "Building Linux 32bit package"
+env GOOS=linux GOARCH=386 go build -o serverauth ./main.go
+echo "Creating archive of Linux 32bit package"
+tar zcvf serverauth-agent-v"$version"-linux-32bit.tar.gz ./serverauth
+
+echo "Building Linux ARMv5 package"
+env GOOS=linux GOARCH=arm GOARM=5 go build -o serverauth ./main.go
+echo "Creating archive of Linux ARMv5 package"
+tar zcvf serverauth-agent-v"$version"-linux-armv5.tar.gz ./serverauth
+
+echo "Building Linux ARMv6 package"
+env GOOS=linux GOARCH=arm GOARM=6 go build -o serverauth ./main.go
+echo "Creating archive of Linux ARMv6 package"
+tar zcvf serverauth-agent-v"$version"-linux-armv6.tar.gz ./serverauth
+
+echo "Building Linux ARMv7 package"
+env GOOS=linux GOARCH=arm GOARM=7 go build -o serverauth ./main.go
+echo "Creating archive of Linux ARMv7 package"
+tar zcvf serverauth-agent-v"$version"-linux-armv6.tar.gz ./serverauth
+
+
+echo "The ServerAuth release files have been created. These can now be added to the release"