From 4c723d8bc87b4e8877e340356f71a4a89611434c Mon Sep 17 00:00:00 2001 From: Wanjohi <71614375+wanjohiryan@users.noreply.github.com> Date: Sun, 2 Jun 2024 00:59:56 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=E2=9C=A8=20feat:=20Write=20cli=20executabl?= =?UTF-8?q?e=20as=20a=20go=20program.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 3 +++ main.go | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 go.mod create mode 100644 main.go diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..a927b75 --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module github.com/netrisdotme/cli + +go 1.22.2 diff --git a/main.go b/main.go new file mode 100644 index 0000000..87ada5b --- /dev/null +++ b/main.go @@ -0,0 +1,23 @@ +package main + +import ( + "fmt" + "runtime" +) + +func main() { + + switch runtime.GOOS { + case "windows": + //This is where we should build our nestri "nest" + fmt.Println("You're on Windows!") + case "darwin": + //do nothing (probably deploy to AWS, Vast.ai and the rest) plus Linux & Windows + fmt.Println("You're on macOS!") + case "linux": + //This is where we should build our nestri "server" + fmt.Println("You're on Linux!") + default: + fmt.Printf("Unsupported operating system: %s\n", runtime.GOOS) + } +} From a61c44bfe86157ad8fc0180e8890793ce8d9713a Mon Sep 17 00:00:00 2001 From: Wanjohi <71614375+wanjohiryan@users.noreply.github.com> Date: Mon, 3 Jun 2024 00:33:51 +0300 Subject: [PATCH 2/7] feat: Add neofetch with ASCII command --- LICENSE | 21 ---------- cmd/nestri.ascii | 22 +++++++++++ cmd/root.go | 101 +++++++++++++++++++++++++++++++++++++++++++++++ go.mod | 15 +++++++ go.sum | 30 ++++++++++++++ main.go | 24 +++-------- 6 files changed, 174 insertions(+), 39 deletions(-) create mode 100644 cmd/nestri.ascii create mode 100644 cmd/root.go create mode 100644 go.sum diff --git a/LICENSE b/LICENSE index 2cf54b1..e69de29 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2024 netris - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/cmd/nestri.ascii b/cmd/nestri.ascii new file mode 100644 index 0000000..2cdd77c --- /dev/null +++ b/cmd/nestri.ascii @@ -0,0 +1,22 @@ + :*@@@@@*- + +@@@@@@@@@@#=. + :@@@@@@@@@@@@@@%+: + .:--. .#@@@@:.=*@@@@@@@@@*- + -%@@@@@@*-. .=#@. :+#@@@@@@@@#+. +*@@@@@@@@@@@%+: .=#@@@@@@@@%= +@@@@@@#@@@@@@@@@*-. -*@@@@@@@* +@@@@@* :+%@@@@@@@@%+: +@@@@@@ +@@@@@+ -#@@@@@@@@@*. :+@@@@@@@* +@@@@@+ -+%@@@*=. .=*@@@@@@@@%= +@@@@@+ :*=. :+%@@@@@@@@#=. +@@@@@+ -@@@%- +@@@@@@@@@#- +@@@@@+ -@@@@@ @@@@@@%*- -*%%*. +@@@@@* -@@@@@: @@@#=. +@@@@@@@= +@@@@@* . -@@@@@: +: .+@@@@@@ +@@@@@#=*%* -@@@@@- :+@@@@@@% +%@@@@@@@@+ -@@@@@- .-*@@@@@@@@#. +.*@@@@@@@+ -@@@@@- .+%@@@@@@@@%+. + .=+**+- :@@@@@= .-*%@@@@@@@@#=. + :@@@@@%%@@@@@@@@%+- + %@@@@@@@@@@@#=. + .+%@@@@@%*- diff --git a/cmd/root.go b/cmd/root.go new file mode 100644 index 0000000..cc32534 --- /dev/null +++ b/cmd/root.go @@ -0,0 +1,101 @@ +/* +Copyright © 2024 Nestri <> +*/ +package cmd + +import ( + _ "embed" + "fmt" + "os" + "strings" + + "github.com/charmbracelet/lipgloss" + "github.com/muesli/termenv" + "github.com/spf13/cobra" +) + +//go:embed nestri.ascii +var art string + +// rootCmd represents the base command when called without any subcommands +var rootCmd = &cobra.Command{ + Use: "nestri", + Short: "A CLI tool to manage your cloud gaming service", + Args: cobra.NoArgs, + RunE: func(cmd *cobra.Command, args []string) error { + return cmd.Help() + }, +} + +var neoFetchCmd = &cobra.Command{ + Use: "neofetch", + Short: "Show important system information", + Args: cobra.NoArgs, + RunE: func(cmd *cobra.Command, args []string) error { + lipgloss.SetColorProfile(termenv.TrueColor) + + var ( + b strings.Builder + lines = strings.Split(art, "\n") + colors = []string{"#F8481C", "#F74127", "#F53B30", "#F23538", "#F02E40"} + step = len(lines) / len(colors) + ) + + for i, l := range lines { + n := clamp(0, len(colors)-1, i/step) + b.WriteString(colorize(colors[n], l)) + b.WriteRune('\n') + } + + fmt.Print(b.String()) + + return nil + }, +} + +// Execute adds all child commands to the root command and sets flags appropriately. +// This is called by main.main(). It only needs to happen once to the rootCmd. +func Execute() { + err := rootCmd.Execute() + if err != nil { + os.Exit(1) + } +} + +func init() { + // Here you will define your flags and configuration settings. + // Cobra supports persistent flags, which, if defined here, + // will be global for your application. + rootCmd.AddCommand(neoFetchCmd) + + // rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.cli.yaml)") + + // Cobra also supports local flags, which will only run + // when this action is called directly. + rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") +} + +func colorize(c, s string) string { + return lipgloss.NewStyle().Foreground(lipgloss.Color(c)).Render(s) +} + +func clamp(v, low, high int) int { + if high < low { + low, high = high, low + } + return min(high, max(low, v)) +} + +func min(a, b int) int { + if a < b { + return a + } + return b +} + +func max(a, b int) int { + if a > b { + return a + } + return b +} diff --git a/go.mod b/go.mod index a927b75..e9a3cb2 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,18 @@ module github.com/netrisdotme/cli go 1.22.2 + +require ( + github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect + github.com/charmbracelet/lipgloss v0.11.0 // indirect + github.com/charmbracelet/x/ansi v0.1.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/muesli/termenv v0.15.2 // indirect + github.com/rivo/uniseg v0.4.7 // indirect + github.com/spf13/cobra v1.8.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + golang.org/x/sys v0.19.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..71a2ea9 --- /dev/null +++ b/go.sum @@ -0,0 +1,30 @@ +github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= +github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= +github.com/charmbracelet/lipgloss v0.11.0 h1:UoAcbQ6Qml8hDwSWs0Y1cB5TEQuZkDPH/ZqwWWYTG4g= +github.com/charmbracelet/lipgloss v0.11.0/go.mod h1:1UdRTH9gYgpcdNN5oBtjbu/IzNKtzVtb7sqN1t9LNn8= +github.com/charmbracelet/x/ansi v0.1.1 h1:CGAduulr6egay/YVbGc8Hsu8deMg1xZ/bkaXTPi1JDk= +github.com/charmbracelet/x/ansi v0.1.1/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo= +github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index 87ada5b..92e8c0b 100644 --- a/main.go +++ b/main.go @@ -1,23 +1,11 @@ +/* +Copyright © 2024 NAME HERE + +*/ package main -import ( - "fmt" - "runtime" -) +import "github.com/netrisdotme/cli/cmd" func main() { - - switch runtime.GOOS { - case "windows": - //This is where we should build our nestri "nest" - fmt.Println("You're on Windows!") - case "darwin": - //do nothing (probably deploy to AWS, Vast.ai and the rest) plus Linux & Windows - fmt.Println("You're on macOS!") - case "linux": - //This is where we should build our nestri "server" - fmt.Println("You're on Linux!") - default: - fmt.Printf("Unsupported operating system: %s\n", runtime.GOOS) - } + cmd.Execute() } From 017c6c6b0d29092cbe25f34cc0e9472d5379fe74 Mon Sep 17 00:00:00 2001 From: Wanjohi <71614375+wanjohiryan@users.noreply.github.com> Date: Tue, 4 Jun 2024 02:18:21 +0300 Subject: [PATCH 3/7] feat: Add padding --- cmd/root.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cmd/root.go b/cmd/root.go index cc32534..9aaefdb 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -10,6 +10,7 @@ import ( "strings" "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/table" "github.com/muesli/termenv" "github.com/spf13/cobra" ) @@ -34,6 +35,12 @@ var neoFetchCmd = &cobra.Command{ RunE: func(cmd *cobra.Command, args []string) error { lipgloss.SetColorProfile(termenv.TrueColor) + baseStyle := lipgloss.NewStyle(). + PaddingTop(1). + PaddingRight(4). + PaddingBottom(1). + PaddingLeft(4) + var ( b strings.Builder lines = strings.Split(art, "\n") @@ -47,7 +54,12 @@ var neoFetchCmd = &cobra.Command{ b.WriteRune('\n') } - fmt.Print(b.String()) + t := table.New(). + Border(lipgloss.HiddenBorder()) + + t.Row(baseStyle.Render(b.String()), baseStyle.Render("System Info goes here")) + + fmt.Print(t) return nil }, From ed1a8e1e4ab5d7ffa38ff82caa6f756c88c9b0e5 Mon Sep 17 00:00:00 2001 From: Wanjohi <71614375+wanjohiryan@users.noreply.github.com> Date: Tue, 4 Jun 2024 02:29:05 +0300 Subject: [PATCH 4/7] =?UTF-8?q?=E2=9C=A8=20feat:=20Add=20`run`=20command?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/root.go | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 9aaefdb..ae37133 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -19,6 +19,7 @@ import ( var art string // rootCmd represents the base command when called without any subcommands +// For a good reference point, start here: https://github.com/charmbracelet/taskcli/blob/main/cmds.go var rootCmd = &cobra.Command{ Use: "nestri", Short: "A CLI tool to manage your cloud gaming service", @@ -28,6 +29,7 @@ var rootCmd = &cobra.Command{ }, } +// this is for the "nestri neofetch" subcommand, has no arguments var neoFetchCmd = &cobra.Command{ Use: "neofetch", Short: "Show important system information", @@ -65,6 +67,17 @@ var neoFetchCmd = &cobra.Command{ }, } +// this is the "nestri run" subcommand, takes no arguments for now +var runCmd = &cobra.Command{ + Use: "run", + Short: "Run a game using nestri", + Args: cobra.NoArgs, + //For now just show the "help" + RunE: func(cmd *cobra.Command, args []string) error { + return cmd.Help() + }, +} + // Execute adds all child commands to the root command and sets flags appropriately. // This is called by main.main(). It only needs to happen once to the rootCmd. func Execute() { @@ -75,16 +88,12 @@ func Execute() { } func init() { - // Here you will define your flags and configuration settings. - // Cobra supports persistent flags, which, if defined here, - // will be global for your application. rootCmd.AddCommand(neoFetchCmd) - // rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.cli.yaml)") + rootCmd.AddCommand(runCmd) - // Cobra also supports local flags, which will only run - // when this action is called directly. - rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") + //If you want to add subcommands to run for example "netri run -fsr" do it like this + // runCmd.Flags().BoolP("fsr", "f", false, "Run the Game with FSR enabled or not") } func colorize(c, s string) string { From e18f65099ced946fcd078dd42ec572c53cc7bc0e Mon Sep 17 00:00:00 2001 From: SmellyBoars <67525817+Makergear25@users.noreply.github.com> Date: Mon, 24 Jun 2024 20:38:50 -0400 Subject: [PATCH 5/7] =?UTF-8?q?=E2=9C=A8feat:=20Add=20step=201=20and=20ste?= =?UTF-8?q?p=202=20to=20`run`=20(#6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit added step 1 and step 2 need to work on docker client for go ## Description **What issue are you solving (or what feature are you adding) and how are you doing it?** Start of "run" command --- root.go | 302 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 302 insertions(+) create mode 100644 root.go diff --git a/root.go b/root.go new file mode 100644 index 0000000..813cb6f --- /dev/null +++ b/root.go @@ -0,0 +1,302 @@ +/* +Copyright © 2024 Nestri <> +*/ +package cmd + +import ( + _ "embed" + "fmt" + "os" + "os/exec" + "path/filepath" + "runtime" + "strings" + "time" + + "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/table" + "github.com/muesli/termenv" + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +//go:embed nestri.ascii +var art string + +var ( + gpu int + hdr bool +) + +// rootCmd represents the base command when called without any subcommands +// For a good reference point, start here: https://github.com/charmbracelet/taskcli/blob/main/cmds.go +var rootCmd = &cobra.Command{ + Use: "nestri", + Short: "A CLI tool to manage your cloud gaming service", + Args: cobra.NoArgs, + RunE: func(cmd *cobra.Command, args []string) error { + return cmd.Help() + }, +} + +// this is for the "nestri neofetch" subcommand, has no arguments +var neoFetchCmd = &cobra.Command{ + Use: "neofetch", + Short: "Show important system information", + Args: cobra.NoArgs, + RunE: func(cmd *cobra.Command, args []string) error { + lipgloss.SetColorProfile(termenv.TrueColor) + + baseStyle := lipgloss.NewStyle(). + PaddingTop(1). + PaddingRight(4). + PaddingBottom(1). + PaddingLeft(4) + + var ( + b strings.Builder + lines = strings.Split(art, "\n") + colors = []string{"#F8481C", "#F74127", "#F53B30", "#F23538", "#F02E40"} + step = len(lines) / len(colors) + ) + + for i, l := range lines { + n := clamp(0, len(colors)-1, i/step) + b.WriteString(colorize(colors[n], l)) + b.WriteRune('\n') + } + + t := table.New(). + Border(lipgloss.HiddenBorder()) + + t.Row(baseStyle.Render(b.String()), baseStyle.Render("System Info goes here")) + + fmt.Print(t) + + return nil + }, +} + +// this is the "nestri run" subcommand, takes no arguments for now +var runCmd = &cobra.Command{ + Use: "run", + Short: "Run a game using nestri", + Args: cobra.MaximumNArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + if runtime.GOOS != "linux" { + //make sure os is linux + fmt.Println("This command is only supported on Linux.") + return nil + } + + var game string + if len(args) > 0 { + game = args[0] + viper.Set("game", game) + viper.WriteConfig() + } else { + game = viper.GetString("game") + if filepath.Ext(game) != ".exe" { + return fmt.Errorf("Make sure the game is a .exe") + } + if game == "" { + return fmt.Errorf("no game specified and no previous game selected") + } + } + + fmt.Printf("Running game: %s\n\n", game) + if gpu > 0 { + fmt.Print("Using gpu %s\n", gpu) + } + if hdr { + fmt.Println("Enabling HDR mode") + } + + //get linux version + versionCmd := exec.Command("grep", "VERSION", "/etc/os-release") + versionOutput, err := versionCmd.CombinedOutput() + if err != nil { + return fmt.Errorf("error getting linux version:") + } + fmt.Printf("Linux version:\n%s\n", string(versionOutput)) + + //Step 1: change to games dir + fmt.Println("changing to game dir.") //this is a temp command for debug as well as leads to a hardcoded dir + + HomeDir, err := os.UserHomeDir() + if err != nil { + return fmt.Errorf("error getting home directory %v\n", err) + } + + err = os.Chdir(fmt.Sprintf("%s/game", HomeDir)) + if err != nil { + return fmt.Errorf("error changing directory: %v\n", err) + } + //verify we are in game dir + dir, err := os.Getwd() + if err != nil { + return fmt.Errorf("error getting current directory: %v\n", err) + } + fmt.Printf("Current directory: %s\n\n", dir) + + //list games dir + listDir := exec.Command("ls", "-la", ".") + listDirOutput, err := listDir.CombinedOutput() + if err != nil { + fmt.Errorf("error listing games: %v\n") + } + fmt.Printf("List of Games: \n%s\n", listDirOutput) + + //step 2: Generate a Session ID + //generate id + SID := exec.Command("bash", "-c", "head /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | head -c 16") + + //save output to variable + output, err := SID.Output() + if err != nil { + fmt.Errorf("Error generating Session ID: %v\n", err) + } + sessionID := strings.TrimSpace(string(output)) + fmt.Printf("Your Session ID is: %s\n\n", sessionID) + + //step 3: Launch netris server + fmt.Println("Installing Netris/Launching Netris Server\n") + checkRunning := exec.Command("sudo", "docker", "ps", "-q", "-f", "name=netris") + containerId, err := checkRunning.Output() + if err != nil { + return fmt.Errorf("error checking running Docker container: %v", err) + } + + if len(containerId) == 0 { + checkExisting := exec.Command("sudo", "docker", "ps", "-aq", "-f", "name=netris") + containerId, err = checkExisting.Output() + if err != nil { + return fmt.Errorf("error checking for existing docker container: %v", err) + } + + if len(containerId) == 0 { + installCmd := exec.Command( + "sudo", "docker", "run", "-d", "--gpus", "all", "--device=/dev/dri", + "--name", "netris", "-it", "--entrypoint", "/bin/bash", + "-e", fmt.Sprintf("SESSION_ID=%s", sessionID), + "-v", fmt.Sprintf("%s:/game", dir), "-p", "8080:8080/udp", + "--cap-add=SYS_NICE", "--cap-add=SYS_ADMIN", "ghcr.io/netrisdotme/netris/server:nightly", + ) + installCmd.Stdout = os.Stdout + installCmd.Stderr = os.Stderr + + if err := installCmd.Run(); err != nil { + return fmt.Errorf("error running docker command: %v", err) + } + } else { + startContainer := exec.Command("sudo", "docker", "start", "netris") + startContainer.Stdout = os.Stdout + startContainer.Stderr = os.Stderr + + if err := startContainer.Run(); err != nil { + return fmt.Errorf("error starting existing Docker container: %v", err) + } + } + } + + //main part of step 4: + //start netris server + + fmt.Println("starting netris server\n\n") + checkFileCmd := exec.Command("sudo", "docker", "exec", "netris", "ls", "-la", "/tmp") + output, err = checkFileCmd.Output() + if err != nil { + return fmt.Errorf("error checking /tmp dir in docker container: %v\n", err) + } + + if !strings.Contains(string(output), ".X11-unix") { + startupCmd := exec.Command("sudo", "docker", "exec", "netris", "/etc/startup.sh", ">", "/dev/null", "&") + startupCmd.Stdout = os.Stdout + startupCmd.Stderr = os.Stderr + + if err := startupCmd.Run(); err != nil { + return fmt.Errorf("error running startup command: %v\n", err) + } + + for { + time.Sleep(7 * time.Minute) + output, err := checkFileCmd.Output() + if err != nil { + return fmt.Errorf("error checking /tmp directory in container: %v\n", err) + } + if strings.Contains(string(output), ".X11-unix") { + break + } + } + } + + gameCmd := fmt.Sprintf("netris-proton -pr %s", game) + execCmd := exec.Command("sudo", "docker", "exec", "netris", gameCmd) + execCmd.Stdout = os.Stdout + execCmd.Stderr = os.Stderr + + if err := execCmd.Run(); err != nil { + return fmt.Errorf("error executing game command in docker container: %v\n", err) + } + + return nil + }, +} + +// Execute adds all child commands to the root command and sets flags appropriately. +// This is called by main.main(). It only needs to happen once to the rootCmd. +func Execute() { + err := rootCmd.Execute() + if err != nil { + os.Exit(1) + } +} + +func init() { + rootCmd.AddCommand(neoFetchCmd) + + rootCmd.AddCommand(runCmd) + + runCmd.Flags().IntVar(&gpu, "gpu", 0, "Specify GPU index") + runCmd.Flags().BoolVar(&hdr, "hdr", false, "Enable HDR mode") + + viper.SetConfigName("config") + viper.SetConfigType("yaml") + viper.AddConfigPath(".") + + if err := viper.ReadInConfig(); err != nil { + if _, ok := err.(viper.ConfigFileNotFoundError); ok { + + } else { + fmt.Println("error reading config file: %v(you should be able to ignore this)", err) + } + } + + //If you want to add subcommands to run for example "netri run -fsr" do it like this + // runCmd.Flags().BoolP("fsr", "f", false, "Run the Game with FSR enabled or not") +} + +func colorize(c, s string) string { + return lipgloss.NewStyle().Foreground(lipgloss.Color(c)).Render(s) +} + +func clamp(v, low, high int) int { + if high < low { + low, high = high, low + } + return min(high, max(low, v)) +} + +func min(a, b int) int { + if a < b { + return a + } + return b +} + +func max(a, b int) int { + if a > b { + return a + } + return b +} From 84b916973a2c3945e12134e3848be590e06a2aed Mon Sep 17 00:00:00 2001 From: Wanjohi Ryan <71614375+wanjohiryan@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:19:06 +0300 Subject: [PATCH 6/7] feat: Add `viper` --- cmd/root.go | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/cmd/root.go b/cmd/root.go index 653ef68..6b7a4f8 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -7,8 +7,12 @@ import ( _ "embed" "fmt" "os" + "os/exec" + "path/filepath" + "runtime" "strings" "sync" + "time" "github.com/nestriness/cli/pkg/specs" @@ -16,6 +20,7 @@ import ( "github.com/charmbracelet/lipgloss/table" "github.com/muesli/termenv" "github.com/spf13/cobra" + "github.com/spf13/viper" ) //go:embed nestri.ascii @@ -76,6 +81,172 @@ var neoFetchCmd = &cobra.Command{ }, } +// this is the "nestri run" subcommand, takes no arguments for now +var runCmd = &cobra.Command{ + Use: "run", + Short: "Run a game using nestri", + Args: cobra.MaximumNArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + if runtime.GOOS != "linux" { + //make sure os is linux + fmt.Println("This command is only supported on Linux.") + return nil + } + + var game string + if len(args) > 0 { + game = args[0] + viper.Set("game", game) + viper.WriteConfig() + } else { + game = viper.GetString("game") + if filepath.Ext(game) != ".exe" { + return fmt.Errorf("Make sure the game is a .exe") + } + if game == "" { + return fmt.Errorf("no game specified and no previous game selected") + } + } + + fmt.Printf("Running game: %s\n\n", game) + // if gpu > 0 { + // fmt.Print("Using gpu %s\n", gpu) + // } + // if hdr { + // fmt.Println("Enabling HDR mode") + // } + + //get linux version + versionCmd := exec.Command("grep", "VERSION", "/etc/os-release") + versionOutput, err := versionCmd.CombinedOutput() + if err != nil { + return fmt.Errorf("error getting linux version:") + } + fmt.Printf("Linux version:\n%s\n", string(versionOutput)) + + //Step 1: change to games dir + fmt.Println("changing to game dir.") //this is a temp command for debug as well as leads to a hardcoded dir + + HomeDir, err := os.UserHomeDir() + if err != nil { + return fmt.Errorf("error getting home directory %v\n", err) + } + + err = os.Chdir(fmt.Sprintf("%s/game", HomeDir)) + if err != nil { + return fmt.Errorf("error changing directory: %v\n", err) + } + //verify we are in game dir + dir, err := os.Getwd() + if err != nil { + return fmt.Errorf("error getting current directory: %v\n", err) + } + fmt.Printf("Current directory: %s\n\n", dir) + + //list games dir + listDir := exec.Command("ls", "-la", ".") + listDirOutput, err := listDir.CombinedOutput() + if err != nil { + fmt.Errorf("error listing games: %v\n") + } + fmt.Printf("List of Games: \n%s\n", listDirOutput) + + //step 2: Generate a Session ID + //generate id + SID := exec.Command("bash", "-c", "head /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | head -c 16") + + //save output to variable + output, err := SID.Output() + if err != nil { + fmt.Errorf("Error generating Session ID: %v\n", err) + } + sessionID := strings.TrimSpace(string(output)) + fmt.Printf("Your Session ID is: %s\n\n", sessionID) + + //step 3: Launch netris server + fmt.Println("Installing Netris/Launching Netris Server\n") + checkRunning := exec.Command("sudo", "docker", "ps", "-q", "-f", "name=netris") + containerId, err := checkRunning.Output() + if err != nil { + return fmt.Errorf("error checking running Docker container: %v", err) + } + + if len(containerId) == 0 { + checkExisting := exec.Command("sudo", "docker", "ps", "-aq", "-f", "name=netris") + containerId, err = checkExisting.Output() + if err != nil { + return fmt.Errorf("error checking for existing docker container: %v", err) + } + + if len(containerId) == 0 { + installCmd := exec.Command( + "sudo", "docker", "run", "-d", "--gpus", "all", "--device=/dev/dri", + "--name", "netris", "-it", "--entrypoint", "/bin/bash", + "-e", fmt.Sprintf("SESSION_ID=%s", sessionID), + "-v", fmt.Sprintf("%s:/game", dir), "-p", "8080:8080/udp", + "--cap-add=SYS_NICE", "--cap-add=SYS_ADMIN", "ghcr.io/netrisdotme/netris/server:nightly", + ) + installCmd.Stdout = os.Stdout + installCmd.Stderr = os.Stderr + + if err := installCmd.Run(); err != nil { + return fmt.Errorf("error running docker command: %v", err) + } + } else { + startContainer := exec.Command("sudo", "docker", "start", "netris") + startContainer.Stdout = os.Stdout + startContainer.Stderr = os.Stderr + + if err := startContainer.Run(); err != nil { + return fmt.Errorf("error starting existing Docker container: %v", err) + } + } + } + + //main part of step 4: + //start netris server + + fmt.Println("starting netris server\n\n") + checkFileCmd := exec.Command("sudo", "docker", "exec", "netris", "ls", "-la", "/tmp") + output, err = checkFileCmd.Output() + if err != nil { + return fmt.Errorf("error checking /tmp dir in docker container: %v\n", err) + } + + if !strings.Contains(string(output), ".X11-unix") { + startupCmd := exec.Command("sudo", "docker", "exec", "netris", "/etc/startup.sh", ">", "/dev/null", "&") + startupCmd.Stdout = os.Stdout + startupCmd.Stderr = os.Stderr + + if err := startupCmd.Run(); err != nil { + return fmt.Errorf("error running startup command: %v\n", err) + } + + for { + time.Sleep(7 * time.Minute) + output, err := checkFileCmd.Output() + if err != nil { + return fmt.Errorf("error checking /tmp directory in container: %v\n", err) + } + if strings.Contains(string(output), ".X11-unix") { + break + } + } + } + + gameCmd := fmt.Sprintf("netris-proton -pr %s", game) + execCmd := exec.Command("sudo", "docker", "exec", "netris", gameCmd) + execCmd.Stdout = os.Stdout + execCmd.Stderr = os.Stderr + + if err := execCmd.Run(); err != nil { + return fmt.Errorf("error executing game command in docker container: %v\n", err) + } + + return nil + }, +} + // Execute adds all child commands to the root command and sets flags appropriately. // This is called by main.main(). It only needs to happen once to the rootCmd. func Execute() { From a4e0a70181cfd3521c16f311285eed4eea1dc714 Mon Sep 17 00:00:00 2001 From: Wanjohi Ryan <71614375+wanjohiryan@users.noreply.github.com> Date: Thu, 27 Jun 2024 03:16:52 +0300 Subject: [PATCH 7/7] feat: use docker client --- cmd/root.go | 327 +++++++++++++++++++++++++++++----------------------- go.mod | 53 ++++++++- go.sum | 179 +++++++++++++++++++++++++++- 3 files changed, 410 insertions(+), 149 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 6b7a4f8..65e0504 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -4,23 +4,20 @@ Copyright © 2024 Nestri <> package cmd import ( + "context" _ "embed" "fmt" "os" - "os/exec" - "path/filepath" "runtime" "strings" - "sync" - "time" - - "github.com/nestriness/cli/pkg/specs" "github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss/table" + "github.com/docker/docker/api/types/container" + "github.com/docker/docker/client" + "github.com/docker/docker/pkg/stdcopy" "github.com/muesli/termenv" "github.com/spf13/cobra" - "github.com/spf13/viper" ) //go:embed nestri.ascii @@ -93,22 +90,65 @@ var runCmd = &cobra.Command{ return nil } - var game string - if len(args) > 0 { - game = args[0] - viper.Set("game", game) - viper.WriteConfig() - } else { - game = viper.GetString("game") - if filepath.Ext(game) != ".exe" { - return fmt.Errorf("Make sure the game is a .exe") - } - if game == "" { - return fmt.Errorf("no game specified and no previous game selected") - } + // var game string + // if len(args) > 0 { + // game = args[0] + // viper.Set("game", game) + // viper.WriteConfig() + // } else { + // game = viper.GetString("game") + // if filepath.Ext(game) != ".exe" { + // return fmt.Errorf("Make sure the game is a .exe") + // } + // if game == "" { + // return fmt.Errorf("no game specified and no previous game selected") + // } + // } + + // fmt.Printf("Running game: %s\n\n", game) + + cli, err := client.NewClientWithOpts() + if err != nil { + panic(err) } - fmt.Printf("Running game: %s\n\n", game) + ctx := context.Background() + resp, err := cli.ContainerCreate(ctx, &container.Config{ + Image: "hello-world", + }, nil, nil, nil, "hello-world") + + if err != nil { + panic(err) + } + + if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil { + panic(err) + } + + // Attach to the container to get logs + out, err := cli.ContainerLogs(ctx, resp.ID, container.LogsOptions{ShowStdout: true, ShowStderr: true, Follow: true}) + if err != nil { + fmt.Printf("Error attaching to container logs: %s\n", err) + } + defer out.Close() + + // Copy the logs to stdout and stderr + stdcopy.StdCopy(os.Stdout, os.Stderr, out) + + // Wait for the container to finish + statusCh, errCh := cli.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning) + select { + case err := <-errCh: + if err != nil { + fmt.Printf("Error waiting for container: %s\n", err) + } + case <-statusCh: + fmt.Println("Container finished") + } + // Clean up the container + if err := cli.ContainerRemove(ctx, resp.ID, container.RemoveOptions{}); err != nil { + fmt.Printf("Error removing container: %s\n", err) + } // if gpu > 0 { // fmt.Print("Using gpu %s\n", gpu) // } @@ -117,131 +157,131 @@ var runCmd = &cobra.Command{ // } //get linux version - versionCmd := exec.Command("grep", "VERSION", "/etc/os-release") - versionOutput, err := versionCmd.CombinedOutput() - if err != nil { - return fmt.Errorf("error getting linux version:") - } - fmt.Printf("Linux version:\n%s\n", string(versionOutput)) + // versionCmd := exec.Command("grep", "VERSION", "/etc/os-release") + // versionOutput, err := versionCmd.CombinedOutput() + // if err != nil { + // return fmt.Errorf("error getting linux version:") + // } + // fmt.Printf("Linux version:\n%s\n", string(versionOutput)) - //Step 1: change to games dir - fmt.Println("changing to game dir.") //this is a temp command for debug as well as leads to a hardcoded dir + // //Step 1: change to games dir + // fmt.Println("changing to game dir.") //this is a temp command for debug as well as leads to a hardcoded dir - HomeDir, err := os.UserHomeDir() - if err != nil { - return fmt.Errorf("error getting home directory %v\n", err) - } + // HomeDir, err := os.UserHomeDir() + // if err != nil { + // return fmt.Errorf("error getting home directory %v\n", err) + // } - err = os.Chdir(fmt.Sprintf("%s/game", HomeDir)) - if err != nil { - return fmt.Errorf("error changing directory: %v\n", err) - } - //verify we are in game dir - dir, err := os.Getwd() - if err != nil { - return fmt.Errorf("error getting current directory: %v\n", err) - } - fmt.Printf("Current directory: %s\n\n", dir) + // err = os.Chdir(fmt.Sprintf("%s/game", HomeDir)) + // if err != nil { + // return fmt.Errorf("error changing directory: %v\n", err) + // } + // //verify we are in game dir + // dir, err := os.Getwd() + // if err != nil { + // return fmt.Errorf("error getting current directory: %v\n", err) + // } + // fmt.Printf("Current directory: %s\n\n", dir) - //list games dir - listDir := exec.Command("ls", "-la", ".") - listDirOutput, err := listDir.CombinedOutput() - if err != nil { - fmt.Errorf("error listing games: %v\n") - } - fmt.Printf("List of Games: \n%s\n", listDirOutput) + // //list games dir + // listDir := exec.Command("ls", "-la", ".") + // listDirOutput, err := listDir.CombinedOutput() + // if err != nil { + // fmt.Errorf("error listing games: %v\n") + // } + // fmt.Printf("List of Games: \n%s\n", listDirOutput) - //step 2: Generate a Session ID - //generate id - SID := exec.Command("bash", "-c", "head /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | head -c 16") + // //step 2: Generate a Session ID + // //generate id + // SID := exec.Command("bash", "-c", "head /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | head -c 16") - //save output to variable - output, err := SID.Output() - if err != nil { - fmt.Errorf("Error generating Session ID: %v\n", err) - } - sessionID := strings.TrimSpace(string(output)) - fmt.Printf("Your Session ID is: %s\n\n", sessionID) + // //save output to variable + // output, err := SID.Output() + // if err != nil { + // fmt.Errorf("Error generating Session ID: %v\n", err) + // } + // sessionID := strings.TrimSpace(string(output)) + // fmt.Printf("Your Session ID is: %s\n\n", sessionID) - //step 3: Launch netris server - fmt.Println("Installing Netris/Launching Netris Server\n") - checkRunning := exec.Command("sudo", "docker", "ps", "-q", "-f", "name=netris") - containerId, err := checkRunning.Output() - if err != nil { - return fmt.Errorf("error checking running Docker container: %v", err) - } + // //step 3: Launch netris server + // fmt.Println("Installing Netris/Launching Netris Server") + // checkRunning := exec.Command("sudo", "docker", "ps", "-q", "-f", "name=netris") + // containerId, err := checkRunning.Output() + // if err != nil { + // return fmt.Errorf("error checking running Docker container: %v", err) + // } - if len(containerId) == 0 { - checkExisting := exec.Command("sudo", "docker", "ps", "-aq", "-f", "name=netris") - containerId, err = checkExisting.Output() - if err != nil { - return fmt.Errorf("error checking for existing docker container: %v", err) - } + // if len(containerId) == 0 { + // checkExisting := exec.Command("sudo", "docker", "ps", "-aq", "-f", "name=netris") + // containerId, err = checkExisting.Output() + // if err != nil { + // return fmt.Errorf("error checking for existing docker container: %v", err) + // } - if len(containerId) == 0 { - installCmd := exec.Command( - "sudo", "docker", "run", "-d", "--gpus", "all", "--device=/dev/dri", - "--name", "netris", "-it", "--entrypoint", "/bin/bash", - "-e", fmt.Sprintf("SESSION_ID=%s", sessionID), - "-v", fmt.Sprintf("%s:/game", dir), "-p", "8080:8080/udp", - "--cap-add=SYS_NICE", "--cap-add=SYS_ADMIN", "ghcr.io/netrisdotme/netris/server:nightly", - ) - installCmd.Stdout = os.Stdout - installCmd.Stderr = os.Stderr + // if len(containerId) == 0 { + // installCmd := exec.Command( + // "sudo", "docker", "run", "-d", "--gpus", "all", "--device=/dev/dri", + // "--name", "netris", "-it", "--entrypoint", "/bin/bash", + // "-e", fmt.Sprintf("SESSION_ID=%s", sessionID), + // "-v", fmt.Sprintf("%s:/game", dir), "-p", "8080:8080/udp", + // "--cap-add=SYS_NICE", "--cap-add=SYS_ADMIN", "ghcr.io/netrisdotme/netris/server:nightly", + // ) + // installCmd.Stdout = os.Stdout + // installCmd.Stderr = os.Stderr - if err := installCmd.Run(); err != nil { - return fmt.Errorf("error running docker command: %v", err) - } - } else { - startContainer := exec.Command("sudo", "docker", "start", "netris") - startContainer.Stdout = os.Stdout - startContainer.Stderr = os.Stderr + // if err := installCmd.Run(); err != nil { + // return fmt.Errorf("error running docker command: %v", err) + // } + // } else { + // startContainer := exec.Command("sudo", "docker", "start", "netris") + // startContainer.Stdout = os.Stdout + // startContainer.Stderr = os.Stderr - if err := startContainer.Run(); err != nil { - return fmt.Errorf("error starting existing Docker container: %v", err) - } - } - } + // if err := startContainer.Run(); err != nil { + // return fmt.Errorf("error starting existing Docker container: %v", err) + // } + // } + // } - //main part of step 4: - //start netris server + // //main part of step 4: + // //start netris server - fmt.Println("starting netris server\n\n") - checkFileCmd := exec.Command("sudo", "docker", "exec", "netris", "ls", "-la", "/tmp") - output, err = checkFileCmd.Output() - if err != nil { - return fmt.Errorf("error checking /tmp dir in docker container: %v\n", err) - } + // fmt.Println("starting netris server\n\n") + // checkFileCmd := exec.Command("sudo", "docker", "exec", "netris", "ls", "-la", "/tmp") + // output, err = checkFileCmd.Output() + // if err != nil { + // return fmt.Errorf("error checking /tmp dir in docker container: %v\n", err) + // } - if !strings.Contains(string(output), ".X11-unix") { - startupCmd := exec.Command("sudo", "docker", "exec", "netris", "/etc/startup.sh", ">", "/dev/null", "&") - startupCmd.Stdout = os.Stdout - startupCmd.Stderr = os.Stderr + // if !strings.Contains(string(output), ".X11-unix") { + // startupCmd := exec.Command("sudo", "docker", "exec", "netris", "/etc/startup.sh", ">", "/dev/null", "&") + // startupCmd.Stdout = os.Stdout + // startupCmd.Stderr = os.Stderr - if err := startupCmd.Run(); err != nil { - return fmt.Errorf("error running startup command: %v\n", err) - } + // if err := startupCmd.Run(); err != nil { + // return fmt.Errorf("error running startup command: %v\n", err) + // } - for { - time.Sleep(7 * time.Minute) - output, err := checkFileCmd.Output() - if err != nil { - return fmt.Errorf("error checking /tmp directory in container: %v\n", err) - } - if strings.Contains(string(output), ".X11-unix") { - break - } - } - } + // for { + // time.Sleep(7 * time.Minute) + // output, err := checkFileCmd.Output() + // if err != nil { + // return fmt.Errorf("error checking /tmp directory in container: %v\n", err) + // } + // if strings.Contains(string(output), ".X11-unix") { + // break + // } + // } + // } - gameCmd := fmt.Sprintf("netris-proton -pr %s", game) - execCmd := exec.Command("sudo", "docker", "exec", "netris", gameCmd) - execCmd.Stdout = os.Stdout - execCmd.Stderr = os.Stderr + // gameCmd := fmt.Sprintf("netris-proton -pr %s", game) + // execCmd := exec.Command("sudo", "docker", "exec", "netris", gameCmd) + // execCmd.Stdout = os.Stdout + // execCmd.Stderr = os.Stderr - if err := execCmd.Run(); err != nil { - return fmt.Errorf("error executing game command in docker container: %v\n", err) - } + // if err := execCmd.Run(); err != nil { + // return fmt.Errorf("error executing game command in docker container: %v\n", err) + // } return nil }, @@ -261,6 +301,7 @@ func init() { // Cobra supports persistent flags, which, if defined here, // will be global for your application. rootCmd.AddCommand(neoFetchCmd) + rootCmd.AddCommand(runCmd) // rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.cli.yaml)") @@ -294,18 +335,18 @@ func max(a, b int) int { return b } -func getSpecs(info *specs.Specs, infoChan chan specs.Specs, wg *sync.WaitGroup) { - defer wg.Done() - sys := specs.New() - // info.Userhost = getUserHostname() - // info.OS = getOSName() - // info.Kernel = getKernelVersion() - // info.Uptime = getUptime() - // info.Shell = getShell() - // info.CPU = getCPUName() - // info.RAM = getMemStats() - info.GPU, _ = sys.GetGPUInfo() - // info.SystemArch, _ = getSystemArch() - // info.DiskUsage, _ = getDiskUsage() - infoChan <- *info -} +// func getSpecs(info *specs.Specs, infoChan chan specs.Specs, wg *sync.WaitGroup) { +// defer wg.Done() +// sys := specs.New() +// // info.Userhost = getUserHostname() +// // info.OS = getOSName() +// // info.Kernel = getKernelVersion() +// // info.Uptime = getUptime() +// // info.Shell = getShell() +// // info.CPU = getCPUName() +// // info.RAM = getMemStats() +// info.GPU, _ = sys.GetGPUInfo() +// // info.SystemArch, _ = getSystemArch() +// // info.DiskUsage, _ = getDiskUsage() +// infoChan <- *info +// } diff --git a/go.mod b/go.mod index 76bdebf..8a776ca 100644 --- a/go.mod +++ b/go.mod @@ -3,16 +3,61 @@ module github.com/nestriness/cli go 1.22.2 require ( + github.com/charmbracelet/lipgloss v0.11.0 + github.com/moby/moby v27.0.2+incompatible + github.com/muesli/termenv v0.15.2 + github.com/spf13/cobra v1.8.0 + github.com/spf13/viper v1.19.0 +) + +require ( + github.com/Microsoft/go-winio v0.4.14 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect - github.com/charmbracelet/lipgloss v0.11.0 // indirect github.com/charmbracelet/x/ansi v0.1.1 // indirect + github.com/containerd/log v0.1.0 // indirect + github.com/distribution/reference v0.6.0 // indirect + github.com/docker/docker v27.0.2+incompatible // indirect + github.com/docker/go-connections v0.5.0 // indirect + github.com/docker/go-units v0.5.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect - github.com/muesli/termenv v0.15.2 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/moby/docker-image-spec v1.3.1 // indirect + github.com/moby/term v0.5.0 // indirect + github.com/morikuni/aec v1.0.0 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.0 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/rivo/uniseg v0.4.7 // indirect - github.com/spf13/cobra v1.8.0 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cast v1.6.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/sys v0.19.0 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + go.opentelemetry.io/otel v1.27.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect + go.opentelemetry.io/otel/metric v1.27.0 // indirect + go.opentelemetry.io/otel/sdk v1.27.0 // indirect + go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.uber.org/atomic v1.9.0 // indirect + go.uber.org/multierr v1.9.0 // indirect + golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + gotest.tools/v3 v3.5.1 // indirect ) diff --git a/go.sum b/go.sum index 71a2ea9..448b9ec 100644 --- a/go.sum +++ b/go.sum @@ -1,30 +1,205 @@ +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/charmbracelet/lipgloss v0.11.0 h1:UoAcbQ6Qml8hDwSWs0Y1cB5TEQuZkDPH/ZqwWWYTG4g= github.com/charmbracelet/lipgloss v0.11.0/go.mod h1:1UdRTH9gYgpcdNN5oBtjbu/IzNKtzVtb7sqN1t9LNn8= github.com/charmbracelet/x/ansi v0.1.1 h1:CGAduulr6egay/YVbGc8Hsu8deMg1xZ/bkaXTPi1JDk= github.com/charmbracelet/x/ansi v0.1.1/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/docker v27.0.2+incompatible h1:mNhCtgXNV1fIRns102grG7rdzIsGGCq1OlOD0KunZos= +github.com/docker/docker v27.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +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/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +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/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= +github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= +github.com/moby/moby v27.0.2+incompatible h1:iYtGEjFi9lkX2m/Bop2H/peXzx3VtzmPlE9r0JHyH0s= +github.com/moby/moby v27.0.2+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= +github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo= github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= +github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= +github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= +github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= +github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= 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.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= +github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/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/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +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.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= +go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= +go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= +go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= +go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= +go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= +go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= +go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= +go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +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-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +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/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/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= +google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 h1:P8OJ/WCl/Xo4E4zoe4/bifHpSmmKwARqyqE4nW6J2GQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 h1:AgADTJarZTBqgjiUzRgfaBchgYB3/WFTC80GPwsMcRI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +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/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= +gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= +gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=