From 74903182569db421cf5cfeb0d10700af92317b4e Mon Sep 17 00:00:00 2001 From: Marius Date: Tue, 11 May 2021 09:27:31 +0200 Subject: [PATCH 1/2] Update Transloadit Go SDK to v1.3.0 --- go.mod | 2 +- go.sum | 17 +--- transloadit/provider.go | 3 +- transloadit/provider_test.go | 5 +- transloadit/resource_template.go | 3 +- transloadit/resource_template_test.go | 3 +- vendor/github.com/hashicorp/hcl/.gitignore | 18 ++-- vendor/github.com/hashicorp/hcl/Makefile | 36 ++++---- .../mitchellh/copystructure/README.md | 42 +++++----- vendor/github.com/spf13/afero/.travis.yml | 42 +++++----- .../transloadit/go-sdk}/.gitignore | 0 .../transloadit/go-sdk}/LICENSE | 0 .../transloadit/go-sdk}/Makefile | 0 .../transloadit/go-sdk}/README.md | 11 +-- .../transloadit/go-sdk}/Vagrantfile | 0 .../transloadit/go-sdk}/assembly.go | 0 vendor/github.com/transloadit/go-sdk/go.mod | 3 + .../transloadit/go-sdk}/notification.go | 0 .../transloadit/go-sdk}/template.go | 83 +++++++++++++++++-- .../transloadit/go-sdk}/transloadit.go | 0 .../transloadit/go-sdk}/version.go | 2 +- .../transloadit/go-sdk}/wait.go | 0 .../transloadit/go-sdk.v1/.travis.yml | 23 ----- vendor/modules.txt | 4 +- 24 files changed, 170 insertions(+), 127 deletions(-) rename vendor/{gopkg.in/transloadit/go-sdk.v1 => github.com/transloadit/go-sdk}/.gitignore (100%) rename vendor/{gopkg.in/transloadit/go-sdk.v1 => github.com/transloadit/go-sdk}/LICENSE (100%) rename vendor/{gopkg.in/transloadit/go-sdk.v1 => github.com/transloadit/go-sdk}/Makefile (100%) rename vendor/{gopkg.in/transloadit/go-sdk.v1 => github.com/transloadit/go-sdk}/README.md (83%) rename vendor/{gopkg.in/transloadit/go-sdk.v1 => github.com/transloadit/go-sdk}/Vagrantfile (100%) rename vendor/{gopkg.in/transloadit/go-sdk.v1 => github.com/transloadit/go-sdk}/assembly.go (100%) create mode 100644 vendor/github.com/transloadit/go-sdk/go.mod rename vendor/{gopkg.in/transloadit/go-sdk.v1 => github.com/transloadit/go-sdk}/notification.go (100%) rename vendor/{gopkg.in/transloadit/go-sdk.v1 => github.com/transloadit/go-sdk}/template.go (66%) rename vendor/{gopkg.in/transloadit/go-sdk.v1 => github.com/transloadit/go-sdk}/transloadit.go (100%) rename vendor/{gopkg.in/transloadit/go-sdk.v1 => github.com/transloadit/go-sdk}/version.go (75%) rename vendor/{gopkg.in/transloadit/go-sdk.v1 => github.com/transloadit/go-sdk}/wait.go (100%) delete mode 100644 vendor/gopkg.in/transloadit/go-sdk.v1/.travis.yml diff --git a/go.mod b/go.mod index b4e59677..9e782682 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.12 require ( github.com/hashicorp/terraform-plugin-sdk v1.11.0 - gopkg.in/transloadit/go-sdk.v1 v1.2.0 + github.com/transloadit/go-sdk v1.3.0 ) diff --git a/go.sum b/go.sum index d6470dbd..7c2eafcf 100644 --- a/go.sum +++ b/go.sum @@ -51,7 +51,6 @@ github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFU github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk= @@ -60,7 +59,6 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -129,12 +127,10 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5 h1:tHXDdz1cpzGaovsTB+TVB8q90WEokoVmfMqoVcrLUgw= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= @@ -178,14 +174,16 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/transloadit/go-sdk v1.2.1-0.20210510215436-0b8a4e6bd012 h1:QLWp8DC10g1XizD7YjQlkrDXcBc+i3Ag5zCu2n4OVvc= +github.com/transloadit/go-sdk v1.2.1-0.20210510215436-0b8a4e6bd012/go.mod h1:4gUsTnUsd4S+liSsPH3VUXJZOW4WMMXS0Rwd1BAf4Vs= +github.com/transloadit/go-sdk v1.3.0 h1:TKeqsEwyGb5VGHtoxYJjLeD300x+pmzzMwnk9pKMbEQ= +github.com/transloadit/go-sdk v1.3.0/go.mod h1:4gUsTnUsd4S+liSsPH3VUXJZOW4WMMXS0Rwd1BAf4Vs= github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok= github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= -github.com/vmihailenco/msgpack v3.3.3+incompatible h1:wapg9xDUZDzGCNFlwc5SqI1rvcciqcxEHac4CYj89xI= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.1+incompatible h1:RMF1enSPeKTlXrXdOcqjFUElywVZjjC6pqse21bKbEU= github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= -github.com/zclconf/go-cty v1.1.0 h1:uJwc9HiBOCpoKIObTQaLR+tsEXx1HBHnOsOOpcdhZgw= github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.2.1 h1:vGMsygfmeCl4Xb6OA5U5XVAaQZ69FvoG7X2jUtQujb8= github.com/zclconf/go-cty v1.2.1/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= @@ -242,7 +240,6 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -279,7 +276,6 @@ google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200310143817-43be25429f5a h1:lRlI5zu6AFy3iU/F8YWyNrAmn/tPCnhiTxfwhWb76eU= google.golang.org/genproto v0.0.0-20200310143817-43be25429f5a/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -287,7 +283,6 @@ google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmE google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk= @@ -295,10 +290,6 @@ google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/transloadit/go-sdk.v1 v1.1.1 h1:8VU2p+9uHb7mFWvozsmLwubO8dj85x7AlruV70C5Y/M= -gopkg.in/transloadit/go-sdk.v1 v1.1.1/go.mod h1:0r/j+IlqMRif2ZcWiicnvrPu5UwhL7EXQ/UUB9WMU0c= -gopkg.in/transloadit/go-sdk.v1 v1.2.0 h1:wWHRODbLA2OFijm94DVwUH5n5k+kgDWIa+01icHDf2c= -gopkg.in/transloadit/go-sdk.v1 v1.2.0/go.mod h1:0r/j+IlqMRif2ZcWiicnvrPu5UwhL7EXQ/UUB9WMU0c= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/transloadit/provider.go b/transloadit/provider.go index f7313d0c..2bb40e3a 100644 --- a/transloadit/provider.go +++ b/transloadit/provider.go @@ -2,9 +2,10 @@ package transloadit import ( "fmt" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/terraform" - "gopkg.in/transloadit/go-sdk.v1" + transloadit "github.com/transloadit/go-sdk" ) const prefix = "transloadit_" diff --git a/transloadit/provider_test.go b/transloadit/provider_test.go index 7b947f7b..d0529f79 100644 --- a/transloadit/provider_test.go +++ b/transloadit/provider_test.go @@ -2,11 +2,12 @@ package transloadit import ( "fmt" + "os" + "testing" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/terraform" - "os" - "testing" ) var testAccProviders map[string]terraform.ResourceProvider diff --git a/transloadit/resource_template.go b/transloadit/resource_template.go index 4e61ef90..1cdcfcb6 100644 --- a/transloadit/resource_template.go +++ b/transloadit/resource_template.go @@ -4,8 +4,9 @@ import ( "context" "encoding/json" "fmt" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - transloadit "gopkg.in/transloadit/go-sdk.v1" + transloadit "github.com/transloadit/go-sdk" ) func resourceTemplate() *schema.Resource { diff --git a/transloadit/resource_template_test.go b/transloadit/resource_template_test.go index 7ef9c4ca..96ec4f7b 100644 --- a/transloadit/resource_template_test.go +++ b/transloadit/resource_template_test.go @@ -2,9 +2,10 @@ package transloadit import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "math/rand" "testing" + + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" ) func TestAccTemplate_basic(t *testing.T) { diff --git a/vendor/github.com/hashicorp/hcl/.gitignore b/vendor/github.com/hashicorp/hcl/.gitignore index 822fa09f..15586a2b 100644 --- a/vendor/github.com/hashicorp/hcl/.gitignore +++ b/vendor/github.com/hashicorp/hcl/.gitignore @@ -1,9 +1,9 @@ -y.output - -# ignore intellij files -.idea -*.iml -*.ipr -*.iws - -*.test +y.output + +# ignore intellij files +.idea +*.iml +*.ipr +*.iws + +*.test diff --git a/vendor/github.com/hashicorp/hcl/Makefile b/vendor/github.com/hashicorp/hcl/Makefile index 9fafd501..84fd743f 100644 --- a/vendor/github.com/hashicorp/hcl/Makefile +++ b/vendor/github.com/hashicorp/hcl/Makefile @@ -1,18 +1,18 @@ -TEST?=./... - -default: test - -fmt: generate - go fmt ./... - -test: generate - go get -t ./... - go test $(TEST) $(TESTARGS) - -generate: - go generate ./... - -updatedeps: - go get -u golang.org/x/tools/cmd/stringer - -.PHONY: default generate test updatedeps +TEST?=./... + +default: test + +fmt: generate + go fmt ./... + +test: generate + go get -t ./... + go test $(TEST) $(TESTARGS) + +generate: + go generate ./... + +updatedeps: + go get -u golang.org/x/tools/cmd/stringer + +.PHONY: default generate test updatedeps diff --git a/vendor/github.com/mitchellh/copystructure/README.md b/vendor/github.com/mitchellh/copystructure/README.md index f0fbd2e5..bcb8c8d2 100644 --- a/vendor/github.com/mitchellh/copystructure/README.md +++ b/vendor/github.com/mitchellh/copystructure/README.md @@ -1,21 +1,21 @@ -# copystructure - -copystructure is a Go library for deep copying values in Go. - -This allows you to copy Go values that may contain reference values -such as maps, slices, or pointers, and copy their data as well instead -of just their references. - -## Installation - -Standard `go get`: - -``` -$ go get github.com/mitchellh/copystructure -``` - -## Usage & Example - -For usage and examples see the [Godoc](http://godoc.org/github.com/mitchellh/copystructure). - -The `Copy` function has examples associated with it there. +# copystructure + +copystructure is a Go library for deep copying values in Go. + +This allows you to copy Go values that may contain reference values +such as maps, slices, or pointers, and copy their data as well instead +of just their references. + +## Installation + +Standard `go get`: + +``` +$ go get github.com/mitchellh/copystructure +``` + +## Usage & Example + +For usage and examples see the [Godoc](http://godoc.org/github.com/mitchellh/copystructure). + +The `Copy` function has examples associated with it there. diff --git a/vendor/github.com/spf13/afero/.travis.yml b/vendor/github.com/spf13/afero/.travis.yml index 8fc1261c..0637db72 100644 --- a/vendor/github.com/spf13/afero/.travis.yml +++ b/vendor/github.com/spf13/afero/.travis.yml @@ -1,21 +1,21 @@ -sudo: false -language: go - -go: - - 1.9 - - "1.10" - - tip - -os: - - linux - - osx - -matrix: - allow_failures: - - go: tip - fast_finish: true - -script: - - go build - - go test -race -v ./... - +sudo: false +language: go + +go: + - 1.9 + - "1.10" + - tip + +os: + - linux + - osx + +matrix: + allow_failures: + - go: tip + fast_finish: true + +script: + - go build + - go test -race -v ./... + diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/.gitignore b/vendor/github.com/transloadit/go-sdk/.gitignore similarity index 100% rename from vendor/gopkg.in/transloadit/go-sdk.v1/.gitignore rename to vendor/github.com/transloadit/go-sdk/.gitignore diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/LICENSE b/vendor/github.com/transloadit/go-sdk/LICENSE similarity index 100% rename from vendor/gopkg.in/transloadit/go-sdk.v1/LICENSE rename to vendor/github.com/transloadit/go-sdk/LICENSE diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/Makefile b/vendor/github.com/transloadit/go-sdk/Makefile similarity index 100% rename from vendor/gopkg.in/transloadit/go-sdk.v1/Makefile rename to vendor/github.com/transloadit/go-sdk/Makefile diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/README.md b/vendor/github.com/transloadit/go-sdk/README.md similarity index 83% rename from vendor/gopkg.in/transloadit/go-sdk.v1/README.md rename to vendor/github.com/transloadit/go-sdk/README.md index 41a39bdf..15d6fa23 100644 --- a/vendor/gopkg.in/transloadit/go-sdk.v1/README.md +++ b/vendor/github.com/transloadit/go-sdk/README.md @@ -1,6 +1,3 @@ -[![Build Status](https://travis-ci.org/transloadit/go-sdk.svg)](https://travis-ci.org/transloadit/go-sdk) -[![Coverage Status](https://coveralls.io/repos/transloadit/go-sdk/badge.png)](https://coveralls.io/r/transloadit/go-sdk) - # go-sdk A **Go** Integration for [Transloadit](https://transloadit.com)'s file uploading and encoding service @@ -14,10 +11,10 @@ This is a **Go** SDK to make it easy to talk to the [Transloadit](https://transl ## Install ```bash -go get gopkg.in/transloadit/go-sdk.v1 +go get github.com/transloadit/go-sdk ``` -The Go SDK requires Go 1.7 or higher. +The Go SDK is confirmed to work with Go 1.11 or higher. ## Usage @@ -28,7 +25,7 @@ import ( "context" "fmt" - "gopkg.in/transloadit/go-sdk.v1" + "github.com/transloadit/go-sdk" ) func main() { @@ -78,7 +75,7 @@ For fully working examples on how to use templates, non-blocking processing and ## Documentation -See Godoc for full API documentation. +See Godoc for full API documentation. ## License diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/Vagrantfile b/vendor/github.com/transloadit/go-sdk/Vagrantfile similarity index 100% rename from vendor/gopkg.in/transloadit/go-sdk.v1/Vagrantfile rename to vendor/github.com/transloadit/go-sdk/Vagrantfile diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/assembly.go b/vendor/github.com/transloadit/go-sdk/assembly.go similarity index 100% rename from vendor/gopkg.in/transloadit/go-sdk.v1/assembly.go rename to vendor/github.com/transloadit/go-sdk/assembly.go diff --git a/vendor/github.com/transloadit/go-sdk/go.mod b/vendor/github.com/transloadit/go-sdk/go.mod new file mode 100644 index 00000000..b0279c9f --- /dev/null +++ b/vendor/github.com/transloadit/go-sdk/go.mod @@ -0,0 +1,3 @@ +module github.com/transloadit/go-sdk + +go 1.15 diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/notification.go b/vendor/github.com/transloadit/go-sdk/notification.go similarity index 100% rename from vendor/gopkg.in/transloadit/go-sdk.v1/notification.go rename to vendor/github.com/transloadit/go-sdk/notification.go diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/template.go b/vendor/github.com/transloadit/go-sdk/template.go similarity index 66% rename from vendor/gopkg.in/transloadit/go-sdk.v1/template.go rename to vendor/github.com/transloadit/go-sdk/template.go index 898efd66..05a31b47 100644 --- a/vendor/gopkg.in/transloadit/go-sdk.v1/template.go +++ b/vendor/github.com/transloadit/go-sdk/template.go @@ -3,6 +3,7 @@ package transloadit import ( "context" "encoding/json" + "fmt" ) // Template contains details about a single template. @@ -14,8 +15,82 @@ type Template struct { } // TemplateContent contains details about the content of a single template. +// The Steps fields maps to the `steps` key in the JSON format. The AdditionalProperties +// field allows you to store additional keys (such as `notify_url`) on the same +// level as the `steps` key. +// For example, the following instance +// TemplateContent{ +// Steps: map[string]interface{}{ +// ":original": map[string]interface{}{ +// "robot": "/upload/handle", +// }, +// "resize": map[string]interface{}{ +// "robot": "/image/resize", +// }, +// }, +// AdditionalProperties: map[string]interface{}{ +// "notify_url": "https://example.com", +// "allow_steps_override": false, +// }, +// } +// is represented by following JSON: +// { +// "steps": { +// ":original": { +// "robot": "/upload/handle" +// }, +// "resize": { +// "robot": "/image/resize" +// } +// }, +// "allow_steps_override": false, +// "notify_url": "https://example.com" +// } type TemplateContent struct { - Steps map[string]interface{} `json:"steps"` + Steps map[string]interface{} + AdditionalProperties map[string]interface{} +} + +func (content *TemplateContent) UnmarshalJSON(b []byte) error { + var data map[string]interface{} + if err := json.Unmarshal(b, &data); err != nil { + return err + } + + if stepsRaw, ok := data["steps"]; ok { + steps, ok := stepsRaw.(map[string]interface{}) + if !ok { + return fmt.Errorf("transloadit: steps property in template content is not an object but %v", stepsRaw) + } + + content.Steps = steps + delete(data, "steps") + } + + if content.AdditionalProperties == nil { + content.AdditionalProperties = make(map[string]interface{}, len(data)) + } + + for key, val := range data { + content.AdditionalProperties[key] = val + } + + return nil +} + +func (content TemplateContent) MarshalJSON() ([]byte, error) { + // Add a hint for the size of the map to reduce the number of necessary allocations + // when filling the map. + numKeys := len(content.AdditionalProperties) + 1 + data := make(map[string]interface{}, numKeys) + + data["steps"] = content.Steps + + for key, val := range content.AdditionalProperties { + data[key] = val + } + + return json.Marshal(data) } // TemplateList contains a list of templates. @@ -24,11 +99,6 @@ type TemplateList struct { Count int `json:"count"` } -type templateListInternal struct { - Templates []templateInternal `json:"items"` - Count int `json:"count"` -} - // NewTemplate returns a new Template struct with initialized values. This // template will not be saved to Transloadit. To do so, please use the // Client.CreateTemplate function. @@ -36,6 +106,7 @@ func NewTemplate() Template { return Template{ Content: TemplateContent{ make(map[string]interface{}), + make(map[string]interface{}), }, } } diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/transloadit.go b/vendor/github.com/transloadit/go-sdk/transloadit.go similarity index 100% rename from vendor/gopkg.in/transloadit/go-sdk.v1/transloadit.go rename to vendor/github.com/transloadit/go-sdk/transloadit.go diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/version.go b/vendor/github.com/transloadit/go-sdk/version.go similarity index 75% rename from vendor/gopkg.in/transloadit/go-sdk.v1/version.go rename to vendor/github.com/transloadit/go-sdk/version.go index e893dc2a..ca984dbf 100644 --- a/vendor/gopkg.in/transloadit/go-sdk.v1/version.go +++ b/vendor/github.com/transloadit/go-sdk/version.go @@ -1,4 +1,4 @@ package transloadit // Version specifies the version of the Go SDK. -var Version = "v1.2.0" +var Version = "v1.3.0" diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/wait.go b/vendor/github.com/transloadit/go-sdk/wait.go similarity index 100% rename from vendor/gopkg.in/transloadit/go-sdk.v1/wait.go rename to vendor/github.com/transloadit/go-sdk/wait.go diff --git a/vendor/gopkg.in/transloadit/go-sdk.v1/.travis.yml b/vendor/gopkg.in/transloadit/go-sdk.v1/.travis.yml deleted file mode 100644 index e09f26bf..00000000 --- a/vendor/gopkg.in/transloadit/go-sdk.v1/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -language: go -go: -- 1.7 -- 1.8 -- 1.9 -- "1.10" -- 1.11 -- 1.12 -- 1.13 -- 1.14 -sudo: false -before_install: -- go get github.com/axw/gocov/gocov -- go get github.com/mattn/goveralls -- go get . -script: -- make test -notifications: - slack: - secure: U+RtmtVJEzEoZf+/VVuon9qNC4GXKzXoTqdYThP57ZTzqoDAJDnuZ/qUrMGrMYpYg38ikxtK3qJhBMfffzHXc3KS9hcA7Ay/yPz4QiCBMy3M9EBPWt8iGP6n2T3KUw4WG/hSBUtnJqmwPdzRfVUIqOMgchiN9eWwEbEmSYTvOqA= -env: - global: - - secure: wGKrsYBSuI4NhxcveqjQGCuY1Jcrh6iF59FEZS8ipWVSIqp2sMQU3K7LqgeUVnyCqXT0LsuLFMPhKDHc8My+aFno85jrmkJo7+gvBnCQC/f5/7Ee3r4LdEgmv4dIRrsItYir/ez/KIQ2BtynWEdLk8/afgNCOF9IjvtX6XneDYg= diff --git a/vendor/modules.txt b/vendor/modules.txt index 5fe60e99..62d4c3f4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -209,6 +209,8 @@ github.com/posener/complete/match # github.com/spf13/afero v1.2.2 github.com/spf13/afero github.com/spf13/afero/mem +# github.com/transloadit/go-sdk v1.3.0 +github.com/transloadit/go-sdk # github.com/ulikunitz/xz v0.5.5 github.com/ulikunitz/xz github.com/ulikunitz/xz/internal/hash @@ -348,5 +350,3 @@ google.golang.org/grpc/stats google.golang.org/grpc/status google.golang.org/grpc/tap google.golang.org/grpc/test/bufconn -# gopkg.in/transloadit/go-sdk.v1 v1.2.0 -gopkg.in/transloadit/go-sdk.v1 From c1cf36d94bdfed86b5d6e0fbdd0f5a2c283f37c0 Mon Sep 17 00:00:00 2001 From: Marius Date: Tue, 11 May 2021 09:28:34 +0200 Subject: [PATCH 2/2] Parse template content using Go SDK --- transloadit/resource_template.go | 19 ++++--------------- transloadit/resource_template_test.go | 13 +++++++------ 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/transloadit/resource_template.go b/transloadit/resource_template.go index 1cdcfcb6..804d8006 100644 --- a/transloadit/resource_template.go +++ b/transloadit/resource_template.go @@ -104,22 +104,11 @@ func resourceTemplateUpdate(d *schema.ResourceData, meta interface{}) error { } func jsonStringToTemplate(src string) (*transloadit.TemplateContent, error) { - var v interface{} - err := json.Unmarshal([]byte(src), &v) + var content transloadit.TemplateContent + err := json.Unmarshal([]byte(src), &content) if err != nil { return nil, err } - content, ok := v.(map[string]interface{}) - if !ok { - return nil, fmt.Errorf("Content must be an JSON Object (Map)") - } - if value, ok := content["steps"]; ok { - steps, ok := value.(map[string]interface{}) - if !ok { - return nil, fmt.Errorf("Steps value must be an Json Object") - } - return &transloadit.TemplateContent{Steps: steps}, nil - } else { - return nil, fmt.Errorf("Template must have a top-level key 'steps'") - } + + return &content, nil } diff --git a/transloadit/resource_template_test.go b/transloadit/resource_template_test.go index 96ec4f7b..ca2a998d 100644 --- a/transloadit/resource_template_test.go +++ b/transloadit/resource_template_test.go @@ -35,8 +35,8 @@ func TestAccTemplate_basic(t *testing.T) { const testAccTemplate_basic_1 = ` resource "transloadit_template" "test" { - name = "%s" - template = <