From 50b59e8d8d2328a174a23f5991924f1167cf6b6b Mon Sep 17 00:00:00 2001
From: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
Date: Sat, 24 Mar 2018 17:26:38 +0100
Subject: [PATCH] refactor: remove hcl support

Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
---
 cli/cds/action/add.go             |   6 +-
 cli/cds/environment/export.go     |   2 +-
 cli/cds/pipeline/export.go        |   2 +-
 cli/cds/pipeline/import.go        |   2 -
 cli/cdsctl/pipeline.go            |   2 -
 sdk/action_script_test.go         | 295 ------------------------------
 sdk/exportentities/common.go      |   2 -
 sdk/exportentities/common_test.go |   5 +-
 sdk/exportentities/pipeline.go    |  12 +-
 sdk/exportentities/types.go       |   1 -
 10 files changed, 10 insertions(+), 319 deletions(-)
 delete mode 100644 sdk/action_script_test.go

diff --git a/cli/cds/action/add.go b/cli/cds/action/add.go
index 0530bd8f98..6d25f04cbf 100644
--- a/cli/cds/action/add.go
+++ b/cli/cds/action/add.go
@@ -20,11 +20,7 @@ func cmdActionAdd() *cobra.Command {
 		Short: "cds action add [<actionName>]",
 		Long: `cds action add [<actionName>]
 
-<actionName> is mandatory if you don't use --url flag
-
-Examples of usage:
-
-$cds action add --url $HOME/src/github.com/ovh/cds/contrib/actions/action-scripts/cds-docker-package.hcl
+<actionName> is mandatory
 
 		`,
 		Run: addAction,
diff --git a/cli/cds/environment/export.go b/cli/cds/environment/export.go
index bab9dc29f7..d62de56a1c 100644
--- a/cli/cds/environment/export.go
+++ b/cli/cds/environment/export.go
@@ -52,7 +52,7 @@ func exportCmd() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&exportFormat, "format", "", "yaml", "Format: json|yaml|hcl")
+	cmd.Flags().StringVarP(&exportFormat, "format", "", "yaml", "Format: json|yaml")
 	cmd.Flags().StringVarP(&exportOutput, "output", "", "", "Output filename")
 
 	return cmd
diff --git a/cli/cds/pipeline/export.go b/cli/cds/pipeline/export.go
index 4f953c5178..9d88f28672 100644
--- a/cli/cds/pipeline/export.go
+++ b/cli/cds/pipeline/export.go
@@ -55,7 +55,7 @@ func exportCmd() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&exportFormat, "format", "", "yaml", "Format: json|yaml|hcl")
+	cmd.Flags().StringVarP(&exportFormat, "format", "", "yaml", "Format: json|yaml")
 	cmd.Flags().StringVarP(&exportOutput, "output", "", "", "Output filename")
 	cmd.Flags().BoolVarP(&exportWithPermissions, "withPermissions", "", false, "Export pipeline configuration with permission")
 
diff --git a/cli/cds/pipeline/import.go b/cli/cds/pipeline/import.go
index b59138eb7f..3d2bb72f4a 100644
--- a/cli/cds/pipeline/import.go
+++ b/cli/cds/pipeline/import.go
@@ -36,8 +36,6 @@ func importCmd() *cobra.Command {
 				importFormat = "yaml"
 				if strings.HasSuffix(name, ".json") {
 					importFormat = "json"
-				} else if strings.HasSuffix(name, ".hcl") {
-					importFormat = "hcl"
 				}
 				var err error
 				btes, _, err = exportentities.ReadFile(name)
diff --git a/cli/cdsctl/pipeline.go b/cli/cdsctl/pipeline.go
index cdda643754..077e639e93 100644
--- a/cli/cdsctl/pipeline.go
+++ b/cli/cdsctl/pipeline.go
@@ -161,8 +161,6 @@ func pipelineImportRun(v cli.Values) error {
 
 	if strings.HasSuffix(v["path"], ".json") {
 		format = "json"
-	} else if strings.HasSuffix(v["path"], ".hcl") {
-		format = "hcl"
 	}
 
 	isURL, _ := regexp.MatchString(`http[s]?:\/\/(.*)`, v["path"])
diff --git a/sdk/action_script_test.go b/sdk/action_script_test.go
deleted file mode 100644
index 6330f57fde..0000000000
--- a/sdk/action_script_test.go
+++ /dev/null
@@ -1,295 +0,0 @@
-package sdk
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestLoadFromActionScript(t *testing.T) {
-	b := []byte(`
-name = "TestGitClone"
-description = "Clone git repository"
-
-// Requirements
-requirements = {
-	"git" = {
-		type = "binary"
-		value = "git"
-	}
-	"ssh-keygen" = {
-		type = "binary"
-		value = "ssh-keygen"
-	}
-}
-
-// Parameters
-parameters = {
-	 "branch" = {
-		type = "string"
-		value = "{{.git.branch}}"
-	}
-	"commit" = {
-		type = "string"
-		value = "{{.git.hash}}"
-	}
-	"directory" = {
-		type = "string"
-		description = "target directory"
-	}
-	"gitOptions" = {
-		type = "string"
-		description = "git clone options"
-	}
-	"url" = {
-		type = "string"
-		description = "git URL"
-		value = "{{.cds.app.repo}}"
-	}
-}
-
-// Steps
-steps  = [{
-	script = <<EOF
-ssh-keygen -R github.com
-EOF
-    },
-    {
-	script = <<EOF
-#! /bin/bash
-set -e
-echo "action git from directory"
-pwd
-echo "running git clone {{.gitOptions}} {{.url}} -b {{.branch}} {{.directory}}"
-git clone {{.gitOptions}} {{.url}} -b {{.branch}} {{.directory}}
-if [ "x{{.commit}}" != "x" ] && [ "x{{.commit}}" != "x{{.git.hash}}" ];  then
-	cd {{.directory}}
-	git reset --hard {{.commit}} || true
-fi
-EOF
-    }]`)
-	a, err := NewActionFromScript(b)
-	assert.NotNil(t, a)
-	assert.NoError(t, err)
-	t.Logf("Action : %v", a)
-
-	assert.Equal(t, len(a.Requirements), 2)
-	assert.Equal(t, len(a.Parameters), 5)
-	assert.Equal(t, len(a.Actions), 2)
-}
-
-func TestLoadFromRemoteActionScript(t *testing.T) {
-	a, err := NewActionFromRemoteScript("https://raw.githubusercontent.com/ovh/cds/master/contrib/actions/cds-docker-package.hcl", nil)
-	assert.NotNil(t, a)
-	assert.NoError(t, err)
-}
-
-func TestTestLoadFromActionScriptWithJUnit(t *testing.T) {
-	b := []byte(`
-steps  = [{
-	jUnitReport = "*.xml"
-}]`)
-
-	a, err := NewActionFromScript(b)
-	assert.NotNil(t, a)
-	assert.NoError(t, err)
-	t.Logf("Action : %v", a)
-
-	assert.Equal(t, JUnitAction, a.Actions[0].Name)
-	assert.Equal(t, BuiltinAction, a.Actions[0].Type)
-	assert.Equal(t, "path", a.Actions[0].Parameters[0].Name)
-	assert.Equal(t, "*.xml", a.Actions[0].Parameters[0].Value)
-}
-
-func TestTestLoadFromActionScriptWithGitClone(t *testing.T) {
-	b := []byte(`
-steps  = [{
-	GitClone = {
-			directory = "./src"
-			url = "{{.git.url}}"
-			commit = "{{.git.hash}}"
-			branch = "{{.git.branch}}"
-	}
-}]`)
-
-	a, err := NewActionFromScript(b)
-	assert.NotNil(t, a)
-	assert.NoError(t, err)
-	t.Logf("Action : %v", a)
-
-	assert.Equal(t, GitCloneAction, a.Actions[0].Name)
-	assert.Equal(t, BuiltinAction, a.Actions[0].Type)
-
-	for i := 0; i < 4; i++ {
-		name := a.Actions[0].Parameters[i].Name
-		v := a.Actions[0].Parameters[i].Value
-		switch name {
-		case "directory":
-			assert.Equal(t, "./src", v)
-		case "url":
-			assert.Equal(t, "{{.git.url}}", v)
-		case "commit":
-			assert.Equal(t, "{{.git.hash}}", v)
-		case "branch":
-			assert.Equal(t, "{{.git.branch}}", v)
-		}
-	}
-}
-
-func TestTestLoadFromActionScriptWithArtifactUpload(t *testing.T) {
-	b := []byte(`
-steps  = [{
-	always_executed = true
-	enabled = true
-	artifactUpload = {
-        path = "myartifact"
-        tag = "{{.cds.version}}"
-    }
-}]`)
-
-	a, err := NewActionFromScript(b)
-	assert.NotNil(t, a)
-	assert.NoError(t, err)
-	t.Logf("Action : %v", a)
-
-	assert.Equal(t, ArtifactUpload, a.Actions[0].Name)
-	assert.Equal(t, BuiltinAction, a.Actions[0].Type)
-	assert.Equal(t, true, a.Actions[0].AlwaysExecuted)
-	assert.Equal(t, true, a.Actions[0].Enabled)
-	var pathFound, tagFound bool
-	for _, p := range a.Actions[0].Parameters {
-		if p.Name == "path" {
-			pathFound = true
-			assert.Equal(t, "myartifact", p.Value)
-		}
-
-		if p.Name == "tag" {
-			tagFound = true
-			assert.Equal(t, "{{.cds.version}}", p.Value)
-		}
-	}
-
-	assert.True(t, pathFound)
-	assert.True(t, tagFound)
-}
-
-func TestTestLoadFromActionScriptWithArtifactDownload(t *testing.T) {
-	b := []byte(`
-steps  = [{
-	artifactDownload = {
-        path = "myartifact"
-        tag = "{{.cds.version}}"
-    }
-}]`)
-
-	a, err := NewActionFromScript(b)
-	assert.NotNil(t, a)
-	assert.NoError(t, err)
-	t.Logf("Action : %v", a)
-
-	assert.Equal(t, ArtifactDownload, a.Actions[0].Name)
-	assert.Equal(t, BuiltinAction, a.Actions[0].Type)
-
-	var pathFound, tagFound bool
-	for _, p := range a.Actions[0].Parameters {
-		if p.Name == "path" {
-			pathFound = true
-			assert.Equal(t, "myartifact", p.Value)
-		}
-
-		if p.Name == "tag" {
-			tagFound = true
-			assert.Equal(t, "{{.cds.version}}", p.Value)
-		}
-	}
-
-	assert.True(t, pathFound)
-	assert.True(t, tagFound)
-}
-
-func TestLoadFromActionScriptWithPlugin(t *testing.T) {
-	b := []byte(`
-steps  = [{
-	plugin = {
-        "my-plugin" = {
-            "param1" = "value1"
-            "param2" = "value2"
-        }
-    }
-}]`)
-
-	a, err := NewActionFromScript(b)
-	assert.NotNil(t, a)
-	assert.NoError(t, err)
-	t.Logf("Action : %v", a)
-
-	assert.Equal(t, "my-plugin", a.Actions[0].Name)
-	assert.Equal(t, PluginAction, a.Actions[0].Type)
-
-	// check param1
-	param1Checked := false
-	param2Checked := false
-	for _, p := range a.Actions[0].Parameters {
-		if p.Name == "param1" {
-			assert.Equal(t, "value1", p.Value)
-			param1Checked = true
-		}
-		if p.Name == "param2" {
-			assert.Equal(t, "value2", p.Value)
-			param2Checked = true
-		}
-	}
-
-	assert.Equal(t, true, param1Checked)
-	assert.Equal(t, true, param2Checked)
-
-}
-
-func TestTestLoadFromActionScriptWithError(t *testing.T) {
-	b := []byte(`
-steps  = [{
-	blabla = "trololo"
-}]`)
-
-	a, err := NewActionFromScript(b)
-	assert.Nil(t, a)
-	assert.Error(t, err)
-	t.Logf("Error : %s", err)
-}
-
-func TestTestDefautValues(t *testing.T) {
-	b := []byte(`
-	steps  = [{
-	artifactDownload = {
-				path = "myartifact"
-				tag = "{{.cds.version}}"
-		}
-	},{
-	always_executed = false
-	enabled = false
-	artifactDownload = {
-				path = "myartifact"
-				tag = "{{.cds.version}}"
-		}
-	},{
-	always_executed = true
-	enabled = true
-	artifactDownload = {
-				path = "myartifact"
-				tag = "{{.cds.version}}"
-		}
-	}]`)
-
-	a, err := NewActionFromScript(b)
-	assert.NotNil(t, a)
-	assert.NoError(t, err)
-	t.Logf("Action : %v", a)
-
-	assert.Equal(t, false, a.Actions[0].AlwaysExecuted)
-	assert.Equal(t, true, a.Actions[0].Enabled)
-	assert.Equal(t, false, a.Actions[1].AlwaysExecuted)
-	assert.Equal(t, false, a.Actions[1].Enabled)
-	assert.Equal(t, true, a.Actions[2].AlwaysExecuted)
-	assert.Equal(t, true, a.Actions[2].Enabled)
-
-}
diff --git a/sdk/exportentities/common.go b/sdk/exportentities/common.go
index 608f4e20b1..2943fbca86 100644
--- a/sdk/exportentities/common.go
+++ b/sdk/exportentities/common.go
@@ -23,8 +23,6 @@ func GetFormat(f string) (Format, error) {
 		return FormatJSON, nil
 	case "toml", "tml":
 		return FormatTOML, nil
-	case "hcl":
-		return FormatHCL, nil
 	default:
 		return UnknownFormat, ErrUnsupportedFormat
 	}
diff --git a/sdk/exportentities/common_test.go b/sdk/exportentities/common_test.go
index 23f91d011f..00de144465 100644
--- a/sdk/exportentities/common_test.go
+++ b/sdk/exportentities/common_test.go
@@ -7,9 +7,6 @@ import (
 )
 
 func TestReadURL(t *testing.T) {
-	b, _, _ := ReadURL("https://raw.githubusercontent.com/ovh/cds/master/contrib/actions/cds-docker-package.hcl", "hcl")
-	assert.True(t, len(b) > 0)
-
-	b, _, _ = ReadURL("https://raw.githubusercontent.com/ovh/tat/master/.travis.yml", "yml")
+	b, _, _ := ReadURL("https://raw.githubusercontent.com/ovh/tat/master/.travis.yml", "yml")
 	assert.True(t, len(b) > 0)
 }
diff --git a/sdk/exportentities/pipeline.go b/sdk/exportentities/pipeline.go
index 7445735baf..38bc0c4510 100644
--- a/sdk/exportentities/pipeline.go
+++ b/sdk/exportentities/pipeline.go
@@ -32,8 +32,8 @@ type Pipeline struct {
 	Parameters   map[string]ParameterValue `json:"parameters,omitempty" yaml:"parameters,omitempty"`
 	Stages       map[string]Stage          `json:"stages,omitempty" yaml:"stages,omitempty"`
 	Jobs         map[string]Job            `json:"jobs,omitempty" yaml:"jobs,omitempty"`
-	Requirements []Requirement             `json:"requirements,omitempty" yaml:"requirements,omitempty" hcl:"requirement,omitempty"`
-	Steps        []Step                    `json:"steps,omitempty" yaml:"steps,omitempty" hcl:"step,omitempty"`
+	Requirements []Requirement             `json:"requirements,omitempty" yaml:"requirements,omitempty"`
+	Steps        []Step                    `json:"steps,omitempty" yaml:"steps,omitempty"`
 }
 
 // Stage represents exported sdk.Stage
@@ -49,10 +49,10 @@ type Job struct {
 	Stage          string        `json:"stage,omitempty" yaml:"stage,omitempty"` //This will ONLY be set with Pipelinev1
 	Description    string        `json:"description,omitempty" yaml:"description,omitempty"`
 	Enabled        *bool         `json:"enabled,omitempty" yaml:"enabled,omitempty"`
-	Steps          []Step        `json:"steps,omitempty" yaml:"steps,omitempty" hcl:"step,omitempty"`
-	Requirements   []Requirement `json:"requirements,omitempty" yaml:"requirements,omitempty" hcl:"requirement,omitempty"`
-	Optional       *bool         `json:"optional,omitempty" yaml:"optional,omitempty" hcl:"optional,omitempty"`
-	AlwaysExecuted *bool         `json:"always_executed,omitempty" yaml:"always_executed,omitempty" hcl:"always_executed,omitempty"`
+	Steps          []Step        `json:"steps,omitempty" yaml:"steps,omitempty"`
+	Requirements   []Requirement `json:"requirements,omitempty" yaml:"requirements,omitempty"`
+	Optional       *bool         `json:"optional,omitempty" yaml:"optional,omitempty"`
+	AlwaysExecuted *bool         `json:"always_executed,omitempty" yaml:"always_executed,omitempty"`
 }
 
 // Step represents exported step used in a job
diff --git a/sdk/exportentities/types.go b/sdk/exportentities/types.go
index eb624475e0..c1c2f46e7d 100644
--- a/sdk/exportentities/types.go
+++ b/sdk/exportentities/types.go
@@ -34,7 +34,6 @@ const (
 	FormatJSON Format = iota
 	FormatYAML
 	FormatTOML
-	FormatHCL
 	UnknownFormat
 )