Merge branch 'master' into devel

bilalcaliskan · Jan 14, 2024 · 254f54a · 254f54a
2 parents 7162fa3 + ee767cd
commit 254f54a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 94 deletions.
diff --git a/cmd/foo/foo.go b/cmd/foo/foo.go
diff --git a/cmd/foo/options/options.go b/cmd/foo/options/options.go
diff --git a/cmd/foo/options/options_test.go b/cmd/foo/options/options_test.go
diff --git a/cmd/root/options/options.go b/cmd/root/options/options.go
@@ -7,12 +7,14 @@ var rootOptions = &RootOptions{}
 type (
 	OptsKey   struct{}
 	LoggerKey struct{}
+	DomainKey struct{}
+	DnsKey    struct{}
 )
 
 // RootOptions contains frequent command line and application options.
 type RootOptions struct {
-	// Key is the dummy option
-	Key string
+	Domain     string
+	DnsServers string
 }
 
 // GetRootOptions returns the pointer of RootOptions
@@ -21,5 +23,6 @@ func GetRootOptions() *RootOptions {
 }
 
 func (opts *RootOptions) InitFlags(cmd *cobra.Command) {
-	cmd.PersistentFlags().StringVarP(&opts.Key, "key", "", "", "")
+	cmd.Flags().StringVarP(&opts.Domain, "domain", "", "", "domain to be used for split tunneling")
+	cmd.Flags().StringVarP(&opts.DnsServers, "dns-servers", "", "", "comma separated dns servers to be used for split tunneling")
 }
diff --git a/cmd/root/root.go b/cmd/root/root.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"os"
 
-	"github.com/bilalcaliskan/split-the-tunnel/cmd/foo"
 	"github.com/bilalcaliskan/split-the-tunnel/cmd/root/options"
 
 	"github.com/bilalcaliskan/split-the-tunnel/internal/logging"
@@ -15,14 +14,11 @@ import (
 var (
 	opts *options.RootOptions
 	ver  = version.Get()
-	//bannerFilePath = "build/ci/banner.txt"
 )
 
 func init() {
 	opts = options.GetRootOptions()
 	opts.InitFlags(rootCmd)
-
-	rootCmd.AddCommand(foo.FooCmd)
 }
 
 // rootCmd represents the base command when called without any subcommands
@@ -32,15 +28,13 @@ var rootCmd = &cobra.Command{
 	Long:    ``,
 	Version: ver.GitVersion,
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-		//if _, err := os.Stat("build/ci/banner.txt"); err == nil {
-		//	bannerBytes, _ := os.ReadFile("build/ci/banner.txt")
-		//	banner.Init(os.Stdout, true, false, strings.NewReader(string(bannerBytes)))
-		//}
-
 		logger := logging.GetLogger()
 		logger.Info().Str("appVersion", ver.GitVersion).Str("goVersion", ver.GoVersion).Str("goOS", ver.GoOs).
 			Str("goArch", ver.GoArch).Str("gitCommit", ver.GitCommit).Str("buildDate", ver.BuildDate).
-			Msg("golang-cli-template is started!")
+			Msg("split-the-tunnel is started!")
+
+		logger.Info().Msg(opts.Domain)
+		logger.Info().Msg(opts.DnsServers)
 
 		cmd.SetContext(context.WithValue(cmd.Context(), options.LoggerKey{}, logger))
 		cmd.SetContext(context.WithValue(cmd.Context(), options.OptsKey{}, opts))