clean: rename state context funcs

jippi · May 9, 2024 · 7a9bc28 · 7a9bc28
1 parent c25c519
commit 7a9bc28
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/pkg/scm/gitlab/client_actioner.go b/pkg/scm/gitlab/client_actioner.go
@@ -43,7 +43,7 @@ func (c *Client) ApplyStep(ctx context.Context, update *scm.UpdateMergeRequestOp
 			return nil
 		}
 
-		_, _, err := c.wrapped.MergeRequestApprovals.ApproveMergeRequest(state.ProjectIDFromContext(ctx), state.MergeRequestIDFromContextInt(ctx), &gitlab.ApproveMergeRequestOptions{})
+		_, _, err := c.wrapped.MergeRequestApprovals.ApproveMergeRequest(state.ProjectID(ctx), state.MergeRequestIDInt(ctx), &gitlab.ApproveMergeRequestOptions{})
 
 		return err
 
@@ -54,7 +54,7 @@ func (c *Client) ApplyStep(ctx context.Context, update *scm.UpdateMergeRequestOp
 			return nil
 		}
 
-		_, err := c.wrapped.MergeRequestApprovals.UnapproveMergeRequest(state.ProjectIDFromContext(ctx), state.MergeRequestIDFromContextInt(ctx))
+		_, err := c.wrapped.MergeRequestApprovals.UnapproveMergeRequest(state.ProjectID(ctx), state.MergeRequestIDInt(ctx))
 
 		return err
 
@@ -79,7 +79,7 @@ func (c *Client) ApplyStep(ctx context.Context, update *scm.UpdateMergeRequestOp
 			return nil
 		}
 
-		_, _, err := c.wrapped.Notes.CreateMergeRequestNote(state.ProjectIDFromContext(ctx), state.MergeRequestIDFromContextInt(ctx), &gitlab.CreateMergeRequestNoteOptions{
+		_, _, err := c.wrapped.Notes.CreateMergeRequestNote(state.ProjectID(ctx), state.MergeRequestIDInt(ctx), &gitlab.CreateMergeRequestNoteOptions{
 			Body: gitlab.Ptr(msgString),
 		})
 

diff --git a/pkg/scm/gitlab/client_label.go b/pkg/scm/gitlab/client_label.go
@@ -65,7 +65,7 @@ func (client *LabelClient) List(ctx context.Context) ([]*scm.Label, error) {
 }
 
 func (client *LabelClient) list(ctx context.Context, opt *scm.ListLabelsOptions) ([]*scm.Label, *scm.Response, error) {
-	project, err := ParseID(state.ProjectIDFromContext(ctx))
+	project, err := ParseID(state.ProjectID(ctx))
 	if err != nil {
 		return nil, nil, err
 	}
@@ -95,7 +95,7 @@ func (client *LabelClient) Create(ctx context.Context, opt *scm.CreateLabelOptio
 	// Invalidate cache
 	client.cache = nil
 
-	project, err := ParseID(state.ProjectIDFromContext(ctx))
+	project, err := ParseID(state.ProjectID(ctx))
 	if err != nil {
 		return nil, nil, err
 	}
@@ -125,7 +125,7 @@ func (client *LabelClient) Update(ctx context.Context, opt *scm.UpdateLabelOptio
 	// Invalidate cache
 	client.cache = nil
 
-	project, err := ParseID(state.ProjectIDFromContext(ctx))
+	project, err := ParseID(state.ProjectID(ctx))
 	if err != nil {
 		return nil, nil, err
 	}

diff --git a/pkg/scm/gitlab/client_merge_request.go b/pkg/scm/gitlab/client_merge_request.go
@@ -25,12 +25,12 @@ func NewMergeRequestClient(client *Client) *MergeRequestClient {
 }
 
 func (client *MergeRequestClient) Update(ctx context.Context, opt *scm.UpdateMergeRequestOptions) (*scm.Response, error) {
-	project, err := ParseID(state.ProjectIDFromContext(ctx))
+	project, err := ParseID(state.ProjectID(ctx))
 	if err != nil {
 		return nil, err
 	}
 
-	endpoint := fmt.Sprintf("projects/%s/merge_requests/%s", go_gitlab.PathEscape(project), state.MergeRequestIDFromContext(ctx))
+	endpoint := fmt.Sprintf("projects/%s/merge_requests/%s", go_gitlab.PathEscape(project), state.MergeRequestID(ctx))
 
 	options := []go_gitlab.RequestOptionFunc{
 		go_gitlab.WithContext(ctx),
@@ -49,7 +49,7 @@ func (client *MergeRequestClient) Update(ctx context.Context, opt *scm.UpdateMer
 }
 
 func (client *MergeRequestClient) GetRemoteConfig(ctx context.Context, filename, ref string) (io.Reader, error) {
-	project, err := ParseID(state.ProjectIDFromContext(ctx))
+	project, err := ParseID(state.ProjectID(ctx))
 	if err != nil {
 		return nil, err
 	}
@@ -77,7 +77,7 @@ func (client *MergeRequestClient) List(ctx context.Context, options *scm.ListMer
 	var (
 		result    *ListMergeRequestsQuery
 		variables = map[string]any{
-			"project_id": graphql.ID(state.ProjectIDFromContext(ctx)),
+			"project_id": graphql.ID(state.ProjectID(ctx)),
 			"state":      MergeRequestState(options.State),
 			"first":      options.First,
 		}

diff --git a/pkg/scm/gitlab/context.go b/pkg/scm/gitlab/context.go
@@ -27,8 +27,8 @@ func NewContext(ctx context.Context, baseURL, token string) (*Context, error) {
 	var (
 		evalContext *Context
 		variables   = map[string]any{
-			"project_id": graphql.ID(state.ProjectIDFromContext(ctx)),
-			"mr_id":      state.MergeRequestIDFromContext(ctx),
+			"project_id": graphql.ID(state.ProjectID(ctx)),
+			"mr_id":      state.MergeRequestID(ctx),
 		}
 	)
 

diff --git a/pkg/state/context.go b/pkg/state/context.go
@@ -24,7 +24,7 @@ func NewContext(project, mr string) context.Context {
 	return ctx
 }
 
-func ProjectIDFromContext(ctx context.Context) string {
+func ProjectID(ctx context.Context) string {
 	return ctx.Value(projectID).(string) //nolint:forcetypeassert
 }
 
@@ -53,12 +53,12 @@ func ContextWithMergeRequestID(ctx context.Context, id string) context.Context {
 	return ctx
 }
 
-func MergeRequestIDFromContext(ctx context.Context) string {
+func MergeRequestID(ctx context.Context) string {
 	return ctx.Value(mergeRequestID).(string) //nolint:forcetypeassert
 }
 
-func MergeRequestIDFromContextInt(ctx context.Context) int {
-	val := MergeRequestIDFromContext(ctx)
+func MergeRequestIDInt(ctx context.Context) int {
+	val := MergeRequestID(ctx)
 
 	number, err := strconv.Atoi(val)
 	if err != nil {