Skip to content

Commit

Permalink
Removing all the changes in cf/commands
Browse files Browse the repository at this point in the history
  • Loading branch information
Dariquest committed Jan 20, 2025

Verified

This commit was signed with the committer’s verified signature.
TheLastCicada Zachary Brown
1 parent 177dab7 commit 38b8fe8
Showing 27 changed files with 166 additions and 762 deletions.
46 changes: 16 additions & 30 deletions cf/actors/actorsfakes/fake_route_actor.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cf/actors/push.go
Original file line number Diff line number Diff line change
@@ -220,5 +220,5 @@ func (actor PushActorImpl) ValidateAppParams(apps []models.AppParams) []error {
}

func (actor PushActorImpl) MapManifestRoute(routeName string, app models.Application, appParamsFromContext models.AppParams) error {
return actor.routeActor.FindAndBindRoute(routeName, app, appParamsFromContext, []string{})
return actor.routeActor.FindAndBindRoute(routeName, app, appParamsFromContext)
}
14 changes: 7 additions & 7 deletions cf/actors/routes.go
Original file line number Diff line number Diff line change
@@ -19,13 +19,13 @@ const tcp = "tcp"

type RouteActor interface {
CreateRandomTCPRoute(domain models.DomainFields) (models.Route, error)
FindOrCreateRoute(hostname string, domain models.DomainFields, path string, port int, useRandomPort bool, options []string) (models.Route, error)
FindOrCreateRoute(hostname string, domain models.DomainFields, path string, port int, useRandomPort bool) (models.Route, error)
BindRoute(app models.Application, route models.Route) error
UnbindAll(app models.Application) error
FindDomain(routeName string) (string, models.DomainFields, error)
FindPath(routeName string) (string, string)
FindPort(routeName string) (string, int, error)
FindAndBindRoute(routeName string, app models.Application, appParamsFromContext models.AppParams, options []string) error
FindAndBindRoute(routeName string, app models.Application, appParamsFromContext models.AppParams) error
}

type routeActor struct {
@@ -47,15 +47,15 @@ func (routeActor routeActor) CreateRandomTCPRoute(domain models.DomainFields) (m
"Domain": terminal.EntityNameColor(domain.Name),
}) + "...")

route, err := routeActor.routeRepo.Create("", domain, "", 0, true, []string{})
route, err := routeActor.routeRepo.Create("", domain, "", 0, true)
if err != nil {
return models.Route{}, err
}

return route, nil
}

func (routeActor routeActor) FindOrCreateRoute(hostname string, domain models.DomainFields, path string, port int, useRandomPort bool, options []string) (models.Route, error) {
func (routeActor routeActor) FindOrCreateRoute(hostname string, domain models.DomainFields, path string, port int, useRandomPort bool) (models.Route, error) {
var route models.Route
var err error
//if tcp route use random port should skip route lookup
@@ -84,7 +84,7 @@ func (routeActor routeActor) FindOrCreateRoute(hostname string, domain models.Do
}),
)

route, err = routeActor.routeRepo.Create(hostname, domain, path, port, false, options)
route, err = routeActor.routeRepo.Create(hostname, domain, path, port, false)
}

routeActor.ui.Ok()
@@ -188,7 +188,7 @@ func (routeActor routeActor) replaceDomain(routeWithoutPathAndPort string, domai
return routeWithoutPathAndPort, nil
}

func (routeActor routeActor) FindAndBindRoute(routeName string, app models.Application, appParamsFromContext models.AppParams, options []string) error {
func (routeActor routeActor) FindAndBindRoute(routeName string, app models.Application, appParamsFromContext models.AppParams) error {
routeWithoutPath, path := routeActor.FindPath(routeName)

routeWithoutPathAndPort, port, err := routeActor.FindPort(routeWithoutPath)
@@ -223,7 +223,7 @@ func (routeActor routeActor) FindAndBindRoute(routeName string, app models.Appli
return err
}

route, err := routeActor.FindOrCreateRoute(hostname, domain, path, port, appParamsFromContext.UseRandomRoute, options)
route, err := routeActor.FindOrCreateRoute(hostname, domain, path, port, appParamsFromContext.UseRandomRoute)
if err != nil {
return err
}
Loading

0 comments on commit 38b8fe8

Please sign in to comment.