break out to multiple services

craftcms · Jul 27, 2020 · 2313e4d · 2313e4d
1 parent e0a3ef7
commit 2313e4d
Show file tree

Hide file tree

Showing 13 changed files with 152 additions and 180 deletions.
diff --git a/cmd/nitrod/main.go b/cmd/nitrod/main.go
@@ -25,8 +25,9 @@ func main() {
 	// create the grpc server
 	s := grpc.NewServer()
 
-	// register our service
-	nitrod.RegisterNitroServiceServer(s, nitrod.New())
+	// register our services
+	nitrod.RegisterNitroServiceServer(s, nitrod.NewNitroService())
+	nitrod.RegisterSystemServiceServer(s, nitrod.NewSystemService())
 
 	fmt.Println("running nitrod on port", *port)
 

diff --git a/internal/client/client.go b/internal/client/client.go
@@ -19,3 +19,12 @@ func NewClient(ip, port string) nitrod.NitroServiceClient {
 
 	return nitrod.NewNitroServiceClient(cc)
 }
+
+func NewSystemClient(ip, port string) nitrod.SystemServiceClient {
+	cc, err := grpc.Dial(ip+":"+port, grpc.WithInsecure())
+	if err != nil {
+		log.Fatal("error creating nitrod system client, error:", err)
+	}
+
+	return nitrod.NewSystemServiceClient(cc)
+}
diff --git a/internal/cmd/nginx.go b/internal/cmd/nginx.go
@@ -25,9 +25,9 @@ var nginxRestartCommand = &cobra.Command{
 		machine := flagMachineName
 		runner := nitro.NewMultipassRunner("multipass")
 		ip := nitro.IP(machine, runner)
-		c := client.NewClient(ip, "50051")
+		c := client.NewSystemClient(ip, "50051")
 
-		resp, err := c.NginxService(cmd.Context(), &nitrod.NginxServiceRequest{Action: nitrod.ServiceAction_RESTART})
+		resp, err := c.Nginx(cmd.Context(), &nitrod.NginxServiceRequest{Action: nitrod.ServiceAction_RESTART})
 		if err != nil {
 			return err
 		}
@@ -45,9 +45,9 @@ var nginxStartCommand = &cobra.Command{
 		machine := flagMachineName
 		runner := nitro.NewMultipassRunner("multipass")
 		ip := nitro.IP(machine, runner)
-		c := client.NewClient(ip, "50051")
+		c := client.NewSystemClient(ip, "50051")
 
-		resp, err := c.NginxService(cmd.Context(), &nitrod.NginxServiceRequest{Action: nitrod.ServiceAction_START})
+		resp, err := c.Nginx(cmd.Context(), &nitrod.NginxServiceRequest{Action: nitrod.ServiceAction_START})
 		if err != nil {
 			return err
 		}
@@ -65,9 +65,9 @@ var nginxStopCommand = &cobra.Command{
 		machine := flagMachineName
 		runner := nitro.NewMultipassRunner("multipass")
 		ip := nitro.IP(machine, runner)
-		c := client.NewClient(ip, "50051")
+		c := client.NewSystemClient(ip, "50051")
 
-		resp, err := c.NginxService(cmd.Context(), &nitrod.NginxServiceRequest{Action: nitrod.ServiceAction_STOP})
+		resp, err := c.Nginx(cmd.Context(), &nitrod.NginxServiceRequest{Action: nitrod.ServiceAction_STOP})
 		if err != nil {
 			return err
 		}

diff --git a/internal/cmd/php.go b/internal/cmd/php.go
@@ -6,9 +6,9 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/craftcms/nitro/config"
-	"github.com/craftcms/nitro/internal/nitrod"
 	"github.com/craftcms/nitro/internal/client"
 	"github.com/craftcms/nitro/internal/nitro"
+	"github.com/craftcms/nitro/internal/nitrod"
 )
 
 var phpCommand = &cobra.Command{
@@ -26,10 +26,10 @@ var phpRestartCommand = &cobra.Command{
 		machine := flagMachineName
 		runner := nitro.NewMultipassRunner("multipass")
 		ip := nitro.IP(machine, runner)
-		c := client.NewClient(ip, "50051")
+		c := client.NewSystemClient(ip, "50051")
 		php := config.GetString("php", flagPhpVersion)
 
-		resp, err := c.PhpFpmService(cmd.Context(), &nitrod.PhpFpmServiceRequest{Version: php, Action: nitrod.ServiceAction_RESTART})
+		resp, err := c.PhpFpm(cmd.Context(), &nitrod.PhpFpmServiceRequest{Version: php, Action: nitrod.ServiceAction_RESTART})
 		if err != nil {
 			return err
 		}
@@ -47,10 +47,10 @@ var phpStartCommand = &cobra.Command{
 		machine := flagMachineName
 		runner := nitro.NewMultipassRunner("multipass")
 		ip := nitro.IP(machine, runner)
-		c := client.NewClient(ip, "50051")
+		c := client.NewSystemClient(ip, "50051")
 		php := config.GetString("php", flagPhpVersion)
 
-		resp, err := c.PhpFpmService(cmd.Context(), &nitrod.PhpFpmServiceRequest{Version: php, Action: nitrod.ServiceAction_START})
+		resp, err := c.PhpFpm(cmd.Context(), &nitrod.PhpFpmServiceRequest{Version: php, Action: nitrod.ServiceAction_START})
 		if err != nil {
 			return err
 		}
@@ -68,10 +68,10 @@ var phpStopCommand = &cobra.Command{
 		machine := flagMachineName
 		runner := nitro.NewMultipassRunner("multipass")
 		ip := nitro.IP(machine, runner)
-		c := client.NewClient(ip, "50051")
+		c := client.NewSystemClient(ip, "50051")
 		php := config.GetString("php", flagPhpVersion)
 
-		resp, err := c.PhpFpmService(cmd.Context(), &nitrod.PhpFpmServiceRequest{Version: php, Action: nitrod.ServiceAction_STOP})
+		resp, err := c.PhpFpm(cmd.Context(), &nitrod.PhpFpmServiceRequest{Version: php, Action: nitrod.ServiceAction_STOP})
 		if err != nil {
 			return err
 		}

diff --git a/internal/nitrod/iniset.go b/internal/nitrod/iniset.go
@@ -10,7 +10,7 @@ import (
 	"github.com/craftcms/nitro/validate"
 )
 
-func (s *Service) PhpIniSettings(ctx context.Context, request *ChangePhpIniSettingRequest) (*ServiceResponse, error) {
+func (s *NitroService) PhpIniSettings(ctx context.Context, request *ChangePhpIniSettingRequest) (*ServiceResponse, error) {
 	var setting string
 	value := request.GetValue()
 	version := request.GetVersion()

diff --git a/internal/nitrod/initset_test.go b/internal/nitrod/initset_test.go
@@ -213,7 +213,7 @@ func TestNitrodService_PhpIniSettings(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			spy := &spyChainRunner{}
-			s := &Service{
+			s := &NitroService{
 				command: spy,
 				logger:  tt.fields.logger,
 			}

diff --git a/internal/nitrod/nginx.go b/internal/nitrod/nginx.go