From 58de05ed1ce581190b827dcdffcf82561d138191 Mon Sep 17 00:00:00 2001 From: Caio Queiroz Date: Mon, 21 Oct 2024 21:03:19 -0300 Subject: [PATCH] fix: lint --- backend/plugins/gitextractor/impl/impl.go | 4 +--- backend/plugins/gitextractor/parser/taskdata.go | 4 ++-- backend/plugins/github/api/blueprint_v200.go | 12 ++++++------ backend/plugins/github/impl/impl.go | 9 ++++++--- backend/plugins/gitlab/api/blueprint_v200.go | 12 ++++++------ 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/backend/plugins/gitextractor/impl/impl.go b/backend/plugins/gitextractor/impl/impl.go index 93a4f40df1a..18d2054bad3 100644 --- a/backend/plugins/gitextractor/impl/impl.go +++ b/backend/plugins/gitextractor/impl/impl.go @@ -73,18 +73,16 @@ func (p GitExtractor) PrepareTaskData(taskCtx plugin.TaskContext, options map[st return nil, err } - if op.PluginName != "" { pluginInstance, err := plugin.GetPlugin(op.PluginName) if err != nil { return nil, errors.Default.Wrap(err, fmt.Sprintf("failed to get plugin instance for plugin: %s", op.PluginName)) - } if pluginGit, ok := pluginInstance.(DynamicGitUrl); ok { gitUrl, err := pluginGit.GetDynamicGitUrl(taskCtx, op.ConnectionId, op.Url) if err != nil { - return nil, errors.Default.Wrap(err, "failed to get Git URL") + return nil, errors.Default.Wrap(err, "failed to get Git URL") } op.Url = gitUrl diff --git a/backend/plugins/gitextractor/parser/taskdata.go b/backend/plugins/gitextractor/parser/taskdata.go index 7cc7b31f88d..8dccf5ffe9f 100644 --- a/backend/plugins/gitextractor/parser/taskdata.go +++ b/backend/plugins/gitextractor/parser/taskdata.go @@ -45,6 +45,6 @@ type GitExtractorOptions struct { SkipCommitStat *bool `json:"skipCommitStat" mapstructure:"skipCommitStat" comment:"skip all commit stat including added/deleted lines and commit files as well"` SkipCommitFiles *bool `json:"skipCommitFiles" mapstructure:"skipCommitFiles"` NoShallowClone bool `json:"noShallowClone" mapstructure:"noShallowClone"` - ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId,omitempty"` - PluginName string `json:"pluginName" mapstructure:"pluginName,omitempty"` + ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId,omitempty"` + PluginName string `json:"pluginName" mapstructure:"pluginName,omitempty"` } diff --git a/backend/plugins/github/api/blueprint_v200.go b/backend/plugins/github/api/blueprint_v200.go index 27c900f7631..4367951a0d0 100644 --- a/backend/plugins/github/api/blueprint_v200.go +++ b/backend/plugins/github/api/blueprint_v200.go @@ -131,13 +131,13 @@ func makeDataSourcePipelinePlanV200( stage = append(stage, &coreModels.PipelineTask{ Plugin: "gitextractor", Options: map[string]interface{}{ - "url": cloneUrl.String(), - "name": githubRepo.FullName, - "fullName": githubRepo.FullName, - "repoId": didgen.NewDomainIdGenerator(&models.GithubRepo{}).Generate(connection.ID, githubRepo.GithubId), - "proxy": connection.Proxy, + "url": cloneUrl.String(), + "name": githubRepo.FullName, + "fullName": githubRepo.FullName, + "repoId": didgen.NewDomainIdGenerator(&models.GithubRepo{}).Generate(connection.ID, githubRepo.GithubId), + "proxy": connection.Proxy, "connectionId": githubRepo.ConnectionId, - "pluginName": "github", + "pluginName": "github", }, }) diff --git a/backend/plugins/github/impl/impl.go b/backend/plugins/github/impl/impl.go index a299fbd7ff1..7cab40b5ade 100644 --- a/backend/plugins/github/impl/impl.go +++ b/backend/plugins/github/impl/impl.go @@ -177,7 +177,6 @@ func (p Github) PrepareTaskData(taskCtx plugin.TaskContext, options map[string]i if err = regexEnricher.TryAdd(devops.ENV_NAME_PATTERN, op.ScopeConfig.EnvNamePattern); err != nil { return nil, errors.BadInput.Wrap(err, "invalid value for `envNamePattern`") } - } taskData.RegexEnricher = regexEnricher @@ -292,7 +291,10 @@ func (p Github) GetDynamicGitUrl(taskCtx plugin.TaskContext, connectionId uint64 return "", err } - connection.PrepareApiClient(apiClient) + err = connection.PrepareApiClient(apiClient) + if err != nil { + return "", err + } newUrl, err := replaceAcessTokenInUrl(repoUrl, connection.Token) if err != nil { @@ -304,7 +306,8 @@ func (p Github) GetDynamicGitUrl(taskCtx plugin.TaskContext, connectionId uint64 func EnrichOptions(taskCtx plugin.TaskContext, op *tasks.GithubOptions, - apiClient *helper.ApiClient) errors.Error { + apiClient *helper.ApiClient, +) errors.Error { var githubRepo models.GithubRepo // validate the op and set name=owner/repo if this is from advanced mode or bpV100 err := tasks.ValidateTaskOptions(op) diff --git a/backend/plugins/gitlab/api/blueprint_v200.go b/backend/plugins/gitlab/api/blueprint_v200.go index c51ba221070..bf870a8e8ba 100644 --- a/backend/plugins/gitlab/api/blueprint_v200.go +++ b/backend/plugins/gitlab/api/blueprint_v200.go @@ -136,13 +136,13 @@ func makePipelinePlanV200( stage = append(stage, &coreModels.PipelineTask{ Plugin: "gitextractor", Options: map[string]interface{}{ - "url": cloneUrl.String(), - "name": gitlabProject.Name, - "fullName": gitlabProject.PathWithNamespace, - "repoId": didgen.NewDomainIdGenerator(&models.GitlabProject{}).Generate(connection.ID, gitlabProject.GitlabId), - "proxy": connection.Proxy, + "url": cloneUrl.String(), + "name": gitlabProject.Name, + "fullName": gitlabProject.PathWithNamespace, + "repoId": didgen.NewDomainIdGenerator(&models.GitlabProject{}).Generate(connection.ID, gitlabProject.GitlabId), + "proxy": connection.Proxy, "connectionId": gitlabProject.ConnectionId, - "pluginName": "gitlab", + "pluginName": "gitlab", }, }) }