remove drone-runtime dependency [ci skip]

engine/compiler/compiler.go

@@ -9,8 +9,8 @@ import (
 	"fmt"
 
 	"github.com/drone-runners/drone-runner-docker/engine"
-	"github.com/drone-runners/drone-runner-docker/engine/compiler/image"
 	"github.com/drone-runners/drone-runner-docker/engine/resource"
+	"github.com/drone-runners/drone-runner-docker/internal/docker/image"
 
 	"github.com/drone/drone-go/drone"
 	"github.com/drone/runner-go/clone"

engine/compiler/encoder/encoder.go

@@ -1,56 +0,0 @@
-// Copyright 2019 Drone.IO Inc. All rights reserved.
-// Use of this source code is governed by the Polyform License
-// that can be found in the LICENSE file.
-
-package encoder
-
-import (
-	"encoding/base64"
-	"strconv"
-	"strings"
-
-	"github.com/buildkite/yaml"
-	json "github.com/ghodss/yaml"
-)
-
-// Encode encodes an interface value as a string. This function
-// assumes all types were unmarshaled by the yaml.v2 library.
-// The yaml.v2 package only supports a subset of primitive types.
-func Encode(v interface{}) string {
-	switch v := v.(type) {
-	case string:
-		return v
-	case bool:
-		return strconv.FormatBool(v)
-	case int:
-		return strconv.Itoa(v)
-	case float64:
-		return strconv.FormatFloat(v, 'g', -1, 64)
-	case []byte:
-		return base64.StdEncoding.EncodeToString(v)
-	case []interface{}:
-		return encodeSlice(v)
-	default:
-		return encodeMap(v)
-	}
-}
-
-// helper function encodes a parameter in map format.
-func encodeMap(v interface{}) string {
-	yml, _ := yaml.Marshal(v)
-	out, _ := json.YAMLToJSON(yml)
-	return string(out)
-}
-
-// helper function encodes a parameter in slice format.
-func encodeSlice(v interface{}) string {
-	out, _ := yaml.Marshal(v)
-
-	in := []string{}
-	err := yaml.Unmarshal(out, &in)
-	if err == nil {
-		return strings.Join(in, ",")
-	}
-	out, _ = json.YAMLToJSON(out)
-	return string(out)
-}

engine/compiler/encoder/encoder_test.go

@@ -1,63 +0,0 @@
-// Copyright 2019 Drone.IO Inc. All rights reserved.
-// Use of this source code is governed by the Polyform License
-// that can be found in the LICENSE file.
-
-package encoder
-
-import "testing"
-
-func TestEncode(t *testing.T) {
-	testdatum := []struct {
-		data interface{}
-		text string
-	}{
-		{
-			data: "foo",
-			text: "foo",
-		},
-		{
-			data: true,
-			text: "true",
-		},
-		{
-			data: 42,
-			text: "42",
-		},
-		{
-			data: float64(42.424242),
-			text: "42.424242",
-		},
-		{
-			data: []interface{}{"foo", "bar", "baz"},
-			text: "foo,bar,baz",
-		},
-		{
-			data: []interface{}{1, 1, 2, 3, 5, 8},
-			text: "1,1,2,3,5,8",
-		},
-		{
-			data: []byte("foo"),
-			text: "Zm9v",
-		},
-		{
-			data: []interface{}{
-				struct {
-					Name string `json:"name"`
-				}{
-					Name: "john",
-				},
-			},
-			text: `[{"name":"john"}]`,
-		},
-		{
-			data: map[interface{}]interface{}{"foo": "bar"},
-			text: `{"foo":"bar"}`,
-		},
-	}
-
-	for _, testdata := range testdatum {
-		if got, want := Encode(testdata.data), testdata.text; got != want {
-			t.Errorf("Want interface{} encoded to %q, got %q", want, got)
-		}
-	}
-}

engine/compiler/image/image.go

@@ -1,71 +0,0 @@
-// Copyright 2019 Drone.IO Inc. All rights reserved.
-// Use of this source code is governed by the Polyform License
-// that can be found in the LICENSE file.
-
-package image
-
-import "github.com/docker/distribution/reference"
-
-// Trim returns the short image name without tag.
-func Trim(name string) string {
-	ref, err := reference.ParseAnyReference(name)
-	if err != nil {
-		return name
-	}
-	named, err := reference.ParseNamed(ref.String())
-	if err != nil {
-		return name
-	}
-	named = reference.TrimNamed(named)
-	return reference.FamiliarName(named)
-}
-
-// Expand returns the fully qualified image name.
-func Expand(name string) string {
-	ref, err := reference.ParseAnyReference(name)
-	if err != nil {
-		return name
-	}
-	named, err := reference.ParseNamed(ref.String())
-	if err != nil {
-		return name
-	}
-	named = reference.TagNameOnly(named)
-	return named.String()
-}
-
-// Match returns true if the image name matches
-// an image in the list. Note the image tag is not used
-// in the matching logic.
-func Match(from string, to ...string) bool {
-	from = Trim(from)
-	for _, match := range to {
-		if from == Trim(match) {
-			return true
-		}
-	}
-	return false
-}
-
-// MatchTag returns true if the image name matches
-// an image in the list, including the tag.
-func MatchTag(a, b string) bool {
-	return Expand(a) == Expand(b)
-}
-
-// MatchHostname returns true if the image hostname
-// matches the specified hostname.
-func MatchHostname(image, hostname string) bool {
-	ref, err := reference.ParseAnyReference(image)
-	if err != nil {
-		return false
-	}
-	named, err := reference.ParseNamed(ref.String())
-	if err != nil {
-		return false
-	}
-	if hostname == "index.docker.io" {
-		hostname = "docker.io"
-	}
-	return reference.Domain(named) == hostname
-}

engine/compiler/image/image_test.go

@@ -1,299 +0,0 @@
-// Copyright 2019 Drone.IO Inc. All rights reserved.
-// Use of this source code is governed by the Polyform License
-// that can be found in the LICENSE file.
-
-package image
-
-import "testing"
-
-func Test_trimImage(t *testing.T) {
-	testdata := []struct {
-		from string
-		want string
-	}{
-		{
-			from: "golang",
-			want: "golang",
-		},
-		{
-			from: "golang:latest",
-			want: "golang",
-		},
-		{
-			from: "golang:1.0.0",
-			want: "golang",
-		},
-		{
-			from: "library/golang",
-			want: "golang",
-		},
-		{
-			from: "library/golang:latest",
-			want: "golang",
-		},
-		{
-			from: "library/golang:1.0.0",
-			want: "golang",
-		},
-		{
-			from: "index.docker.io/library/golang:1.0.0",
-			want: "golang",
-		},
-		{
-			from: "docker.io/library/golang:1.0.0",
-			want: "golang",
-		},
-		{
-			from: "gcr.io/library/golang:1.0.0",
-			want: "gcr.io/library/golang",
-		},
-		// error cases, return input unmodified
-		{
-			from: "foo/bar?baz:boo",
-			want: "foo/bar?baz:boo",
-		},
-	}
-	for _, test := range testdata {
-		got, want := Trim(test.from), test.want
-		if got != want {
-			t.Errorf("Want image %q trimmed to %q, got %q", test.from, want, got)
-		}
-	}
-}
-
-func Test_expandImage(t *testing.T) {
-	testdata := []struct {
-		from string
-		want string
-	}{
-		{
-			from: "golang",
-			want: "docker.io/library/golang:latest",
-		},
-		{
-			from: "golang:latest",
-			want: "docker.io/library/golang:latest",
-		},
-		{
-			from: "golang:1.0.0",
-			want: "docker.io/library/golang:1.0.0",
-		},
-		{
-			from: "library/golang",
-			want: "docker.io/library/golang:latest",
-		},
-		{
-			from: "library/golang:latest",
-			want: "docker.io/library/golang:latest",
-		},
-		{
-			from: "library/golang:1.0.0",
-			want: "docker.io/library/golang:1.0.0",
-		},
-		{
-			from: "index.docker.io/library/golang:1.0.0",
-			want: "docker.io/library/golang:1.0.0",
-		},
-		{
-			from: "gcr.io/golang",
-			want: "gcr.io/golang:latest",
-		},
-		{
-			from: "gcr.io/golang:1.0.0",
-			want: "gcr.io/golang:1.0.0",
-		},
-		// error cases, return input unmodified
-		{
-			from: "foo/bar?baz:boo",
-			want: "foo/bar?baz:boo",
-		},
-	}
-	for _, test := range testdata {
-		got, want := Expand(test.from), test.want
-		if got != want {
-			t.Errorf("Want image %q expanded to %q, got %q", test.from, want, got)
-		}
-	}
-}
-
-func Test_matchImage(t *testing.T) {
-	testdata := []struct {
-		from, to string
-		want     bool
-	}{
-		{
-			from: "golang",
-			to:   "golang",
-			want: true,
-		},
-		{
-			from: "golang:latest",
-			to:   "golang",
-			want: true,
-		},
-		{
-			from: "library/golang:latest",
-			to:   "golang",
-			want: true,
-		},
-		{
-			from: "index.docker.io/library/golang:1.0.0",
-			to:   "golang",
-			want: true,
-		},
-		{
-			from: "golang",
-			to:   "golang:latest",
-			want: true,
-		},
-		{
-			from: "library/golang:latest",
-			to:   "library/golang",
-			want: true,
-		},
-		{
-			from: "gcr.io/golang",
-			to:   "gcr.io/golang",
-			want: true,
-		},
-		{
-			from: "gcr.io/golang:1.0.0",
-			to:   "gcr.io/golang",
-			want: true,
-		},
-		{
-			from: "gcr.io/golang:latest",
-			to:   "gcr.io/golang",
-			want: true,
-		},
-		{
-			from: "gcr.io/golang",
-			to:   "gcr.io/golang:latest",
-			want: true,
-		},
-		{
-			from: "golang",
-			to:   "library/golang",
-			want: true,
-		},
-		{
-			from: "golang",
-			to:   "gcr.io/project/golang",
-			want: false,
-		},
-		{
-			from: "golang",
-			to:   "gcr.io/library/golang",
-			want: false,
-		},
-		{
-			from: "golang",
-			to:   "gcr.io/golang",
-			want: false,
-		},
-	}
-	for _, test := range testdata {
-		got, want := Match(test.from, test.to), test.want
-		if got != want {
-			t.Errorf("Want image %q matching %q is %v", test.from, test.to, want)
-		}
-	}
-}
-
-func Test_matchHostname(t *testing.T) {
-	testdata := []struct {
-		image, hostname string
-		want            bool
-	}{
-		{
-			image:    "golang",
-			hostname: "docker.io",
-			want:     true,
-		},
-		{
-			image:    "golang:latest",
-			hostname: "docker.io",
-			want:     true,
-		},
-		{
-			image:    "golang:latest",
-			hostname: "index.docker.io",
-			want:     true,
-		},
-		{
-			image:    "library/golang:latest",
-			hostname: "docker.io",
-			want:     true,
-		},
-		{
-			image:    "docker.io/library/golang:1.0.0",
-			hostname: "docker.io",
-			want:     true,
-		},
-		{
-			image:    "gcr.io/golang",
-			hostname: "docker.io",
-			want:     false,
-		},
-		{
-			image:    "gcr.io/golang:1.0.0",
-			hostname: "gcr.io",
-			want:     true,
-		},
-		{
-			image:    "1.2.3.4:8000/golang:1.0.0",
-			hostname: "1.2.3.4:8000",
-			want:     true,
-		},
-		{
-			image:    "*&^%",
-			hostname: "1.2.3.4:8000",
-			want:     false,
-		},
-	}
-	for _, test := range testdata {
-		got, want := MatchHostname(test.image, test.hostname), test.want
-		if got != want {
-			t.Errorf("Want image %q matching hostname %q is %v", test.image, test.hostname, want)
-		}
-	}
-}
-
-func Test_matchTag(t *testing.T) {
-	testdata := []struct {
-		a, b string
-		want bool
-	}{
-		{
-			a:    "golang:1.0",
-			b:    "golang:1.0",
-			want: true,
-		},
-		{
-			a:    "golang",
-			b:    "golang:latest",
-			want: true,
-		},
-		{
-			a:    "docker.io/library/golang",
-			b:    "golang:latest",
-			want: true,
-		},
-		{
-			a:    "golang",
-			b:    "golang:1.0",
-			want: false,
-		},
-		{
-			a:    "golang:1.0",
-			b:    "golang:2.0",
-			want: false,
-		},
-	}
-	for _, test := range testdata {
-		got, want := MatchTag(test.a, test.b), test.want
-		if got != want {
-			t.Errorf("Want image %q matching image tag %q is %v", test.a, test.b, want)
-		}
-	}
-}

engine/compiler/step.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/drone-runners/drone-runner-docker/engine"
-	"github.com/drone-runners/drone-runner-docker/engine/compiler/encoder"
-	"github.com/drone-runners/drone-runner-docker/engine/compiler/image"
 	"github.com/drone-runners/drone-runner-docker/engine/resource"
+	"github.com/drone-runners/drone-runner-docker/internal/docker/image"
+	"github.com/drone-runners/drone-runner-docker/internal/encoder"
 )
 
 func createStep(spec *resource.Pipeline, src *resource.Step) *engine.Step {