Cleanup code

Author: kishen-v

cmd/image/qcow2ova/password-generator.go

@@ -20,12 +20,10 @@ import (
 )
 
 // GeneratePassword generates the password of length n
-func GeneratePassword(n int) (b64Password string, err error) {
+func GeneratePassword(n int) (string, error) {
 	b := make([]byte, n)
-	_, err = rand.Read(b)
-	if err != nil {
-		return
+	if _, err := rand.Read(b); err != nil {
+		return "", err
 	}
-	b64Password = base64.URLEncoding.EncodeToString(b)
-	return
+	return base64.URLEncoding.EncodeToString(b), nil
 }

pkg/client/events/events.go

@@ -20,7 +20,6 @@ import (
 	"github.com/IBM-Cloud/power-go-client/ibmpisession"
 	"github.com/IBM-Cloud/power-go-client/power/client/p_cloud_events"
 	"github.com/IBM/go-sdk-core/v5/core"
-	"github.com/ppc64le-cloud/pvsadm/pkg"
 )
 
 type Client struct {
@@ -38,6 +37,6 @@ func NewClient(sess *ibmpisession.IBMPISession, powerinstanceid string) *Client
 }
 
 func (c *Client) GetPcloudEventsGetsince(since time.Duration) (*p_cloud_events.PcloudEventsGetqueryOK, error) {
-	params := p_cloud_events.NewPcloudEventsGetqueryParamsWithTimeout(pkg.TIMEOUT).WithCloudInstanceID(c.instanceID).WithFromTime(core.StringPtr(time.Now().UTC().Add(-since).Format(time.RFC3339)))
+	params := p_cloud_events.NewPcloudEventsGetqueryParams().WithCloudInstanceID(c.instanceID).WithFromTime(core.StringPtr(time.Now().UTC().Add(-since).Format(time.RFC3339)))
 	return c.client.PcloudEventsGetquery(params, c.session.AuthInfo(c.instanceID))
 }