4246 stub org quotas (#4267)

fixes #4246

Author: benjaminguttmann-avtq

api/handlers/isolation_segment.go

@@ -0,0 +1,38 @@
+package handlers
+
+import (
+	"net/http"
+	"net/url"
+
+	"code.cloudfoundry.org/korifi/api/presenter"
+	"code.cloudfoundry.org/korifi/api/repositories"
+	"code.cloudfoundry.org/korifi/api/routing"
+)
+
+const (
+	IsolationSegmentsPath = "/v3/isolation_segments"
+)
+
+type IsolationSegment struct {
+	apiBaseURL url.URL
+}
+
+func NewIsolationSegment(apiBaseURL url.URL) *IsolationSegment {
+	return &IsolationSegment{
+		apiBaseURL: apiBaseURL,
+	}
+}
+
+func (h *IsolationSegment) list(r *http.Request) (*routing.Response, error) {
+	return routing.NewResponse(http.StatusOK).WithBody(presenter.ForList(presenter.Empty, repositories.ListResult[any]{}, h.apiBaseURL, *r.URL)), nil
+}
+
+func (h *IsolationSegment) AuthenticatedRoutes() []routing.Route {
+	return []routing.Route{
+		{Method: "GET", Pattern: IsolationSegmentsPath, Handler: h.list},
+	}
+}
+
+func (h *IsolationSegment) UnauthenticatedRoutes() []routing.Route {
+	return nil
+}

api/handlers/org.go

@@ -21,11 +21,11 @@ import (
 )
 
 const (
-	OrgsPath                 = "/v3/organizations"
-	OrgPath                  = "/v3/organizations/{guid}"
-	OrgDomainsPath           = "/v3/organizations/{guid}/domains"
-	OrgDefaultDomainPath     = "/v3/organizations/{guid}/domains/default"
-	OrgIsolationSegmentsPath = "/v3/organizations/{guid}/relationships/default_isolation_segment"
+	OrgsPath                       = "/v3/organizations"
+	OrgPath                        = "/v3/organizations/{guid}"
+	OrgDomainsPath                 = "/v3/organizations/{guid}/domains"
+	OrgDefaultDomainPath           = "/v3/organizations/{guid}/domains/default"
+	OrgDefaultIsolationSegmentPath = "/v3/organizations/{guid}/relationships/default_isolation_segment"
 )
 
 //counterfeiter:generate -o fake -fake-name CFOrgRepository . CFOrgRepository
@@ -208,8 +208,8 @@ func (h *Org) UnauthenticatedRoutes() []routing.Route {
 	return nil
 }
 
-func (h *Org) getIsolationSegments(r *http.Request) (*routing.Response, error) {
-	return routing.NewResponse(http.StatusOK).WithBody(presenter.ForIsolationSegment(h.apiBaseURL)), nil
+func (h *Org) getDefaultIsolationSegment(r *http.Request) (*routing.Response, error) {
+	return routing.NewResponse(http.StatusOK).WithBody(struct{}{}), nil
 }
 
 func (h *Org) AuthenticatedRoutes() []routing.Route {
@@ -221,7 +221,7 @@ func (h *Org) AuthenticatedRoutes() []routing.Route {
 		{Method: "GET", Pattern: OrgDomainsPath, Handler: h.listDomains},
 		{Method: "GET", Pattern: OrgDefaultDomainPath, Handler: h.defaultDomain},
 		{Method: "GET", Pattern: OrgPath, Handler: h.get},
-		{Method: "GET", Pattern: OrgIsolationSegmentsPath, Handler: h.getIsolationSegments},
+		{Method: "GET", Pattern: OrgDefaultIsolationSegmentPath, Handler: h.getDefaultIsolationSegment},
 	}
 }
 

api/handlers/org_quota.go

@@ -0,0 +1,38 @@
+package handlers
+
+import (
+	"net/http"
+	"net/url"
+
+	"code.cloudfoundry.org/korifi/api/presenter"
+	"code.cloudfoundry.org/korifi/api/repositories"
+	"code.cloudfoundry.org/korifi/api/routing"
+)
+
+const (
+	OrgQuotasPath = "/v3/organization_quotas"
+)
+
+type OrgQuota struct {
+	apiBaseURL url.URL
+}
+
+func NewOrgQuota(apiBaseURL url.URL) *OrgQuota {
+	return &OrgQuota{
+		apiBaseURL: apiBaseURL,
+	}
+}
+
+func (h *OrgQuota) list(r *http.Request) (*routing.Response, error) {
+	return routing.NewResponse(http.StatusOK).WithBody(presenter.ForList(presenter.Empty, repositories.ListResult[any]{}, h.apiBaseURL, *r.URL)), nil
+}
+
+func (h *OrgQuota) AuthenticatedRoutes() []routing.Route {
+	return []routing.Route{
+		{Method: "GET", Pattern: OrgQuotasPath, Handler: h.list},
+	}
+}
+
+func (h *OrgQuota) UnauthenticatedRoutes() []routing.Route {
+	return nil
+}

api/handlers/space.go

@@ -19,11 +19,11 @@ import (
 )
 
 const (
-	SpacesPath                    = "/v3/spaces"
-	SpacePath                     = "/v3/spaces/{guid}"
-	RoutesForSpacePath            = "/v3/spaces/{guid}/routes"
-	SpaceFeaturePath              = "/v3/spaces/{guid}/features/{name}"
-	IsolationSegmentsForSpacePath = "/v3/spaces/{guid}/relationships/isolation_segment"
+	SpacesPath                   = "/v3/spaces"
+	SpacePath                    = "/v3/spaces/{guid}"
+	RoutesForSpacePath           = "/v3/spaces/{guid}/routes"
+	SpaceFeaturePath             = "/v3/spaces/{guid}/features/{name}"
+	IsolationSegmentForSpacePath = "/v3/spaces/{guid}/relationships/isolation_segment"
 )
 
 //counterfeiter:generate -o fake -fake-name CFSpaceRepository . CFSpaceRepository
@@ -200,8 +200,8 @@ func (h *Space) deleteUnmappedRoutes(r *http.Request) (*routing.Response, error)
 	return routing.NewResponse(http.StatusAccepted).WithHeader("Location", presenter.JobURLForRedirects(spaceGUID, presenter.SpaceDeleteUnmappedRoutesOperation, h.apiBaseURL)), nil
 }
 
-func (h *Space) getIsolationSegments(r *http.Request) (*routing.Response, error) {
-	return routing.NewResponse(http.StatusOK).WithBody(presenter.ForIsolationSegment(h.apiBaseURL)), nil
+func (h *Space) getIsolationSegment(r *http.Request) (*routing.Response, error) {
+	return routing.NewResponse(http.StatusOK).WithBody(struct{}{}), nil
 }
 
 func (h *Space) getSpaceFeature(r *http.Request) (*routing.Response, error) {
@@ -231,7 +231,7 @@ func (h *Space) AuthenticatedRoutes() []routing.Route {
 		{Method: "DELETE", Pattern: SpacePath, Handler: h.delete},
 		{Method: "GET", Pattern: SpacePath, Handler: h.get},
 		{Method: "DELETE", Pattern: RoutesForSpacePath, Handler: h.deleteUnmappedRoutes},
-		{Method: "GET", Pattern: IsolationSegmentsForSpacePath, Handler: h.getIsolationSegments},
+		{Method: "GET", Pattern: IsolationSegmentForSpacePath, Handler: h.getIsolationSegment},
 		{Method: "GET", Pattern: SpaceFeaturePath, Handler: h.getSpaceFeature},
 	}
 }

api/main.go

@@ -501,6 +501,12 @@ func main() {
 			spaceRepo,
 			requestValidator,
 		),
+		handlers.NewOrgQuota(
+			*serverURL,
+		),
+		handlers.NewIsolationSegment(
+			*serverURL,
+		),
 	}
 
 	if !cfg.Experimental.ExternalLogCache.Enabled {

api/presenter/isolation_segment.go

@@ -75,6 +75,11 @@ type ToOneRelationship struct {
 
 type itemPresenter[T, S any] func(T, url.URL, ...include.Resource) S
 
+func Empty(any, url.URL, ...include.Resource) any {
+	var result any
+	return result
+}
+
 func ForList[T, S any](itemPresenter itemPresenter[T, S], listResult repositories.ListResult[T], baseURL, requestURL url.URL, includes ...include.Resource) ListResponse[S] {
 	presenters := []S{}
 	for _, resource := range listResult.Records {

api/presenter/shared.go

@@ -0,0 +1,18 @@
+package smoke_test
+
+import (
+	"code.cloudfoundry.org/korifi/tests/helpers"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega/gexec"
+)
+
+var _ = Describe("OrgQuotas", func() {
+	Describe("cf org-quota", func() {
+		It("returns OK", func() {
+			session := helpers.Cf("org-quotas")
+			Expect(session).To(Exit(0))
+		})
+	})
+})

tests/smoke/org_quota_test.go

@@ -0,0 +1,35 @@
+package smoke_test
+
+import (
+	"code.cloudfoundry.org/korifi/tests/helpers"
+
+	"github.com/BooleanCat/go-functional/v2/it"
+	"github.com/google/uuid"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega/gexec"
+)
+
+var _ = Describe("Orgs", func() {
+	var orgName string
+
+	BeforeEach(func() {
+		orgName = uuid.NewString()
+		Expect(helpers.Cf(
+			"create-org",
+			orgName,
+		)).To(Exit(0))
+	})
+
+	Describe("cf org", func() {
+		It("returns successful", func() {
+			session := helpers.Cf("org", orgName)
+			Expect(session).To(Exit(0))
+
+			lines := it.MustCollect(it.LinesString(session.Out))
+			Expect(lines).To(ContainElement(
+				matchSubstrings(orgName),
+			))
+		})
+	})
+})