diff --git a/go.mod b/go.mod index d02fb3836..b39034443 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/gliderlabs/ssh v0.3.2 // indirect github.com/go-git/go-git/v5 v5.2.0 // indirect github.com/go-test/deep v1.0.7 // indirect - github.com/google/go-cmp v0.5.5 // indirect + github.com/google/go-querystring v1.1.0 // indirect github.com/google/uuid v1.2.0 github.com/gruntwork-io/terratest v0.32.3 github.com/hashicorp/errwrap v1.1.0 // indirect @@ -23,8 +23,8 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.2 // indirect github.com/hashicorp/hcl/v2 v2.9.1 // indirect - github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.4 - github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce // indirect + github.com/hashicorp/terraform-plugin-sdk/v2 v2.5.0 + github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864 // indirect github.com/imdario/mergo v0.3.11 // indirect github.com/jhump/protoreflect v1.8.1 // indirect github.com/jinzhu/copier v0.2.8 @@ -38,16 +38,14 @@ require ( github.com/stretchr/testify v1.7.0 github.com/ulikunitz/xz v0.5.10 // indirect github.com/xanzy/ssh-agent v0.3.0 // indirect + github.com/zclconf/go-cty v1.8.1 // indirect go.opencensus.io v0.22.6 // indirect - golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b // indirect - golang.org/x/net v0.0.0-20210315170653-34ac3e1c2000 // indirect + golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect + golang.org/x/net v0.0.0-20210324205630-d1beb07c2056 // indirect golang.org/x/oauth2 v0.0.0-20210201163806-010130855d6c // indirect - golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005 // indirect golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect google.golang.org/api v0.39.0 // indirect - google.golang.org/genproto v0.0.0-20210315173758-2651cd453018 // indirect - google.golang.org/grpc v1.36.0 // indirect - google.golang.org/protobuf v1.25.1-0.20210316024112-23ccb359e1a1 // indirect + google.golang.org/genproto v0.0.0-20210325141258-5636347f2b14 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/go.sum b/go.sum index a4bd8d56c..4c4a28c87 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,6 @@ github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jB github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk= github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/OctopusDeploy/go-octopusdeploy v1.7.11 h1:2Ze8CZrx6xpawRu2SNaClrHYlEz/JcpTIGZFrca5Ers= -github.com/OctopusDeploy/go-octopusdeploy v1.7.11/go.mod h1:ErnZWlZrYbcSt4WzN16dViDsvGAJPjIkyfu9GUrDI6k= github.com/OctopusDeploy/go-octopusdeploy v1.7.12 h1:ev5ZcOHkyNLQ5vie2Xj5fcPfMX2Syzii42YZB2cmI7Y= github.com/OctopusDeploy/go-octopusdeploy v1.7.12/go.mod h1:pvMxtECMFIdX6Ex4DRd02reBd4Ab6pvuCJvWnHXjoqw= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -281,8 +279,10 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1 h1:jAbXjIeW2ZSW2AwFxlGTDoc2CjI2XujLkV3ArsZFCvc= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= 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= @@ -299,8 +299,9 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-containerregistry v0.0.0-20200110202235-f4fb41bf00a3/go.mod h1:2wIuQute9+hhWqvL3vEI7YB0EKluF4WcPzI1eAliazk= -github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -324,7 +325,6 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -397,12 +397,12 @@ github.com/hashicorp/terraform-json v0.8.0 h1:XObQ3PgqU52YLQKEaJ08QtUshAfN3yu4u8 github.com/hashicorp/terraform-json v0.8.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE= github.com/hashicorp/terraform-plugin-go v0.2.1 h1:EW/R8bB2Zbkjmugzsy1d27yS8/0454b3MtYHkzOknqA= github.com/hashicorp/terraform-plugin-go v0.2.1/go.mod h1:10V6F3taeDWVAoLlkmArKttR3IULlRWFAGtQIQTIDr4= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.4 h1:6k0WcxFgVqF/GUFHPvAH8FIrCkoA1RInXzSxhkKamPg= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.4/go.mod h1:z+cMZ0iswzZOahBJ3XmNWgWkVnAd2bl8g+FhyyuPDH4= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.5.0 h1:4EHNOAjwiYCeBxY16rt2KwyRNNVsCaVO3kWBbiXfYM0= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.5.0/go.mod h1:z+cMZ0iswzZOahBJ3XmNWgWkVnAd2bl8g+FhyyuPDH4= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce h1:7UnVY3T/ZnHUrfviiAgIUjg2PXxsQfs5bphsG8F7Keo= -github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864 h1:Y4V+SFe7d3iH+9pJCoeWIOS5/xBJIFsltS7E+KJSsJY= +github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -419,7 +419,6 @@ github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyX github.com/jhump/protoreflect v1.8.1 h1:z7Ciiz3Bz37zSd485fbiTW8ABafIasyOWZI0N9EUUdo= github.com/jhump/protoreflect v1.8.1/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s= -github.com/jinzhu/copier v0.1.0/go.mod h1:24xnZezI2Yqac9J61UC6/dG/k76ttpq0DdJI3QmUvro= github.com/jinzhu/copier v0.2.8 h1:N8MbL5niMwE3P4dOwurJixz5rMkKfujmMRFmAanSzWE= github.com/jinzhu/copier v0.2.8/go.mod h1:24xnZezI2Yqac9J61UC6/dG/k76ttpq0DdJI3QmUvro= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -631,8 +630,9 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= github.com/zclconf/go-cty v1.2.1/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= -github.com/zclconf/go-cty v1.8.0 h1:s4AvqaeQzJIu3ndv4gVIhplVD0krU+bgrcLSVUnaWuA= github.com/zclconf/go-cty v1.8.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= +github.com/zclconf/go-cty v1.8.1 h1:SI0LqNeNxAgv2WWqWJMlG2/Ad/6aYJ7IVYYMigmfkuI= +github.com/zclconf/go-cty v1.8.1/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= @@ -661,9 +661,9 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b h1:wSOdpTq0/eI46Ez/LkDwIsAKA71YP2SRKBODiRWM0as= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -745,8 +745,9 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210315170653-34ac3e1c2000 h1:6mqyFav9MzRNys8OnKlbKYSJxsoVvhb773Si3bu5fYE= -golang.org/x/net v0.0.0-20210315170653-34ac3e1c2000/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210324205630-d1beb07c2056 h1:sANdAef76Ioam9aQUUdcAqricwY/WUaMc4+7LY4eGg8= +golang.org/x/net v0.0.0-20210324205630-d1beb07c2056/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -823,9 +824,10 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005 h1:pDMpM2zh2MT0kHy037cKlSby2nEhD50SYqwQk76Nm40= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492 h1:Paq34FxTluEPvVyayQqMPgHm+vTOrIifmcYxFBx9TLg= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -980,8 +982,8 @@ google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210202153253-cf70463f6119/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210203152818-3206188e46ba/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210315173758-2651cd453018 h1:ZH67MZWSz0sEGHWoYAO1ysjL0yWEXTQ7gOxytol4KAk= -google.golang.org/genproto v0.0.0-20210315173758-2651cd453018/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210325141258-5636347f2b14 h1:0VNRpy5TroA/6mYt3pPEq+E3oomxLJ+FUit3+oIsUy4= +google.golang.org/genproto v0.0.0-20210325141258-5636347f2b14/go.mod h1:f2Bd7+2PlaVKmvKQ52aspJZXIDaRQBVdOOBfJ5i8OEs= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1015,8 +1017,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.25.1-0.20210316024112-23ccb359e1a1 h1:IFrUiw8vEnjuyv/uG3DivpiuweLPD1mVH1F6RusXkKw= -google.golang.org/protobuf v1.25.1-0.20210316024112-23ccb359e1a1/go.mod h1:hFxJC2f0epmp1elRCiEGJTKAWbwxZ2nvqZdHl3FQXCY= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= 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/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/octopusdeploy/schema_action_template_parameter.go b/octopusdeploy/schema_action_template_parameter.go index 6d1de2f65..a52313afe 100644 --- a/octopusdeploy/schema_action_template_parameter.go +++ b/octopusdeploy/schema_action_template_parameter.go @@ -77,7 +77,7 @@ func getActionTemplateParameterSchema() map[string]*schema.Schema { Description: "The name of the variable set by the parameter. The name can contain letters, digits, dashes and periods. Example: `ServerName`.", Required: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty), + ValidateDiagFunc: validation.ToDiagFunc(validation.StringIsNotEmpty), }, } } diff --git a/octopusdeploy/schema_amazon_web_services_account.go b/octopusdeploy/schema_amazon_web_services_account.go index bc7d3d69f..0f6b613c9 100644 --- a/octopusdeploy/schema_amazon_web_services_account.go +++ b/octopusdeploy/schema_amazon_web_services_account.go @@ -61,7 +61,7 @@ func getAmazonWebServicesAccountSchema() map[string]*schema.Schema { Description: "The name of this AWS account.", Required: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringLenBetween(1, 200)), + ValidateDiagFunc: validation.ToDiagFunc(validation.StringLenBetween(1, 200)), }, "secret_key": getSecretKeySchema(true), "space_id": getSpaceIDSchema(), diff --git a/octopusdeploy/schema_certificate.go b/octopusdeploy/schema_certificate.go index f7f291b33..1ce1970c4 100644 --- a/octopusdeploy/schema_certificate.go +++ b/octopusdeploy/schema_certificate.go @@ -192,7 +192,7 @@ func getCertificateSchema() map[string]*schema.Schema { Required: true, Sensitive: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty), + ValidateDiagFunc: validation.ToDiagFunc(validation.StringIsNotEmpty), }, "certificate_data_format": getCertificateDataFormatSchema(), "environments": getEnvironmentsSchema(), diff --git a/octopusdeploy/schema_connectivity_policy.go b/octopusdeploy/schema_connectivity_policy.go index 07535e346..6e2e54890 100644 --- a/octopusdeploy/schema_connectivity_policy.go +++ b/octopusdeploy/schema_connectivity_policy.go @@ -45,7 +45,7 @@ func getConnectivityPolicySchema() map[string]*schema.Schema { Default: "None", Optional: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "SkipUnavailableMachines", "None", }, false)), diff --git a/octopusdeploy/schema_deployment_step.go b/octopusdeploy/schema_deployment_step.go index 2bdf174b6..c9edf9550 100644 --- a/octopusdeploy/schema_deployment_step.go +++ b/octopusdeploy/schema_deployment_step.go @@ -162,7 +162,7 @@ func getDeploymentStepSchema() *schema.Schema { Description: "When to run the step, one of 'Success', 'Failure', 'Always' or 'Variable'", Optional: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "Always", "Failure", "Success", @@ -186,7 +186,7 @@ func getDeploymentStepSchema() *schema.Schema { Description: "Whether to run this step before or after package acquisition (if possible)", Optional: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "AfterPackageAcquisition", "BeforePackageAcquisition", "LetOctopusDecide", @@ -204,7 +204,7 @@ func getDeploymentStepSchema() *schema.Schema { Description: "Whether to run this step after the previous step ('StartAfterPrevious') or at the same time as the previous step ('StartWithPrevious')", Optional: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "StartAfterPrevious", "StartWithPrevious", }, false)), diff --git a/octopusdeploy/schema_endpoint.go b/octopusdeploy/schema_endpoint.go index 60936ee40..ebb94864a 100644 --- a/octopusdeploy/schema_endpoint.go +++ b/octopusdeploy/schema_endpoint.go @@ -258,7 +258,7 @@ func getEndpointSchema() map[string]*schema.Schema { "communication_style": { Type: schema.TypeString, Required: true, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "AzureCloudService", "AzureWebApp", "Ftp", diff --git a/octopusdeploy/schema_kubernetes_authentication.go b/octopusdeploy/schema_kubernetes_authentication.go index 0866fc94f..7b488e76f 100644 --- a/octopusdeploy/schema_kubernetes_authentication.go +++ b/octopusdeploy/schema_kubernetes_authentication.go @@ -111,7 +111,7 @@ func getKubernetesAuthenticationSchema() map[string]*schema.Schema { "authentication_type": { Optional: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "KubernetesAws", "KubernetesAzure", "KubernetesCertificate", diff --git a/octopusdeploy/schema_listening_tentacle_deployment_target.go b/octopusdeploy/schema_listening_tentacle_deployment_target.go index 8f7863d14..2361195ee 100644 --- a/octopusdeploy/schema_listening_tentacle_deployment_target.go +++ b/octopusdeploy/schema_listening_tentacle_deployment_target.go @@ -147,7 +147,7 @@ func getListeningTentacleDeploymentTargetSchema() map[string]*schema.Schema { Description: "The tenant URL of this deployment target.", Required: true, Type: schema.TypeString, - // ValidateDiagFunc: validateDiagFunc(validation.IsURLWithHTTPorHTTPS), + // ValidateDiagFunc: validation.ToDiagFunc(validation.IsURLWithHTTPorHTTPS), }, "thumbprint": { Description: "The thumbprint of this deployment target.", @@ -159,7 +159,7 @@ func getListeningTentacleDeploymentTargetSchema() map[string]*schema.Schema { Description: "The URI of this deployment target.", Optional: true, Type: schema.TypeString, - // ValidateDiagFunc: validateDiagFunc(validation.IsURLWithHTTPorHTTPS), + // ValidateDiagFunc: validation.ToDiagFunc(validation.IsURLWithHTTPorHTTPS), }, } } diff --git a/octopusdeploy/schema_project.go b/octopusdeploy/schema_project.go index cb717da6e..8387765d1 100644 --- a/octopusdeploy/schema_project.go +++ b/octopusdeploy/schema_project.go @@ -195,7 +195,7 @@ func getProjectSchema() map[string]*schema.Schema { Optional: true, Type: schema.TypeString, Default: "EnvironmentDefault", - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "EnvironmentDefault", "Off", "On", diff --git a/octopusdeploy/schema_queries.go b/octopusdeploy/schema_queries.go index f2be184d3..34a4c4669 100644 --- a/octopusdeploy/schema_queries.go +++ b/octopusdeploy/schema_queries.go @@ -52,7 +52,7 @@ func getQueryCommunicationStyles() *schema.Schema { Description: "A filter to search by a list of communication styles. Valid communication styles are `AzureCloudService`, `AzureServiceFabricCluster`, `AzureWebApp`, `Ftp`, `Kubernetes`, `None`, `OfflineDrop`, `Ssh`, `TentacleActive`, or `TentaclePassive`.", Elem: &schema.Schema{ Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "AzureCloudService", "AzureServiceFabricCluster", "AzureWebApp", @@ -92,7 +92,7 @@ func getQueryFeedType() *schema.Schema { Description: "A filter to search by feed type. Valid feed types are `AwsElasticContainerRegistry`, `BuiltIn`, `Docker`, `GitHub`, `Helm`, `Maven`, `NuGet`, or `OctopusProject`.", Optional: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "AwsElasticContainerRegistry", "BuiltIn", "Docker", @@ -126,7 +126,7 @@ func getQueryHealthStatuses() *schema.Schema { Description: "A filter to search by a list of health statuses of resources. Valid health statuses are `HasWarnings`, `Healthy`, `Unavailable`, `Unhealthy`, or `Unknown`.", Elem: &schema.Schema{ Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "HasWarnings", "Healthy", "Unavailable", diff --git a/octopusdeploy/schema_retention_period.go b/octopusdeploy/schema_retention_period.go index 4c98b9391..62cc91f34 100644 --- a/octopusdeploy/schema_retention_period.go +++ b/octopusdeploy/schema_retention_period.go @@ -59,7 +59,7 @@ func getRetentionPeriodSchema() map[string]*schema.Schema { Description: "The number of days/releases to keep. The default value is `30`. If `0` then all are kept.", Optional: true, Type: schema.TypeInt, - ValidateDiagFunc: validateDiagFunc(validation.IntAtLeast(0)), + ValidateDiagFunc: validation.ToDiagFunc(validation.IntAtLeast(0)), }, "should_keep_forever": { Default: false, @@ -72,7 +72,7 @@ func getRetentionPeriodSchema() map[string]*schema.Schema { Description: "The unit of quantity to keep. Valid units are `Days` or `Items`. The default value is `Days`.", Optional: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "Days", "Items", }, false)), diff --git a/octopusdeploy/schema_utilities.go b/octopusdeploy/schema_utilities.go index f201cb6dc..6c8ec06db 100644 --- a/octopusdeploy/schema_utilities.go +++ b/octopusdeploy/schema_utilities.go @@ -50,7 +50,7 @@ func getApplicationIDSchema(isRequired bool) *schema.Schema { schema := &schema.Schema{ Description: "The application ID of this resource.", Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.IsUUID), + ValidateDiagFunc: validation.ToDiagFunc(validation.IsUUID), } if isRequired { @@ -66,7 +66,7 @@ func getAuthenticationEndpointSchema(isRequired bool) *schema.Schema { schema := &schema.Schema{ Description: "The authentication endpoint URI for this resource.", Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.IsURLWithHTTPS), + ValidateDiagFunc: validation.ToDiagFunc(validation.IsURLWithHTTPS), } if isRequired { @@ -100,7 +100,7 @@ func getCertificateDataFormatSchema() *schema.Schema { Description: "Specifies the archive file format used for storing cryptography objects in the certificate. Valid formats are `Der`, `Pem`, `Pkcs12`, or `Unknown`.", Optional: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "Der", "Pem", "Pkcs12", @@ -163,7 +163,7 @@ func getHealthStatusSchema() *schema.Schema { Description: "Represents the health status of this deployment target. Valid health statuses are `HasWarnings`, `Healthy`, `Unavailable`, `Unhealthy`, or `Unknown`.", Optional: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "HasWarnings", "Healthy", "Unavailable", @@ -196,7 +196,7 @@ func getPasswordSchema(isRequired bool) *schema.Schema { Description: "The password associated with this resource.", Sensitive: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty), + ValidateDiagFunc: validation.ToDiagFunc(validation.StringIsNotEmpty), } if isRequired { @@ -212,7 +212,7 @@ func getNameSchema(isRequired bool) *schema.Schema { schema := &schema.Schema{ Description: "The name of this resource.", Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty), + ValidateDiagFunc: validation.ToDiagFunc(validation.StringIsNotEmpty), } if isRequired { @@ -228,7 +228,7 @@ func getResourceManagerEndpointSchema(isRequired bool) *schema.Schema { schema := &schema.Schema{ Description: "The resource manager endpoint URI for this resource.", Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.IsURLWithHTTPS), + ValidateDiagFunc: validation.ToDiagFunc(validation.IsURLWithHTTPS), } if isRequired { @@ -304,7 +304,7 @@ func getSubscriptionIDSchema(isRequired bool) *schema.Schema { schema := &schema.Schema{ Description: "The subscription ID of this resource.", Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.IsUUID), + ValidateDiagFunc: validation.ToDiagFunc(validation.IsUUID), } if isRequired { @@ -334,7 +334,7 @@ func getTenantIDSchema(isRequired bool) *schema.Schema { schema := &schema.Schema{ Description: "The tenant ID of this resource.", Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.IsUUID), + ValidateDiagFunc: validation.ToDiagFunc(validation.IsUUID), } if isRequired { @@ -370,7 +370,7 @@ func getTokenSchema(isRequired bool) *schema.Schema { Description: "The token of this resource.", Sensitive: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty), + ValidateDiagFunc: validation.ToDiagFunc(validation.StringIsNotEmpty), } if isRequired { @@ -387,7 +387,7 @@ func getUsernameSchema(isRequired bool) *schema.Schema { Description: "The username associated with this resource.", Sensitive: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty), + ValidateDiagFunc: validation.ToDiagFunc(validation.StringIsNotEmpty), } if isRequired { @@ -404,7 +404,7 @@ func getVariableTypeSchema() *schema.Schema { Description: "The type of variable represented by this resource. Valid types are `AmazonWebServicesAccount`, `AzureAccount`, `Certificate`, `Sensitive`, `String`, or `WorkerPool`.", Required: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{ + ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ "AmazonWebServicesAccount", "AzureAccount", "Certificate", diff --git a/octopusdeploy/schema_version_control_settings.go b/octopusdeploy/schema_version_control_settings.go index 839e41703..6dc34b574 100644 --- a/octopusdeploy/schema_version_control_settings.go +++ b/octopusdeploy/schema_version_control_settings.go @@ -55,7 +55,7 @@ func getVersionControlSettingsSchema() map[string]*schema.Schema { Sensitive: true, Optional: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty), + ValidateDiagFunc: validation.ToDiagFunc(validation.StringIsNotEmpty), }, "url": { Description: "The URL associated with these version control settings.", @@ -67,7 +67,7 @@ func getVersionControlSettingsSchema() map[string]*schema.Schema { Optional: true, Sensitive: true, Type: schema.TypeString, - ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty), + ValidateDiagFunc: validation.ToDiagFunc(validation.StringIsNotEmpty), }, } } diff --git a/octopusdeploy/util.go b/octopusdeploy/util.go index be433b65c..2775fdb15 100644 --- a/octopusdeploy/util.go +++ b/octopusdeploy/util.go @@ -34,27 +34,6 @@ func flattenArray(values []string) []interface{} { return s } -// wrapper function to be removed -func validateDiagFunc(validateFunc func(interface{}, string) ([]string, []error)) schema.SchemaValidateDiagFunc { - return func(i interface{}, path cty.Path) diag.Diagnostics { - warnings, errors := validateFunc(i, fmt.Sprintf("%+v", path)) - var diags diag.Diagnostics - for _, warning := range warnings { - diags = append(diags, diag.Diagnostic{ - Severity: diag.Warning, - Summary: warning, - }) - } - for _, err := range errors { - diags = append(diags, diag.Diagnostic{ - Severity: diag.Error, - Summary: err.Error(), - }) - } - return diags - } -} - // Validate a value against a set of possible values func validateValueFunc(values []string) schema.SchemaValidateDiagFunc {