From 81543749f03adf76cc7e24bde2709e0571291ad5 Mon Sep 17 00:00:00 2001 From: KeerthanaAP Date: Fri, 27 Oct 2023 14:15:01 +0530 Subject: [PATCH] Added log levels --- cmd/create/port/port.go | 2 +- cmd/delete/port/port.go | 2 +- cmd/dhcp-sync/dhcp-sync.go | 6 ++-- cmd/dhcpserver/create.go | 3 +- cmd/dhcpserver/delete.go | 2 +- cmd/image/import/import.go | 14 ++++---- cmd/image/info/info.go | 6 ++-- cmd/image/qcow2ova/get-image.go | 8 ++--- cmd/image/qcow2ova/prep/loop.go | 6 ++-- cmd/image/qcow2ova/prep/prepare.go | 2 +- cmd/image/qcow2ova/qcow2ova.go | 32 +++++++++---------- .../qcow2ova/validate/diskspace/diskspace.go | 2 +- cmd/image/qcow2ova/validate/tools/tools.go | 2 +- cmd/image/qcow2ova/validate/validate.go | 4 +-- cmd/image/sync/sync.go | 10 +++--- cmd/image/sync/sync_test.go | 4 +-- cmd/image/upload/upload.go | 12 +++---- cmd/purge/images/images.go | 6 ++-- cmd/purge/keys/keys.go | 6 ++-- cmd/purge/networks/networks.go | 10 +++--- cmd/purge/vms/vms.go | 6 ++-- cmd/purge/volumes/volumes.go | 6 ++-- cmd/root.go | 2 +- pkg/client/client.go | 11 ++++--- pkg/client/network/network.go | 2 +- pkg/client/s3client.go | 16 +++++----- pkg/client/volume/volume.go | 2 +- test/e2e/sync/sync.go | 32 +++++++++---------- 28 files changed, 109 insertions(+), 107 deletions(-) diff --git a/cmd/create/port/port.go b/cmd/create/port/port.go index ad895c67..f2f4cc72 100644 --- a/cmd/create/port/port.go +++ b/cmd/create/port/port.go @@ -83,7 +83,7 @@ var Cmd = &cobra.Command{ if err != nil { return fmt.Errorf("failed to create a port, err: %v", err) } - klog.Infof("Successfully created a port, id: %s", *port.PortID) + klog.V(1).Infof("Successfully created a port, id: %s", *port.PortID) table := utils.NewTable() table.Render([]*models.NetworkPort{port}, []string{}) diff --git a/cmd/delete/port/port.go b/cmd/delete/port/port.go index 4ca674a8..7b1f6135 100644 --- a/cmd/delete/port/port.go +++ b/cmd/delete/port/port.go @@ -77,7 +77,7 @@ var Cmd = &cobra.Command{ if err != nil { return fmt.Errorf("failed to delete a port, err: %v", err) } - klog.Infof("Successfully deleted a port, id: %s", portID) + klog.V(1).Infof("Successfully deleted a port, id: %s", portID) return nil }, } diff --git a/cmd/dhcp-sync/dhcp-sync.go b/cmd/dhcp-sync/dhcp-sync.go index c095f30c..fa440c8f 100644 --- a/cmd/dhcp-sync/dhcp-sync.go +++ b/cmd/dhcp-sync/dhcp-sync.go @@ -179,10 +179,10 @@ var Cmd = &cobra.Command{ if !ok { return } - klog.Info("event:", event) + klog.V(2).Info("event:", event) if event.Op&fsnotify.Write == fsnotify.Write { - klog.Info("modified file:", event.Name) - klog.Info("restarting the dhcpd service") + klog.V(2).Info("modified file:", event.Name) + klog.V(2).Info("restarting the dhcpd service") exitcode, out, err := utils.RunCMD("systemctl", "restart", "dhcpd") if exitcode != 0 { klog.Errorf("failed to restart the dhcpd service, exitcode: %d, stdout: %s, err: %s", exitcode, out, err) diff --git a/cmd/dhcpserver/create.go b/cmd/dhcpserver/create.go index 0599438a..61a8ed0c 100644 --- a/cmd/dhcpserver/create.go +++ b/cmd/dhcpserver/create.go @@ -16,6 +16,7 @@ package dhcpserver import ( "fmt" + "github.com/IBM/go-sdk-core/v5/core" "github.com/spf13/cobra" @@ -69,7 +70,7 @@ var createCmd = &cobra.Command{ return fmt.Errorf("failed to create a dhcpserver, err: %v", err) } - klog.Infof("Successfully created a DHCP server") + klog.V(1).Infof("Successfully created a DHCP server") return nil }, } diff --git a/cmd/dhcpserver/delete.go b/cmd/dhcpserver/delete.go index 604b7fec..1629506b 100644 --- a/cmd/dhcpserver/delete.go +++ b/cmd/dhcpserver/delete.go @@ -48,7 +48,7 @@ var deleteCmd = &cobra.Command{ return fmt.Errorf("failed to delete a dhcpserver, err: %v", err) } - klog.Infof("Successfully Deleted a DHCP server") + klog.V(1).Infof("Successfully Deleted a DHCP server") return nil }, } diff --git a/cmd/image/import/import.go b/cmd/image/import/import.go index 12922d80..54138705 100644 --- a/cmd/image/import/import.go +++ b/cmd/image/import/import.go @@ -148,7 +148,7 @@ pvsadm image import -n upstream-core-lon04 -b --object rhel-83-100 } // Create the service credential if does not exist - klog.Infof("Auto Generating the COS Service credential for importing the image with name: %s", opt.ServiceCredName) + klog.V(3).Infof("Auto Generating the COS Service credential for importing the image with name: %s", opt.ServiceCredName) CreateServiceKeyRequest := controller.CreateServiceKeyRequest{ Name: opt.ServiceCredName, SourceCRN: crn, @@ -161,7 +161,7 @@ pvsadm image import -n upstream-core-lon04 -b --object rhel-83-100 cred, ok = newKey.Credentials["cos_hmac_keys"].(map[string]interface{}) } else { // Use the service credential already created - klog.Infof("Reading the existing service credential") + klog.V(3).Infof("Reading the existing service credential") cred, ok = keys[0].Credentials["cos_hmac_keys"].(map[string]interface{}) } if !ok { @@ -200,7 +200,7 @@ pvsadm image import -n upstream-core-lon04 -b --object rhel-83-100 if *job.Status.State == "failed" { return false, fmt.Errorf("image import job failed to complete, err: %v", job.Status.Message) } - klog.Infof("Image Import Job in-progress, current state: %s", *job.Status.State) + klog.V(1).Infof("Image Import Job in-progress, current state: %s", *job.Status.State) return false, nil }) if pollErr == wait.ErrWaitTimeout { @@ -217,11 +217,11 @@ pvsadm image import -n upstream-core-lon04 -b --object rhel-83-100 if err != nil { return err } - klog.Infof("Retriving image details") + klog.V(2).Infof("Retriving image details") } if !opt.Watch { - klog.Infof("Importing Image %s is currently in %s state, Please check the Progress in the IBM Cloud UI\n", *image.Name, *image.State) + klog.V(1).Infof("Importing Image %s is currently in %s state, Please check the Progress in the IBM Cloud UI\n", *image.Name, *image.State) return nil } @@ -233,7 +233,7 @@ pvsadm image import -n upstream-core-lon04 -b --object rhel-83-100 if img.State == "active" { return true, nil } - klog.Infof("Import in-progress, current state: %s", img.State) + klog.V(1).Infof("Import in-progress, current state: %s", img.State) return false, nil }) if pollErr == wait.ErrWaitTimeout { @@ -244,7 +244,7 @@ pvsadm image import -n upstream-core-lon04 -b --object rhel-83-100 return fmt.Errorf("failed to import the image, err: %v\n\nRun this command to get more information for the failure: pvsadm get events -i %s", pollErr, pvmclient.InstanceID) } - klog.Infof("Successfully imported the image: %s with ID: %s within %s", *image.Name, *image.ImageID, time.Since(start)) + klog.V(1).Infof("Successfully imported the image: %s with ID: %s within %s", *image.Name, *image.ImageID, time.Since(start)) return nil }, diff --git a/cmd/image/info/info.go b/cmd/image/info/info.go index 3369320d..504306ed 100644 --- a/cmd/image/info/info.go +++ b/cmd/image/info/info.go @@ -58,13 +58,13 @@ pvsadm image info rhcos-46-12152021.ova.gz return fmt.Errorf("failed to detect the image filetype: %v", err) } if checkGzip { - klog.Infof("Image %s is in gzip format, extracting it", fileName) + klog.V(2).Infof("Image %s is in gzip format, extracting it", fileName) ova = filepath.Join(ovaImgDir, "image.ova") err = utils.GunzipIt(fileName, ova) if err != nil { return err } - klog.Infof("Extract complete") + klog.V(2).Infof("Extract complete") } else { ova = fileName } @@ -110,7 +110,7 @@ pvsadm image info rhcos-46-12152021.ova.gz klog.Warning("unable to find the pvsadm tool version") return nil } - klog.Infof("Pvsadm tool version used for creating this image: %+v", toolversion) + klog.V(1).Infof("Pvsadm tool version used for creating this image: %+v", toolversion) return nil }, } diff --git a/cmd/image/qcow2ova/get-image.go b/cmd/image/qcow2ova/get-image.go index 64aeb569..987bea20 100644 --- a/cmd/image/qcow2ova/get-image.go +++ b/cmd/image/qcow2ova/get-image.go @@ -40,18 +40,18 @@ func getImage(downloadDir string, srcUrl string, timeout time.Duration) (string, if !fileExists(srcUrl) { return "", fmt.Errorf("not a valid URL or file does not exist at %s", srcUrl) } - klog.Infof("Copying %s into %s", srcUrl, dest) + klog.V(2).Infof("Copying %s into %s", srcUrl, dest) if err := cp(srcUrl, dest); err != nil { return "", err } - klog.Infof("Copy Completed!") + klog.V(2).Infof("Copy Completed!") } else { out, err := os.Create(dest) if err != nil { return "", err } defer out.Close() - klog.Infof("Downloading %s into %s", srcUrl, dest) + klog.V(2).Infof("Downloading %s into %s", srcUrl, dest) client := http.Client{ Timeout: timeout, } @@ -69,7 +69,7 @@ func getImage(downloadDir string, srcUrl string, timeout time.Duration) (string, if err != nil { return "", err } - klog.Infof("Download Completed!") + klog.V(2).Infof("Download Completed!") } return dest, nil } diff --git a/cmd/image/qcow2ova/prep/loop.go b/cmd/image/qcow2ova/prep/loop.go index 62f9fc39..9a35c266 100644 --- a/cmd/image/qcow2ova/prep/loop.go +++ b/cmd/image/qcow2ova/prep/loop.go @@ -108,11 +108,11 @@ func Umount(dir string) error { exitcode, out, err := utils.RunCMD("umount", dir) if exitcode != 0 { if strings.Contains(err, "not mounted") { - klog.Infof("Ignoring 'not mounted' error for %s", dir) + klog.V(2).Infof("Ignoring 'not mounted' error for %s", dir) return nil } if strings.Contains(err, "no mount point specified") { - klog.Infof("Ignoring 'no mount point specified' error for %s", dir) + klog.V(2).Infof("Ignoring 'no mount point specified' error for %s", dir) return nil } if strings.Contains(err, "target is busy") { @@ -122,7 +122,7 @@ func Umount(dir string) error { return nil } } - klog.Infof(" As '%s' is busy, unmounting it using lazy unmount", dir) + klog.V(2).Infof(" As '%s' is busy, unmounting it using lazy unmount", dir) exitcode, out, err = utils.RunCMD("umount", "-lf", dir) if exitcode == 0 { return nil diff --git a/cmd/image/qcow2ova/prep/prepare.go b/cmd/image/qcow2ova/prep/prepare.go index b2b760c1..07b857b8 100644 --- a/cmd/image/qcow2ova/prep/prepare.go +++ b/cmd/image/qcow2ova/prep/prepare.go @@ -147,7 +147,7 @@ func Prepare4capture(mnt, volume, dist, rhnuser, rhnpasswd, rootpasswd string) e case "rhel", "centos": return prepare(mnt, volume, dist, rhnuser, rhnpasswd, rootpasswd) case "coreos": - klog.Infof("No image preparation required for the coreos...") + klog.V(1).Infof("No image preparation required for the coreos...") return nil default: return fmt.Errorf("not a supported distro: %s", dist) diff --git a/cmd/image/qcow2ova/qcow2ova.go b/cmd/image/qcow2ova/qcow2ova.go index 42406ecc..e89df5c3 100644 --- a/cmd/image/qcow2ova/qcow2ova.go +++ b/cmd/image/qcow2ova/qcow2ova.go @@ -97,7 +97,7 @@ Qcow2 images location: if strings.ToLower(opt.ImageDist) == "coreos" { return fmt.Errorf("--prep-template option is not supported for coreos distro") } else { - klog.Info("Overriding with the user defined image preparation template.") + klog.V(2).Info("Overriding with the user defined image preparation template.") content, err := ioutil.ReadFile(opt.PrepTemplate) if err != nil { return err @@ -160,7 +160,7 @@ Qcow2 images location: if opt.ImageDist != "coreos" && opt.OSPassword == "" && !opt.OSPasswordSkip { var err error opt.OSPassword, err = GeneratePassword(12) - klog.Infof("Autogenerated OS root password is: %s", opt.OSPassword) + klog.V(1).Infof("Autogenerated OS root password is: %s", opt.OSPassword) if err != nil { return err } @@ -194,7 +194,7 @@ Qcow2 images location: signal.Notify(c, syscall.SIGINT, syscall.SIGTERM) go func() { <-c - klog.Infof("Received an interrupt, exiting...") + klog.V(1).Infof("Received an interrupt, exiting...") prep.ExitChroot() prep.UmountHostPartitions(mnt) _ = prep.Umount(mnt) @@ -207,7 +207,7 @@ Qcow2 images location: return fmt.Errorf("failed to download the %s into %s, error: %v", opt.ImageURL, tmpDir, err) } - klog.Infof("downloaded/copied the file at: %s", image) + klog.V(2).Infof("downloaded/copied the file at: %s", image) var qcow2Img string @@ -216,13 +216,13 @@ Qcow2 images location: return fmt.Errorf("failed to detect the image filetype: %v", err) } if checkGzip { - klog.Infof("Image %s is in gzip format, extracting it", image) + klog.V(2).Infof("Image %s is in gzip format, extracting it", image) qcow2Img = filepath.Join(tmpDir, ova.VolName+".qcow2") err = utils.GunzipIt(image, qcow2Img) if err != nil { return err } - klog.Infof("Extract complete") + klog.V(2).Infof("Extract complete") } else { qcow2Img = image } @@ -235,41 +235,41 @@ Qcow2 images location: rawImg := filepath.Join(ovaImgDir, ova.VolNameRaw) - klog.Infof("Converting Qcow2(%s) image to raw(%s) format", qcow2Img, rawImg) + klog.V(1).Infof("Converting Qcow2(%s) image to raw(%s) format", qcow2Img, rawImg) err = qemuImgConvertQcow2Raw(qcow2Img, rawImg) if err != nil { return err } - klog.Infof("Conversion completed") + klog.V(1).Infof("Conversion completed") - klog.Infof("Resizing the image %s to %dG", rawImg, opt.ImageSize) + klog.V(1).Infof("Resizing the image %s to %dG", rawImg, opt.ImageSize) err = qemuImgResize("-f", "raw", rawImg, fmt.Sprintf("%dG", opt.ImageSize)) if err != nil { return err } - klog.Infof("Resize completed") + klog.V(1).Infof("Resize completed") - klog.Infof("Preparing the image") + klog.V(1).Infof("Preparing the image") err = prep.Prepare4capture(mnt, rawImg, opt.ImageDist, opt.RHNUser, opt.RHNPassword, opt.OSPassword) if err != nil { return fmt.Errorf("failed while preparing the image for %s distro, err: %v", opt.ImageDist, err) } - klog.Infof("Preparation completed") + klog.V(1).Infof("Preparation completed") - klog.Infof("Creating an OVA bundle") + klog.V(1).Infof("Creating an OVA bundle") ovafile := filepath.Join(tmpDir, opt.ImageName+".ova") if err := ova.CreateTarArchive(ovaImgDir, ovafile, opt.TargetDiskSize, opt.ImageDist); err != nil { return fmt.Errorf("failed to create ova bundle, err: %v", err) } - klog.Infof("OVA bundle creation completed: %s", ovafile) + klog.V(1).Infof("OVA bundle creation completed: %s", ovafile) - klog.Infof("Compressing an OVA file") + klog.V(1).Infof("Compressing an OVA file") ovaGZfile := filepath.Join(cwd, opt.ImageName+".ova.gz") err = utils.GzipIt(ovafile, ovaGZfile) if err != nil { return err } - klog.Infof("OVA file Compression completed") + klog.V(1).Infof("OVA file Compression completed") fmt.Printf("\n\nSuccessfully converted Qcow2 image to OVA format, find at %s\nOS root password: %s\n", ovaGZfile, opt.OSPassword) return nil diff --git a/cmd/image/qcow2ova/validate/diskspace/diskspace.go b/cmd/image/qcow2ova/validate/diskspace/diskspace.go index a651eaa1..ff4c6d5c 100644 --- a/cmd/image/qcow2ova/validate/diskspace/diskspace.go +++ b/cmd/image/qcow2ova/validate/diskspace/diskspace.go @@ -47,7 +47,7 @@ func (p *Rule) Verify() error { } free := (stat.Bavail * uint64(stat.Bsize)) / GB need := opt.ImageSize + BUFFER - klog.Infof("free: %dG, need: %dG", free, need) + klog.V(1).Infof("free: %dG, need: %dG", free, need) if free < need { return fmt.Errorf("%s does not have enough space for the conversion need: %d but got %d", opt.TempDir, need, free) } diff --git a/cmd/image/qcow2ova/validate/tools/tools.go b/cmd/image/qcow2ova/validate/tools/tools.go index a21ff6d0..29cb4843 100644 --- a/cmd/image/qcow2ova/validate/tools/tools.go +++ b/cmd/image/qcow2ova/validate/tools/tools.go @@ -40,7 +40,7 @@ func (p *Rule) Verify() error { p.failedCommand = command return err } - klog.Infof("%s found at %s\n", command, path) + klog.V(1).Infof("%s found at %s\n", command, path) } return nil } diff --git a/cmd/image/qcow2ova/validate/validate.go b/cmd/image/qcow2ova/validate/validate.go index 8ab50a43..48ddea22 100644 --- a/cmd/image/qcow2ova/validate/validate.go +++ b/cmd/image/qcow2ova/validate/validate.go @@ -37,9 +37,9 @@ func AddRule(r Rule) { func Validate() error { for _, rule := range rules { ruleStr := rule.String() - klog.Infof("Checking: %s\n", ruleStr) + klog.V(1).Infof("Checking: %s\n", ruleStr) if utils.Contains(pkg.ImageCMDOptions.PreflightSkip, ruleStr) { - klog.Infof("SKIPPED!") + klog.V(1).Infof("SKIPPED!") continue } err := rule.Verify() diff --git a/cmd/image/sync/sync.go b/cmd/image/sync/sync.go index 4367c4d3..4c6b33dc 100644 --- a/cmd/image/sync/sync.go +++ b/cmd/image/sync/sync.go @@ -51,14 +51,14 @@ const ( func copyWorker(copyJobs <-chan copyWorkload, results chan<- bool, workerId int) { for copyJob := range copyJobs { start := time.Now() - klog.Infof("Copying object: %s src bucket: %s dest bucket: %s", copyJob.srcObject, copyJob.srcBucket, copyJob.tgtBucket) + klog.V(1).Infof("Copying object: %s src bucket: %s dest bucket: %s", copyJob.srcObject, copyJob.srcBucket, copyJob.tgtBucket) err := copyJob.s3Cli.CopyObjectToBucket(copyJob.srcBucket, copyJob.tgtBucket, copyJob.srcObject) if err != nil { klog.Errorf("ERROR: %v, Copy object %s failed", err, copyJob.srcObject) results <- false } duration := time.Since(start) - klog.Infof("Copying object: %s from bucket: %s to bucket: %s took %v", copyJob.srcObject, copyJob.srcBucket, copyJob.tgtBucket, duration) + klog.V(1).Infof("Copying object: %s from bucket: %s to bucket: %s took %v", copyJob.srcObject, copyJob.srcBucket, copyJob.tgtBucket, duration) results <- true } } @@ -118,7 +118,7 @@ func copyObjects(spec []pkg.Spec, instanceList []InstanceItem, copyJobs chan<- c return err } - klog.Infof("Selected Objects from bucket %s: %s", item.Source.Bucket, strings.Join(selectedObjects, ", ")) + klog.V(1).Infof("Selected Objects from bucket %s: %s", item.Source.Bucket, strings.Join(selectedObjects, ", ")) for targetItemNo, targetItem := range item.Target { _, err = instanceList[item_no].Target[targetItemNo].CheckBucketLocationConstraint(targetItem.Bucket, targetItem.Region+"-"+targetItem.StorageClass) if err != nil { @@ -152,7 +152,7 @@ func getResults(results <-chan bool, totalChannels int) bool { } passedCopies = passedCopies + 1 } - klog.Infof("No of copies passed: %d No of copies failed: %d", passedCopies, failedCopies) + klog.V(1).Infof("No of copies passed: %d No of copies failed: %d", passedCopies, failedCopies) return failedCopies == 0 } @@ -282,7 +282,7 @@ Sample spec.yaml file: // Calculate total elapsed time duration := time.Since(start) - klog.Infof("Total elapsed time: %v", duration) + klog.V(1).Infof("Total elapsed time: %v", duration) return nil }, } diff --git a/cmd/image/sync/sync_test.go b/cmd/image/sync/sync_test.go index 50d65e0b..ea07c139 100644 --- a/cmd/image/sync/sync_test.go +++ b/cmd/image/sync/sync_test.go @@ -80,7 +80,7 @@ func TestGetSpec(t *testing.T) { SpecFileName := file.Name() defer os.Remove(SpecFileName) - klog.Infoln("Specfile :", SpecFileName) + klog.V(1).Infoln("Specfile :", SpecFileName) specString, merr := yaml.Marshal(&spec) require.NoError(t, merr, "Error in Unmarshalling Specfile") @@ -248,7 +248,7 @@ func mockCreateInstances(mockSyncClient *mocksync.MockSyncClient) []InstanceItem } func mockCreateSpec() []pkg.Spec { - klog.Infoln("STEP: Generating Spec") + klog.V(1).Infoln("STEP: Generating Spec") specSlice := make([]pkg.Spec, 0) for i := 0; i < noOfSources; i++ { specSlice = append(specSlice, utils.GenerateSpec(noOfTargetsPerSource)) diff --git a/cmd/image/upload/upload.go b/cmd/image/upload/upload.go index ec6d84a8..41717e7f 100644 --- a/cmd/image/upload/upload.go +++ b/cmd/image/upload/upload.go @@ -144,17 +144,17 @@ pvsadm image upload --bucket bucket1320 -f centos-8-latest.ova.gz --bucket-regio if bucketExists { opt.InstanceName = instanceName - klog.Infof("Found bucket %s in the %s instance", opt.BucketName, opt.InstanceName) + klog.V(1).Infof("Found bucket %s in the %s instance", opt.BucketName, opt.InstanceName) break } } } else if len(instances) == 0 { - klog.Infof("No active Cloud Object Storage instances were found in the account\n") + klog.V(1).Infof("No active Cloud Object Storage instances were found in the account\n") } // Ask if user likes to use existing instance if opt.InstanceName == "" && len(instances) != 0 { - klog.Infof("Bucket %s not found in the account provided\n", opt.BucketName) + klog.V(1).Infof("Bucket %s not found in the account provided\n", opt.BucketName) if utils.AskConfirmation(UseExistingPromptMessage) { availableInstances := []string{} for name := range instances { @@ -162,7 +162,7 @@ pvsadm image upload --bucket bucket1320 -f centos-8-latest.ova.gz --bucket-regio } selectedInstance := utils.SelectItem("Select Cloud Object Storage Instance:", availableInstances) opt.InstanceName = selectedInstance - klog.Infof("Selected InstanceName is %s\n", opt.InstanceName) + klog.V(1).Infof("Selected InstanceName is %s\n", opt.InstanceName) } } @@ -190,7 +190,7 @@ pvsadm image upload --bucket bucket1320 -f centos-8-latest.ova.gz --bucket-regio } opt.InstanceName = utils.ReadUserInput("Type Name of the Cloud Object Storage instance:") - klog.Infof("Creating a new cos %s instance\n", opt.InstanceName) + klog.V(1).Infof("Creating a new cos %s instance\n", opt.InstanceName) _, err = bxCli.CreateServiceInstance(opt.InstanceName, ServiceType, opt.ServicePlan, opt.ResourceGrp, ResourceGroupAPIRegion) @@ -215,7 +215,7 @@ pvsadm image upload --bucket bucket1320 -f centos-8-latest.ova.gz --bucket-regio //Create a new bucket if !bucketExists { - klog.Infof("Creating a new bucket %s\n", opt.BucketName) + klog.V(1).Infof("Creating a new bucket %s\n", opt.BucketName) s3Cli, err = client.NewS3Client(bxCli, opt.InstanceName, opt.Region) if err != nil { return err diff --git a/cmd/purge/images/images.go b/cmd/purge/images/images.go index 1a5e2e42..0eb91738 100644 --- a/cmd/purge/images/images.go +++ b/cmd/purge/images/images.go @@ -34,7 +34,7 @@ var Cmd = &cobra.Command{ pvsadm purge --help for information `, RunE: func(cmd *cobra.Command, args []string) error { - klog.Infof("Purge the images for the instance: %v", pkg.Options.InstanceID) + klog.V(1).Infof("Purge the images for the instance: %v", pkg.Options.InstanceID) opt := pkg.Options c, err := client.NewClientWithEnv(opt.APIKey, opt.Environment, opt.Debug) @@ -58,11 +58,11 @@ pvsadm purge --help for information if !opt.DryRun && len(images) != 0 { if opt.NoPrompt || utils.AskYesOrNo(deletePromptMessage) { for _, image := range images { - klog.Infof("Deleting the %s, and ID: %s", *image.Name, *image.ImageID) + klog.V(1).Infof("Deleting the %s, and ID: %s", *image.Name, *image.ImageID) err = pvmclient.ImgClient.Delete(*image.ImageID) if err != nil { if opt.IgnoreErrors { - klog.Infof("error occurred while deleting the image: %v", err) + klog.V(1).Infof("error occurred while deleting the image: %v", err) } else { return err } diff --git a/cmd/purge/keys/keys.go b/cmd/purge/keys/keys.go index d3098f78..49e6e02f 100644 --- a/cmd/purge/keys/keys.go +++ b/cmd/purge/keys/keys.go @@ -60,19 +60,19 @@ pvsadm purge --help for information return fmt.Errorf("failed to get the ssh keys, err: %v", err) } - klog.Infof("keys matched are %s", keys) + klog.V(1).Infof("keys matched are %s", keys) if len(keys) != 0 { if opt.NoPrompt || utils.AskConfirmation(deletePromptMessage) { for _, key := range keys { err = pvmclient.KeyClient.Delete(key) if err != nil { if opt.IgnoreErrors { - klog.Infof("error occurred while deleting the key: %v", err) + klog.V(1).Infof("error occurred while deleting the key: %v", err) } else { return fmt.Errorf("failed to delete a key, err: %v", err) } } - klog.Infof("Successfully deleted a key, id: %s", key) + klog.V(1).Infof("Successfully deleted a key, id: %s", key) } } } diff --git a/cmd/purge/networks/networks.go b/cmd/purge/networks/networks.go index 5f751627..86279960 100644 --- a/cmd/purge/networks/networks.go +++ b/cmd/purge/networks/networks.go @@ -49,7 +49,7 @@ pvsadm purge --help for information if err != nil { return err } - klog.Infof("Purging the networks for the instance: %v", pvmclient.InstanceID) + klog.V(1).Infof("Purging the networks for the instance: %v", pvmclient.InstanceID) networks, err := pvmclient.NetworkClient.GetAllPurgeable(opt.Before, opt.Since, opt.Expr) if err != nil { @@ -76,22 +76,22 @@ pvsadm purge --help for information if err != nil { return fmt.Errorf("failed to delete the instance: %v", err) } - klog.Infof("Successfully deleted a instance %s using network '%s'", pvminstance.PvmInstanceID, *network.Name) + klog.V(1).Infof("Successfully deleted a instance %s using network '%s'", pvminstance.PvmInstanceID, *network.Name) } if deletePorts { err = pvmclient.NetworkClient.DeletePort(*network.NetworkID, *portID) if err != nil { return fmt.Errorf("failed to delete a port, err: %v", err) } - klog.Infof("Successfully deleted a port %s using network '%s'", *portID, *network.Name) + klog.V(1).Infof("Successfully deleted a port %s using network '%s'", *portID, *network.Name) } } } - klog.Infof("Deleting the %s, and ID: %s", *network.Name, *network.NetworkID) + klog.V(1).Infof("Deleting the %s, and ID: %s", *network.Name, *network.NetworkID) err = pvmclient.NetworkClient.Delete(*network.NetworkID) if err != nil { if opt.IgnoreErrors { - klog.Infof("error occurred while deleting the network: %v", err) + klog.V(1).Infof("error occurred while deleting the network: %v", err) } else { return err } diff --git a/cmd/purge/vms/vms.go b/cmd/purge/vms/vms.go index 87ac4d89..1dfcf856 100644 --- a/cmd/purge/vms/vms.go +++ b/cmd/purge/vms/vms.go @@ -57,7 +57,7 @@ pvsadm purge --help for information for _, instance := range instances { ins, err := pvmclient.InstanceClient.Get(*instance.PvmInstanceID) if err != nil { - klog.Infof("Error occurred while getting the vm %s", err) + klog.V(1).Infof("Error occurred while getting the vm %s", err) continue } var ipAddrsPrivate, ipAddrsPublic []string @@ -76,11 +76,11 @@ pvsadm purge --help for information if !opt.DryRun && len(instances) != 0 { if opt.NoPrompt || utils.AskYesOrNo(deletePromptMessage) { for _, instance := range instances { - klog.Infof("Deleting the %s, and ID: %s", *instance.ServerName, *instance.PvmInstanceID) + klog.V(1).Infof("Deleting the %s, and ID: %s", *instance.ServerName, *instance.PvmInstanceID) err = pvmclient.InstanceClient.Delete(*instance.PvmInstanceID) if err != nil { if opt.IgnoreErrors { - klog.Infof("error occurred while deleting the vm: %v", err) + klog.V(1).Infof("error occurred while deleting the vm: %v", err) } else { return err } diff --git a/cmd/purge/volumes/volumes.go b/cmd/purge/volumes/volumes.go index 89f3cdae..8898347c 100644 --- a/cmd/purge/volumes/volumes.go +++ b/cmd/purge/volumes/volumes.go @@ -62,15 +62,15 @@ pvsadm purge --help for information t.Table.Render() if !opt.DryRun && len(volumes) != 0 { - klog.Infof("Deleting all the volumes in available state") + klog.V(1).Infof("Deleting all the volumes in available state") if opt.NoPrompt || utils.AskYesOrNo(deletePromptMessage) { for _, volume := range volumes { if *volume.State == "available" { - klog.Infof("Deleting the %s, and ID: %s", *volume.Name, *volume.VolumeID) + klog.V(1).Infof("Deleting the %s, and ID: %s", *volume.Name, *volume.VolumeID) err = pvmclient.VolumeClient.DeleteVolume(*volume.VolumeID) if err != nil { if opt.IgnoreErrors { - klog.Infof("error occurred while deleting the volume: %v", err) + klog.V(1).Infof("error occurred while deleting the volume: %v", err) } else { return err } diff --git a/cmd/root.go b/cmd/root.go index ce57cf32..c42f552f 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -47,7 +47,7 @@ This is a tool built for the Power Systems Virtual Server helps managing and mai PersistentPreRunE: func(cmd *cobra.Command, args []string) error { if pkg.Options.APIKey == "" { if key := os.Getenv("IBMCLOUD_API_KEY"); key != "" { - klog.Infof("Using an API key from IBMCLOUD_API_KEY environment variable") + klog.V(2).Infof("Using an API key from IBMCLOUD_API_KEY environment variable") pkg.Options.APIKey = key } } diff --git a/pkg/client/client.go b/pkg/client/client.go index 43eb27b6..cc5e1dd6 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -30,6 +30,7 @@ import ( "github.com/IBM-Cloud/bluemix-go/rest" bxsession "github.com/IBM-Cloud/bluemix-go/session" "k8s.io/klog/v2" + //"golang.org/x/oauth2/jwt" "github.com/golang-jwt/jwt" ) @@ -201,7 +202,7 @@ func (c *Client) CreateServiceInstance(instanceName, serviceName, servicePlan, r } if len(deployments) == 0 { - klog.Infof("No deployment found for service plan : %s", servicePlan) + klog.V(1).Infof("No deployment found for service plan : %s", servicePlan) return "", err } @@ -232,7 +233,7 @@ func (c *Client) CreateServiceInstance(instanceName, serviceName, servicePlan, r return "", err } - klog.Infof("Resource group: %s and ID: %s", resGrp[0].Name, resGrp[0].ID) + klog.V(1).Infof("Resource group: %s and ID: %s", resGrp[0].Name, resGrp[0].ID) var serviceInstancePayload = controller.CreateServiceInstanceRequest{ Name: instanceName, @@ -246,8 +247,8 @@ func (c *Client) CreateServiceInstance(instanceName, serviceName, servicePlan, r return "", err } - klog.Infof("Resource service Instance Details :%v\n", serviceInstance) - klog.Infof("Resource service InstanceID :%v\n", serviceInstance.Crn.ServiceInstance) + klog.V(1).Infof("Resource service Instance Details :%v\n", serviceInstance) + klog.V(1).Infof("Resource service InstanceID :%v\n", serviceInstance.Crn.ServiceInstance) return serviceInstance.Crn.ServiceInstance, nil } @@ -256,7 +257,7 @@ func (c *Client) CreateServiceInstance(instanceName, serviceName, servicePlan, r func (c *Client) DeleteServiceInstance(instanceID string, recursive bool) error { err := c.ResourceClientV1.DeleteInstance(instanceID, recursive) if err != nil { - klog.Infof("Failed to delete the instance with id %s because of the error %s", instanceID, err) + klog.V(1).Infof("Failed to delete the instance with id %s because of the error %s", instanceID, err) return err } return nil diff --git a/pkg/client/network/network.go b/pkg/client/network/network.go index 58e54b13..e069d1a4 100644 --- a/pkg/client/network/network.go +++ b/pkg/client/network/network.go @@ -57,7 +57,7 @@ func (c *Client) GetAll() (*models.Networks, error) { resp, err := c.session.Power.PCloudNetworks.PcloudNetworksGetall(params, c.session.AuthInfo(c.instanceID)) if err != nil || resp.Payload == nil { - klog.Infof("Failed to perform the operation... %v", err) + klog.V(2).Infof("Failed to perform the operation... %v", err) return nil, errors.ToError(err) } diff --git a/pkg/client/s3client.go b/pkg/client/s3client.go index b708463a..c822caa7 100644 --- a/pkg/client/s3client.go +++ b/pkg/client/s3client.go @@ -118,7 +118,7 @@ func NewS3Client(c *Client, instanceName, region string) (s3client *S3Client, er func (c *S3Client) CheckBucketExists(bucketName string) (bool, error) { result, err := c.S3Session.ListBuckets(nil) if err != nil { - klog.Infof("Unable to list buckets, %v\n", err) + klog.V(2).Infof("Unable to list buckets, %v\n", err) return false, err } @@ -151,7 +151,7 @@ func (c *S3Client) SelectObjects(bucketName string, regex string) ([]string, err return true }) if err != nil { - klog.Infof("failed to list objects", err) + klog.V(2).Infof("failed to list objects", err) return nil, err } return matchedObjects, err @@ -166,7 +166,7 @@ func (c *S3Client) CheckBucketLocationConstraint(bucketName string, bucketLocati result, err := c.S3Session.GetBucketLocation(getParams) if err != nil { - klog.Infof("Unable to get bucket location %v\n", err) + klog.V(2).Infof("Unable to get bucket location %v\n", err) return false, err } @@ -187,7 +187,7 @@ func (c *S3Client) CheckIfObjectExists(bucketName, objectName string) (bool, err if err != nil { if aerr, ok := err.(awserr.Error); ok { if aerr.Code() == s3.ErrCodeNoSuchKey { - klog.Infof("Object %s not found in %s bucket", objectName, bucketName) + klog.V(2).Infof("Object %s not found in %s bucket", objectName, bucketName) return false, nil } } @@ -206,7 +206,7 @@ func (c *S3Client) CreateBucket(bucketName string) error { return err } // Wait until bucket is created before finishing - klog.Infof("Waiting for bucket %q to be created...\n", bucketName) + klog.V(1).Infof("Waiting for bucket %q to be created...\n", bucketName) err = c.S3Session.WaitUntilBucketExists(&s3.HeadBucketInput{ Bucket: aws.String(bucketName), @@ -227,7 +227,7 @@ func (c *S3Client) CopyObjectToBucket(srcBucketName string, destBucketName strin return err } - klog.Infof("Copy successful for object: %s from bucket: %s to bucket: %s", objectName, srcBucketName, destBucketName) + klog.V(1).Infof("Copy successful for object: %s from bucket: %s to bucket: %s", objectName, srcBucketName, destBucketName) return err } @@ -266,7 +266,7 @@ func (r *CustomReader) Seek(offset int64, whence int) (int64, error) { // To upload a object to S3 bucket func (c *S3Client) UploadObject(fileName, objectName, bucketName string) error { - klog.Infof("uploading the file %s\n", fileName) + klog.V(1).Infof("uploading the file %s\n", fileName) //Read the content of the file file, err := os.Open(fileName) if err != nil { @@ -303,6 +303,6 @@ func (c *S3Client) UploadObject(fileName, objectName, bucketName string) error { return err } fmt.Println() - klog.Infof("Upload completed successfully in %f seconds to location %s\n", time.Since(startTime).Seconds(), result.Location) + klog.V(1).Infof("Upload completed successfully in %f seconds to location %s\n", time.Since(startTime).Seconds(), result.Location) return err } diff --git a/pkg/client/volume/volume.go b/pkg/client/volume/volume.go index 27096e9e..526c04e7 100644 --- a/pkg/client/volume/volume.go +++ b/pkg/client/volume/volume.go @@ -55,7 +55,7 @@ func (c *Client) DeleteVolume(id string) error { } func (c *Client) GetAll() (*models.Volumes, error) { - klog.Infof("Calling the Power Volumes GetAll Method") + klog.V(2).Infof("Calling the Power Volumes GetAll Method") params := p_cloud_volumes.NewPcloudCloudinstancesVolumesGetallParamsWithTimeout(pkg.TIMEOUT).WithCloudInstanceID(c.instanceID) resp, err := c.session.Power.PCloudVolumes.PcloudCloudinstancesVolumesGetall(params, c.session.AuthInfo(c.instanceID)) if err != nil { diff --git a/test/e2e/sync/sync.go b/test/e2e/sync/sync.go index 627a81e5..ab073dad 100644 --- a/test/e2e/sync/sync.go +++ b/test/e2e/sync/sync.go @@ -65,7 +65,7 @@ func runSyncCMD(args ...string) (int, string, string) { // Create Specifications yaml file func createSpecFile(spec []pkg.Spec) error { - klog.Infof("STEP: Creating Spec file") + klog.V(4).Infof("STEP: Creating Spec file") dir, err := ioutil.TempDir(".", "spec") if err != nil { klog.Errorf("ERROR: %v", err) @@ -92,13 +92,13 @@ func createSpecFile(spec []pkg.Spec) error { return err } - klog.Infoln(string(specString)) + klog.V(3).Infoln(string(specString)) return nil } // Create Cloud Object Storage Service instance func createCOSInstance(instanceName string) error { - klog.Infoln("STEP: Creating COS instance :", instanceName) + klog.V(4).Infoln("STEP: Creating COS instance :", instanceName) bxCli, err := client.NewClientWithEnv(APIKey, client.DefaultEnv, Debug) if err != nil { klog.Errorf("ERROR: %v", err) @@ -118,7 +118,7 @@ func createCOSInstance(instanceName string) error { for _, resgrp := range resGrpList { resourceGroupNames = append(resourceGroupNames, resgrp.Name) } - klog.Infoln("Resource Group names: ", resourceGroupNames) + klog.V(3).Infoln("Resource Group names: ", resourceGroupNames) _, err = bxCli.CreateServiceInstance(instanceName, ServiceType, ServicePlan, resourceGroupNames[0], ResourceGroupAPIRegion) @@ -132,7 +132,7 @@ func createCOSInstance(instanceName string) error { // Delete Cloud Object Storage Service instance func deleteCOSInstance(instanceName string) error { - klog.Infoln("STEP: Deleting COS instance", instanceName) + klog.V(4).Infoln("STEP: Deleting COS instance", instanceName) bxCli, err := client.NewClientWithEnv(APIKey, client.DefaultEnv, Debug) if err != nil { klog.Errorf("ERROR: %v", err) @@ -155,7 +155,7 @@ func deleteCOSInstance(instanceName string) error { klog.Errorf("ERROR: %v", err) return err } - klog.Infoln("Service Instance Deleted: ", svc.Name) + klog.V(2).Infoln("Service Instance Deleted: ", svc.Name) } } @@ -164,7 +164,7 @@ func deleteCOSInstance(instanceName string) error { // Create S3 bucket in the given region and storage class func createBucket(bucketName string, cos string, region string, storageClass string) error { - klog.Infof("STEP: Creating Bucket %s in region %s in COS %s storageClass %s", bucketName, region, cos, storageClass) + klog.V(4).Infof("STEP: Creating Bucket %s in region %s in COS %s storageClass %s", bucketName, region, cos, storageClass) bxCli, err := client.NewClientWithEnv(APIKey, client.DefaultEnv, Debug) if err != nil { klog.Errorf("ERROR: %v", err) @@ -201,7 +201,7 @@ func createBucket(bucketName string, cos string, region string, storageClass str // Create Local object files func createObjects() error { - klog.Infoln("STEP: Create Required Files") + klog.V(4).Infoln("STEP: Create Required Files") var content string dir, err := ioutil.TempDir(".", "objects") if err != nil { @@ -231,9 +231,9 @@ func createObjects() error { // Delete Temporarily created local object files and spec file func deleteTempFiles() error { - klog.Infoln("STEP: Delete created Files") + klog.V(4).Infoln("STEP: Delete created Files") specFolder := strings.Split(SpecFileName, "/")[0] - klog.Infoln("Spec folder : ", specFolder) + klog.V(4).Infoln("Spec folder : ", specFolder) err := os.RemoveAll(specFolder) if err != nil { @@ -263,7 +263,7 @@ func uploadWorker(s3Cli *client.S3Client, bucketName string, workerId int, filep // Upload object from local dir to s3 bucket func uploadObjects(src pkg.Source) error { - klog.Infoln("STEP: Upload Objects to source Bucket ", src.Bucket) + klog.V(4).Infoln("STEP: Upload Objects to source Bucket ", src.Bucket) var filePath string files, err := ioutil.ReadDir(ObjectsFolderName) if err != nil { @@ -307,7 +307,7 @@ func uploadObjects(src pkg.Source) error { // Verify the copied Objects exists in the target bucket func verifyBucketObjects(tgt pkg.TargetItem, cos string, files []fs.FileInfo, regex string) error { - klog.Infoln("STEP: Verify objects in Bucket ", tgt.Bucket) + klog.V(4).Infoln("STEP: Verify objects in Bucket ", tgt.Bucket) bxCli, err := client.NewClientWithEnv(APIKey, client.DefaultEnv, Debug) if err != nil { klog.Errorf("ERROR: %v", err) @@ -329,7 +329,7 @@ func verifyBucketObjects(tgt pkg.TargetItem, cos string, files []fs.FileInfo, re for _, f := range files { fileName := f.Name() res := false - klog.Infoln("Verifying object", fileName) + klog.V(4).Infoln("Verifying object", fileName) for _, item := range objects { if item == fileName { @@ -348,7 +348,7 @@ func verifyBucketObjects(tgt pkg.TargetItem, cos string, files []fs.FileInfo, re // Verify objects copied from source bucket to dest buckets func verifyObjectsCopied(spec []pkg.Spec) error { - klog.Infoln("STEP: Verify Objects Copied to dest buckets") + klog.V(4).Infoln("STEP: Verify Objects Copied to dest buckets") files, err := ioutil.ReadDir(ObjectsFolderName) if err != nil { klog.Errorf("ERROR: %v", err) @@ -370,7 +370,7 @@ func verifyObjectsCopied(spec []pkg.Spec) error { // Create necessary resources to run the sync command func createResources(spec []pkg.Spec) error { - klog.Infoln("STEP: Create resources") + klog.V(4).Infoln("STEP: Create resources") err := createSpecFile(spec) if err != nil { return err @@ -410,7 +410,7 @@ func createResources(spec []pkg.Spec) error { // Delete the resources func deleteResources(spec []pkg.Spec) error { - klog.Infoln("STEP: Delete resources") + klog.V(4).Infoln("STEP: Delete resources") for _, src := range spec { err := deleteCOSInstance(src.Cos) if err != nil {