resolve merge conflicts

Author: Piskoo

.chainloop.yml

@@ -1,5 +1,5 @@
 # This can indicate the next version and by default it will be marked as pre-release
-projectVersion: v1.31.0
+projectVersion: v1.35.0
 
 # Experimental feature used by Chainloop labs shared workflow https://github.com/chainloop-dev/labs
 # It maps the material names with location in disk so they get automatically attested

app/cli/cmd/organization_member_delete.go

@@ -25,12 +25,12 @@ import (
 
 // Get the membership entry associated to the current user for the given organization
 func loadMembershipCurrentOrg(ctx context.Context, membershipID string) (*action.MembershipItem, error) {
-	memberships, err := action.NewMembershipList(actionOpts).ListMembers(ctx)
+	res, err := action.NewMembershipList(actionOpts).ListMembers(ctx, 1, 1, &action.ListMembersOpts{MembershipID: &membershipID})
 	if err != nil {
 		return nil, fmt.Errorf("listing memberships: %w", err)
 	}
 
-	for _, m := range memberships {
+	for _, m := range res.Memberships {
 		if m.ID == membershipID {
 			return m, nil
 		}

app/cli/cmd/organization_member_list.go

@@ -19,40 +19,109 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
 
 func newOrganizationMemberList() *cobra.Command {
+	var (
+		paginationOpts = &options.OffsetPaginationOpts{}
+		name           string
+		email          string
+		role           string
+	)
+
 	cmd := &cobra.Command{
 		Use:     "list",
 		Aliases: []string{"ls"},
 		Short:   "List the members of the current organization",
+		Example: `  # Let the default pagination apply
+  chainloop organization member list
+
+  # Specify the page and page size
+  chainloop organization member list --page 2 --limit 10
+
+  # Filter by name
+  chainloop organization member list --name alice
+
+  # Filter by email
+  chainloop organization member list --email alice@example.com
+
+  # Filter by role
+  chainloop organization member list --role admin
+
+  # Combine filters and pagination
+  chainloop organization member list --role admin --page 2 --limit 5
+`,
+		PreRunE: func(_ *cobra.Command, _ []string) error {
+			if paginationOpts.Page < 1 {
+				return fmt.Errorf("--page must be greater or equal than 1")
+			}
+			if paginationOpts.Limit < 1 {
+				return fmt.Errorf("--limit must be greater or equal than 1")
+			}
+
+			return nil
+		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewMembershipList(actionOpts).ListMembers(cmd.Context())
+			opts := &action.ListMembersOpts{}
+
+			switch {
+			case name != "":
+				opts.Name = &name
+			case email != "":
+				opts.Email = &email
+			case role != "":
+				opts.Role = &role
+			}
+
+			res, err := action.NewMembershipList(actionOpts).ListMembers(cmd.Context(), paginationOpts.Page, paginationOpts.Limit, opts)
 			if err != nil {
 				return err
 			}
 
-			return encodeOutput(res, orgMembershipsTableOutput)
+			if err := encodeOutput(res, orgMembershipsTableOutput); err != nil {
+				return err
+			}
+
+			pgResponse := res.PaginationMeta
+
+			if pgResponse.TotalPages >= paginationOpts.Page {
+				inPage := min(paginationOpts.Limit, len(res.Memberships))
+				lowerBound := (paginationOpts.Page - 1) * paginationOpts.Limit
+				logger.Info().Msg(fmt.Sprintf("Showing [%d-%d] out of %d", lowerBound+1, lowerBound+inPage, pgResponse.TotalCount))
+			}
+
+			if pgResponse.TotalCount > pgResponse.Page*pgResponse.PageSize {
+				logger.Info().Msg(fmt.Sprintf("Next page available: %d", pgResponse.Page+1))
+			}
+
+			return nil
 		},
 	}
 
+	cmd.Flags().StringVar(&name, "name", "", "Filter by member name or last name")
+	cmd.Flags().StringVar(&email, "email", "", "Filter by member email")
+	cmd.Flags().StringVar(&role, "role", "", fmt.Sprintf("Role of the user in the organization, available %s", action.AvailableRoles[:3]))
+	paginationOpts.AddFlags(cmd)
+
 	return cmd
 }
 
-func orgMembershipsTableOutput(items []*action.MembershipItem) error {
-	if len(items) == 0 {
-		fmt.Println(UserWithNoOrganizationMsg)
-		return nil
-	}
-
+func orgMembershipsTableOutput(res *action.ListMembershipResult) error {
 	t := newTableWriter()
 	t.AppendHeader(table.Row{"ID", "Email", "Role", "Joined At"})
 
-	for _, i := range items {
-		t.AppendRow(table.Row{i.ID, i.User.PrintUserProfileWithEmail(), i.Role, i.CreatedAt.Format(time.RFC822)})
+	for _, m := range res.Memberships {
+		t.AppendRow(table.Row{
+			m.ID,
+			m.User.PrintUserProfileWithEmail(),
+			m.Role,
+			m.CreatedAt.Format(time.RFC822),
+		})
 		t.AppendSeparator()
 	}
 

app/cli/cmd/organization_member_update.go

@@ -46,7 +46,7 @@ func newOrganizationMemberUpdateCmd() *cobra.Command {
 				return err
 			}
 
-			return encodeOutput([]*action.MembershipItem{res}, orgMembershipsTableOutput)
+			return encodeOutput(&action.ListMembershipResult{Memberships: []*action.MembershipItem{res}}, orgMembershipsTableOutput)
 		},
 	}
 

app/cli/cmd/output.go

@@ -53,7 +53,8 @@ type tabulatedData interface {
 		[]*action.OrgInvitationItem |
 		*action.APITokenItem |
 		[]*action.APITokenItem |
-		*action.AttestationStatusMaterial
+		*action.AttestationStatusMaterial |
+		*action.ListMembershipResult
 }
 
 var ErrOutputFormatNotImplemented = errors.New("format not implemented")

app/cli/cmd/policy_develop.go

@@ -28,6 +28,6 @@ Refer to https://docs.chainloop.dev/guides/custom-policies
 `,
 	}
 
-	cmd.AddCommand(newPolicyDevelopEvalCmd())
+	cmd.AddCommand(newPolicyDevelopInitCmd(), newPolicyDevelopEvalCmd())
 	return cmd
 }

app/cli/cmd/policy_develop_init.go

@@ -0,0 +1,78 @@
+//
+// Copyright 2025 The Chainloop Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/spf13/cobra"
+)
+
+func newPolicyDevelopInitCmd() *cobra.Command {
+	var (
+		force       bool
+		embedded    bool
+		name        string
+		description string
+		directory   string
+	)
+
+	cmd := &cobra.Command{
+		Use:   "init",
+		Short: "Initialize a new policy",
+		Long: `Initialize a new policy by creating template policy files in the specified directory.
+By default, it creates chainloop-policy.yaml and chainloop-policy.rego files.`,
+		Example: `  
+  # Initialize in current directory with separate files
+  chainloop policy develop init
+
+  # Initialize in specific directory with embedded format and policy name
+  chainloop policy develop init --directory ./policies --embedded --name mypolicy`,
+		RunE: func(_ *cobra.Command, _ []string) error {
+			if directory == "" {
+				directory = "."
+			}
+			opts := &action.PolicyInitOpts{
+				Force:       force,
+				Embedded:    embedded,
+				Name:        name,
+				Description: description,
+				Directory:   directory,
+			}
+
+			policyInit, err := action.NewPolicyInit(opts, actionOpts)
+			if err != nil {
+				return fmt.Errorf("failed to initialize policy: %w", err)
+			}
+
+			if err := policyInit.Run(); err != nil {
+				return newGracefulError(err)
+			}
+
+			logger.Info().Msg("Initialized policy files")
+
+			return nil
+		},
+	}
+
+	cmd.Flags().BoolVarP(&force, "force", "f", false, "overwrite existing files")
+	cmd.Flags().BoolVar(&embedded, "embedded", false, "initialize an embedded policy (single YAML file)")
+	cmd.Flags().StringVar(&name, "name", "", "name of the policy")
+	cmd.Flags().StringVar(&description, "description", "", "description of the policy")
+	cmd.Flags().StringVar(&directory, "directory", "", "directory for policy")
+	return cmd
+}

app/cli/documentation/cli-reference.mdx

@@ -2573,10 +2573,38 @@ List the members of the current organization
 chainloop organization member list [flags]
 ```
 
+Examples
+
+```
+Let the default pagination apply
+chainloop organization member list
+
+Specify the page and page size
+chainloop organization member list --page 2 --limit 10
+
+Filter by name
+chainloop organization member list --name alice
+
+Filter by email
+chainloop organization member list --email alice@example.com
+
+Filter by role
+chainloop organization member list --role admin
+
+Combine filters and pagination
+chainloop organization member list --role admin --page 2 --limit 5
+
+```
+
 Options
 
 ```
--h, --help   help for list
+--email string   Filter by member email
+-h, --help           help for list
+--limit int      number of items to show (default 50)
+--name string    Filter by member name or last name
+--page int       page number (default 1)
+--role string    Role of the user in the organization, available admin, owner, viewer
 ```
 
 Options inherited from parent commands
@@ -2839,6 +2867,57 @@ Options inherited from parent commands
 -y, --yes                       Skip confirmation
 ```
 
+#### chainloop policy develop init
+
+Initialize a new policy
+
+Synopsis
+
+Initialize a new policy by creating template policy files in the specified directory.
+By default, it creates chainloop-policy.yaml and chainloop-policy.rego files.
+
+```
+chainloop policy develop init [flags]
+```
+
+Examples
+
+```
+
+Initialize in current directory with separate files
+chainloop policy develop init
+
+Initialize in specific directory with embedded format and policy name
+chainloop policy develop init --directory ./policies --embedded --name mypolicy
+```
+
+Options
+
+```
+--description string   description of the policy
+--directory string     directory for policy
+--embedded             initialize an embedded policy (single YAML file)
+-f, --force                overwrite existing files
+-h, --help                 help for init
+--name string          name of the policy
+```
+
+Options inherited from parent commands
+
+```
+--artifact-cas string       URL for the Artifacts Content Addressable Storage API ($CHAINLOOP_ARTIFACT_CAS_API) (default "api.cas.chainloop.dev:443")
+--artifact-cas-ca string    CUSTOM CA file for the Artifacts CAS API (optional) ($CHAINLOOP_ARTIFACT_CAS_API_CA)
+-c, --config string             Path to an existing config file (default is $HOME/.config/chainloop/config.toml)
+--control-plane string      URL for the Control Plane API ($CHAINLOOP_CONTROL_PLANE_API) (default "api.cp.chainloop.dev:443")
+--control-plane-ca string   CUSTOM CA file for the Control Plane API (optional) ($CHAINLOOP_CONTROL_PLANE_API_CA)
+--debug                     Enable debug/verbose logging mode
+-i, --insecure                  Skip TLS transport during connection to the control plane ($CHAINLOOP_API_INSECURE)
+-n, --org string                organization name
+-o, --output string             Output format, valid options are json and table (default "table")
+-t, --token string              API token. NOTE: Alternatively use the env variable CHAINLOOP_TOKEN
+-y, --yes                       Skip confirmation
+```
+
 ### chainloop policy help
 
 Help about any command