Skip to content

refactor: deprecate specifying timeAfter via taskOptions #7323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abeizn merged 1 commit into from
Apr 15, 2024
Merged

refactor: deprecate specifying timeAfter via taskOptions #7323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions backend/plugins/ae/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ import (
)

type AeOptions struct {
ConnectionId uint64 `json:"connectionId"`
ProjectId int
helper.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId"`
ProjectId int
}

type AeTaskData struct {
Expand Down
11 changes: 4 additions & 7 deletions backend/plugins/bamboo/models/task.go → backend/plugins/bamboo/models/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ limitations under the License.

package models

import "github.com/apache/incubator-devlake/helpers/pluginhelper/api"

type BambooApiParams struct {
ConnectionId uint64 `json:"connectionId"`
PlanKey string
Expand All @@ -29,9 +27,8 @@ type BambooOptions struct {
// options means some custom params required by plugin running.
// Such As How many rows do your want
// You can use it in sub tasks and you need pass it in main.go and pipelines.
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId"`
PlanKey string `json:"planKey" mapstructure:"planKey"`
ScopeConfigId uint64 ` json:"scopeConfigId" mapstructure:"scopeConfigId,omitempty"`
*BambooScopeConfig `json:"scopeConfig" mapstructure:"scopeConfig,omitempty"`
api.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId"`
PlanKey string `json:"planKey" mapstructure:"planKey"`
ScopeConfigId uint64 ` json:"scopeConfigId" mapstructure:"scopeConfigId,omitempty"`
*BambooScopeConfig `json:"scopeConfig" mapstructure:"scopeConfig,omitempty"`
}
1 change: 0 additions & 1 deletion backend/plugins/bitbucket/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ type BitbucketOptions struct {
FullName string `json:"fullName" mapstructure:"fullName"`
ScopeConfigId uint64 `json:"scopeConfigId" mapstructure:"scopeConfigId,omitempty"`
*models.BitbucketScopeConfig `mapstructure:"scopeConfig,omitempty" json:"scopeConfig"`
api.CollectorOptions `mapstructure:",squash"`
}

type BitbucketTaskData struct {
Expand Down
11 changes: 5 additions & 6 deletions backend/plugins/circleci/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@ import (
)

type CircleciOptions struct {
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId"`
ProjectSlug string `json:"projectSlug" mapstructure:"projectSlug"`
PageSize uint64 `mapstruct:"pageSize" mapstructure:"pageSize,omitempty"`
ScopeConfigId uint64 `json:"scopeConfigId" mapstructure:"scopeConfigId,omitempty"`
ScopeConfig *models.CircleciScopeConfig `json:"scopeConfig" mapstructure:"scopeConfig,omitempty"`
helper.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId"`
ProjectSlug string `json:"projectSlug" mapstructure:"projectSlug"`
PageSize uint64 `mapstruct:"pageSize" mapstructure:"pageSize,omitempty"`
ScopeConfigId uint64 `json:"scopeConfigId" mapstructure:"scopeConfigId,omitempty"`
ScopeConfig *models.CircleciScopeConfig `json:"scopeConfig" mapstructure:"scopeConfig,omitempty"`
}

type CircleciTaskData struct {
Expand Down
5 changes: 1 addition & 4 deletions backend/plugins/customize/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ limitations under the License.

package tasks

import "github.com/apache/incubator-devlake/helpers/pluginhelper/api"

type MappingRules struct {
Table string `json:"table" example:"issues"`
RawDataTable string `json:"rawDataTable" example:"_raw_jira_api_issues"`
Expand All @@ -27,8 +25,7 @@ type MappingRules struct {
}

type Options struct {
TransformationRules []MappingRules `json:"transformationRules"`
api.CollectorOptions `mapstructure:",squash"`
TransformationRules []MappingRules `json:"transformationRules"`
}

type TaskData struct {
Expand Down
5 changes: 2 additions & 3 deletions backend/plugins/feishu/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ type FeishuApiParams struct {
}

type FeishuOptions struct {
ConnectionId uint64 `json:"connectionId"`
NumOfDaysToCollect float64 `json:"numOfDaysToCollect"`
helper.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId"`
NumOfDaysToCollect float64 `json:"numOfDaysToCollect"`
}

type FeishuTaskData struct {
Expand Down
9 changes: 4 additions & 5 deletions backend/plugins/gitee/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@ import (
)

type GiteeOptions struct {
ConnectionId uint64 `json:"connectionId"`
Owner string
Repo string
ScopeConfig models.GiteeScopeConfig `mapstructure:"scopeConfig" json:"scopeConfig"`
api.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId"`
Owner string
Repo string
ScopeConfig models.GiteeScopeConfig `mapstructure:"scopeConfig" json:"scopeConfig"`
}

type GiteeTaskData struct {
Expand Down
17 changes: 8 additions & 9 deletions backend/plugins/github/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@ import (
)

type GithubOptions struct {
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId,omitempty"`
ScopeConfigId uint64 `json:"scopeConfigId" mapstructure:"scopeConfigId,omitempty"`
GithubId int `json:"githubId" mapstructure:"githubId,omitempty"`
Owner string `json:"owner" mapstructure:"owner,omitempty"`
Repo string `json:"repo" mapstructure:"repo,omitempty"`
Name string `json:"name" mapstructure:"name,omitempty"`
FullName string `json:"fullName" mapstructure:"fullName,omitempty"`
ScopeConfig *models.GithubScopeConfig `mapstructure:"scopeConfig,omitempty" json:"scopeConfig"`
helper.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId,omitempty"`
ScopeConfigId uint64 `json:"scopeConfigId" mapstructure:"scopeConfigId,omitempty"`
GithubId int `json:"githubId" mapstructure:"githubId,omitempty"`
Owner string `json:"owner" mapstructure:"owner,omitempty"`
Repo string `json:"repo" mapstructure:"repo,omitempty"`
Name string `json:"name" mapstructure:"name,omitempty"`
FullName string `json:"fullName" mapstructure:"fullName,omitempty"`
ScopeConfig *models.GithubScopeConfig `mapstructure:"scopeConfig,omitempty" json:"scopeConfig"`
}

type GithubTaskData struct {
Expand Down
11 changes: 5 additions & 6 deletions backend/plugins/gitlab/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@ import (
)

type GitlabOptions struct {
ConnectionId uint64 `mapstructure:"connectionId" json:"connectionId"`
ProjectId int `mapstructure:"projectId" json:"projectId"`
FullName string `mapstructure:"fullName" json:"fullName"`
ScopeConfigId uint64 `mapstructure:"scopeConfigId" json:"scopeConfigId"`
ScopeConfig *models.GitlabScopeConfig `mapstructure:"scopeConfig" json:"scopeConfig"`
helper.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `mapstructure:"connectionId" json:"connectionId"`
ProjectId int `mapstructure:"projectId" json:"projectId"`
FullName string `mapstructure:"fullName" json:"fullName"`
ScopeConfigId uint64 `mapstructure:"scopeConfigId" json:"scopeConfigId"`
ScopeConfig *models.GitlabScopeConfig `mapstructure:"scopeConfig" json:"scopeConfig"`
}

type GitlabTaskData struct {
Expand Down
3 changes: 1 addition & 2 deletions backend/plugins/icla/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ type IclaOptions struct {
// options means some custom params required by plugin running.
// Such As How many rows do your want
// You can use it in subtasks, and you need to pass it to main.go and pipelines.
Tasks []string `json:"tasks,omitempty"`
helper.CollectorOptions `mapstructure:",squash"`
Tasks []string `json:"tasks,omitempty"`
}

type IclaTaskData struct {
Expand Down
17 changes: 8 additions & 9 deletions backend/plugins/jenkins/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@ import (

type JenkinsApiParams models.JenkinsApiParams
type JenkinsOptions struct {
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId"`
ScopeConfigId uint64 `json:"scopeConfigId" mapstructure:"scopeConfigId,omitempty"`
FullName string `json:"fullName,omitempty" mapstructure:"fullName,omitempty"` // "path1/path2/job name"
JobFullName string `json:"jobFullName,omitempty" mapstructure:"jobFullName,omitempty"` // "path1/path2/job name"
JobName string `json:"jobName,omitempty" mapstructure:"jobName,omitempty"` // "job name"
JobPath string `json:"jobPath,omitempty" mapstructure:"jobPath,omitempty"` // "job/path1/job/path2"
Tasks []string `json:"tasks,omitempty" mapstructure:"tasks,omitempty"`
ScopeConfig *models.JenkinsScopeConfig `mapstructure:"scopeConfig" json:"scopeConfig"`
api.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId"`
ScopeConfigId uint64 `json:"scopeConfigId" mapstructure:"scopeConfigId,omitempty"`
FullName string `json:"fullName,omitempty" mapstructure:"fullName,omitempty"` // "path1/path2/job name"
JobFullName string `json:"jobFullName,omitempty" mapstructure:"jobFullName,omitempty"` // "path1/path2/job name"
JobName string `json:"jobName,omitempty" mapstructure:"jobName,omitempty"` // "job name"
JobPath string `json:"jobPath,omitempty" mapstructure:"jobPath,omitempty"` // "job/path1/job/path2"
Tasks []string `json:"tasks,omitempty" mapstructure:"tasks,omitempty"`
ScopeConfig *models.JenkinsScopeConfig `mapstructure:"scopeConfig" json:"scopeConfig"`
}

type JenkinsTaskData struct {
Expand Down
11 changes: 5 additions & 6 deletions backend/plugins/jira/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@ import (
)

type JiraOptions struct {
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId"`
BoardId uint64 `json:"boardId" mapstructure:"boardId"`
ScopeConfig *models.JiraScopeConfig `json:"scopeConfig" mapstructure:"scopeConfig"`
ScopeConfigId uint64 `json:"scopeConfigId" mapstructure:"scopeConfigId"`
PageSize int `json:"pageSize" mapstructure:"pageSize"`
api.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId"`
BoardId uint64 `json:"boardId" mapstructure:"boardId"`
ScopeConfig *models.JiraScopeConfig `json:"scopeConfig" mapstructure:"scopeConfig"`
ScopeConfigId uint64 `json:"scopeConfigId" mapstructure:"scopeConfigId"`
PageSize int `json:"pageSize" mapstructure:"pageSize"`
}

type JiraTaskData struct {
Expand Down
9 changes: 4 additions & 5 deletions backend/plugins/opsgenie/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ import (
)

type OpsgenieOptions struct {
ConnectionId uint64 `json:"connectionId"`
ServiceId string `json:"service_id,omitempty"`
ServiceName string `json:"service_name,omitempty"`
Tasks []string `json:"tasks,omitempty"`
api.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId"`
ServiceId string `json:"service_id,omitempty"`
ServiceName string `json:"service_name,omitempty"`
Tasks []string `json:"tasks,omitempty"`
*models.OpsenieScopeConfig
}

Expand Down
9 changes: 4 additions & 5 deletions backend/plugins/pagerduty/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ import (
)

type PagerDutyOptions struct {
ConnectionId uint64 `json:"connectionId"`
ServiceId string `json:"service_id,omitempty"`
ServiceName string `json:"service_name,omitempty"`
Tasks []string `json:"tasks,omitempty"`
api.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId"`
ServiceId string `json:"service_id,omitempty"`
ServiceName string `json:"service_name,omitempty"`
Tasks []string `json:"tasks,omitempty"`
*models.PagerdutyScopeConfig
}

Expand Down
3 changes: 1 addition & 2 deletions backend/plugins/slack/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ type SlackApiParams struct {
}

type SlackOptions struct {
ConnectionId uint64 `json:"connectionId"`
helper.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId"`
}

type SlackTaskData struct {
Expand Down
5 changes: 2 additions & 3 deletions backend/plugins/sonarqube/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ type SonarqubeOptions struct {
// options means some custom params required by plugin running.
// Such As How many rows do your want
// You can use it in subtasks, and you need to pass it to main.go and pipelines.
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId"`
ProjectKey string `json:"projectKey" mapstructure:"projectKey"`
api.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId"`
ProjectKey string `json:"projectKey" mapstructure:"projectKey"`
}

type SonarqubeTaskData struct {
Expand Down
13 changes: 6 additions & 7 deletions backend/plugins/tapd/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@ import (
)

type TapdOptions struct {
ConnectionId uint64 `mapstruct:"connectionId"`
WorkspaceId uint64 `mapstruct:"workspaceId"`
PageSize uint64 `mapstruct:"pageSize"`
CstZone *time.Location
ScopeConfigId uint64
ScopeConfig *models.TapdScopeConfig `json:"scopeConfig"`
helper.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `mapstruct:"connectionId"`
WorkspaceId uint64 `mapstruct:"workspaceId"`
PageSize uint64 `mapstruct:"pageSize"`
CstZone *time.Location
ScopeConfigId uint64
ScopeConfig *models.TapdScopeConfig `json:"scopeConfig"`
}

type TapdTaskData struct {
Expand Down
11 changes: 5 additions & 6 deletions backend/plugins/teambition/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ import (
)

type TeambitionOptions struct {
ConnectionId uint64 `json:"connectionId"`
ProjectId string `json:"projectId"`
PageSize uint64 `mapstruct:"pageSize"`
CstZone *time.Location
TransformationRules TransformationRules `json:"transformationRules"`
helper.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId"`
ProjectId string `json:"projectId"`
PageSize uint64 `mapstruct:"pageSize"`
CstZone *time.Location
TransformationRules TransformationRules `json:"transformationRules"`
}

type TeambitionTaskData struct {
Expand Down
9 changes: 4 additions & 5 deletions backend/plugins/trello/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ import (
)

type TrelloOptions struct {
ConnectionId uint64 `json:"connectionId"`
BoardId string `json:"boardId"`
ScopeId string
ScopeConfigId uint64
api.CollectorOptions `mapstructure:",squash"`
ConnectionId uint64 `json:"connectionId"`
BoardId string `json:"boardId"`
ScopeId string
ScopeConfigId uint64
}

type TrelloTaskData struct {
Expand Down
5 changes: 2 additions & 3 deletions backend/plugins/zentao/tasks/task_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ type ZentaoOptions struct {
ConnectionId uint64 `json:"connectionId"`
ProjectId int64 `json:"projectId" mapstructure:"projectId"`
// TODO not support now
ScopeConfigId uint64 `json:"scopeConfigId" mapstructure:"scopeConfigId,omitempty"`
ScopeConfig *models.ZentaoScopeConfig `json:"scopeConfig" mapstructure:"scopeConfig,omitempty"`
helper.CollectorOptions `mapstructure:",squash"`
ScopeConfigId uint64 `json:"scopeConfigId" mapstructure:"scopeConfigId,omitempty"`
ScopeConfig *models.ZentaoScopeConfig `json:"scopeConfig" mapstructure:"scopeConfig,omitempty"`
}

func (o *ZentaoOptions) GetParams() any {
Expand Down