feat(api): add git.tag support #3200

bnjjj · 2018-08-14T11:52:28Z

Description
Add support of git tag in CDS.
Related issues
About tests
Mentions
cc @Alkorin

@ovh/cds

Signed-off-by: Benjamin Coenen <[email protected]>

golangci · 2018-08-14T11:53:10Z

engine/worker/builtin_gitclone.go

@@ -233,7 +236,7 @@ func gitClone(w *currentWorker, params *[]sdk.Parameter, url string, dir string,
 	gitURLSSH := sdk.ParameterValue(*params, "git.url")
 	gitURLHTTP := sdk.ParameterValue(*params, "git.http_url")
 	if gitURLSSH == url || gitURLHTTP == url {
-		extractInfo(w, dir, params, clone.Branch, clone.CheckoutCommit, sendLog)
+		extractInfo(w, dir, params, clone.Tag, clone.Branch, clone.CheckoutCommit, sendLog)


Error return value of extractInfo is not checked

yesnault · 2018-08-14T11:59:49Z

engine/worker/builtin_gitclone.go

@@ -207,6 +209,7 @@ func gitClone(w *currentWorker, params *[]sdk.Parameter, url string, dir string,

 	git.LogFunc = log.Info

+	sendLog(fmt.Sprintf("cloneOpts ---> %+v\n", *clone))


yesnault · 2018-08-14T12:04:29Z

engine/worker/builtin_gitclone.go

 		sendLog(fmt.Sprintf("git.branch: %s", branch))
 	}

+	if tag != "" && tag != "{{.git.tag}}" {


check tag != "{{.git.tag}}" to remove. .git.tag is not a default value on action GitClone

yesnault · 2018-08-14T12:06:05Z

sdk/repositories_manager.go

+//VCSTag represents tag known by the repositories manager
+type VCSTag struct {
+	Tag     string    `json:"tag"`
+	Sha     string    `json:"sha"`


should be great to have a comment for the difference between Sha and Hash here

yesnault · 2018-08-14T12:08:53Z

missing :

some documentation too
GitClone SQL to add tag in parameter (advanced parameter?)
git.tag in default payload
suggest.go : missing git.tag in variable suggestion

yesnault · 2018-08-14T12:10:40Z

engine/worker/builtin_gitclone.go

@@ -24,6 +24,7 @@ func runGitClone(w *currentWorker) BuiltInAction {
 		password := sdk.ParameterFind(&a.Parameters, "password")
 		branch := sdk.ParameterFind(&a.Parameters, "branch")
 		defaultBranch := sdk.ParameterValue(*params, "git.default_branch")
+		tag := sdk.ParameterValue(*params, "git.tag")


tag have to be retrieve from a.Parameter, not params

Signed-off-by: Benjamin Coenen <[email protected]>

ovh-cds · 2018-08-14T15:52:08Z

CDS Report it#5566.0 ✘

w-it
- w-it ✘
  Unit Tests Report
Platform model admin [tests/cli_admin_platform_model.yml]
Application Command TestSuite [tests/cli_application.yml]
Environment Command TestSuite [tests/cli_environment.yml]
Pipeline Command TestSuite [tests/cli_pipeline.yml]
Pipeline Export / Import Command TestSuite [tests/cli_pipeline_export_import.yml]
Action Command TestSuite with cdsctl [tests/clictl_action.yml]
Broadcast Command TestSuite [tests/clictl_admin_broadcast.yml]
Plugins Command TestSuite with cdsctl [tests/clictl_admin_plugin_and_platforms.yml]
Action Command TestSuite with cdsctl [tests/clictl_admin_services.yml]
Application Command TestSuite with CDS ctl [tests/clictl_application.yml]
Environement Command TestSuite with CDS ctl [tests/clictl_environment.yml]
Group Command TestSuite [tests/clictl_group.yml]
Pipeline Command TestSuite with CDS ctl [tests/clictl_pipeline.yml]
Project Command TestSuite with CDS ctl [tests/clictl_project.yml]
Token Command TestSuite with CDS ctl [tests/clictl_token.yml]
User Command TestSuite [tests/clictl_user.yml]
Version Command TestSuite [tests/clictl_version.yml]
Worker Command TestSuite [tests/clictl_worker_model.yml]
Create a simple workflow (ITSCWRKFLW3) and run it [tests/sc_workflow_create_run_join.yml]
Create a simple workflow (ITSCWRKFLW1) and pull it [tests/sc_workflow_create_simple.yml]
Create a simple workflow (ITSCWRKFLW6) and run it to test gitClone action [tests/sc_workflow_git_clone_tag.yml]
- import pipeline ✘
- import workflow ✘
- run workflow ✘
- check workflow ✘
Workflow (ITSCWRKFLW5) should use the worker key install command [tests/sc_workflow_key_install.yml]
Workflow (ITSCWRKFLW4) should use the worker cache command [tests/sc_workflow_run_cache.yml]
Create a simple workflow (ITSCWRKFLW2) and run it [tests/sc_workflow_run_simple.yml]
Create a simple workflow (ITSCWRKFLW2) run it and then stop it [tests/sc_workflow_stop_simple.yml]
Create a simple workflow (ITSCWRKFLW2), update it and run it [tests/sc_workflow_update_run.yml]

fsamin · 2018-08-16T06:55:05Z

engine/api/repositoriesmanager/repositories_manager.go

+func (c *vcsClient) CommitsBetweenRefs(ctx context.Context, fullname, base, head string) ([]sdk.VCSCommit, error) {
+	var commits []sdk.VCSCommit
+	path := fmt.Sprintf("/vcs/%s/repos/%s/commits?base=%s&head=%s", c.name, fullname, url.QueryEscape(base), url.QueryEscape(head))
+	if code, err := c.doJSONRequest(context.Background(), "GET", path, nil, &commits); err != nil {


context.Background => ctx

Signed-off-by: Benjamin Coenen <[email protected]>

bnjjj added 4 commits August 13, 2018 15:15

wip

ca2c5e6

Signed-off-by: Benjamin Coenen <[email protected]>

feat(api): add tag support

2f322a2

Signed-off-by: Benjamin Coenen <[email protected]>

feat(api): add tag support

f6ea26a

Signed-off-by: Benjamin Coenen <[email protected]>

feat(api): add tag support

4173a80

Signed-off-by: Benjamin Coenen <[email protected]>

bnjjj added the feature label Aug 14, 2018

bnjjj requested a review from yesnault August 14, 2018 11:52

golangci reviewed Aug 14, 2018

View reviewed changes

yesnault requested changes Aug 14, 2018

View reviewed changes

bnjjj added 4 commits August 14, 2018 16:47

feat(api): add tag support

69d6a8b

Signed-off-by: Benjamin Coenen <[email protected]>

feat(api): add tag support

d821163

Signed-off-by: Benjamin Coenen <[email protected]>

Merge branch 'master' of github.com:ovh/cds into feat_git_tag

3b389dc

feat(api): add tag support

c59f21a

Signed-off-by: Benjamin Coenen <[email protected]>

fsamin requested changes Aug 16, 2018

View reviewed changes

bnjjj added 3 commits August 16, 2018 10:21

feat(api): add tag support

7549355

Signed-off-by: Benjamin Coenen <[email protected]>

feat(api): add tag support

e4f6a88

Signed-off-by: Benjamin Coenen <[email protected]>

feat(api): add tag support

50ef198

Signed-off-by: Benjamin Coenen <[email protected]>

yesnault approved these changes Aug 17, 2018

View reviewed changes

fsamin approved these changes Aug 17, 2018

View reviewed changes

fsamin merged commit d4cac55 into master Aug 17, 2018

bnjjj deleted the feat_git_tag branch August 17, 2018 09:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(api): add git.tag support #3200

feat(api): add git.tag support #3200

bnjjj commented Aug 14, 2018

golangci Aug 14, 2018

yesnault Aug 14, 2018

yesnault Aug 14, 2018

yesnault Aug 14, 2018

yesnault commented Aug 14, 2018 •

edited by bnjjj

Loading

yesnault Aug 14, 2018

ovh-cds commented Aug 14, 2018

fsamin Aug 16, 2018

		@@ -207,6 +209,7 @@ func gitClone(w currentWorker, params []sdk.Parameter, url string, dir string,

		git.LogFunc = log.Info

		sendLog(fmt.Sprintf("cloneOpts ---> %+v\n", *clone))

feat(api): add git.tag support #3200

feat(api): add git.tag support #3200

Conversation

bnjjj commented Aug 14, 2018

golangci Aug 14, 2018

Choose a reason for hiding this comment

yesnault Aug 14, 2018

Choose a reason for hiding this comment

yesnault Aug 14, 2018

Choose a reason for hiding this comment

yesnault Aug 14, 2018

Choose a reason for hiding this comment

yesnault commented Aug 14, 2018 • edited by bnjjj Loading

yesnault Aug 14, 2018

Choose a reason for hiding this comment

ovh-cds commented Aug 14, 2018

fsamin Aug 16, 2018

Choose a reason for hiding this comment

yesnault commented Aug 14, 2018 •

edited by bnjjj

Loading