Merge remote-tracking branch 'origin/develop' into feature/SCALRCORE-26056

Author: soltysss

environment.go

@@ -109,10 +109,16 @@ func (o EnvironmentCreateOptions) valid() error {
 type EnvironmentListOptions struct {
 	ListOptions
 
-	Include *string `url:"include,omitempty"`
-	Name    *string `url:"query,omitempty"`
-	Id      *string `url:"query,omitempty"`
-	Account *string `url:"filter[account],omitempty"`
+	Include *string            `url:"include,omitempty"`
+	Filter  *EnvironmentFilter `url:"filter,omitempty"`
+}
+
+// EnvironmentFilter represents the options for filtering environments.
+type EnvironmentFilter struct {
+	Id      *string `url:"environment,omitempty"`
+	Account *string `url:"account,omitempty"`
+	Name    *string `url:"name,omitempty"`
+	Tag     *string `url:"tag,omitempty"`
 }
 
 // List all the environmens.

environment_test.go

@@ -48,7 +48,7 @@ func TestEnvironmentsList(t *testing.T) {
 	})
 
 	filterByNameOptions := EnvironmentListOptions{
-		Name: &envTest1.Name,
+		Filter: &EnvironmentFilter{Name: &envTest1.Name},
 	}
 	t.Run("with filter by name option", func(t *testing.T) {
 		envl, err := client.Environments.List(ctx, filterByNameOptions)
@@ -59,7 +59,7 @@ func TestEnvironmentsList(t *testing.T) {
 	})
 
 	filterByIdOptions := EnvironmentListOptions{
-		Id: &envTest1.ID,
+		Filter: &EnvironmentFilter{Id: &envTest1.ID},
 	}
 	t.Run("with filter by ID option", func(t *testing.T) {
 		envl, err := client.Environments.List(ctx, filterByIdOptions)
@@ -70,7 +70,7 @@ func TestEnvironmentsList(t *testing.T) {
 	})
 
 	filterByAccountIdOptions := EnvironmentListOptions{
-		Account: String(defaultAccountID),
+		Filter: &EnvironmentFilter{Account: String(defaultAccountID)},
 	}
 	t.Run("with filter by account option", func(t *testing.T) {
 		envl, err := client.Environments.List(ctx, filterByAccountIdOptions)

workspace.go

@@ -142,12 +142,18 @@ type WorkspacePermissions struct {
 // WorkspaceListOptions represents the options for listing workspaces.
 type WorkspaceListOptions struct {
 	ListOptions
+	Include string           `url:"include,omitempty"`
+	Filter  *WorkspaceFilter `url:"filter,omitempty"`
+}
 
-	Workspace   *string `url:"filter[workspace],omitempty"`
-	Environment *string `url:"filter[environment],omitempty"`
-	AgentPool   *string `url:"filter[agent-pool],omitempty"`
-	Name        *string `url:"filter[name],omitempty"`
-	Include     string  `url:"include,omitempty"`
+// WorkspaceFilter represents the options for filtering workspaces.
+type WorkspaceFilter struct {
+	Id          *string `url:"workspace,omitempty"`
+	Account     *string `url:"account,omitempty"`
+	Environment *string `url:"environment,omitempty"`
+	Name        *string `url:"name,omitempty"`
+	Tag         *string `url:"tag,omitempty"`
+	AgentPool   *string `url:"agent-pool,omitempty"`
 }
 
 // WorkspaceRunScheduleOptions represents option for setting run schedules for workspace
@@ -295,7 +301,10 @@ func (s *workspaces) Read(ctx context.Context, environmentID, workspaceName stri
 		return nil, errors.New("invalid value for workspace")
 	}
 
-	options := WorkspaceListOptions{Environment: &environmentID, Name: &workspaceName, Include: "created-by"}
+	options := WorkspaceListOptions{
+		Include: "created-by",
+		Filter:  &WorkspaceFilter{Environment: &environmentID, Name: &workspaceName},
+	}
 
 	req, err := s.client.newRequest("GET", "workspaces", &options)
 	if err != nil {

workspace_test.go

@@ -22,7 +22,13 @@ func TestWorkspacesList(t *testing.T) {
 	defer wsTest2Cleanup()
 
 	t.Run("without list options", func(t *testing.T) {
-		wsl, err := client.Workspaces.List(ctx, WorkspaceListOptions{Environment: &envTest.ID})
+		wsl, err := client.Workspaces.List(ctx,
+			WorkspaceListOptions{
+				Filter: &WorkspaceFilter{
+					Environment: &envTest.ID,
+				},
+			},
+		)
 		require.NoError(t, err)
 		wslIDs := make([]string, len(wsl.Items))
 		for _, ws := range wsl.Items {
@@ -36,8 +42,10 @@ func TestWorkspacesList(t *testing.T) {
 
 	t.Run("with ID in list options", func(t *testing.T) {
 		wsl, err := client.Workspaces.List(ctx, WorkspaceListOptions{
-			Environment: &envTest.ID,
-			Workspace:   &wsTest1.ID,
+			Filter: &WorkspaceFilter{
+				Environment: &envTest.ID,
+				Id:          &wsTest1.ID,
+			},
 		})
 		require.NoError(t, err)
 		assert.Equal(t, 1, wsl.TotalCount)
@@ -53,15 +61,23 @@ func TestWorkspacesList(t *testing.T) {
 				PageNumber: 999,
 				PageSize:   100,
 			},
-			Environment: &envTest.ID,
+			Filter: &WorkspaceFilter{
+				Environment: &envTest.ID,
+			},
 		})
 		require.NoError(t, err)
 		assert.Empty(t, wl.Items)
 		assert.Equal(t, 999, wl.CurrentPage)
 		assert.Equal(t, 2, wl.TotalCount)
 	})
 	t.Run("without a valid environment", func(t *testing.T) {
-		wl, err := client.Workspaces.List(ctx, WorkspaceListOptions{Environment: String(badIdentifier)})
+		wl, err := client.Workspaces.List(ctx,
+			WorkspaceListOptions{
+				Filter: &WorkspaceFilter{
+					Environment: String(badIdentifier),
+				},
+			},
+		)
 		assert.Len(t, wl.Items, 0)
 		assert.NoError(t, err)
 	})