Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/connector/connector.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (ln *Linear) Metadata(ctx context.Context) (*v2.ConnectorMetadata, error) {

// Validate hits the Linear API to assure that the API key is valid.
func (ln *Linear) Validate(ctx context.Context) (annotations.Annotations, error) {
_, _, _, err := ln.client.Authorize(ctx)
_, _, err := ln.client.Authorize(ctx)
if err != nil {
return nil, fmt.Errorf("linear-connector: failed to authenticate. Error: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/connector/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (o *orgResourceType) List(ctx context.Context, parentId *v2.ResourceId, tok
return nil, "", nil, err
}

org, nextTokens, _, restApiRateLimit, err := o.client.GetOrganization(ctx, paginationOptions)
org, nextTokens, restApiRateLimit, err := o.client.GetOrganization(ctx, paginationOptions)
annotations.WithRateLimiting(restApiRateLimit)
if err != nil {
return nil, "", annotations, fmt.Errorf("linear-connector: failed to list an organization: %w", err)
Expand Down Expand Up @@ -115,7 +115,7 @@ func (o *orgResourceType) Grants(ctx context.Context, resource *v2.Resource, tok
return nil, "", nil, err
}

org, nextTokens, _, rlData, err := o.client.GetOrganization(ctx, paginationOptions)
org, nextTokens, rlData, err := o.client.GetOrganization(ctx, paginationOptions)
if err != nil {
return nil, "", nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/connector/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (o *projectResourceType) List(ctx context.Context, parentId *v2.ResourceId,
return nil, "", nil, err
}

projects, nextToken, _, restApiRateLimit, err := o.client.GetProjects(ctx, linear.GetResourcesVars{First: resourcePageSize, After: bag.PageToken()})
projects, nextToken, restApiRateLimit, err := o.client.GetProjects(ctx, linear.GetResourcesVars{First: resourcePageSize, After: bag.PageToken()})
if err != nil {
return nil, "", nil, fmt.Errorf("linear-connector: failed to list projects: %w", err)
}
Expand Down Expand Up @@ -130,7 +130,7 @@ func (o *projectResourceType) Grants(ctx context.Context, resource *v2.Resource,
return nil, "", nil, fmt.Errorf("error fetching project_id from project profile")
}

project, nextTokens, _, rlData, err := o.client.GetProject(
project, nextTokens, rlData, err := o.client.GetProject(
ctx,
linear.GetProjectVars{
ProjectId: projectId,
Expand Down
4 changes: 2 additions & 2 deletions pkg/connector/team.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (o *teamResourceType) List(ctx context.Context, parentId *v2.ResourceId, to
return nil, "", nil, err
}

teams, nextToken, _, rlData, err := o.client.GetTeams(ctx, linear.GetResourcesVars{After: bag.PageToken(), First: resourcePageSize})
teams, nextToken, rlData, err := o.client.GetTeams(ctx, linear.GetResourcesVars{After: bag.PageToken(), First: resourcePageSize})
annotations.WithRateLimiting(rlData)
if err != nil {
return nil, "", annotations, fmt.Errorf("linear-connector: failed to list teams: %w", err)
Expand Down Expand Up @@ -115,7 +115,7 @@ func (o *teamResourceType) Grants(ctx context.Context, resource *v2.Resource, to
return nil, "", nil, err
}

team, nextToken, _, rlData, err := o.client.GetTeam(ctx, linear.GetTeamVars{TeamId: resource.Id.Resource, After: bag.PageToken(), First: resourcePageSize})
team, nextToken, rlData, err := o.client.GetTeam(ctx, linear.GetTeamVars{TeamId: resource.Id.Resource, After: bag.PageToken(), First: resourcePageSize})
annotations.WithRateLimiting(rlData)
if err != nil {
return nil, "", annotations, err
Expand Down
12 changes: 6 additions & 6 deletions pkg/connector/tickets.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ func (ln *Linear) createIssuePayloadFromTicket(ctx context.Context, ticket *v2.T
if label == "" {
continue
}
issueLabel, _, _, err := ln.client.GetIssueLabel(ctx, label)
issueLabel, _, err := ln.client.GetIssueLabel(ctx, label)
if err != nil {
return nil, fmt.Errorf("baton-linear: failed to get issue label: %w", err)
}
if issueLabel == nil {
issueLabel, _, _, err = ln.client.CreateIssueLabel(ctx, label)
issueLabel, _, err = ln.client.CreateIssueLabel(ctx, label)
if err != nil {
return nil, fmt.Errorf("baton-linear: failed to create issue label: %w", err)
}
Expand Down Expand Up @@ -129,14 +129,14 @@ func (ln *Linear) CreateTicket(ctx context.Context, ticket *v2.Ticket, schema *v
}

func (ln *Linear) GetTicketSchema(ctx context.Context, schemaID string) (*v2.TicketSchema, annotations.Annotations, error) {
teams, _, _, _, err := ln.client.ListTeamWorkflowStates(ctx, linear.GetTeamsVars{TeamIDs: []string{schemaID}, First: 2})
teams, _, _, err := ln.client.ListTeamWorkflowStates(ctx, linear.GetTeamsVars{TeamIDs: []string{schemaID}, First: 2})
if err != nil {
return nil, nil, fmt.Errorf("baton-linear: failed to list team workflow states: %w", err)
}
if len(teams) != 1 {
return nil, nil, fmt.Errorf("baton-linear: expected 1 team, got %d", len(teams))
}
fields, _, _, _, err := ln.client.ListIssueFields(ctx)
fields, _, _, err := ln.client.ListIssueFields(ctx)
if err != nil {
return nil, nil, fmt.Errorf("baton-linear: failed to list issue fields: %w", err)
}
Expand All @@ -153,7 +153,7 @@ func (ln *Linear) ListTicketSchemas(ctx context.Context, p *pagination.Token) ([
return nil, "", nil, err
}

teams, nextToken, _, rlData, err := ln.client.ListTeamWorkflowStates(ctx, linear.GetTeamsVars{TeamIDs: ln.ticketSchemaTeamIDs, After: bag.PageToken(), First: resourcePageSize})
teams, nextToken, rlData, err := ln.client.ListTeamWorkflowStates(ctx, linear.GetTeamsVars{TeamIDs: ln.ticketSchemaTeamIDs, After: bag.PageToken(), First: resourcePageSize})
annotations.WithRateLimiting(rlData)
if err != nil {
return nil, "", annotations, fmt.Errorf("baton-linear: failed to list teams: %w", err)
Expand All @@ -164,7 +164,7 @@ func (ln *Linear) ListTicketSchemas(ctx context.Context, p *pagination.Token) ([
return nil, "", annotations, err
}

fields, _, _, rlData, err := ln.client.ListIssueFields(ctx)
fields, _, rlData, err := ln.client.ListIssueFields(ctx)
annotations.WithRateLimiting(rlData)
if err != nil {
return nil, "", annotations, fmt.Errorf("baton-linear: failed to list issue fields: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/connector/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func (o *userResourceType) List(ctx context.Context, parentId *v2.ResourceId, to
return nil, "", nil, err
}

users, nextToken, _, rlData, err := o.client.GetUsers(ctx, linear.GetResourcesVars{First: resourcePageSize, After: bag.PageToken()})
users, nextToken, rlData, err := o.client.GetUsers(ctx, linear.GetResourcesVars{First: resourcePageSize, After: bag.PageToken()})
annotations.WithRateLimiting(rlData)
if err != nil {
return nil, "", annotations, fmt.Errorf("linear-connector: failed to list users: %w", err)
Expand Down
Loading
Loading