Create server API - create the chef server using the webui key (#6376)

* added API chanegs for adding the chef server with webui key Signed-off-by: Vinay Sharma <vsharma@chef.io> * added changes for the validation and test cases Signed-off-by: Vinay Sharma <vsharma@chef.io>
chef · May 2, 2022 · 9730fdd · 9730fdd
1 parent 104453a
commit 9730fdd
Show file tree

Hide file tree

Showing 12 changed files with 140 additions and 62 deletions.
diff --git a/api/external/infra_proxy/infra_proxy.pb.policy.go b/api/external/infra_proxy/infra_proxy.pb.policy.go
diff --git a/api/external/infra_proxy/infra_proxy.swagger.json b/api/external/infra_proxy/infra_proxy.swagger.json
diff --git a/api/external/infra_proxy/request/servers.pb.go b/api/external/infra_proxy/request/servers.pb.go
diff --git a/api/external/infra_proxy/request/servers.proto b/api/external/infra_proxy/request/servers.proto
@@ -12,6 +12,8 @@ message CreateServer {
     string fqdn = 3;
     // Chef Infra Server IP address.
     string ip_address = 4;
+    // Chef Infra Server Webui key.
+    string webui_key = 5;
 }
 
 message UpdateServer {

diff --git a/api/interservice/infra_proxy/request/servers.pb.go b/api/interservice/infra_proxy/request/servers.pb.go
diff --git a/api/interservice/infra_proxy/request/servers.proto b/api/interservice/infra_proxy/request/servers.proto
@@ -12,6 +12,8 @@ message CreateServer {
     string fqdn = 3;
     // Chef Infra Server IP address.
     string ip_address = 4;
+    // Chef Infra Server Webui key.
+    string webui_key = 5;
 }
 
 message UpdateServer {

diff --git a/components/automate-gateway/api/infra_proxy.pb.swagger.go b/components/automate-gateway/api/infra_proxy.pb.swagger.go
diff --git a/components/automate-gateway/handler/infra_proxy/servers.go b/components/automate-gateway/handler/infra_proxy/servers.go
@@ -2,6 +2,7 @@ package infra_proxy
 
 import (
 	"context"
+
 	gwreq "github.com/chef/automate/api/external/infra_proxy/request"
 	gwres "github.com/chef/automate/api/external/infra_proxy/response"
 	infra_req "github.com/chef/automate/api/interservice/infra_proxy/request"
@@ -44,6 +45,7 @@ func (a *InfraProxyServer) CreateServer(ctx context.Context, r *gwreq.CreateServ
 		Name:      r.Name,
 		Fqdn:      r.Fqdn,
 		IpAddress: r.IpAddress,
+		WebuiKey:  r.WebuiKey,
 	}
 	res, err := a.client.CreateServer(ctx, req)
 	if err != nil {

diff --git a/components/infra-proxy-service/server/servers.go b/components/infra-proxy-service/server/servers.go
@@ -5,6 +5,8 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
+	"github.com/chef/automate/api/external/common/query"
+	secrets "github.com/chef/automate/api/external/secrets"
 	"github.com/chef/automate/api/interservice/infra_proxy/request"
 	"github.com/chef/automate/api/interservice/infra_proxy/response"
 	"github.com/chef/automate/components/infra-proxy-service/service"
@@ -27,8 +29,9 @@ func (s *Server) CreateServer(ctx context.Context, req *request.CreateServer) (*
 		Target:  "server",
 		Request: *req,
 		Rules: validation.Rules{
-			"Id":   []string{"required"},
-			"Name": []string{"required"},
+			"Id":       []string{"required"},
+			"Name":     []string{"required"},
+			"WebuiKey": []string{"required"},
 		},
 	}).Validate()
 
@@ -40,6 +43,19 @@ func (s *Server) CreateServer(ctx context.Context, req *request.CreateServer) (*
 		return nil, errors.Wrap(err, "FQDN or IP required to add the server.")
 	}
 
+	// TODO: validate the new webui key
+	newSecret := &secrets.Secret{
+		Name: "infra-proxy-service-webui-key",
+		Type: "chef-server",
+		Data: []*query.Kv{
+			{Key: "key", Value: req.WebuiKey},
+		},
+	}
+	credential, err := s.service.Secrets.Create(ctx, newSecret)
+	if err != nil {
+		return nil, err
+	}
+
 	// commenting this code because sometimes chef-services are down that time we can't able to check the server status and not able to add or update the server.
 	/*
 		serverHost := req.GetFqdn()
@@ -53,7 +69,7 @@ func (s *Server) CreateServer(ctx context.Context, req *request.CreateServer) (*
 		}
 	*/
 
-	server, err := s.service.Storage.StoreServer(ctx, req.Id, req.Name, req.Fqdn, req.IpAddress)
+	server, err := s.service.Storage.StoreServer(ctx, req.Id, req.Name, req.Fqdn, req.IpAddress, credential.Id)
 	if err != nil {
 		return nil, service.ParseStorageError(err, *req, "server")
 	}