Skip to content

fix:job name support added in input variables #4863

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
merged 5 commits into from
Apr 9, 2024
Merged

fix:job name support added in input variables #4863

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75e4fee
job name added
Laeeqdev Apr 1, 2024
3017e7c
resolved PR code review comments
Laeeqdev Apr 1, 2024
a932bd1
resolved PR code review comments final
Laeeqdev Apr 2, 2024
7509546
Merge branch 'main' into wrong-job-name-printed
Laeeqdev Apr 9, 2024
b96264a
Merge branch 'main' into wrong-job-name-printed
Laeeqdev Apr 9, 2024
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 api/restHandler/GlobalPluginRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func (handler *GlobalPluginRestHandlerImpl) GetAllGlobalVariables(w http.Respons
common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
return
}
globalVariables, err := handler.globalPluginService.GetAllGlobalVariables()
globalVariables, err := handler.globalPluginService.GetAllGlobalVariables(app.AppType)
if err != nil {
handler.logger.Errorw("error in getting global variable list", "err", err)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand Down
2 changes: 1 addition & 1 deletion pkg/pipeline/CiService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ func (impl *CiServiceImpl) buildWfRequestForCiPipeline(pipeline *pipelineConfig.
PreCiSteps: preCiSteps,
PostCiSteps: postCiSteps,
RefPlugins: refPluginsData,
AppName: pipeline.App.AppName,
AppName: pipeline.App.DisplayName,
TriggerByAuthor: userEmailId,
CiBuildConfig: ciBuildConfigBean,
CiBuildDockerMtuValue: impl.config.CiRunnerDockerMTUValue,
Expand Down
26 changes: 18 additions & 8 deletions pkg/plugin/GlobalPluginService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package plugin
import (
"errors"
"fmt"
"github.com/devtron-labs/devtron/internal/sql/repository/helper"
repository2 "github.com/devtron-labs/devtron/pkg/pipeline/repository"
"github.com/devtron-labs/devtron/pkg/plugin/repository"
"github.com/devtron-labs/devtron/pkg/sql"
Expand Down Expand Up @@ -37,7 +38,7 @@ const (
)

type GlobalPluginService interface {
GetAllGlobalVariables() ([]*GlobalVariable, error)
GetAllGlobalVariables(appType helper.AppType) ([]*GlobalVariable, error)
ListAllPlugins(stageTypeReq string) ([]*PluginListComponentDto, error)
GetPluginDetailById(pluginId int) (*PluginDetailDto, error)
GetRefPluginIdByRefPluginName(pluginName string) (refPluginId int, err error)
Expand All @@ -61,7 +62,7 @@ type GlobalPluginServiceImpl struct {
pipelineStageRepository repository2.PipelineStageRepository
}

func (impl *GlobalPluginServiceImpl) GetAllGlobalVariables() ([]*GlobalVariable, error) {
func (impl *GlobalPluginServiceImpl) GetAllGlobalVariables(appType helper.AppType) ([]*GlobalVariable, error) {
globalVariables := []*GlobalVariable{
{
Name: "WORKING_DIRECTORY",
Expand Down Expand Up @@ -93,12 +94,6 @@ func (impl *GlobalPluginServiceImpl) GetAllGlobalVariables() ([]*GlobalVariable,
Description: "Complete image name(repository+registry+tag).",
Type: "ci",
},
{
Name: "APP_NAME",
Format: string(repository.PLUGIN_VARIABLE_FORMAT_TYPE_STRING),
Description: "Name of the app this pipeline resides in.",
Type: "ci",
},
{
Name: "TRIGGER_BY_AUTHOR",
Format: string(repository.PLUGIN_VARIABLE_FORMAT_TYPE_STRING),
Expand Down Expand Up @@ -172,6 +167,21 @@ func (impl *GlobalPluginServiceImpl) GetAllGlobalVariables() ([]*GlobalVariable,
Type: "cd",
},
}
globalVariable := &GlobalVariable{
Name: "APP_NAME",
Format: string(repository.PLUGIN_VARIABLE_FORMAT_TYPE_STRING),
Description: "Name of the app this pipeline resides in.",
Type: "ci",
}
if appType == helper.Job {
globalVariable = &GlobalVariable{
Name: "JOB_NAME",
Format: string(repository.PLUGIN_VARIABLE_FORMAT_TYPE_STRING),
Description: "Name of the Job this pipeline resides in.",
Type: "ci",
}
}
globalVariables = append(globalVariables, globalVariable)
return globalVariables, nil
}

Expand Down