V7 Quota Resource

We refactor the {ccv3|v7action}.{space|org|}quota → resources.{space|org|}quota

[#171119141]

Co-authored-by: Reid Mitchell <[email protected]>
Co-authored-by: Brian Cunnie <[email protected]>

Author: reidmit

actor/v7action/cloud_controller_client.go

@@ -30,14 +30,14 @@ type CloudControllerClient interface {
 	CreateDroplet(appGUID string) (ccv3.Droplet, ccv3.Warnings, error)
 	CreateIsolationSegment(isolationSegment ccv3.IsolationSegment) (ccv3.IsolationSegment, ccv3.Warnings, error)
 	CreateOrganization(orgName string) (ccv3.Organization, ccv3.Warnings, error)
-	CreateOrganizationQuota(orgQuota ccv3.OrganizationQuota) (ccv3.OrganizationQuota, ccv3.Warnings, error)
+	CreateOrganizationQuota(orgQuota resources.OrganizationQuota) (resources.OrganizationQuota, ccv3.Warnings, error)
 	CreatePackage(pkg ccv3.Package) (ccv3.Package, ccv3.Warnings, error)
 	CreateRole(role resources.Role) (resources.Role, ccv3.Warnings, error)
 	CreateRoute(route resources.Route) (resources.Route, ccv3.Warnings, error)
 	CreateServiceBroker(serviceBroker ccv3.ServiceBrokerModel) (ccv3.JobURL, ccv3.Warnings, error)
 	CreateSecurityGroup(securityGroup resources.SecurityGroup) (resources.SecurityGroup, ccv3.Warnings, error)
 	CreateSpace(space ccv3.Space) (ccv3.Space, ccv3.Warnings, error)
-	CreateSpaceQuota(spaceQuota ccv3.SpaceQuota) (ccv3.SpaceQuota, ccv3.Warnings, error)
+	CreateSpaceQuota(spaceQuota resources.SpaceQuota) (resources.SpaceQuota, ccv3.Warnings, error)
 	CreateUser(userGUID string) (resources.User, ccv3.Warnings, error)
 	DeleteApplication(guid string) (ccv3.JobURL, ccv3.Warnings, error)
 	DeleteApplicationProcessInstance(appGUID string, processType string, instanceIndex int) (ccv3.Warnings, error)
@@ -87,8 +87,8 @@ type CloudControllerClient interface {
 	GetOrganization(orgGUID string) (ccv3.Organization, ccv3.Warnings, error)
 	GetOrganizationDefaultIsolationSegment(orgGUID string) (resources.Relationship, ccv3.Warnings, error)
 	GetOrganizationDomains(orgGUID string, query ...ccv3.Query) ([]ccv3.Domain, ccv3.Warnings, error)
-	GetOrganizationQuota(quotaGUID string) (ccv3.OrganizationQuota, ccv3.Warnings, error)
-	GetOrganizationQuotas(query ...ccv3.Query) ([]ccv3.OrganizationQuota, ccv3.Warnings, error)
+	GetOrganizationQuota(quotaGUID string) (resources.OrganizationQuota, ccv3.Warnings, error)
+	GetOrganizationQuotas(query ...ccv3.Query) ([]resources.OrganizationQuota, ccv3.Warnings, error)
 	GetOrganizations(query ...ccv3.Query) ([]ccv3.Organization, ccv3.Warnings, error)
 	GetPackage(guid string) (ccv3.Package, ccv3.Warnings, error)
 	GetPackages(query ...ccv3.Query) ([]ccv3.Package, ccv3.Warnings, error)
@@ -113,9 +113,9 @@ type CloudControllerClient interface {
 	GetServicePlansWithSpaceAndOrganization(query ...ccv3.Query) ([]ccv3.ServicePlanWithSpaceAndOrganization, ccv3.Warnings, error)
 	GetSpaceFeature(spaceGUID string, featureName string) (bool, ccv3.Warnings, error)
 	GetSpaceIsolationSegment(spaceGUID string) (resources.Relationship, ccv3.Warnings, error)
-	GetSpaceQuota(spaceQuotaGUID string) (ccv3.SpaceQuota, ccv3.Warnings, error)
+	GetSpaceQuota(spaceQuotaGUID string) (resources.SpaceQuota, ccv3.Warnings, error)
 	GetSpaces(query ...ccv3.Query) ([]ccv3.Space, ccv3.IncludedResources, ccv3.Warnings, error)
-	GetSpaceQuotas(query ...ccv3.Query) ([]ccv3.SpaceQuota, ccv3.Warnings, error)
+	GetSpaceQuotas(query ...ccv3.Query) ([]resources.SpaceQuota, ccv3.Warnings, error)
 	GetSSHEnabled(appGUID string) (ccv3.SSHEnabled, ccv3.Warnings, error)
 	GetAppFeature(appGUID string, featureName string) (ccv3.ApplicationFeature, ccv3.Warnings, error)
 	GetStacks(query ...ccv3.Query) ([]ccv3.Stack, ccv3.Warnings, error)
@@ -146,7 +146,7 @@ type CloudControllerClient interface {
 	UpdateFeatureFlag(flag ccv3.FeatureFlag) (ccv3.FeatureFlag, ccv3.Warnings, error)
 	UpdateOrganization(org ccv3.Organization) (ccv3.Organization, ccv3.Warnings, error)
 	UpdateOrganizationDefaultIsolationSegmentRelationship(orgGUID string, isolationSegmentGUID string) (resources.Relationship, ccv3.Warnings, error)
-	UpdateOrganizationQuota(orgQuota ccv3.OrganizationQuota) (ccv3.OrganizationQuota, ccv3.Warnings, error)
+	UpdateOrganizationQuota(orgQuota resources.OrganizationQuota) (resources.OrganizationQuota, ccv3.Warnings, error)
 	UpdateProcess(process ccv3.Process) (ccv3.Process, ccv3.Warnings, error)
 	UpdateResourceMetadata(resource string, resourceGUID string, metadata ccv3.Metadata) (ccv3.JobURL, ccv3.Warnings, error)
 	UpdateSecurityGroupRunningSpace(securityGroupGUID string, spaceGUID string) (ccv3.Warnings, error)
@@ -156,7 +156,7 @@ type CloudControllerClient interface {
 	UpdateSpaceApplyManifest(spaceGUID string, rawManifest []byte) (ccv3.JobURL, ccv3.Warnings, error)
 	UpdateSpaceFeature(spaceGUID string, enabled bool, featureName string) (ccv3.Warnings, error)
 	UpdateSpaceIsolationSegmentRelationship(spaceGUID string, isolationSegmentGUID string) (resources.Relationship, ccv3.Warnings, error)
-	UpdateSpaceQuota(spaceQuota ccv3.SpaceQuota) (ccv3.SpaceQuota, ccv3.Warnings, error)
+	UpdateSpaceQuota(spaceQuota resources.SpaceQuota) (resources.SpaceQuota, ccv3.Warnings, error)
 	UnsetSpaceQuota(spaceQuotaGUID, spaceGUID string) (ccv3.Warnings, error)
 	UpdateServiceBroker(serviceBrokerGUID string, serviceBroker ccv3.ServiceBrokerModel) (ccv3.JobURL, ccv3.Warnings, error)
 	UpdateTaskCancel(taskGUID string) (ccv3.Task, ccv3.Warnings, error)

actor/v7action/organization_quota.go

@@ -3,13 +3,10 @@ package v7action
 import (
 	"code.cloudfoundry.org/cli/actor/actionerror"
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
+	"code.cloudfoundry.org/cli/resources"
 	"code.cloudfoundry.org/cli/types"
 )
 
-type Quota ccv3.Quota
-
-type OrganizationQuota ccv3.OrganizationQuota
-
 type QuotaLimits struct {
 	TotalMemoryInMB       *types.NullInt
 	PerProcessMemoryInMB  *types.NullInt
@@ -67,38 +64,32 @@ func (actor Actor) DeleteOrganizationQuota(quotaName string) (Warnings, error) {
 	return allWarnings, err
 }
 
-func (actor Actor) GetOrganizationQuotas() ([]OrganizationQuota, Warnings, error) {
-	ccv3OrgQuotas, warnings, err := actor.CloudControllerClient.GetOrganizationQuotas()
+func (actor Actor) GetOrganizationQuotas() ([]resources.OrganizationQuota, Warnings, error) {
+	orgQuotas, warnings, err := actor.CloudControllerClient.GetOrganizationQuotas()
 	if err != nil {
-		return []OrganizationQuota{}, Warnings(warnings), err
-	}
-
-	var orgQuotas []OrganizationQuota
-	for _, quota := range ccv3OrgQuotas {
-		orgQuotas = append(orgQuotas, OrganizationQuota(quota))
+		return []resources.OrganizationQuota{}, Warnings(warnings), err
 	}
 
 	return orgQuotas, Warnings(warnings), nil
 }
 
-func (actor Actor) GetOrganizationQuotaByName(orgQuotaName string) (OrganizationQuota, Warnings, error) {
+func (actor Actor) GetOrganizationQuotaByName(orgQuotaName string) (resources.OrganizationQuota, Warnings, error) {
 	ccv3OrgQuotas, warnings, err := actor.CloudControllerClient.GetOrganizationQuotas(
 		ccv3.Query{
 			Key:    ccv3.NameFilter,
 			Values: []string{orgQuotaName},
 		},
 	)
 	if err != nil {
-		return OrganizationQuota{}, Warnings(warnings), err
+		return resources.OrganizationQuota{}, Warnings(warnings), err
 
 	}
 
 	if len(ccv3OrgQuotas) == 0 {
-		return OrganizationQuota{}, Warnings(warnings), actionerror.OrganizationQuotaNotFoundForNameError{Name: orgQuotaName}
+		return resources.OrganizationQuota{}, Warnings(warnings), actionerror.OrganizationQuotaNotFoundForNameError{Name: orgQuotaName}
 	}
-	orgQuota := OrganizationQuota(ccv3OrgQuotas[0])
 
-	return orgQuota, Warnings(warnings), nil
+	return ccv3OrgQuotas[0], Warnings(warnings), nil
 }
 
 func (actor Actor) UpdateOrganizationQuota(quotaName string, newName string, limits QuotaLimits) (Warnings, error) {
@@ -123,23 +114,23 @@ func (actor Actor) UpdateOrganizationQuota(quotaName string, newName string, lim
 	return allWarnings, err
 }
 
-func createQuotaStruct(name string, limits QuotaLimits) ccv3.OrganizationQuota {
-	AppLimit := ccv3.AppLimit{
+func createQuotaStruct(name string, limits QuotaLimits) resources.OrganizationQuota {
+	AppLimit := resources.AppLimit{
 		TotalMemory:       limits.TotalMemoryInMB,
 		InstanceMemory:    limits.PerProcessMemoryInMB,
 		TotalAppInstances: limits.TotalInstances,
 	}
-	ServiceLimit := ccv3.ServiceLimit{
+	ServiceLimit := resources.ServiceLimit{
 		TotalServiceInstances: limits.TotalServiceInstances,
 		PaidServicePlans:      limits.PaidServicesAllowed,
 	}
-	RouteLimit := ccv3.RouteLimit{
+	RouteLimit := resources.RouteLimit{
 		TotalRoutes:        limits.TotalRoutes,
 		TotalReservedPorts: limits.TotalReservedPorts,
 	}
 
-	quota := ccv3.OrganizationQuota{
-		Quota: ccv3.Quota{
+	quota := resources.OrganizationQuota{
+		Quota: resources.Quota{
 			Name:     name,
 			Apps:     AppLimit,
 			Services: ServiceLimit,
@@ -150,7 +141,7 @@ func createQuotaStruct(name string, limits QuotaLimits) ccv3.OrganizationQuota {
 	return quota
 }
 
-func setZeroDefaultsForQuotaCreation(apps *ccv3.AppLimit, routes *ccv3.RouteLimit, services *ccv3.ServiceLimit) {
+func setZeroDefaultsForQuotaCreation(apps *resources.AppLimit, routes *resources.RouteLimit, services *resources.ServiceLimit) {
 	if apps.TotalMemory == nil {
 		apps.TotalMemory = &types.NullInt{IsSet: true, Value: 0}
 	}
@@ -168,7 +159,7 @@ func setZeroDefaultsForQuotaCreation(apps *ccv3.AppLimit, routes *ccv3.RouteLimi
 	}
 }
 
-func convertUnlimitedToNil(apps *ccv3.AppLimit, routes *ccv3.RouteLimit, services *ccv3.ServiceLimit) {
+func convertUnlimitedToNil(apps *resources.AppLimit, routes *resources.RouteLimit, services *resources.ServiceLimit) {
 	flags := []*types.NullInt{
 		apps.TotalMemory,
 		apps.InstanceMemory,