Skip to content

Commit

Permalink
Merge pull request cloudfoundry#1625 from cloudfoundry-incubator/bug_…
Browse files Browse the repository at this point in the history 
…fix_marketplace_164045778-rebase

Don't list disabled plans in cf marketplace

[finishes #165674475]
  • Loading branch information
@williammartin
williammartin authored Apr 29, 2019
2 parents 6f050b3 + 87d25e8 commit 5fca03e
Show file tree
Hide file tree
Showing 7 changed files with 893 additions and 97 deletions.
153 changes: 132 additions & 21 deletions actor/v2action/service_summary.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ func (actor Actor) GetServicesSummaries() ([]ServiceSummary, Warnings, error) {
return []ServiceSummary{}, Warnings(warnings), err
}

summaries, serviceWarnings, err := actor.createServiceSummaries(services)
summaries, serviceWarnings, err := actor.createServiceSummaries(services, "", "")
warnings = append(warnings, serviceWarnings...)
return summaries, Warnings(warnings), err
}

func (actor Actor) GetServicesSummariesForSpace(spaceGUID string) ([]ServiceSummary, Warnings, error) {
func (actor Actor) GetServicesSummariesForSpace(spaceGUID string, organizationGUID string) ([]ServiceSummary, Warnings, error) {
services, warnings, err := actor.CloudControllerClient.GetSpaceServices(spaceGUID)
if err != nil {
return []ServiceSummary{}, Warnings(warnings), err
}

summaries, summaryWarnings, err := actor.createServiceSummaries(services)
summaries, summaryWarnings, err := actor.createServiceSummaries(services, organizationGUID, spaceGUID)
warnings = append(warnings, summaryWarnings...)
return summaries, Warnings(warnings), err
}
Expand All @@ -47,7 +47,13 @@ func (actor Actor) GetServiceSummaryByName(serviceName string) (ServiceSummary,
return ServiceSummary{}, Warnings(warnings), actionerror.ServiceNotFoundError{Name: serviceName}
}

summary, summaryWarnings, err := actor.createServiceSummary(services[0])
plans, planWarnings, err := actor.getPlansForOneService(services[0])
warnings = append(warnings, planWarnings...)
if err != nil {
return ServiceSummary{}, Warnings(warnings), err
}

summary, summaryWarnings, err := actor.createServiceSummary(services[0], plans, "", "")
warnings = append(warnings, summaryWarnings...)
if err != nil {
return ServiceSummary{}, Warnings(warnings), err
Expand All @@ -56,7 +62,7 @@ func (actor Actor) GetServiceSummaryByName(serviceName string) (ServiceSummary,
return summary, Warnings(warnings), err
}

func (actor Actor) GetServiceSummaryForSpaceByName(spaceGUID, serviceName string) (ServiceSummary, Warnings, error) {
func (actor Actor) GetServiceSummaryForSpaceByName(spaceGUID, serviceName, organizationGUID string) (ServiceSummary, Warnings, error) {
services, warnings, err := actor.CloudControllerClient.GetSpaceServices(spaceGUID, ccv2.Filter{
Type: constant.LabelFilter,
Operator: constant.EqualOperator,
Expand All @@ -70,7 +76,13 @@ func (actor Actor) GetServiceSummaryForSpaceByName(spaceGUID, serviceName string
return ServiceSummary{}, Warnings(warnings), actionerror.ServiceNotFoundError{Name: serviceName}
}

summary, summaryWarnings, err := actor.createServiceSummary(services[0])
plans, planWarnings, err := actor.getPlansForOneService(services[0])
warnings = append(warnings, planWarnings...)
if err != nil {
return ServiceSummary{}, Warnings(warnings), err
}

summary, summaryWarnings, err := actor.createServiceSummary(services[0], plans, organizationGUID, spaceGUID)
warnings = append(warnings, summaryWarnings...)
if err != nil {
return ServiceSummary{}, Warnings(warnings), err
Expand All @@ -79,46 +91,145 @@ func (actor Actor) GetServiceSummaryForSpaceByName(spaceGUID, serviceName string
return summary, Warnings(warnings), err
}

func (actor Actor) createServiceSummaries(services []ccv2.Service) ([]ServiceSummary, ccv2.Warnings, error) {
func (actor Actor) createServiceSummaries(services []ccv2.Service, organizationGUID, spaceGUID string) ([]ServiceSummary, ccv2.Warnings, error) {
var serviceSummaries []ServiceSummary
var warnings ccv2.Warnings

plans, planWarnings, err := actor.getPlansForManyServices(services)
warnings = append(warnings, planWarnings...)
if err != nil {
return []ServiceSummary{}, warnings, err
}

for _, service := range services {
summary, summaryWarnings, err := actor.createServiceSummary(service)
plansForThatService := actor.getPlansForService(service, plans)

summary, summaryWarnings, err := actor.createServiceSummary(service, plansForThatService, organizationGUID, spaceGUID)
warnings = append(warnings, summaryWarnings...)
if err != nil {
return []ServiceSummary{}, warnings, err
}

serviceSummaries = append(serviceSummaries, summary)
if len(summary.Plans) > 0 {
serviceSummaries = append(serviceSummaries, summary)
}
}

return serviceSummaries, warnings, nil
}

func (actor Actor) createServiceSummary(service ccv2.Service) (ServiceSummary, ccv2.Warnings, error) {
planSummaries, warnings, err := actor.getPlanSummariesForService(service)
func (actor Actor) getPlansForOneService(service ccv2.Service) ([]ccv2.ServicePlan, ccv2.Warnings, error) {
return actor.CloudControllerClient.GetServicePlans(ccv2.Filter{
Type: constant.ServiceGUIDFilter,
Operator: constant.EqualOperator,
Values: []string{service.GUID},
})
}

func (actor Actor) getPlansForManyServices(services []ccv2.Service) ([]ccv2.ServicePlan, ccv2.Warnings, error) {
serviceGUIDs := []string{}
for _, service := range services {
serviceGUIDs = append(serviceGUIDs, service.GUID)
}

return actor.CloudControllerClient.GetServicePlans(ccv2.Filter{
Type: constant.ServiceGUIDFilter,
Operator: constant.InOperator,
Values: serviceGUIDs,
})
}

func (actor Actor) createServiceSummary(service ccv2.Service, plans []ccv2.ServicePlan, organizationGUID, spaceGUID string) (ServiceSummary, ccv2.Warnings, error) {
planSummaries, warnings, err := actor.getPlanSummariesForService(service, plans, organizationGUID, spaceGUID)
if err != nil {
return ServiceSummary{}, warnings, err
}

return ServiceSummary{Service: Service(service), Plans: planSummaries}, warnings, nil
}

func (actor Actor) getPlanSummariesForService(service ccv2.Service) ([]ServicePlanSummary, ccv2.Warnings, error) {
plans, warnings, err := actor.CloudControllerClient.GetServicePlans(ccv2.Filter{
Type: constant.ServiceGUIDFilter,
Operator: constant.EqualOperator,
Values: []string{service.GUID},
})
if err != nil {
return []ServicePlanSummary{}, warnings, err
func (actor Actor) getPlanSummariesForService(service ccv2.Service, plans []ccv2.ServicePlan, organizationGUID, spaceGUID string) ([]ServicePlanSummary, ccv2.Warnings, error) {
var err error
var warnings ccv2.Warnings

nonPublicPlans := []string{}
for _, plan := range plans {
if !plan.Public {
nonPublicPlans = append(nonPublicPlans, plan.GUID)
}
}

var broker ServiceBroker
if spaceGUID != "" && len(nonPublicPlans) > 0 {
var brokerWarnings Warnings
broker, brokerWarnings, err = actor.GetServiceBrokerByName(service.ServiceBrokerName)
warnings = append(warnings, brokerWarnings...)
if err != nil {
return []ServicePlanSummary{}, warnings, err
}
}

var visibilities []ccv2.ServicePlanVisibility

if len(nonPublicPlans) > 0 {
var visibilityWarnings ccv2.Warnings

visibilities, visibilityWarnings, err = actor.getPlanVisibilitiesForOrg(nonPublicPlans, organizationGUID)
warnings = append(warnings, visibilityWarnings...)
if err != nil {
return []ServicePlanSummary{}, warnings, err
}
}

planSummaries := actor.getSummariesForVisiblePlans(plans, broker, visibilities, spaceGUID)

return planSummaries, warnings, nil
}

func (actor Actor) getSummariesForVisiblePlans(plans []ccv2.ServicePlan, broker ServiceBroker, visibilities []ccv2.ServicePlanVisibility, spaceGUID string) []ServicePlanSummary {
var planSummaries []ServicePlanSummary
for _, plan := range plans {
planSummaries = append(planSummaries, ServicePlanSummary{ServicePlan: ServicePlan(plan)})
if plan.Public || (spaceGUID != "" && broker.SpaceGUID == spaceGUID) {
planSummaries = append(planSummaries, ServicePlanSummary{ServicePlan: ServicePlan(plan)})
} else {
visibleInOrg := false
for _, visibility := range visibilities {
if visibility.ServicePlanGUID == plan.GUID {
visibleInOrg = true
break
}
}

if visibleInOrg {
planSummaries = append(planSummaries, ServicePlanSummary{ServicePlan: ServicePlan(plan)})
}
}
}

return planSummaries, warnings, nil
return planSummaries
}

func (actor Actor) getPlanVisibilitiesForOrg(plans []string, organizationGUID string) ([]ccv2.ServicePlanVisibility, ccv2.Warnings, error) {
return actor.CloudControllerClient.GetServicePlanVisibilities(
ccv2.Filter{
Type: constant.ServicePlanGUIDFilter,
Operator: constant.InOperator,
Values: plans,
},
ccv2.Filter{
Type: constant.OrganizationGUIDFilter,
Operator: constant.EqualOperator,
Values: []string{organizationGUID},
},
)
}

func (actor Actor) getPlansForService(service ccv2.Service, plans []ccv2.ServicePlan) []ccv2.ServicePlan {
plansForThatService := []ccv2.ServicePlan{}
for _, plan := range plans {
if plan.ServiceGUID == service.GUID {
plansForThatService = append(plansForThatService, plan)
}
}
return plansForThatService
}
Loading

0 comments on commit 5fca03e

Please sign in to comment.