From 519ada17e462f78f958f8782edf5241eec43e0c4 Mon Sep 17 00:00:00 2001 From: Anthony Zhao Date: Fri, 5 Apr 2024 14:04:27 -0700 Subject: [PATCH 1/4] Changed method to search --- pkg/client/policy.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/client/policy.go b/pkg/client/policy.go index 6a656e1e..48aa903e 100644 --- a/pkg/client/policy.go +++ b/pkg/client/policy.go @@ -3,7 +3,6 @@ package client import ( "context" - "github.com/conductorone/conductorone-sdk-go/pkg/models/operations" "github.com/conductorone/conductorone-sdk-go/pkg/models/shared" ) @@ -12,9 +11,9 @@ func (c *client) ListPolicies(ctx context.Context) ([]shared.Policy, error) { pageSize := float64(100) pageToken := "" for { - resp, err := c.sdk.Policies.List(ctx, operations.C1APIPolicyV1PoliciesListRequest{ - PageToken: &pageToken, + resp, err := c.sdk.PolicySearch.Search(ctx, &shared.SearchPoliciesRequest{ PageSize: &pageSize, + PageToken: &pageToken, }) if err != nil { return nil, err From 73bb8259b93cc878f2c41f73de6456bbe7e8a814 Mon Sep 17 00:00:00 2001 From: Anthony Zhao Date: Fri, 5 Apr 2024 14:11:43 -0700 Subject: [PATCH 2/4] Lint --- cmd/cone/task_flags.go | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/cmd/cone/task_flags.go b/cmd/cone/task_flags.go index 4cd2fa8b..87308cdc 100644 --- a/cmd/cone/task_flags.go +++ b/cmd/cone/task_flags.go @@ -3,14 +3,14 @@ package main import "github.com/spf13/cobra" const ( - accessReviewIdsFlag = "access-review-id" - appEntitlementIdsFlag = "app-entitlement-id" - appResourceIdsFlag = "app-resource-id" - appResourceTypeIdsFlag = "app-resource-type-id" - appUserSubjectIdsFlag = "app-user-subject-id" - userSubjectIdsFlag = "user-subject-id" - appIdsFlag = "app-id" - assigneeIdsFlag = "assignee-id" + accessReviewIDsFlag = "access-review-id" + appEntitlementIDsFlag = "app-entitlement-id" + appResourceIDsFlag = "app-resource-id" + appResourceTypeIDsFlag = "app-resource-type-id" + appUserSubjectIDsFlag = "app-user-subject-id" + userSubjectIDsFlag = "user-subject-id" + appIDsFlag = "app-id" + assigneeIDsFlag = "assignee-id" stateFlag = "state" taskTypeFlag = "task-type" includeDeletedFlag = "include-deleted" @@ -20,29 +20,29 @@ const ( func addCommentFlag(cmd *cobra.Command) { cmd.Flags().String(commentFlag, "", "Comment to add to the task when performing an action") } -func addAccessReviewIdsFlag(cmd *cobra.Command) { - cmd.Flags().StringSlice(accessReviewIdsFlag, nil, "Filter tasks by access review id(s) (access review campaign this task belongs to)") +func addAccessReviewIDsFlag(cmd *cobra.Command) { + cmd.Flags().StringSlice(accessReviewIDsFlag, nil, "Filter tasks by access review id(s) (access review campaign this task belongs to)") } -func addAppEntitlementIdsFlag(cmd *cobra.Command) { - cmd.Flags().StringSlice(appEntitlementIdsFlag, nil, "Filter tasks by app entitlement id(s) (target app entitlement of the ticket)") +func addAppEntitlementIDsFlag(cmd *cobra.Command) { + cmd.Flags().StringSlice(appEntitlementIDsFlag, nil, "Filter tasks by app entitlement id(s) (target app entitlement of the ticket)") } -func addAppResourceIdsFlag(cmd *cobra.Command) { - cmd.Flags().StringSlice(appResourceIdsFlag, nil, "Filter tasks by app resource id(s) (target resource of the ticket)") +func addAppResourceIDsFlag(cmd *cobra.Command) { + cmd.Flags().StringSlice(appResourceIDsFlag, nil, "Filter tasks by app resource id(s) (target resource of the ticket)") } -func addAppResourceTypeIdsFlag(cmd *cobra.Command) { - cmd.Flags().StringSlice(appResourceTypeIdsFlag, nil, "Filter tasks by app resource type id(s) (target resource type of the task)") +func addAppResourceTypeIDsFlag(cmd *cobra.Command) { + cmd.Flags().StringSlice(appResourceTypeIDsFlag, nil, "Filter tasks by app resource type id(s) (target resource type of the task)") } -func addAppUserSubjectIdsFlag(cmd *cobra.Command) { - cmd.Flags().StringSlice(appUserSubjectIdsFlag, nil, "Filter tasks by app user subject id(s) (target of the task)") +func addAppUserSubjectIDsFlag(cmd *cobra.Command) { + cmd.Flags().StringSlice(appUserSubjectIDsFlag, nil, "Filter tasks by app user subject id(s) (target of the task)") } -func addUserSubjectIdsFlag(cmd *cobra.Command) { - cmd.Flags().StringSlice(userSubjectIdsFlag, nil, "Filter tasks by user subject id(s) (c1 user target of the task)") +func addUserSubjectIDsFlag(cmd *cobra.Command) { + cmd.Flags().StringSlice(userSubjectIDsFlag, nil, "Filter tasks by user subject id(s) (c1 user target of the task)") } -func addAppApplicationIdsFlag(cmd *cobra.Command) { - cmd.Flags().StringSlice(appIdsFlag, nil, "Filter tasks by app application id(s) (target application of the task)") +func addAppApplicationIDsFlag(cmd *cobra.Command) { + cmd.Flags().StringSlice(appIDsFlag, nil, "Filter tasks by app application id(s) (target application of the task)") } -func addAssigneesIds(cmd *cobra.Command) { - cmd.Flags().StringSlice(assigneeIdsFlag, nil, "Filter tasks by who is currently assigned to them") +func addAssigneesIDs(cmd *cobra.Command) { + cmd.Flags().StringSlice(assigneeIDsFlag, nil, "Filter tasks by who is currently assigned to them") } func addQueryTaskFlag(cmd *cobra.Command) { From 7b0323bac088fe5b9cf701dd089c697b8c3832b0 Mon Sep 17 00:00:00 2001 From: Anthony Zhao Date: Fri, 5 Apr 2024 14:13:12 -0700 Subject: [PATCH 3/4] LINT --- cmd/cone/task_search.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/cone/task_search.go b/cmd/cone/task_search.go index c583cea8..75486a62 100644 --- a/cmd/cone/task_search.go +++ b/cmd/cone/task_search.go @@ -80,18 +80,18 @@ func searchTasksRun(cmd *cobra.Command, args []string) error { } taskResp, err := c.SearchTasks(ctx, shared.TaskSearchRequestInput{ - AccessReviewIds: v.GetStringSlice(accessReviewIdsFlag), - AppEntitlementIds: v.GetStringSlice(appEntitlementIdsFlag), - AppResourceIds: v.GetStringSlice(appResourceIdsFlag), - AppResourceTypeIds: v.GetStringSlice(appResourceTypeIdsFlag), - AppUserSubjectIds: v.GetStringSlice(appUserSubjectIdsFlag), - ApplicationIds: v.GetStringSlice(appIdsFlag), - AssigneesInIds: v.GetStringSlice(assigneeIdsFlag), + AccessReviewIds: v.GetStringSlice(accessReviewIDsFlag), + AppEntitlementIds: v.GetStringSlice(appEntitlementIDsFlag), + AppResourceIds: v.GetStringSlice(appResourceIDsFlag), + AppResourceTypeIds: v.GetStringSlice(appResourceTypeIDsFlag), + AppUserSubjectIds: v.GetStringSlice(appUserSubjectIDsFlag), + ApplicationIds: v.GetStringSlice(appIDsFlag), + AssigneesInIds: v.GetStringSlice(assigneeIDsFlag), IncludeDeleted: includeDeleted, Query: query, TaskStates: state, TaskTypes: taskTypes, - SubjectIds: v.GetStringSlice(userSubjectIdsFlag), + SubjectIds: v.GetStringSlice(userSubjectIDsFlag), }) if err != nil { return err From 49f7fdca6c0f7dcf6d56f30be55579a8d6018bfc Mon Sep 17 00:00:00 2001 From: Anthony Zhao Date: Fri, 5 Apr 2024 14:14:23 -0700 Subject: [PATCH 4/4] lint --- cmd/cone/task_search.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/cone/task_search.go b/cmd/cone/task_search.go index 75486a62..9bb89d5c 100644 --- a/cmd/cone/task_search.go +++ b/cmd/cone/task_search.go @@ -17,14 +17,14 @@ func searchTasksCmd() *cobra.Command { RunE: searchTasksRun, } - addAccessReviewIdsFlag(cmd) - addAppEntitlementIdsFlag(cmd) - addAppResourceIdsFlag(cmd) - addAppResourceTypeIdsFlag(cmd) - addAppUserSubjectIdsFlag(cmd) - addUserSubjectIdsFlag(cmd) - addAppApplicationIdsFlag(cmd) - addAssigneesIds(cmd) + addAccessReviewIDsFlag(cmd) + addAppEntitlementIDsFlag(cmd) + addAppResourceIDsFlag(cmd) + addAppResourceTypeIDsFlag(cmd) + addAppUserSubjectIDsFlag(cmd) + addUserSubjectIDsFlag(cmd) + addAppApplicationIDsFlag(cmd) + addAssigneesIDs(cmd) addQueryTaskFlag(cmd) addTaskStatesFlag(cmd) addTaskTypesFlag(cmd)