optimize pipline gates (#310)

zreigz · web-flow · commit dabab7337367 · 2024-11-04T15:07:07.000+01:00
diff --git a/go.mod b/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/open-policy-agent/gatekeeper/v3 v3.17.1
 	github.com/orcaman/concurrent-map/v2 v2.0.1
 	github.com/pkg/errors v0.9.1
-	github.com/pluralsh/console/go/client v1.22.2
+	github.com/pluralsh/console/go/client v1.22.3
 	github.com/pluralsh/controller-reconcile-helper v0.1.0
 	github.com/pluralsh/gophoenix v0.1.3-0.20231201014135-dff1b4309e34
 	github.com/pluralsh/polly v0.1.10
diff --git a/go.sum b/go.sum
@@ -666,8 +666,8 @@ github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5/go.mod h1:iIss55rK
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pluralsh/console/go/client v1.22.2 h1:mOWPel/oZ9vypJvF136/CWIl6P2Rj89uarHvoRJDnHI=
-github.com/pluralsh/console/go/client v1.22.2/go.mod h1:lpoWASYsM9keNePS3dpFiEisUHEfObIVlSL3tzpKn8k=
+github.com/pluralsh/console/go/client v1.22.3 h1:5CUV4E/EH5G84ZVIIdr4NuUzM92AKUrZBLEh2SjLeEc=
+github.com/pluralsh/console/go/client v1.22.3/go.mod h1:lpoWASYsM9keNePS3dpFiEisUHEfObIVlSL3tzpKn8k=
 github.com/pluralsh/controller-reconcile-helper v0.1.0 h1:BV3dYZFH5rn8ZvZjtpkACSv/GmLEtRftNQj/Y4ddHEo=
 github.com/pluralsh/controller-reconcile-helper v0.1.0/go.mod h1:RxAbvSB4/jkvx616krCdNQXPbpGJXW3J1L3rASxeFOA=
 github.com/pluralsh/gophoenix v0.1.3-0.20231201014135-dff1b4309e34 h1:ab2PN+6if/Aq3/sJM0AVdy1SYuMAnq4g20VaKhTm/Bw=
diff --git a/pkg/client/console.go b/pkg/client/console.go
@@ -55,7 +55,7 @@ type Client interface {
 	ParsePipelineGateCR(pgFragment *console.PipelineGateFragment, operatorNamespace string) (*v1alpha1.PipelineGate, error)
 	GateExists(id string) bool
 	GetClusterGate(id string) (*console.PipelineGateFragment, error)
-	GetClusterGates(after *string, first *int64) (*console.PagedClusterGates, error)
+	GetClusterGates(after *string, first *int64) (*console.PagedClusterGateIDs, error)
 	UpdateGate(id string, attributes console.GateUpdateAttributes) error
 	UpsertConstraints(constraints []*console.PolicyConstraintAttributes) (*console.UpsertPolicyConstraints, error)
 	GetNamespace(id string) (*console.ManagedNamespaceFragment, error)
diff --git a/pkg/client/pipelines.go b/pkg/client/pipelines.go
@@ -22,8 +22,8 @@ func (c *client) UpdateGate(id string, attributes console.GateUpdateAttributes)
 	return err
 }
 
-func (c *client) GetClusterGates(after *string, first *int64) (*console.PagedClusterGates, error) {
-	resp, err := c.consoleClient.PagedClusterGates(c.ctx, after, first, nil, nil)
+func (c *client) GetClusterGates(after *string, first *int64) (*console.PagedClusterGateIDs, error) {
+	resp, err := c.consoleClient.PagedClusterGateIDs(c.ctx, after, first, nil, nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/controller/pipelinegates/reconciler.go b/pkg/controller/pipelinegates/reconciler.go
@@ -85,10 +85,10 @@ func (s *GateReconciler) GetPollInterval() time.Duration {
 	return s.pollInterval
 }
 
-func (s *GateReconciler) ListGates(ctx context.Context) *algorithms.Pager[*console.PipelineGateEdgeFragment] {
+func (s *GateReconciler) ListGates(ctx context.Context) *algorithms.Pager[*console.PipelineGateIDsEdgeFragment] {
 	logger := log.FromContext(ctx)
 	logger.Info("create pipeline gate pager")
-	fetch := func(page *string, size int64) ([]*console.PipelineGateEdgeFragment, *algorithms.PageInfo, error) {
+	fetch := func(page *string, size int64) ([]*console.PipelineGateIDsEdgeFragment, *algorithms.PageInfo, error) {
 		resp, err := s.consoleClient.GetClusterGates(page, &size)
 		if err != nil {
 			logger.Error(err, "failed to fetch gates")
@@ -101,7 +101,7 @@ func (s *GateReconciler) ListGates(ctx context.Context) *algorithms.Pager[*conso
 		}
 		return resp.PagedClusterGates.Edges, pageInfo, nil
 	}
-	return algorithms.NewPager[*console.PipelineGateEdgeFragment](common.DefaultPageSize, fetch)
+	return algorithms.NewPager[*console.PipelineGateIDsEdgeFragment](common.DefaultPageSize, fetch)
 }
 
 func (s *GateReconciler) Poll(ctx context.Context) error {
diff --git a/pkg/test/mocks/Client_mock.go b/pkg/test/mocks/Client_mock.go

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ func (c *client) UpdateGate(id string, attributes console.GateUpdateAttributes)`
`22`	`22`	`return err`
`23`	`23`	`}`
`24`	`24`
`25`		`-func (c client) GetClusterGates(after string, first int64) (console.PagedClusterGates, error) {`
`26`		`- resp, err := c.consoleClient.PagedClusterGates(c.ctx, after, first, nil, nil)`
	`25`	`+func (c client) GetClusterGates(after string, first int64) (console.PagedClusterGateIDs, error) {`
	`26`	`+ resp, err := c.consoleClient.PagedClusterGateIDs(c.ctx, after, first, nil, nil)`
`27`	`27`	`if err != nil {`
`28`	`28`	`return nil, err`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,10 @@ func (s *GateReconciler) GetPollInterval() time.Duration {`
`85`	`85`	`return s.pollInterval`
`86`	`86`	`}`
`87`	`87`
`88`		`-func (s GateReconciler) ListGates(ctx context.Context) algorithms.Pager[*console.PipelineGateEdgeFragment] {`
	`88`	`+func (s GateReconciler) ListGates(ctx context.Context) algorithms.Pager[*console.PipelineGateIDsEdgeFragment] {`
`89`	`89`	`logger := log.FromContext(ctx)`
`90`	`90`	`logger.Info("create pipeline gate pager")`
`91`		`- fetch := func(page string, size int64) ([]console.PipelineGateEdgeFragment, *algorithms.PageInfo, error) {`
	`91`	`+ fetch := func(page string, size int64) ([]console.PipelineGateIDsEdgeFragment, *algorithms.PageInfo, error) {`
`92`	`92`	`resp, err := s.consoleClient.GetClusterGates(page, &size)`
`93`	`93`	`if err != nil {`
`94`	`94`	`logger.Error(err, "failed to fetch gates")`
`@@ -101,7 +101,7 @@ func (s GateReconciler) ListGates(ctx context.Context) algorithms.Pager[*conso`
`101`	`101`	`}`
`102`	`102`	`return resp.PagedClusterGates.Edges, pageInfo, nil`
`103`	`103`	`}`
`104`		`- return algorithms.NewPager[*console.PipelineGateEdgeFragment](common.DefaultPageSize, fetch)`
	`104`	`+ return algorithms.NewPager[*console.PipelineGateIDsEdgeFragment](common.DefaultPageSize, fetch)`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`func (s *GateReconciler) Poll(ctx context.Context) error {`