From 8081f79d6d24e761a4bac6f2270a53d3c577397b Mon Sep 17 00:00:00 2001 From: mtturcsik Date: Thu, 18 Jun 2020 16:59:42 +0200 Subject: [PATCH 1/3] update Gopkg.lock --- Gopkg.lock | 295 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 280 insertions(+), 15 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index b0ac779..731bb1d 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,295 +2,560 @@ [[projects]] + digest = "1:61c24bdb660a326b420d5422c4fd124041b4aac88e212c6ac75f3a57b0b9cada" name = "github.com/agext/levenshtein" packages = ["."] + pruneopts = "" revision = "5f10fee965225ac1eecdc234c09daf5cd9e7f7b6" version = "v1.2.1" [[projects]] branch = "master" + digest = "1:9f81043ecde141c23c6ccbf8ec273c43eaefcaac09d3bcc53fbddd4e180e2f7c" name = "github.com/apparentlymart/go-cidr" packages = ["cidr"] + pruneopts = "" revision = "2bd8b58cf4275aeb086ade613de226773e29e853" [[projects]] branch = "master" + digest = "1:ee5a076f487c362d53eacd9442ee2f6656ff3e0739256043d96fac4fccf7b9a2" name = "github.com/apparentlymart/go-textseg" packages = ["textseg"] + pruneopts = "" revision = "b836f5c4d331d1945a2fead7188db25432d73b69" [[projects]] branch = "master" + digest = "1:2a1e6af234d7de1ccf4504f397cf7cfa82922ee59b29252e3c34cb38d0b91989" name = "github.com/armon/go-radix" packages = ["."] + pruneopts = "" revision = "1fca145dffbcaa8fe914309b1ec0cfc67500fe61" [[projects]] + digest = "1:6960afc5acfff07b0297b36e5369bcf6d59625a13471056e173cea20fcdf35f7" name = "github.com/aws/aws-sdk-go" - packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","internal/shareddefaults","private/protocol","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/restxml","private/protocol/xml/xmlutil","service/s3","service/sts"] + packages = [ + "aws", + "aws/awserr", + "aws/awsutil", + "aws/client", + "aws/client/metadata", + "aws/corehandlers", + "aws/credentials", + "aws/credentials/ec2rolecreds", + "aws/credentials/endpointcreds", + "aws/credentials/stscreds", + "aws/defaults", + "aws/ec2metadata", + "aws/endpoints", + "aws/request", + "aws/session", + "aws/signer/v4", + "internal/shareddefaults", + "private/protocol", + "private/protocol/query", + "private/protocol/query/queryutil", + "private/protocol/rest", + "private/protocol/restxml", + "private/protocol/xml/xmlutil", + "service/s3", + "service/sts", + ] + pruneopts = "" revision = "a201bf33b18ad4ab54344e4bc26b87eb6ad37b8e" version = "v1.12.25" [[projects]] branch = "master" + digest = "1:98e84060475ed245c3b355042afd43a74aa7d32efe50658f4f995977916f9fc3" name = "github.com/bgentry/go-netrc" packages = ["netrc"] + pruneopts = "" revision = "9fd32a8b3d3d3f9d43c341bfe098430e07609480" [[projects]] + digest = "1:15ceb8ca7a71db4c426d8aef1909ea074f6840efa163490bb2798f475624e4ae" name = "github.com/bgentry/speakeasy" packages = ["."] + pruneopts = "" revision = "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd" version = "v0.1.0" [[projects]] + digest = "1:79421244ba5848aae4b0a5c41e633a04e4894cb0b164a219dc8c15ec7facb7f1" name = "github.com/blang/semver" packages = ["."] + pruneopts = "" revision = "2ee87856327ba09384cabd113bc6b5d174e9ec0f" version = "v3.5.1" [[projects]] + digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b" name = "github.com/davecgh/go-spew" packages = ["spew"] + pruneopts = "" revision = "346938d642f2ec3594ed81d874461961cd0faa76" version = "v1.1.0" [[projects]] + digest = "1:1f557d2b7814235704f63f15e5bd3d7a5d3be9d3f9e7bf74b411150df89886e6" name = "github.com/go-ini/ini" packages = ["."] + pruneopts = "" revision = "f280b3ba517bf5fc98922624f21fb0e7a92adaec" version = "v1.30.3" [[projects]] branch = "master" + digest = "1:54859951ba785c9f5c7a0e665a9fe9fb6b1afeef112c62eaad77081d3d5916cc" name = "github.com/golang/protobuf" - packages = ["proto","ptypes","ptypes/any","ptypes/duration","ptypes/timestamp"] + packages = [ + "proto", + "ptypes", + "ptypes/any", + "ptypes/duration", + "ptypes/timestamp", + ] + pruneopts = "" revision = "1643683e1b54a9e88ad26d98f81400c8c9d9f4f9" [[projects]] branch = "master" + digest = "1:304c322b62533a48ac052ffee80f67087fce1bc07186cd4e610a1b0e77765836" name = "github.com/hashicorp/errwrap" packages = ["."] + pruneopts = "" revision = "7554cd9344cec97297fa6649b055a8c98c2a1e55" [[projects]] branch = "master" + digest = "1:ae263e6b149fb7aadfc0f2284a8891cc3b9d2700e58b9a613fecf70fcc6e495d" name = "github.com/hashicorp/go-cleanhttp" packages = ["."] + pruneopts = "" revision = "3573b8b52aa7b37b9358d966a898feb387f62437" [[projects]] branch = "master" + digest = "1:40c03e8920046c06329b22bf86254c4c3c516f9819e0b715c1133fe3444b4058" name = "github.com/hashicorp/go-getter" - packages = [".","helper/url"] + packages = [ + ".", + "helper/url", + ] + pruneopts = "" revision = "2f449c791e6af9e532bc1aca36d1d3865b8537f9" [[projects]] branch = "master" + digest = "1:c7ae8c08e5f3eab0871cb75d3684852065fb4ff8692008a9bc6868b84be8d34f" name = "github.com/hashicorp/go-hclog" packages = ["."] + pruneopts = "" revision = "ca137eb4b4389c9bc6f1a6d887f056bf16c00510" [[projects]] branch = "master" + digest = "1:7660b6ee3fd92bcb9b19f5d359d3fbc8e853257d8a3d49e0424d00b6faa69cfd" name = "github.com/hashicorp/go-multierror" packages = ["."] + pruneopts = "" revision = "83588e72410abfbe4df460eeb6f30841ae47d4c4" [[projects]] branch = "master" + digest = "1:46f74ff32ea0f011877a556bff498ff6485eac3bef044caaf0472f768acb0f45" name = "github.com/hashicorp/go-plugin" packages = ["."] + pruneopts = "" revision = "e2fbc6864d18d3c37b6cde4297ec9fca266d28f1" [[projects]] branch = "master" + digest = "1:50518e39c832eacbbd55a0ca08c6490911fe9483b06fa77468693a31b7893f3e" name = "github.com/hashicorp/go-uuid" packages = ["."] + pruneopts = "" revision = "64130c7a86d732268a38cb04cfbaf0cc987fda98" [[projects]] branch = "master" + digest = "1:2aa07a6931b73e70f07a5bd30ef30a73cd103aa06291213c4e46e3fe52822dea" name = "github.com/hashicorp/go-version" packages = ["."] + pruneopts = "" revision = "fc61389e27c71d120f87031ca8c88a3428f372dd" [[projects]] branch = "master" + digest = "1:147d671753effde6d3bcd58fc74c1d67d740196c84c280c762a5417319499972" name = "github.com/hashicorp/hcl" - packages = [".","hcl/ast","hcl/parser","hcl/scanner","hcl/strconv","hcl/token","json/parser","json/scanner","json/token"] + packages = [ + ".", + "hcl/ast", + "hcl/parser", + "hcl/scanner", + "hcl/strconv", + "hcl/token", + "json/parser", + "json/scanner", + "json/token", + ] + pruneopts = "" revision = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8" [[projects]] branch = "master" + digest = "1:597b5bd06022a310c334ad0098cc7a75907b39687c89092b8a3aaa539728f103" name = "github.com/hashicorp/hcl2" - packages = ["gohcl","hcl","hcl/hclsyntax","hcl/json","hcldec","hclparse"] + packages = [ + "gohcl", + "hcl", + "hcl/hclsyntax", + "hcl/json", + "hcldec", + "hclparse", + ] + pruneopts = "" revision = "44bad6dbf5490f5da17ec991e664df3d017b706f" [[projects]] branch = "master" + digest = "1:f63bbfd54a9ebe0f15cd6597d58f404874fd20739faf56170879767db2fe69dc" name = "github.com/hashicorp/hil" - packages = [".","ast","parser","scanner"] + packages = [ + ".", + "ast", + "parser", + "scanner", + ] + pruneopts = "" revision = "fa9f258a92500514cc8e9c67020487709df92432" [[projects]] branch = "master" + digest = "1:8b7dd3b581147b44cf522c66894b9119ab845c346d8f124d83f77ab499cf7ca3" name = "github.com/hashicorp/logutils" packages = ["."] + pruneopts = "" revision = "0dc08b1671f34c4250ce212759ebd880f743d883" [[projects]] + digest = "1:d2ca18c95fd03f7937a8fec9b3fe15f6763b833cc653f8f1113a2a01d2d7a528" name = "github.com/hashicorp/terraform" - packages = ["config","config/configschema","config/hcl2shim","config/module","dag","flatmap","helper/config","helper/hashcode","helper/hilmapstructure","helper/logging","helper/resource","helper/schema","moduledeps","plugin","plugin/discovery","terraform","tfdiags","version"] + packages = [ + "config", + "config/configschema", + "config/hcl2shim", + "config/module", + "dag", + "flatmap", + "helper/config", + "helper/hashcode", + "helper/hilmapstructure", + "helper/logging", + "helper/resource", + "helper/schema", + "moduledeps", + "plugin", + "plugin/discovery", + "terraform", + "tfdiags", + "version", + ] + pruneopts = "" revision = "e0fd3ddd704b230897723a7ca251f36b71c2b67a" version = "v0.10.8" [[projects]] branch = "master" + digest = "1:755f0590df531fdf5221158ba457555b525ea497f27ae1b8b195da7d0906d4a6" name = "github.com/hashicorp/yamux" packages = ["."] + pruneopts = "" revision = "f5742cb6b85602e7fa834e9d5d91a7d7fa850824" [[projects]] + digest = "1:6f49eae0c1e5dab1dafafee34b207aeb7a42303105960944828c2079b92fc88e" name = "github.com/jmespath/go-jmespath" packages = ["."] + pruneopts = "" revision = "0b12d6b5" [[projects]] + digest = "1:78229b46ddb7434f881390029bd1af7661294af31f6802e0e1bedaad4ab0af3c" name = "github.com/mattn/go-isatty" packages = ["."] + pruneopts = "" revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" version = "v0.0.3" [[projects]] branch = "master" + digest = "1:39ea802d82adbe69247c3222654ac34575a08be8da85642a99c30af1d148df0f" name = "github.com/mitchellh/cli" packages = ["."] + pruneopts = "" revision = "65fcae5817c8600da98ada9d7edf26dd1a84837b" [[projects]] branch = "master" + digest = "1:ae14aee05347b333fd7ab0c801c789438ef559cfb1307b53d5c42ea3cf6d61b6" name = "github.com/mitchellh/copystructure" packages = ["."] + pruneopts = "" revision = "d23ffcb85de31694d6ccaa23ccb4a03e55c1303f" [[projects]] branch = "master" + digest = "1:59d11e81d6fdd12a771321696bb22abdd9a94d26ac864787e98c9b419e428734" name = "github.com/mitchellh/go-homedir" packages = ["."] + pruneopts = "" revision = "b8bc1bf767474819792c23f32d8286a45736f1c6" [[projects]] branch = "master" + digest = "1:51c98e2c9a8d0a724a69f46421876af14e12132cb02f1d0e144785d752247162" name = "github.com/mitchellh/go-testing-interface" packages = ["."] + pruneopts = "" revision = "a61a99592b77c9ba629d254a693acffaeb4b7e28" [[projects]] branch = "master" + digest = "1:1856ee5a608d9e93667ac7811fc6360e2a9cae3ada938b3f13016c578b6d5f6e" name = "github.com/mitchellh/go-wordwrap" packages = ["."] + pruneopts = "" revision = "ad45545899c7b13c020ea92b2072220eefad42b8" [[projects]] branch = "master" + digest = "1:0de0f377aeccd41384e883c59c6f184c9db01c96db33a2724a1eaadd60f92629" name = "github.com/mitchellh/hashstructure" packages = ["."] + pruneopts = "" revision = "2bca23e0e452137f789efbc8610126fd8b94f73b" [[projects]] branch = "master" + digest = "1:30a2adc78c422ebd23aac9cfece529954d5eacf9ddbe37345f2a17439f8fa849" name = "github.com/mitchellh/mapstructure" packages = ["."] + pruneopts = "" revision = "06020f85339e21b2478f756a78e295255ffa4d6a" [[projects]] branch = "master" + digest = "1:a5aebbd13aa160140a1fd1286b94cd8c6ba3d1522014fd04508d7f36d5bb8d19" name = "github.com/mitchellh/reflectwalk" packages = ["."] + pruneopts = "" revision = "63d60e9d0dbc60cf9164e6510889b0db6683d98c" [[projects]] branch = "master" + digest = "1:fe67641b990bdc1802f8a1e462a4924210a8762a8a17b72e09656049c906b871" name = "github.com/moul/http2curl" packages = ["."] + pruneopts = "" revision = "9ac6cf4d929b2fa8fd2d2e6dec5bb0feb4f4911d" [[projects]] + digest = "1:1d1d7cc9c374bc5bd1884d07705dbde6d2257de17f5f6504e4335e4d2b60a350" name = "github.com/parnurzeal/gorequest" packages = ["."] + pruneopts = "" revision = "a578a48e8d6ca8b01a3b18314c43c6716bb5f5a3" version = "v0.2.15" [[projects]] + digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca" name = "github.com/pkg/errors" packages = ["."] + pruneopts = "" revision = "645ef00459ed84a119197bfb8d8205042c6df63d" version = "v0.8.0" [[projects]] + digest = "1:257644eddd6b1722f96711c3ca98c9ef755b77cb9f446e23e5ce03fbabafdcd3" name = "github.com/posener/complete" - packages = [".","cmd","cmd/install","match"] + packages = [ + ".", + "cmd", + "cmd/install", + "match", + ] + pruneopts = "" revision = "dc2bc5a81accba8782bebea28628224643a8286a" version = "v1.1" [[projects]] + digest = "1:6b55df4b0517a459af9d3879c99330af4367adcf45f3d0d37ded80a6272ae057" name = "github.com/satori/go.uuid" packages = ["."] + pruneopts = "" revision = "879c5887cd475cd7864858769793b2ceb0d44feb" version = "v1.1.0" [[projects]] + digest = "1:ee723e6a1962a196eeba1b24f82af61a4f60f8821d7aa96d48e787f8337bcffc" name = "github.com/ulikunitz/xz" - packages = [".","internal/hash","internal/xlog","lzma"] + packages = [ + ".", + "internal/hash", + "internal/xlog", + "lzma", + ] + pruneopts = "" revision = "0c6b41e72360850ca4f98dc341fd999726ea007f" version = "v0.5.4" +[[projects]] + digest = "1:d7b27e500d2e2c87c54d22d39f2234dca8a1a6f51e6a2215a734b43c7111a047" + name = "github.com/ustream/terraform-provider-compose" + packages = [ + "compose", + "composeapi", + ] + pruneopts = "" + revision = "ec372628af7af153bbd876ba7189d62756bd38ff" + version = "v0.3.0" + [[projects]] branch = "master" + digest = "1:ee9d0fafc925d015e7e7ab627a6b9e852539b5a74ca780cfebb660db6c374a23" name = "github.com/zclconf/go-cty" - packages = ["cty","cty/convert","cty/function","cty/function/stdlib","cty/gocty","cty/json","cty/set"] + packages = [ + "cty", + "cty/convert", + "cty/function", + "cty/function/stdlib", + "cty/gocty", + "cty/json", + "cty/set", + ] + pruneopts = "" revision = "8bf222d6d03b7b336d013978f3acbfd877da428f" [[projects]] branch = "master" + digest = "1:7ac6c89335cdca86063465acc67ff283d9517a8ceec0da2f893a7a7ff5245e95" name = "golang.org/x/crypto" - packages = ["bcrypt","blowfish","cast5","openpgp","openpgp/armor","openpgp/elgamal","openpgp/errors","openpgp/packet","openpgp/s2k"] + packages = [ + "bcrypt", + "blowfish", + "cast5", + "openpgp", + "openpgp/armor", + "openpgp/elgamal", + "openpgp/errors", + "openpgp/packet", + "openpgp/s2k", + ] + pruneopts = "" revision = "6a293f2d4b14b8e6d3f0539e383f6d0d30fce3fd" [[projects]] branch = "master" + digest = "1:a143fd748b88512b9b7eb43e0ad5b92560d89dc596787438abe25d7e345b7362" name = "golang.org/x/net" - packages = ["context","html","html/atom","http2","http2/hpack","idna","internal/timeseries","lex/httplex","publicsuffix","trace"] + packages = [ + "context", + "html", + "html/atom", + "http2", + "http2/hpack", + "idna", + "internal/timeseries", + "lex/httplex", + "publicsuffix", + "trace", + ] + pruneopts = "" revision = "a337091b0525af65de94df2eb7e98bd9962dcbe2" [[projects]] branch = "master" + digest = "1:57be0ee99ef4b53bbe8570e176f11f7c23c33d38d388079a2c1aeb3ba197b7ed" name = "golang.org/x/sys" packages = ["unix"] + pruneopts = "" revision = "4b45465282a4624cf39876842a017334f13b8aff" [[projects]] branch = "master" + digest = "1:39a1a71adca4b837a25dc6b5fcdd9d175e4597c6d3440f107dfeda31230218e4" name = "golang.org/x/text" - packages = ["collate","collate/build","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","language","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"] + packages = [ + "collate", + "collate/build", + "internal/colltab", + "internal/gen", + "internal/tag", + "internal/triegen", + "internal/ucd", + "language", + "secure/bidirule", + "transform", + "unicode/bidi", + "unicode/cldr", + "unicode/norm", + "unicode/rangetable", + ] + pruneopts = "" revision = "88f656faf3f37f690df1a32515b479415e1a6769" [[projects]] branch = "master" + digest = "1:b2a56937cae9680d4c1f8cc6d0a80cbbdd61853510509b80af7ffd9d51366a31" name = "google.golang.org/genproto" packages = ["googleapis/rpc/status"] + pruneopts = "" revision = "11c7f9e547da6db876260ce49ea7536985904c9b" [[projects]] + digest = "1:b5cec1d5f5a9bc284b645afb8ba9cbd6b145cb20545bb3eb13c1aa10600ece31" name = "google.golang.org/grpc" - packages = [".","balancer","codes","connectivity","credentials","grpclb/grpc_lb_v1/messages","grpclog","health","health/grpc_health_v1","internal","keepalive","metadata","naming","peer","resolver","stats","status","tap","transport"] + packages = [ + ".", + "balancer", + "codes", + "connectivity", + "credentials", + "grpclb/grpc_lb_v1/messages", + "grpclog", + "health", + "health/grpc_health_v1", + "internal", + "keepalive", + "metadata", + "naming", + "peer", + "resolver", + "stats", + "status", + "tap", + "transport", + ] + pruneopts = "" revision = "5ffe3083946d5603a0578721101dc8165b1d5b5f" version = "v1.7.2" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "3f9693197c59df63c14605eb0f03fc01b6d149b2b8e3cba7b558d6596f04e980" + input-imports = [ + "github.com/hashicorp/terraform/helper/resource", + "github.com/hashicorp/terraform/helper/schema", + "github.com/hashicorp/terraform/plugin", + "github.com/hashicorp/terraform/terraform", + "github.com/parnurzeal/gorequest", + "github.com/ustream/terraform-provider-compose/compose", + "github.com/ustream/terraform-provider-compose/composeapi", + ] solver-name = "gps-cdcl" solver-version = 1 From 775d9bdb20b89a9c8ebd2d68d57483e9feca9ec5 Mon Sep 17 00:00:00 2001 From: mtturcsik Date: Thu, 18 Jun 2020 17:02:42 +0200 Subject: [PATCH 2/3] add new ibm cloud env vars --- compose/provider.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/provider.go b/compose/provider.go index e68c4a9..83ee34d 100644 --- a/compose/provider.go +++ b/compose/provider.go @@ -35,14 +35,14 @@ func Provider() terraform.ResourceProvider { Type: schema.TypeString, Optional: true, Description: "The Bluemix API Key", - DefaultFunc: schema.MultiEnvDefaultFunc([]string{"BM_API_KEY", "BLUEMIX_API_KEY"}, ""), + DefaultFunc: schema.MultiEnvDefaultFunc([]string{"BM_API_KEY", "BLUEMIX_API_KEY", "IBMCLOUD_API_KEY"}, ""), Sensitive: true, }, "region": { Type: schema.TypeString, Optional: true, Description: "The Bluemix Region (for example 'us-south').", - DefaultFunc: schema.MultiEnvDefaultFunc([]string{"BM_REGION", "BLUEMIX_REGION"}, "us-south"), + DefaultFunc: schema.MultiEnvDefaultFunc([]string{"BM_REGION", "BLUEMIX_REGION", "IBMCLOUD_REGION"}, "us-south"), }, }, From f33519d7896efe9cfa9729e2b6f00151beef8997 Mon Sep 17 00:00:00 2001 From: mtturcsik Date: Thu, 18 Jun 2020 17:14:54 +0200 Subject: [PATCH 3/3] add new ibm cloud env vars shorter forms --- compose/provider.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/provider.go b/compose/provider.go index 83ee34d..08692f0 100644 --- a/compose/provider.go +++ b/compose/provider.go @@ -35,14 +35,14 @@ func Provider() terraform.ResourceProvider { Type: schema.TypeString, Optional: true, Description: "The Bluemix API Key", - DefaultFunc: schema.MultiEnvDefaultFunc([]string{"BM_API_KEY", "BLUEMIX_API_KEY", "IBMCLOUD_API_KEY"}, ""), + DefaultFunc: schema.MultiEnvDefaultFunc([]string{"BM_API_KEY", "BLUEMIX_API_KEY", "IBMCLOUD_API_KEY", "IC_API_KEY"}, ""), Sensitive: true, }, "region": { Type: schema.TypeString, Optional: true, Description: "The Bluemix Region (for example 'us-south').", - DefaultFunc: schema.MultiEnvDefaultFunc([]string{"BM_REGION", "BLUEMIX_REGION", "IBMCLOUD_REGION"}, "us-south"), + DefaultFunc: schema.MultiEnvDefaultFunc([]string{"BM_REGION", "BLUEMIX_REGION", "IBMCLOUD_REGION", "IC_REGION"}, "us-south"), }, },