(feat) remove drone-yaml dependency. use docker compiler for lint

drone/convert/convert.go

@@ -1,19 +1,15 @@
 package convert
 
 import (
-	"bytes"
-	"io"
 	"io/ioutil"
-	"os"
 
-	"github.com/drone/drone-yaml/yaml/converter"
 	"github.com/urfave/cli"
 )
 
 // Command exports the convert command.
 var Command = cli.Command{
 	Name:      "convert",
-	Usage:     "convert legacy format",
+	Usage:     "<deprecated. this operation is a no-op> convert legacy format",
 	ArgsUsage: "<source>",
 	Action:    convert,
 	Flags: []cli.Flag{
@@ -30,20 +26,9 @@ func convert(c *cli.Context) error {
 		path = ".drone.yml"
 	}
 
-	raw, err := ioutil.ReadFile(path)
+	_, err := ioutil.ReadFile(path)
 	if err != nil {
 		return err
 	}
-
-	res, err := converter.Convert(raw, converter.Metadata{Filename: path})
-	if err != nil {
-		return err
-	}
-
-	if c.Bool("save") {
-		return ioutil.WriteFile(path, res, 0644)
-	}
-
-	_, err = io.Copy(os.Stderr, bytes.NewReader(res))
 	return err
 }

drone/exec/exec.go

@@ -20,7 +20,6 @@ import (
 	"github.com/drone/drone-yaml/yaml"
 	"github.com/drone/drone-yaml/yaml/compiler"
 	"github.com/drone/drone-yaml/yaml/compiler/transform"
-	"github.com/drone/drone-yaml/yaml/converter"
 	"github.com/drone/drone-yaml/yaml/linter"
 	"github.com/drone/signal"
 
@@ -103,10 +102,7 @@ var Command = cli.Command{
 				"plugins/heroku",
 			},
 		},
-
-		//
 		// netrc parameters
-		//
 		cli.StringFlag{
 			Name: "netrc-username",
 		},
@@ -116,11 +112,7 @@ var Command = cli.Command{
 		cli.StringFlag{
 			Name: "netrc-machine",
 		},
-
-		//
 		// trigger parameters
-		//
-
 		cli.StringFlag{
 			Name:  "branch",
 			Usage: "branch name",
@@ -170,17 +162,6 @@ func exec(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-
-	// this code is temporarily in place to detect and convert
-	// the legacy yaml configuration file to the new format.
-	dataS, err = converter.ConvertString(dataS, converter.Metadata{
-		Filename: file,
-		Ref:      c.String("ref"),
-	})
-	if err != nil {
-		return err
-	}
-
 	manifest, err := yaml.ParseString(dataS)
 	if err != nil {
 		return err

drone/lint/lint.go

@@ -1,41 +1,83 @@
 package lint
 
 import (
-	"github.com/drone/drone-yaml/yaml"
-	"github.com/drone/drone-yaml/yaml/linter"
+	"fmt"
+	"io/ioutil"
+	"strings"
+
+	"github.com/drone-runners/drone-runner-docker/engine/linter"
+	"github.com/drone-runners/drone-runner-docker/engine/resource"
+	"github.com/drone/drone-go/drone"
+	"github.com/drone/envsubst"
+	"github.com/drone/runner-go/manifest"
 	"github.com/urfave/cli"
 )
 
 // Command exports the linter command.
 var Command = cli.Command{
 	Name:      "lint",
-	Usage:     "lint the yaml file",
+	Usage:     "lint the yaml file, checks for yaml errors",
 	ArgsUsage: "<source>",
 	Action:    lint,
 	Flags: []cli.Flag{
 		cli.BoolFlag{
-			Name:  "trusted",
-			Usage: "is the yaml trustable",
+			Name:   "trusted",
+			Hidden: true,
+			Usage:  "is the yaml trustable",
 		},
 	},
 }
 
+type Flags struct {
+	Build  drone.Build
+	Netrc  drone.Netrc
+	Repo   drone.Repo
+	Stage  drone.Stage
+	System drone.System
+}
+
 func lint(c *cli.Context) error {
+	f := new(Flags)
+	var envs map[string]string
+
 	path := c.Args().First()
 	if path == "" {
 		path = ".drone.yml"
 	}
 
-	manifest, err := yaml.ParseFile(path)
+	rawsource, err := ioutil.ReadFile(path)
 	if err != nil {
 		return err
 	}
 
-	for _, resource := range manifest.Resources {
-		if err := linter.Lint(resource, c.Bool("trusted")); err != nil {
-			return err
+	// string substitution function ensures that string replacement variables are escaped and quoted if they contain newlines.
+	subf := func(k string) string {
+		v := envs[k]
+		if strings.Contains(v, "\n") {
+			v = fmt.Sprintf("%q", v)
 		}
+		return v
+	}
+	// evaluates string replacement expressions and returns an update configuration.
+	config, err := envsubst.Eval(string(rawsource), subf)
+	if err != nil {
+		return err
+	}
+	// parse and lint the configuration
+	manifest, err := manifest.ParseString(config)
+	if err != nil {
+		return err
+	}
+	// a configuration can contain multiple pipelines. get a specific pipeline resource for execution.
+	resource, err := resource.Lookup(f.Stage.Name, manifest)
+	if err != nil {
+		return err
+	}
+	// lint the pipeline and return an error if any linting rules are broken
+	lint := linter.New()
+	err = lint.Lint(resource, &f.Repo)
+	if err != nil {
+		return err
 	}
-
 	return nil
 }

drone/sign/sign.go

@@ -1,11 +1,15 @@
 package sign
 
 import (
+	"bufio"
+	"bytes"
 	"fmt"
+	"io"
 	"io/ioutil"
+	"strings"
 
+	"github.com/buildkite/yaml"
 	"github.com/drone/drone-cli/drone/internal"
-	"github.com/drone/drone-yaml/yaml/signer"
 	"github.com/urfave/cli"
 )
 
@@ -55,9 +59,131 @@ func format(c *cli.Context) error {
 		return nil
 	}
 
-	data, err = signer.WriteTo(data, hmac)
+	data, err = writeTo(data, hmac)
 	if err != nil {
 		return err
 	}
 	return ioutil.WriteFile(path, data, 0644)
 }
+
+// Resource enums.
+const (
+	KindCron      = "cron"
+	KindPipeline  = "pipeline"
+	KindRegistry  = "registry"
+	KindSecret    = "secret"
+	KindSignature = "signature"
+)
+
+type (
+	// Manifest is a collection of Drone resources.
+	Manifest struct {
+		Resources []Resource
+	}
+
+	// Resource represents a Drone resource.
+	Resource interface {
+		// GetVersion returns the resource version.
+		GetVersion() string
+
+		// GetKind returns the resource kind.
+		GetKind() string
+	}
+
+	// RawResource is a raw encoded resource with the
+	// resource kind and type extracted.
+	RawResource struct {
+		Version string
+		Kind    string
+		Type    string
+		Data    []byte `yaml:"-"`
+	}
+
+	resource struct {
+		Version string
+		Kind    string `json:"kind"`
+		Type    string `json:"type"`
+	}
+)
+
+func writeTo(data []byte, hmac string) ([]byte, error) {
+	res, err := parseRawBytes(data)
+	return upsert(res, hmac), err
+}
+
+func parseRawBytes(b []byte) ([]*RawResource, error) {
+	return parseRaw(
+		bytes.NewReader(b),
+	)
+}
+
+func parseRaw(r io.Reader) ([]*RawResource, error) {
+	const newline = '\n'
+	var resources []*RawResource
+	var resource *RawResource
+
+	scanner := bufio.NewScanner(r)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if isSeparator(line) {
+			resource = nil
+		}
+		if resource == nil {
+			resource = &RawResource{}
+			resources = append(resources, resource)
+		}
+		if isSeparator(line) {
+			continue
+		}
+		if isTerminator(line) {
+			break
+		}
+		if scanner.Err() == io.EOF {
+			break
+		}
+		resource.Data = append(
+			resource.Data,
+			line...,
+		)
+		resource.Data = append(
+			resource.Data,
+			newline,
+		)
+	}
+	for _, resource := range resources {
+		err := yaml.Unmarshal(resource.Data, resource)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return resources, nil
+}
+
+func upsert(res []*RawResource, hmac string) []byte {
+	var buf bytes.Buffer
+	for _, r := range res {
+		if r.Kind != KindSignature {
+			buf.WriteString("---")
+			buf.WriteByte('\n')
+			buf.Write(r.Data)
+		}
+	}
+	buf.WriteString("---")
+	buf.WriteByte('\n')
+	buf.WriteString("kind: signature")
+	buf.WriteByte('\n')
+	buf.WriteString("hmac: " + hmac)
+	buf.WriteByte('\n')
+	buf.WriteByte('\n')
+	buf.WriteString("...")
+	buf.WriteByte('\n')
+	return buf.Bytes()
+}
+
+func isSeparator(s string) bool {
+	return strings.HasPrefix(s, "---")
+}
+
+func isTerminator(s string) bool {
+	return strings.HasPrefix(s, "...")
+}