Make sure and import modules in the main.go (#78)

Srop doing this in the common module.

Which modules a server/cli use should be decided by the end builder, not common code.

cmd/proxy-server/main.go

@@ -32,6 +32,16 @@ import (
 	"github.com/Snowflake-Labs/sansshell/cmd/proxy-server/server"
 	"github.com/Snowflake-Labs/sansshell/cmd/util"
 	"github.com/go-logr/stdr"
+
+	// Import services here to make them proxy-able
+	_ "github.com/Snowflake-Labs/sansshell/services/ansible"
+	_ "github.com/Snowflake-Labs/sansshell/services/exec"
+	_ "github.com/Snowflake-Labs/sansshell/services/healthcheck"
+	_ "github.com/Snowflake-Labs/sansshell/services/localfile"
+	_ "github.com/Snowflake-Labs/sansshell/services/packages"
+	_ "github.com/Snowflake-Labs/sansshell/services/process"
+	_ "github.com/Snowflake-Labs/sansshell/services/sansshell/server"
+	_ "github.com/Snowflake-Labs/sansshell/services/service"
 )
 
 var (

cmd/proxy-server/server/server.go

@@ -28,20 +28,11 @@ import (
 	"github.com/Snowflake-Labs/sansshell/auth/mtls"
 	"github.com/Snowflake-Labs/sansshell/auth/opa/rpcauth"
 	"github.com/Snowflake-Labs/sansshell/proxy/server"
+	ss "github.com/Snowflake-Labs/sansshell/services/sansshell/server"
 	"github.com/Snowflake-Labs/sansshell/telemetry"
 	"github.com/go-logr/logr"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
-
-	// Import services here to make them proxy-able
-	_ "github.com/Snowflake-Labs/sansshell/services/ansible"
-	_ "github.com/Snowflake-Labs/sansshell/services/exec"
-	_ "github.com/Snowflake-Labs/sansshell/services/healthcheck"
-	_ "github.com/Snowflake-Labs/sansshell/services/localfile"
-	_ "github.com/Snowflake-Labs/sansshell/services/packages"
-	_ "github.com/Snowflake-Labs/sansshell/services/process"
-	ss "github.com/Snowflake-Labs/sansshell/services/sansshell/server"
-	_ "github.com/Snowflake-Labs/sansshell/services/service"
 )
 
 // RunState encapsulates all of the variable state needed

cmd/sanssh/client/client.go

@@ -31,15 +31,6 @@ import (
 	"github.com/google/subcommands"
 	"google.golang.org/grpc"
 
-	// Import services here to make them proxy-able
-	_ "github.com/Snowflake-Labs/sansshell/services/ansible/client"
-	_ "github.com/Snowflake-Labs/sansshell/services/exec/client"
-	_ "github.com/Snowflake-Labs/sansshell/services/healthcheck/client"
-	_ "github.com/Snowflake-Labs/sansshell/services/localfile/client"
-	_ "github.com/Snowflake-Labs/sansshell/services/packages/client"
-	_ "github.com/Snowflake-Labs/sansshell/services/process/client"
-	_ "github.com/Snowflake-Labs/sansshell/services/sansshell/client"
-	_ "github.com/Snowflake-Labs/sansshell/services/service/client"
 	"github.com/Snowflake-Labs/sansshell/services/util"
 )
 

cmd/sanssh/main.go

@@ -31,6 +31,16 @@ import (
 	"github.com/Snowflake-Labs/sansshell/services/util"
 	"github.com/google/subcommands"
 	"google.golang.org/grpc/metadata"
+
+	// Import services here to make them accessible for CLI
+	_ "github.com/Snowflake-Labs/sansshell/services/ansible/client"
+	_ "github.com/Snowflake-Labs/sansshell/services/exec/client"
+	_ "github.com/Snowflake-Labs/sansshell/services/healthcheck/client"
+	_ "github.com/Snowflake-Labs/sansshell/services/localfile/client"
+	_ "github.com/Snowflake-Labs/sansshell/services/packages/client"
+	_ "github.com/Snowflake-Labs/sansshell/services/process/client"
+	_ "github.com/Snowflake-Labs/sansshell/services/sansshell/client"
+	_ "github.com/Snowflake-Labs/sansshell/services/service/client"
 )
 
 var (

cmd/sansshell-server/main.go

@@ -37,6 +37,16 @@ import (
 	"github.com/Snowflake-Labs/sansshell/auth/opa/rpcauth"
 	"github.com/Snowflake-Labs/sansshell/cmd/sansshell-server/server"
 	"github.com/Snowflake-Labs/sansshell/cmd/util"
+
+	// Import the server modules you want to expose, they automatically register
+	_ "github.com/Snowflake-Labs/sansshell/services/ansible/server"
+	_ "github.com/Snowflake-Labs/sansshell/services/exec/server"
+	_ "github.com/Snowflake-Labs/sansshell/services/healthcheck/server"
+	_ "github.com/Snowflake-Labs/sansshell/services/localfile/server"
+	_ "github.com/Snowflake-Labs/sansshell/services/packages/server"
+	_ "github.com/Snowflake-Labs/sansshell/services/process/server"
+	_ "github.com/Snowflake-Labs/sansshell/services/sansshell/server"
+	_ "github.com/Snowflake-Labs/sansshell/services/service/server"
 )
 
 var (

cmd/sansshell-server/server/server.go

@@ -27,16 +27,6 @@ import (
 	"github.com/Snowflake-Labs/sansshell/auth/opa/rpcauth"
 	"github.com/Snowflake-Labs/sansshell/server"
 	"github.com/go-logr/logr"
-
-	// Import the server modules you want to expose, they automatically register
-	_ "github.com/Snowflake-Labs/sansshell/services/ansible/server"
-	_ "github.com/Snowflake-Labs/sansshell/services/exec/server"
-	_ "github.com/Snowflake-Labs/sansshell/services/healthcheck/server"
-	_ "github.com/Snowflake-Labs/sansshell/services/localfile/server"
-	_ "github.com/Snowflake-Labs/sansshell/services/packages/server"
-	_ "github.com/Snowflake-Labs/sansshell/services/process/server"
-	_ "github.com/Snowflake-Labs/sansshell/services/sansshell/server"
-	_ "github.com/Snowflake-Labs/sansshell/services/service/server"
 )
 
 type RunState struct {