fix: Context updating, environment rate limiting, toggle styling (#437)

* Fix context updating, fix environment rate limiting, fix toggle * Fix limit not being respected * Remove unnecessary filterEnvironments
launchdarkly · Oct 1, 2024 · c7832d5 · c7832d5
1 parent facf237
commit c7832d5
Show file tree

Hide file tree

Showing 15 changed files with 257 additions and 94 deletions.
diff --git a/cmd/dev_server/dev_server.go b/cmd/dev_server/dev_server.go
@@ -7,10 +7,9 @@ import (
 	"github.com/spf13/viper"
 
 	cmdAnalytics "github.com/launchdarkly/ldcli/cmd/analytics"
-	"github.com/launchdarkly/ldcli/internal/analytics"
-
 	"github.com/launchdarkly/ldcli/cmd/cliflags"
 	resourcecmd "github.com/launchdarkly/ldcli/cmd/resources"
+	"github.com/launchdarkly/ldcli/internal/analytics"
 	"github.com/launchdarkly/ldcli/internal/dev_server"
 	"github.com/launchdarkly/ldcli/internal/resources"
 )

diff --git a/internal/dev_server/adapters/api.go b/internal/dev_server/adapters/api.go
@@ -2,6 +2,7 @@ package adapters
 
 import (
 	"context"
+	"fmt"
 	"log"
 	"net/url"
 	"strconv"
@@ -25,7 +26,7 @@ func GetApi(ctx context.Context) Api {
 type Api interface {
 	GetSdkKey(ctx context.Context, projectKey, environmentKey string) (string, error)
 	GetAllFlags(ctx context.Context, projectKey string) ([]ldapi.FeatureFlag, error)
-	GetProjectEnvironments(ctx context.Context, projectKey string) ([]ldapi.Environment, error)
+	GetProjectEnvironments(ctx context.Context, projectKey string, query string, limit *int) ([]ldapi.Environment, error)
 }
 
 type apiClientApi struct {
@@ -54,9 +55,9 @@ func (a apiClientApi) GetAllFlags(ctx context.Context, projectKey string) ([]lda
 	return flags, err
 }
 
-func (a apiClientApi) GetProjectEnvironments(ctx context.Context, projectKey string) ([]ldapi.Environment, error) {
+func (a apiClientApi) GetProjectEnvironments(ctx context.Context, projectKey string, query string, limit *int) ([]ldapi.Environment, error) {
 	log.Printf("Fetching all environments for project '%s'", projectKey)
-	environments, err := a.getEnvironments(ctx, projectKey, nil)
+	environments, err := a.getEnvironments(ctx, projectKey, nil, query, limit)
 	if err != nil {
 		err = errors.Wrap(err, "unable to get environments from LD API")
 	}
@@ -81,21 +82,28 @@ func (a apiClientApi) getFlags(ctx context.Context, projectKey string, href *str
 	})
 }
 
-func (a apiClientApi) getEnvironments(ctx context.Context, projectKey string, href *string) ([]ldapi.Environment, error) {
-	return getPaginatedItems(ctx, projectKey, href, func(ctx context.Context, projectKey string, limit, offset *int64) (*ldapi.Environments, error) {
-		request := a.apiClient.EnvironmentsApi.GetEnvironmentsByProject(ctx, projectKey)
-		if limit != nil {
-			request = request.Limit(*limit)
-		}
+func (a apiClientApi) getEnvironments(ctx context.Context, projectKey string, href *string, query string, limit *int) ([]ldapi.Environment, error) {
+	request := a.apiClient.EnvironmentsApi.GetEnvironmentsByProject(ctx, projectKey)
 
-		if offset != nil {
-			request = request.Offset(*offset)
-		}
+	if limit != nil {
+		request = request.Limit(int64(*limit))
+	}
 
-		envs, _, err := request.
-			Execute()
-		return envs, err
-	})
+	if query != "" {
+		request = request.Sort("name").Filter(fmt.Sprintf("query:%s", query))
+	}
+
+	envs, _, err := request.
+		Execute()
+	if err != nil {
+		return nil, err
+	}
+
+	if envs == nil {
+		return []ldapi.Environment{}, nil
+	}
+
+	return envs.Items, nil
 }
 
 func getPaginatedItems[T any, R interface {

diff --git a/internal/dev_server/adapters/mocks/api.go b/internal/dev_server/adapters/mocks/api.go
diff --git a/internal/dev_server/api/api.yaml b/internal/dev_server/api/api.yaml
@@ -131,6 +131,18 @@ paths:
       summary: list all environments for the given project
       parameters:
         - $ref: "#/components/parameters/projectKey"
+        - name: name
+          in: query
+          description: filter by environment name
+          required: false
+          schema:
+            type: string
+        - name: limit
+          in: query
+          description: limit the number of environments returned
+          required: false
+          schema:
+              type: integer
       responses:
         200:
           description: OK. List of environments

diff --git a/internal/dev_server/api/get_environments.go b/internal/dev_server/api/get_environments.go
@@ -16,7 +16,12 @@ func (s server) GetEnvironments(ctx context.Context, request GetEnvironmentsRequ
 		return GetEnvironments404JSONResponse{}, nil
 	}
 
-	environments, err := model.GetEnvironmentsForProject(ctx, project.Key)
+	var query string
+	if request.Params.Name != nil {
+		query = *request.Params.Name
+	}
+
+	environments, err := model.GetEnvironmentsForProject(ctx, project.Key, query, request.Params.Limit)
 	if err != nil {
 		return nil, err
 	}

diff --git a/internal/dev_server/api/server.gen.go b/internal/dev_server/api/server.gen.go
diff --git a/internal/dev_server/model/environments.go b/internal/dev_server/model/environments.go
@@ -11,9 +11,9 @@ type Environment struct {
 	Name string
 }
 
-func GetEnvironmentsForProject(ctx context.Context, projectKey string) ([]Environment, error) {
+func GetEnvironmentsForProject(ctx context.Context, projectKey string, query string, limit *int) ([]Environment, error) {
 	apiAdapter := adapters.GetApi(ctx)
-	environments, err := apiAdapter.GetProjectEnvironments(ctx, projectKey)
+	environments, err := apiAdapter.GetProjectEnvironments(ctx, projectKey, query, limit)
 	if err != nil {
 		return nil, err
 	}

diff --git a/internal/dev_server/model/project_test.go b/internal/dev_server/model/project_test.go
@@ -5,17 +5,18 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/samber/lo"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
+
 	ldapi "github.com/launchdarkly/api-client-go/v14"
 	"github.com/launchdarkly/go-sdk-common/v3/ldcontext"
 	"github.com/launchdarkly/go-sdk-common/v3/ldvalue"
 	"github.com/launchdarkly/go-server-sdk/v7/interfaces/flagstate"
 	adapters_mocks "github.com/launchdarkly/ldcli/internal/dev_server/adapters/mocks"
 	"github.com/launchdarkly/ldcli/internal/dev_server/model"
 	"github.com/launchdarkly/ldcli/internal/dev_server/model/mocks"
-	"github.com/samber/lo"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/mock/gomock"
 )
 
 func TestCreateProject(t *testing.T) {

diff --git a/internal/dev_server/sdk/go_sdk_test.go b/internal/dev_server/sdk/go_sdk_test.go
@@ -9,6 +9,10 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
+
 	"github.com/launchdarkly/go-sdk-common/v3/ldcontext"
 	"github.com/launchdarkly/go-sdk-common/v3/ldvalue"
 	ldclient "github.com/launchdarkly/go-server-sdk/v7"
@@ -17,9 +21,6 @@ import (
 	"github.com/launchdarkly/ldcli/internal/dev_server/adapters/mocks"
 	"github.com/launchdarkly/ldcli/internal/dev_server/db"
 	"github.com/launchdarkly/ldcli/internal/dev_server/model"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/mock/gomock"
 )
 
 // TestSdkRoutesViaGoSDK is an integration test. It hooks up a real go SDK to our SDK routes and makes changes to the