From 68e4075a8ba4a80b7727824eb8a91216a18c32dc Mon Sep 17 00:00:00 2001 From: agrawalgaurav Date: Wed, 13 May 2020 17:42:15 +0530 Subject: [PATCH] Remove system information from logs Change-Id: I9be8af0c5fc582d7e2a9015bf0da26f7e775102f --- mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go | 33 +++++++++++------------ mecm/mepm/applcm/k8shelm/pkg/plugin/helmclient.go | 18 ++++++------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go b/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go index 6ec356f..2bcdc47 100644 --- a/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go +++ b/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go @@ -69,17 +69,16 @@ func (s *ServerGRPC) Listen() (err error) { // Listen announces on the network address listener, err = net.Listen("tcp", ":"+strconv.Itoa(s.port)) if err != nil { - s.logger.Fatalf("failed to listen on port: %s. Err: %s", s.port, err) - return err + s.logger.Fatalf("failed to listen on specified port") } - s.logger.Infof("Server started listening on port ", s.port) + s.logger.Infof("Server started listening on specified port") // Secure connection if asked if s.certificate != "" && s.key != "" { grpcCreds, err = credentials.NewServerTLSFromFile( s.certificate, s.key) if err != nil { - s.logger.Fatalf("failed to create tls grpc server using cert %s and key: %s. Err: %s", s.certificate, s.key, err) + s.logger.Fatalf("failed to create tls grpc server using given cert and key") } grpcOpts = append(grpcOpts, grpc.Creds(grpcCreds)) } @@ -104,15 +103,14 @@ func (s *ServerGRPC) Query(ctx context.Context, req *lcmservice.QueryRequest) (r // Input validation if (req.GetHostIp() == "") || (req.GetWorkloadId() == "") { - return nil, s.logError(status.Errorf(codes.InvalidArgument, "Nil input HostIp: %s or workloadId: %s. " + - "Err: %s", req.GetHostIp(), req.GetWorkloadId(), err)) + return nil, s.logError(status.Errorf(codes.InvalidArgument, "HostIP & WorkloadId can't be null", err)) } // Create HELM Client hc, err := NewHelmClient(req.GetHostIp(), s.logger) if os.IsNotExist(err) { - return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig for HostIp can't be found: %s. " + - "Err: %s", req.GetHostIp(), err)) + return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to given Edge can't be found. " + + "Err: %s", err)) } // Query Chart @@ -131,15 +129,14 @@ func (s *ServerGRPC) Query(ctx context.Context, req *lcmservice.QueryRequest) (r func (s *ServerGRPC) Terminate(ctx context.Context, req *lcmservice.TerminateRequest) (resp *lcmservice.TerminateResponse, err error) { // Input validation if (req.GetHostIp() == "") || (req.GetWorkloadId() == "") { - return nil, s.logError(status.Errorf(codes.InvalidArgument, "Nil input HostIp: %s or workloadId: %s. " + - "Err: %s", req.GetHostIp(), req.GetWorkloadId(), err)) + return nil, s.logError(status.Errorf(codes.InvalidArgument, "HostIP & WorkloadId can't be null", err)) } // Create HELM client hc, err := NewHelmClient(req.GetHostIp(), s.logger) if os.IsNotExist(err) { - return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig for HostIp can't be found: %s. " + - "Err: %s", req.GetHostIp(), err)) + return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to given Edge can't be found. " + + "Err: %s", err)) } // Uninstall chart @@ -170,11 +167,11 @@ func (s *ServerGRPC) Instantiate(stream lcmservice.AppLCM_InstantiateServer) (er } hostIP := req.GetHostIp() - s.logger.Info("Recieved instantiate request for host ", hostIP) + s.logger.Info("Recieved instantiate request") // Host validation if (hostIP == "") { - return s.logError(status.Errorf(codes.InvalidArgument, "Nil input for HostIp: %s Err: %s", req.GetHostIp(), err)) + return s.logError(status.Errorf(codes.InvalidArgument, "HostIP & WorkloadId can't be null", err)) } // Receive package @@ -185,11 +182,11 @@ func (s *ServerGRPC) Instantiate(stream lcmservice.AppLCM_InstantiateServer) (er return err } - s.logger.Info("Waiting to receive more data") + s.logger.Debug("Waiting to receive more data") req, err := stream.Recv() if err == io.EOF { - s.logger.Info("No more data") + s.logger.Debug("No more data") break } if err != nil { @@ -210,8 +207,8 @@ 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 for HostIp can't be found: %s. " + - "Err: %s", req.GetHostIp(), err)) + return s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to edge can't be found. " + + "Err: %s", err)) } relName, err := hc.installChart(helmPkg) diff --git a/mecm/mepm/applcm/k8shelm/pkg/plugin/helmclient.go b/mecm/mepm/applcm/k8shelm/pkg/plugin/helmclient.go index eae3c03..0115ed9 100644 --- a/mecm/mepm/applcm/k8shelm/pkg/plugin/helmclient.go +++ b/mecm/mepm/applcm/k8shelm/pkg/plugin/helmclient.go @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package plugin import ( @@ -53,7 +54,7 @@ func NewHelmClient(hostIP string, logger *logrus.Logger) (*HelmClient, error) { // Install a given helm chart func (hc *HelmClient) installChart(helmPkg bytes.Buffer) (string, error) { - hc.logger.Info("Inside helm client") + hc.logger.Debug("Inside helm client") // Create temporary file to hold helm chart file, err := os.Create(chartPath + "temp.tar.gz") @@ -84,11 +85,11 @@ func (hc *HelmClient) installChart(helmPkg bytes.Buffer) (string, error) { actionConfig := new(action.Configuration) if err := actionConfig.Init(kube.GetConfig(hc.kubeconfig, "", releaseNamespace), releaseNamespace, os.Getenv("HELM_DRIVER"), func(format string, v ...interface{}) { - fmt.Sprintf(format, v) + fmt.Sprintf(format, v) }); err != nil { hc.logger.Errorf("Unable to initialize action config Err: %s", err) return "", err - } + } // Prepare chart install action and install chart installer := action.NewInstall(actionConfig) @@ -109,11 +110,11 @@ func (hc *HelmClient) uninstallChart(relName string) (error) { actionConfig := new(action.Configuration) if err := actionConfig.Init(kube.GetConfig(hc.kubeconfig, "", releaseNamespace), releaseNamespace, os.Getenv("HELM_DRIVER"), func(format string, v ...interface{}) { - fmt.Sprintf(format, v) + fmt.Sprintf(format, v) }); err != nil { hc.logger.Errorf("Unable to initialize action config Err: %s", err) return err - } + } ui := action.NewUninstall(actionConfig) res, err := ui.Run(relName); @@ -130,8 +131,8 @@ func (hc *HelmClient) queryChart(relName string) (string, error) { actionConfig := new(action.Configuration) if err := actionConfig.Init(kube.GetConfig(hc.kubeconfig, "", releaseNamespace), releaseNamespace, os.Getenv("HELM_DRIVER"), func(format string, v ...interface{}) { - fmt.Sprintf(format, v) - }); err != nil { + fmt.Sprintf(format, v) + }); err != nil { hc.logger.Errorf("Unable to initialize action config Err: %s", err) return "", err } @@ -152,5 +153,4 @@ func fileExists(filename string) (bool, error) { return false, err } return !info.IsDir(), nil -} - +} \ No newline at end of file -- 2.16.6