X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=mecm%2Fmepm%2Fapplcm%2Fk8shelm%2Fpkg%2Fplugin%2Fgrpcserver.go;h=d2b4d4ae8354e4f892d37ab4ff422805dd648fb3;hb=5011a34d8324f1458ead3734992058c60d7af761;hp=00bbb1c7e38292a0ab8a8fbbf71b4de974ae0261;hpb=2bb9c251cb17db7849a0a364fbe557175b336402;p=ealt-edge.git diff --git a/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go b/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go index 00bbb1c..d2b4d4a 100644 --- a/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go +++ b/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go @@ -18,17 +18,18 @@ package plugin import ( "bytes" "context" + "io" + "k8shelm/internal/lcmservice" + "net" + "os" + "strconv" + "github.com/sirupsen/logrus" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" _ "google.golang.org/grpc/encoding/gzip" "google.golang.org/grpc/status" - "io" - "k8shelm/internal/lcmservice" - "net" - "os" - "strconv" ) // GRPC server @@ -109,13 +110,13 @@ func (s *ServerGRPC) Query(ctx context.Context, req *lcmservice.QueryRequest) (r // Create HELM Client hc, err := NewHelmClient(req.GetHostIp(), s.logger) if os.IsNotExist(err) { - return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to given Edge can't be found. " + + return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to given Edge can't be found. "+ "Err: %s", err)) } // Query Chart r, err := hc.queryChart(req.GetWorkloadId()) - if (err != nil) { + if err != nil { return nil, s.logError(status.Errorf(codes.NotFound, "Chart not found for workloadId: %s. Err: %s", req.GetWorkloadId(), err)) } @@ -135,14 +136,14 @@ func (s *ServerGRPC) Terminate(ctx context.Context, req *lcmservice.TerminateReq // Create HELM client hc, err := NewHelmClient(req.GetHostIp(), s.logger) if os.IsNotExist(err) { - return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to given Edge can't be found. " + + return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to given Edge can't be found. "+ "Err: %s", err)) } // Uninstall chart err = hc.uninstallChart(req.GetWorkloadId()) - if (err != nil) { + if err != nil { resp = &lcmservice.TerminateResponse{ Status: "Failure", } @@ -170,7 +171,7 @@ func (s *ServerGRPC) Instantiate(stream lcmservice.AppLCM_InstantiateServer) (er s.logger.Infof("Recieved instantiate request") // Host validation - if (hostIP == "") { + if hostIP == "" { return s.logError(status.Errorf(codes.InvalidArgument, "HostIP & WorkloadId can't be null", err)) } @@ -207,7 +208,7 @@ func (s *ServerGRPC) Instantiate(stream lcmservice.AppLCM_InstantiateServer) (er // Create HELM client hc, err := NewHelmClient(req.GetHostIp(), s.logger) if os.IsNotExist(err) { - return s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to edge can't be found. " + + return s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to edge can't be found. "+ "Err: %s", err)) } @@ -216,7 +217,7 @@ func (s *ServerGRPC) Instantiate(stream lcmservice.AppLCM_InstantiateServer) (er var res lcmservice.InstantiateResponse res.WorkloadId = relName - if (err != nil) { + if err != nil { res.Status = "Failure" s.logger.Infof("Instantiation Failed") } else { @@ -247,4 +248,4 @@ func (s *ServerGRPC) logError(err error) error { s.logger.Errorf("Error Information: ", err) } return err -} \ No newline at end of file +}