cloudfoundry
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎actor/actionerror/domain_not_enforcing_route_policies_error.go‎
Lines changed: 13 additions & 0 deletions b/‎actor/actionerror/domain_not_enforcing_route_policies_error.go‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎actor/actionerror/route_policy_ambiguity_error.go‎
Lines changed: 17 additions & 0 deletions b/‎actor/actionerror/route_policy_ambiguity_error.go‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎actor/actionerror/route_policy_not_found_error.go‎
Lines changed: 11 additions & 0 deletions b/‎actor/actionerror/route_policy_not_found_error.go‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎actor/v7action/cloud_controller_client.go‎
Lines changed: 3 additions & 0 deletions b/‎actor/v7action/cloud_controller_client.go‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎actor/v7action/domain.go‎
Lines changed: 23 additions & 6 deletions b/‎actor/v7action/domain.go‎
Lines changed: 23 additions & 6 deletions
diff --git a/‎actor/v7action/domain_test.go‎
Lines changed: 54 additions & 5 deletions b/‎actor/v7action/domain_test.go‎
Lines changed: 54 additions & 5 deletions
diff --git a/‎actor/v7action/label.go‎
Lines changed: 16 additions & 0 deletions b/‎actor/v7action/label.go‎
Lines changed: 16 additions & 0 deletions
@@ -26,6 +26,7 @@ _testmain.go
 # Built binaries
 *.exe
 /cli
+/cf/cli
 
 out/
 release/*
 
@@ -0,0 +1,13 @@
+package actionerror
+
+import "fmt"
+
+// DomainNotEnforcingRoutePoliciesError is returned when a user attempts to
+// add a route policy to a domain that does not have enforce_route_policies enabled.
+type DomainNotEnforcingRoutePoliciesError struct {
+	Name string
+}
+
+func (e DomainNotEnforcingRoutePoliciesError) Error() string {
+	return fmt.Sprintf("Domain '%s' does not have route policy enforcement enabled.", e.Name)
+}
@@ -0,0 +1,17 @@
+package actionerror
+
+import "fmt"
+
+// RoutePolicyAmbiguityError is returned when a route has multiple policies
+// and no --source flag was given to disambiguate.
+type RoutePolicyAmbiguityError struct {
+	RouteURL string
+	Count    int
+}
+
+func (e RoutePolicyAmbiguityError) Error() string {
+	return fmt.Sprintf(
+		"Route '%s' has %d policies. Specify one with --source.",
+		e.RouteURL, e.Count,
+	)
+}
@@ -0,0 +1,11 @@
+package actionerror
+
+import "fmt"
+
+type RoutePolicyNotFoundError struct {
+	Source string
+}
+
+func (e RoutePolicyNotFoundError) Error() string {
+	return fmt.Sprintf("Route policy with source '%s' not found.", e.Source)
+}
@@ -20,6 +20,7 @@ type CloudControllerClient interface {
 	CancelDeployment(deploymentGUID string) (ccv3.Warnings, error)
 	ContinueDeployment(deploymentGUID string) (ccv3.Warnings, error)
 	CopyPackage(sourcePackageGUID string, targetAppGUID string) (resources.Package, ccv3.Warnings, error)
+	CreateRoutePolicy(routePolicy resources.RoutePolicy) (resources.RoutePolicy, ccv3.Warnings, error)
 	CreateApplication(app resources.Application) (resources.Application, ccv3.Warnings, error)
 	CreateApplicationDeployment(dep resources.Deployment) (string, ccv3.Warnings, error)
 	CreateApplicationProcessScale(appGUID string, process resources.Process) (resources.Process, ccv3.Warnings, error)
@@ -42,6 +43,7 @@ type CloudControllerClient interface {
 	CreateSpace(space resources.Space) (resources.Space, ccv3.Warnings, error)
 	CreateSpaceQuota(spaceQuota resources.SpaceQuota) (resources.SpaceQuota, ccv3.Warnings, error)
 	CreateUser(userGUID string) (resources.User, ccv3.Warnings, error)
+	DeleteRoutePolicy(guid string) (ccv3.JobURL, ccv3.Warnings, error)
 	DeleteApplication(guid string) (ccv3.JobURL, ccv3.Warnings, error)
 	DeleteApplicationProcessInstance(appGUID string, processType string, instanceIndex int) (ccv3.Warnings, error)
 	DeleteBuildpack(buildpackGUID string) (ccv3.JobURL, ccv3.Warnings, error)
@@ -63,6 +65,7 @@ type CloudControllerClient interface {
 	DeleteUser(userGUID string) (ccv3.JobURL, ccv3.Warnings, error)
 	DownloadDroplet(dropletGUID string) ([]byte, ccv3.Warnings, error)
 	EntitleIsolationSegmentToOrganizations(isoGUID string, orgGUIDs []string) (resources.RelationshipList, ccv3.Warnings, error)
+	GetRoutePolicies(query ...ccv3.Query) ([]resources.RoutePolicy, ccv3.IncludedResources, ccv3.Warnings, error)
 	GetApplicationByNameAndSpace(appName string, spaceGUID string) (resources.Application, ccv3.Warnings, error)
 	GetApplicationDropletCurrent(appGUID string) (resources.Droplet, ccv3.Warnings, error)
 	GetApplicationEnvironment(appGUID string) (ccv3.Environment, ccv3.Warnings, error)
 
@@ -24,7 +24,7 @@ func (actor Actor) CheckRoute(domainName string, hostname string, path string, p
 	return matches, allWarnings, err
 }
 
-func (actor Actor) CreateSharedDomain(domainName string, internal bool, routerGroupName string) (Warnings, error) {
+func (actor Actor) CreateSharedDomain(domainName string, internal bool, routerGroupName string, enforceAccessRules bool, accessRulesScope string) (Warnings, error) {
 	allWarnings := Warnings{}
 	routerGroupGUID := ""
 
@@ -37,28 +37,45 @@ func (actor Actor) CreateSharedDomain(domainName string, internal bool, routerGr
 		routerGroupGUID = routerGroup.GUID
 	}
 
-	_, warnings, err := actor.CloudControllerClient.CreateDomain(resources.Domain{
+	domain := resources.Domain{
 		Name:        domainName,
 		Internal:    types.NullBool{IsSet: true, Value: internal},
 		RouterGroup: routerGroupGUID,
-	})
+	}
+
+	// Set enforce_route_policies if specified
+	if enforceAccessRules {
+		domain.EnforceRoutePolicies = types.NullBool{IsSet: true, Value: true}
+		domain.RoutePoliciesScope = accessRulesScope
+	}
+
+	_, warnings, err := actor.CloudControllerClient.CreateDomain(domain)
 	allWarnings = append(allWarnings, Warnings(warnings)...)
 
 	return allWarnings, err
 }
 
-func (actor Actor) CreatePrivateDomain(domainName string, orgName string) (Warnings, error) {
+func (actor Actor) CreatePrivateDomain(domainName string, orgName string, enforceAccessRules bool, accessRulesScope string) (Warnings, error) {
 	allWarnings := Warnings{}
 	organization, warnings, err := actor.GetOrganizationByName(orgName)
 	allWarnings = append(allWarnings, warnings...)
 
 	if err != nil {
 		return allWarnings, err
 	}
-	_, apiWarnings, err := actor.CloudControllerClient.CreateDomain(resources.Domain{
+
+	domain := resources.Domain{
 		Name:             domainName,
 		OrganizationGUID: organization.GUID,
-	})
+	}
+
+	// Set enforce_route_policies if specified
+	if enforceAccessRules {
+		domain.EnforceRoutePolicies = types.NullBool{IsSet: true, Value: true}
+		domain.RoutePoliciesScope = accessRulesScope
+	}
+
+	_, apiWarnings, err := actor.CloudControllerClient.CreateDomain(domain)
 
 	actorWarnings := Warnings(apiWarnings)
 	allWarnings = append(allWarnings, actorWarnings...)
 
@@ -112,17 +112,21 @@ var _ = Describe("Domain Actions", func() {
 
 	Describe("CreateSharedDomain", func() {
 		var (
-			warnings    Warnings
-			executeErr  error
-			routerGroup string
+			warnings      Warnings
+			executeErr    error
+			routerGroup   string
+			enforceRules  bool
+			scope         string
 		)
 
 		JustBeforeEach(func() {
-			warnings, executeErr = actor.CreateSharedDomain("the-domain-name", true, routerGroup)
+			warnings, executeErr = actor.CreateSharedDomain("the-domain-name", true, routerGroup, enforceRules, scope)
 		})
 
 		BeforeEach(func() {
 			routerGroup = ""
+			enforceRules = false
+			scope = ""
 			fakeCloudControllerClient.CreateDomainReturns(resources.Domain{}, ccv3.Warnings{"create-warning-1", "create-warning-2"}, errors.New("create-error"))
 		})
 
@@ -170,11 +174,40 @@ var _ = Describe("Domain Actions", func() {
 				))
 			})
 		})
+
+		Context("when enforce route policies is enabled with a scope", func() {
+			BeforeEach(func() {
+				enforceRules = true
+				scope = "org"
+				fakeCloudControllerClient.CreateDomainReturns(resources.Domain{}, ccv3.Warnings{"create-warning-1"}, nil)
+			})
+
+			It("passes EnforceRoutePolicies and RoutePoliciesScope to the client", func() {
+				Expect(executeErr).NotTo(HaveOccurred())
+
+				Expect(fakeCloudControllerClient.CreateDomainCallCount()).To(Equal(1))
+				passedDomain := fakeCloudControllerClient.CreateDomainArgsForCall(0)
+				Expect(passedDomain.EnforceRoutePolicies).To(Equal(types.NullBool{IsSet: true, Value: true}))
+				Expect(passedDomain.RoutePoliciesScope).To(Equal("org"))
+			})
+		})
 	})
 
 	Describe("CreatePrivateDomain", func() {
+		var (
+			warnings     Warnings
+			executeErr   error
+			enforceRules bool
+			scope        string
+		)
+
+		JustBeforeEach(func() {
+			warnings, executeErr = actor.CreatePrivateDomain("private-domain-name", "org-name", enforceRules, scope)
+		})
 
 		BeforeEach(func() {
+			enforceRules = false
+			scope = ""
 			fakeCloudControllerClient.GetOrganizationsReturns(
 				[]resources.Organization{
 					{GUID: "org-guid"},
@@ -191,7 +224,6 @@ var _ = Describe("Domain Actions", func() {
 		})
 
 		It("delegates to the cloud controller client", func() {
-			warnings, executeErr := actor.CreatePrivateDomain("private-domain-name", "org-name")
 			Expect(executeErr).To(MatchError("create-error"))
 			Expect(warnings).To(ConsistOf("get-orgs-warning", "create-warning-1", "create-warning-2"))
 
@@ -205,6 +237,23 @@ var _ = Describe("Domain Actions", func() {
 				},
 			))
 		})
+
+		Context("when enforce route policies is enabled with a scope", func() {
+			BeforeEach(func() {
+				enforceRules = true
+				scope = "org"
+				fakeCloudControllerClient.CreateDomainReturns(resources.Domain{}, ccv3.Warnings{"create-warning-1"}, nil)
+			})
+
+			It("passes EnforceRoutePolicies and RoutePoliciesScope to the client", func() {
+				Expect(executeErr).NotTo(HaveOccurred())
+
+				Expect(fakeCloudControllerClient.CreateDomainCallCount()).To(Equal(1))
+				passedDomain := fakeCloudControllerClient.CreateDomainArgsForCall(0)
+				Expect(passedDomain.EnforceRoutePolicies).To(Equal(types.NullBool{IsSet: true, Value: true}))
+				Expect(passedDomain.RoutePoliciesScope).To(Equal("org"))
+			})
+		})
 	})
 
 	Describe("delete domain", func() {
 
@@ -178,3 +178,19 @@ func (actor *Actor) updateResourceMetadata(resourceType string, resourceGUID str
 
 	return warnings, nil
 }
+
+func (actor *Actor) GetRoutePolicyLabels(routeURL, spaceGUID, source string) (map[string]types.NullString, Warnings, error) {
+	_, metadata, warnings, err := actor.resolveRoutePolicyGUID(routeURL, spaceGUID, source)
+	if err != nil {
+		return nil, warnings, err
+	}
+	return actor.extractLabels(metadata, warnings, nil)
+}
+
+func (actor *Actor) UpdateRoutePolicyLabels(routeURL, spaceGUID, source string, labels map[string]types.NullString) (Warnings, error) {
+	policyGUID, _, warnings, err := actor.resolveRoutePolicyGUID(routeURL, spaceGUID, source)
+	if err != nil {
+		return warnings, err
+	}
+	return actor.updateResourceMetadata("route-policy", policyGUID, resources.Metadata{Labels: labels}, warnings)
+}