name change to reflect function

replicatedhq · Sep 6, 2023 · 3dcd881 · 3dcd881
1 parent 328814e
commit 3dcd881
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/cli/cmd/customer_archive.go b/cli/cmd/customer_archive.go
@@ -24,7 +24,7 @@ func (r *runners) archiveCustomer(_ *cobra.Command, _ []string) error {
 		return errors.Errorf("missing or invalid parameters: customer")
 	}
 
-	customer, err := r.api.GetCustomerByName(r.appType, r.appID, r.args.archiveCustomerNameOrId)
+	customer, err := r.api.GetCustomerByNameOrId(r.appType, r.appID, r.args.archiveCustomerNameOrId)
 	if err != nil {
 		return errors.Wrapf(err, "find customer %q", r.args.archiveCustomerNameOrId)
 	}

diff --git a/cli/cmd/customer_download_license.go b/cli/cmd/customer_download_license.go
@@ -31,7 +31,7 @@ func (r *runners) downloadCustomerLicense(_ *cobra.Command, _ []string) error {
 		return errors.Errorf("missing or invalid parameters: output")
 	}
 
-	customer, err := r.api.GetCustomerByName(r.appType, r.appID, r.args.customerLicenseInspectCustomer)
+	customer, err := r.api.GetCustomerByNameOrId(r.appType, r.appID, r.args.customerLicenseInspectCustomer)
 	if err != nil {
 		return errors.Wrapf(err, "find customer %q", r.args.customerLicenseInspectCustomer)
 	}

diff --git a/cli/cmd/customer_inspect.go b/cli/cmd/customer_inspect.go
@@ -31,7 +31,7 @@ func (r *runners) inspectCustomer(_ *cobra.Command, _ []string) error {
 		return errors.Errorf("missing or invalid parameters: customer")
 	}
 
-	customer, err := r.api.GetCustomerByName(r.appType, r.appID, r.args.customerInspectCustomer)
+	customer, err := r.api.GetCustomerByNameOrId(r.appType, r.appID, r.args.customerInspectCustomer)
 	if err != nil {
 		return errors.Wrapf(err, "get customer %q", r.args.customerInspectCustomer)
 	}

diff --git a/client/customer.go b/client/customer.go
@@ -39,11 +39,11 @@ func (c *Client) CreateCustomer(appType string, opts kotsclient.CreateCustomerOp
 
 }
 
-func (c *Client) GetCustomerByName(appType string, appID, name string) (*types.Customer, error) {
+func (c *Client) GetCustomerByNameOrId(appType string, appID, nameOrId string) (*types.Customer, error) {
 	if appType == "platform" {
 		return nil, errors.New("listing customers is not supported for platform applications")
 	} else if appType == "kots" {
-		return c.KotsClient.GetCustomerByName(appID, name)
+		return c.KotsClient.GetCustomerByNameOrId(appID, nameOrId)
 	}
 
 	return nil, errors.Errorf("unknown app type %q", appType)

diff --git a/pkg/kotsclient/customer_list.go b/pkg/kotsclient/customer_list.go
@@ -49,25 +49,25 @@ func (c *VendorV3Client) ListCustomers(appID string, includeTest bool) ([]types.
 	return allCustomers, nil
 }
 
-func (c *VendorV3Client) GetCustomerByName(appID string, name string) (*types.Customer, error) {
+func (c *VendorV3Client) GetCustomerByNameOrId(appID string, nameOrId string) (*types.Customer, error) {
 	allCustomers, err := c.ListCustomers(appID, false)
 	if err != nil {
 		return nil, err
 	}
 
 	matchingCustomers := make([]types.Customer, 0)
 	for _, customer := range allCustomers {
-		if customer.ID == name || customer.Name == name {
+		if customer.ID == nameOrId || customer.Name == nameOrId {
 			matchingCustomers = append(matchingCustomers, customer)
 		}
 	}
 
 	if len(matchingCustomers) == 0 {
-		return nil, ErrCustomerNotFound{Name: name}
+		return nil, ErrCustomerNotFound{Name: nameOrId}
 	}
 
 	if len(matchingCustomers) > 1 {
-		return nil, fmt.Errorf("customer %q is ambiguous, please use customer ID", name)
+		return nil, fmt.Errorf("customer %q is ambiguous, please use customer ID", nameOrId)
 	}
 	return &matchingCustomers[0], nil
 }