diff --git a/.gitignore b/.gitignore index 9d5fbf3..80b6570 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ NOTES* *.out -*.env \ No newline at end of file +*.env +drone-yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 41d5b29..c9354f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed +- Support for yaml merge keys, by [@bradrydzewski](https://github.com/bradrydzewski). ## [1.0.9] - 2019-05-20 ### Added diff --git a/go.mod b/go.mod index 2b64654..72043e0 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,19 @@ module github.com/drone/drone-yaml require ( - github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc - github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf + github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect + github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect github.com/bmatcuk/doublestar v1.1.1 + github.com/buildkite/yaml v2.1.0+incompatible github.com/docker/distribution v2.7.1+incompatible github.com/docker/go-units v0.3.3 github.com/drone/drone-runtime v1.0.5 github.com/ghodss/yaml v1.0.0 github.com/google/go-cmp v0.2.0 - github.com/opencontainers/go-digest v1.0.0-rc1 + github.com/kr/pretty v0.1.0 // indirect github.com/sergi/go-diff v1.0.0 + github.com/stretchr/testify v1.3.0 // indirect + github.com/vinzenz/yaml v0.0.0-20170920082545-91409cdd725d gopkg.in/alecthomas/kingpin.v2 v2.2.6 - gopkg.in/yaml.v2 v2.2.2 + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect ) diff --git a/go.sum b/go.sum index 40a1f59..7436e82 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -docker.io/go-docker v1.0.0 h1:VdXS/aNYQxyA9wdLD5z8Q8Ro688/hG8HzKxYVEVbE6s= docker.io/go-docker v1.0.0/go.mod h1:7tiAn5a0LFmjbPDbyTPOaTTOuG1ZRNXdPA6RvKY+fpY= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU= @@ -7,97 +6,72 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZq github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/buildkite/yaml v2.1.0+incompatible h1:xirI+ql5GzfikVNDmt+yeiXpf/v1Gt03qXTtT5WXdr8= +github.com/buildkite/yaml v2.1.0+incompatible/go.mod h1:UoU8vbcwu1+vjZq01+KrpSeLBgQQIjL/H7Y6KwikUrI= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/go-connections v0.3.0 h1:3lOnM9cSzgGwx8VfK/NGOW5fLQ0GjIlCkaktF+n1M6o= github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/drone/drone-runtime v0.0.0-20190210191445-ad403a0ca24e h1:Eq0QI9lKe6T5pziU/Kes1xX6QKAA6ZfnYvaZZeyY5TU= -github.com/drone/drone-runtime v0.0.0-20190210191445-ad403a0ca24e/go.mod h1:I+wJO4yvngCUAro6wKjkMbuPPDI/jRynqU0LTW+8J44= github.com/drone/drone-runtime v1.0.5 h1:fEdUvKd5+l8BQaPXntjUtSIVLvGWo3Blgb/zrXLKJoM= github.com/drone/drone-runtime v1.0.5/go.mod h1:+osgwGADc/nyl40J0fdsf8Z09bgcBZXvXXnLOY48zYs= -github.com/drone/signal v1.0.0 h1:NrnM2M/4yAuU/tXs6RP1a1ZfxnaHwYkd0kJurA1p6uI= github.com/drone/signal v1.0.0/go.mod h1:S8t92eFT0g4WUgEc/LxG+LCuiskpMNsG0ajAMGnyZpc= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506 h1:zDlw+wgyXdfkRuvFCdEDUiPLmZp2cvf/dWHazY0a5VM= github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= -github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g= github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f h1:ShTPMJQes6tubcjzGMODIVG5hlrCeImaBnZzKF2N8SM= github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/natessilva/dag v0.0.0-20180124060714-7194b8dcc5c4 h1:dnMxwus89s86tI8rcGVp2HwZzlz7c5o92VOy7dSckBQ= github.com/natessilva/dag v0.0.0-20180124060714-7194b8dcc5c4/go.mod h1:cojhOHk1gbMeklOyDP2oKKLftefXoJreOQGOrXk+Z38= github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c/go.mod h1:HUpKUBZnpzkdx0kD/+Yfuft+uD3zHGtXF/XJB14TUr4= -github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/vinzenz/yaml v0.0.0-20170920082545-91409cdd725d/go.mod h1:mb5taDqMnJiZNRQ3+02W2IFG+oEz1+dTuCXkp4jpkfo= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181005035420-146acd28ed58 h1:otZG8yDCO4LVps5+9bxOeNiCvgmOyt96J3roHTYs7oE= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 h1:uESlIz09WIHT2I+pasSXcpLYqYK8wHcdCetU3VuMBJE= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e h1:EfdBzeKbFSvOjoIqSZcfS8wp0FBLokGBEs9lz1OtSg0= golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -k8s.io/api v0.0.0-20181130031204-d04500c8c3dd h1:5aHsneN62ehs/tdtS9tWZlhVk68V7yms/Qw7nsGmvCA= k8s.io/api v0.0.0-20181130031204-d04500c8c3dd/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/apimachinery v0.0.0-20181201231028-18a5ff3097b4 h1:JbAkABSztlJL76bNqKsGGBXf9++ZHClITsuRKrZ8wfw= k8s.io/apimachinery v0.0.0-20181201231028-18a5ff3097b4/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/client-go v9.0.0+incompatible h1:2kqW3X2xQ9SbFvWZjGEHBLlWc1LG9JIJNXWkuqwdZ3A= k8s.io/client-go v9.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/klog v0.1.0 h1:I5HMfc/DtuVaGR1KPwUrTc476K8NCqNBldC7H4dYEzk= k8s.io/klog v0.1.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/yaml/build_test.go b/yaml/build_test.go index adf387b..255c355 100644 --- a/yaml/build_test.go +++ b/yaml/build_test.go @@ -7,7 +7,7 @@ package yaml import ( "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestBuild(t *testing.T) { diff --git a/yaml/compiler/encode.go b/yaml/compiler/encode.go index 9b11682..8029656 100644 --- a/yaml/compiler/encode.go +++ b/yaml/compiler/encode.go @@ -19,8 +19,8 @@ import ( "strconv" "strings" + "github.com/buildkite/yaml" json "github.com/ghodss/yaml" - "gopkg.in/yaml.v2" ) // helper funciton encodes an interface value as a string. diff --git a/yaml/cond_test.go b/yaml/cond_test.go index 1b12f9a..382008f 100644 --- a/yaml/cond_test.go +++ b/yaml/cond_test.go @@ -7,7 +7,7 @@ package yaml import ( "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestConstraintMatch(t *testing.T) { diff --git a/yaml/converter/bitbucket/convert.go b/yaml/converter/bitbucket/convert.go index ec369ec..a365ce1 100644 --- a/yaml/converter/bitbucket/convert.go +++ b/yaml/converter/bitbucket/convert.go @@ -11,7 +11,7 @@ import ( droneyaml "github.com/drone/drone-yaml/yaml" "github.com/drone/drone-yaml/yaml/pretty" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) // Convert converts the yaml configuration file from diff --git a/yaml/converter/gitlab/convert.go b/yaml/converter/gitlab/convert.go index 68b8fe2..7a19938 100644 --- a/yaml/converter/gitlab/convert.go +++ b/yaml/converter/gitlab/convert.go @@ -12,7 +12,7 @@ import ( "github.com/drone/drone-yaml/yaml/compiler/image" "github.com/drone/drone-yaml/yaml/pretty" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) // Convert converts the yaml configuration file from diff --git a/yaml/converter/internal/string_slice_test.go b/yaml/converter/internal/string_slice_test.go index c924d35..7a4faeb 100644 --- a/yaml/converter/internal/string_slice_test.go +++ b/yaml/converter/internal/string_slice_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestStringSlice(t *testing.T) { diff --git a/yaml/converter/legacy/internal/config.go b/yaml/converter/legacy/internal/config.go index 5714632..de2ddd1 100644 --- a/yaml/converter/legacy/internal/config.go +++ b/yaml/converter/legacy/internal/config.go @@ -14,7 +14,7 @@ import ( "github.com/drone/drone-yaml/yaml/converter/legacy/matrix" "github.com/drone/drone-yaml/yaml/pretty" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) // Config provides the high-level configuration. diff --git a/yaml/converter/legacy/internal/container.go b/yaml/converter/legacy/internal/container.go index 82f2cb0..460bf82 100644 --- a/yaml/converter/legacy/internal/container.go +++ b/yaml/converter/legacy/internal/container.go @@ -7,7 +7,7 @@ package yaml import ( "fmt" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) type ( diff --git a/yaml/converter/legacy/internal/secret_test.go b/yaml/converter/legacy/internal/secret_test.go index 0eb9d0d..4d021dd 100644 --- a/yaml/converter/legacy/internal/secret_test.go +++ b/yaml/converter/legacy/internal/secret_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestUnmarshalSecrets(t *testing.T) { diff --git a/yaml/converter/legacy/internal/slice_map_test.go b/yaml/converter/legacy/internal/slice_map_test.go index 6677b75..0b1f186 100644 --- a/yaml/converter/legacy/internal/slice_map_test.go +++ b/yaml/converter/legacy/internal/slice_map_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestMapSlice(t *testing.T) { diff --git a/yaml/converter/legacy/internal/string_slice_test.go b/yaml/converter/legacy/internal/string_slice_test.go index 88a33d7..1d14395 100644 --- a/yaml/converter/legacy/internal/string_slice_test.go +++ b/yaml/converter/legacy/internal/string_slice_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestStringSlice(t *testing.T) { diff --git a/yaml/converter/legacy/internal/volume_test.go b/yaml/converter/legacy/internal/volume_test.go index 55d95ed..ee9227c 100644 --- a/yaml/converter/legacy/internal/volume_test.go +++ b/yaml/converter/legacy/internal/volume_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestVolume(t *testing.T) { diff --git a/yaml/converter/legacy/matrix/matrix.go b/yaml/converter/legacy/matrix/matrix.go index 786de2a..112dd1b 100644 --- a/yaml/converter/legacy/matrix/matrix.go +++ b/yaml/converter/legacy/matrix/matrix.go @@ -7,7 +7,7 @@ package matrix import ( "strings" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) const ( diff --git a/yaml/env_test.go b/yaml/env_test.go index 5961dbc..26d6383 100644 --- a/yaml/env_test.go +++ b/yaml/env_test.go @@ -7,7 +7,7 @@ package yaml import ( "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestEnv(t *testing.T) { diff --git a/yaml/manifest.go b/yaml/manifest.go index 2b0431a..44faa3a 100644 --- a/yaml/manifest.go +++ b/yaml/manifest.go @@ -19,7 +19,7 @@ import ( "encoding/json" "errors" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) // Resource enums. diff --git a/yaml/param_test.go b/yaml/param_test.go index 1136b13..7489c47 100644 --- a/yaml/param_test.go +++ b/yaml/param_test.go @@ -7,7 +7,7 @@ package yaml import ( "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestParam(t *testing.T) { diff --git a/yaml/parse.go b/yaml/parse.go index 51905e6..82ff09a 100644 --- a/yaml/parse.go +++ b/yaml/parse.go @@ -21,7 +21,7 @@ import ( "os" "strings" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) // Parse parses the configuration from io.Reader r. diff --git a/yaml/port_test.go b/yaml/port_test.go index 8480cee..8656dcf 100644 --- a/yaml/port_test.go +++ b/yaml/port_test.go @@ -7,7 +7,7 @@ package yaml import ( "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestPort(t *testing.T) { diff --git a/yaml/pretty/writer_test.go b/yaml/pretty/writer_test.go index cbb89de..d68e948 100644 --- a/yaml/pretty/writer_test.go +++ b/yaml/pretty/writer_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) // this unit tests pretty prints a complex yaml structure diff --git a/yaml/push_test.go b/yaml/push_test.go index f447142..39c9818 100644 --- a/yaml/push_test.go +++ b/yaml/push_test.go @@ -7,7 +7,7 @@ package yaml import ( "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestPush(t *testing.T) { diff --git a/yaml/signer/signer.go b/yaml/signer/signer.go index 9528571..99d46fc 100644 --- a/yaml/signer/signer.go +++ b/yaml/signer/signer.go @@ -9,7 +9,7 @@ import ( "github.com/drone/drone-yaml/yaml" - goyaml "gopkg.in/yaml.v2" + goyaml "github.com/buildkite/yaml" ) // ErrInvalidKey is returned when the key is missing or diff --git a/yaml/unit_test.go b/yaml/unit_test.go index a2b06be..44394e1 100644 --- a/yaml/unit_test.go +++ b/yaml/unit_test.go @@ -17,7 +17,7 @@ package yaml import ( "testing" - "gopkg.in/yaml.v2" + "github.com/buildkite/yaml" ) func TestBytesSize(t *testing.T) {