From 71f5b42a1ba72f708203e699ef0bc56e2bd78fd6 Mon Sep 17 00:00:00 2001 From: Ben Watson Date: Mon, 7 Jan 2019 14:09:22 -0500 Subject: [PATCH 01/10] Fixes typo in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aff17166..2bf239df 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ Clone this repository into `$GOPATH/src/github.com/Cox-Automotive/terraform-prov ``` cd "$GOPATH/src/github.com/Cox-Automotive/terraform-provider-alks" -make built test +make build test ``` If you add any additional depedencies to the project you'll need to run `godep save` to update `Godeps.json` and `/vendor`. From 13e235492f8e8cb9ba99fae4e71f5f2a1ed416cb Mon Sep 17 00:00:00 2001 From: Webb Barker Date: Mon, 14 Jan 2019 09:22:55 -0500 Subject: [PATCH 02/10] Update project to godep --- Godeps/Godeps.json | 346 ------------------ Godeps/Readme | 5 - Gopkg.lock | 256 +++++++++++++ Gopkg.toml | 30 ++ .../aws-networking/region/numbering.tf | 1 + .../aws-networking/subnet/numbering.tf | 1 + .../hashicorp/terraform/website/LICENSE.md | 10 + 7 files changed, 298 insertions(+), 351 deletions(-) delete mode 100644 Godeps/Godeps.json delete mode 100644 Godeps/Readme create mode 100644 Gopkg.lock create mode 100644 Gopkg.toml create mode 120000 vendor/github.com/hashicorp/terraform/examples/aws-networking/region/numbering.tf create mode 120000 vendor/github.com/hashicorp/terraform/examples/aws-networking/subnet/numbering.tf create mode 100644 vendor/github.com/hashicorp/terraform/website/LICENSE.md diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json deleted file mode 100644 index 1e88be6b..00000000 --- a/Godeps/Godeps.json +++ /dev/null @@ -1,346 +0,0 @@ -{ - "ImportPath": "github.com/Cox-Automotive/terraform-provider-alks", - "GoVersion": "go1.8", - "GodepVersion": "v80", - "Deps": [ - { - "ImportPath": "github.com/Cox-Automotive/alks-go", - "Rev": "4a87d235c4553dba29ddd235db623425c68aa851" - }, - { - "ImportPath": "github.com/apparentlymart/go-cidr/cidr", - "Rev": "a3ebdb999b831ecb6ab8a226e31b07b2b9061c47" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/awserr", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/awsutil", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/client", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/client/metadata", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/corehandlers", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/credentials", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/credentials/endpointcreds", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/credentials/stscreds", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/defaults", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/ec2metadata", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/endpoints", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/request", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/session", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/aws/signer/v4", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/private/protocol", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/query", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/query/queryutil", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/rest", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/restxml", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/private/waiter", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/service/s3", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/aws/aws-sdk-go/service/sts", - "Comment": "v1.7.1-1-g504f3ae", - "Rev": "504f3aed90b8db295a45a9d900f11f1327841c81" - }, - { - "ImportPath": "github.com/bgentry/go-netrc/netrc", - "Rev": "9fd32a8b3d3d3f9d43c341bfe098430e07609480" - }, - { - "ImportPath": "github.com/davecgh/go-spew/spew", - "Comment": "v1.1.0", - "Rev": "346938d642f2ec3594ed81d874461961cd0faa76" - }, - { - "ImportPath": "github.com/go-ini/ini", - "Comment": "v1.25.2-1-gc437d20", - "Rev": "c437d20015c2ab6454b7a66a13109ff0fb99e17a" - }, - { - "ImportPath": "github.com/hashicorp/errwrap", - "Rev": "7554cd9344cec97297fa6649b055a8c98c2a1e55" - }, - { - "ImportPath": "github.com/hashicorp/go-cleanhttp", - "Rev": "3573b8b52aa7b37b9358d966a898feb387f62437" - }, - { - "ImportPath": "github.com/hashicorp/go-getter", - "Rev": "c3d66e76678dce180a7b452653472f949aedfbcd" - }, - { - "ImportPath": "github.com/hashicorp/go-getter/helper/url", - "Rev": "c3d66e76678dce180a7b452653472f949aedfbcd" - }, - { - "ImportPath": "github.com/hashicorp/go-multierror", - "Rev": "ed905158d87462226a13fe39ddf685ea65f1c11f" - }, - { - "ImportPath": "github.com/hashicorp/go-plugin", - "Rev": "f72692aebca2008343a9deb06ddb4b17f7051c15" - }, - { - "ImportPath": "github.com/hashicorp/go-uuid", - "Rev": "64130c7a86d732268a38cb04cfbaf0cc987fda98" - }, - { - "ImportPath": "github.com/hashicorp/go-version", - "Rev": "03c5bf6be031b6dd45afec16b1cf94fc8938bc77" - }, - { - "ImportPath": "github.com/hashicorp/hcl", - "Rev": "630949a3c5fa3c613328e1b8256052cbc2327c9b" - }, - { - "ImportPath": "github.com/hashicorp/hcl/hcl/ast", - "Rev": "630949a3c5fa3c613328e1b8256052cbc2327c9b" - }, - { - "ImportPath": "github.com/hashicorp/hcl/hcl/parser", - "Rev": "630949a3c5fa3c613328e1b8256052cbc2327c9b" - }, - { - "ImportPath": "github.com/hashicorp/hcl/hcl/scanner", - "Rev": "630949a3c5fa3c613328e1b8256052cbc2327c9b" - }, - { - "ImportPath": "github.com/hashicorp/hcl/hcl/strconv", - "Rev": "630949a3c5fa3c613328e1b8256052cbc2327c9b" - }, - { - "ImportPath": "github.com/hashicorp/hcl/hcl/token", - "Rev": "630949a3c5fa3c613328e1b8256052cbc2327c9b" - }, - { - "ImportPath": "github.com/hashicorp/hcl/json/parser", - "Rev": "630949a3c5fa3c613328e1b8256052cbc2327c9b" - }, - { - "ImportPath": "github.com/hashicorp/hcl/json/scanner", - "Rev": "630949a3c5fa3c613328e1b8256052cbc2327c9b" - }, - { - "ImportPath": "github.com/hashicorp/hcl/json/token", - "Rev": "630949a3c5fa3c613328e1b8256052cbc2327c9b" - }, - { - "ImportPath": "github.com/hashicorp/hil", - "Rev": "5b8d13c8c5c2753e109fab25392a1dbfa2db93d2" - }, - { - "ImportPath": "github.com/hashicorp/hil/ast", - "Rev": "5b8d13c8c5c2753e109fab25392a1dbfa2db93d2" - }, - { - "ImportPath": "github.com/hashicorp/hil/parser", - "Rev": "5b8d13c8c5c2753e109fab25392a1dbfa2db93d2" - }, - { - "ImportPath": "github.com/hashicorp/hil/scanner", - "Rev": "5b8d13c8c5c2753e109fab25392a1dbfa2db93d2" - }, - { - "ImportPath": "github.com/hashicorp/logutils", - "Rev": "0dc08b1671f34c4250ce212759ebd880f743d883" - }, - { - "ImportPath": "github.com/hashicorp/terraform/config", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/config/module", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/dag", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/flatmap", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/helper/config", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/helper/experiment", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/helper/hashcode", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/helper/hilmapstructure", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/helper/logging", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/helper/resource", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/helper/schema", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/helper/shadow", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/plugin", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/terraform/terraform", - "Comment": "v0.9.2-98-g99c8c5302", - "Rev": "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" - }, - { - "ImportPath": "github.com/hashicorp/yamux", - "Rev": "d1caa6c97c9fc1cc9e83bbe34d0603f9ff0ce8bd" - }, - { - "ImportPath": "github.com/jmespath/go-jmespath", - "Comment": "0.2.2-14-gbd40a43", - "Rev": "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d" - }, - { - "ImportPath": "github.com/mitchellh/copystructure", - "Rev": "f81071c9d77b7931f78c90b416a074ecdc50e959" - }, - { - "ImportPath": "github.com/mitchellh/go-homedir", - "Rev": "b8bc1bf767474819792c23f32d8286a45736f1c6" - }, - { - "ImportPath": "github.com/mitchellh/hashstructure", - "Rev": "ab25296c0f51f1022f01cd99dfb45f1775de8799" - }, - { - "ImportPath": "github.com/mitchellh/mapstructure", - "Rev": "db1efb556f84b25a0a13a04aad883943538ad2e0" - }, - { - "ImportPath": "github.com/mitchellh/reflectwalk", - "Rev": "417edcfd99a4d472c262e58f22b4bfe97580f03e" - }, - { - "ImportPath": "github.com/satori/go.uuid", - "Comment": "v1.1.0-6-gb061729", - "Rev": "b061729afc07e77a8aa4fad0a2fd840958f1942a" - } - ] -} diff --git a/Godeps/Readme b/Godeps/Readme deleted file mode 100644 index 4cdaa53d..00000000 --- a/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 00000000..dbbbdbb6 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,256 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + digest = "1:222804d5fb195251b4c21f704e39672590154664475bc69381c545a9ecfc39b2" + name = "github.com/Cox-Automotive/alks-go" + packages = ["."] + pruneopts = "UT" + revision = "4a87d235c4553dba29ddd235db623425c68aa851" + +[[projects]] + digest = "1:672133929e2786ef49ada5ea7476fa154e251d04da8fa79ae0be0694562ef94e" + name = "github.com/apparentlymart/go-cidr" + packages = ["cidr"] + pruneopts = "UT" + revision = "a3ebdb999b831ecb6ab8a226e31b07b2b9061c47" + +[[projects]] + digest = "1:bfb184a6bdc497cb8889dc7102f73bc3cec03180e81bc32680d941a9460f547b" + 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", + "private/protocol", + "private/protocol/query", + "private/protocol/query/queryutil", + "private/protocol/rest", + "private/protocol/restxml", + "private/protocol/xml/xmlutil", + "private/waiter", + "service/s3", + "service/sts", + ] + pruneopts = "UT" + revision = "504f3aed90b8db295a45a9d900f11f1327841c81" + +[[projects]] + branch = "master" + digest = "1:37011b20a70e205b93ebea5287e1afa5618db54bf3998c36ff5a8e4b146a170a" + name = "github.com/bgentry/go-netrc" + packages = ["netrc"] + pruneopts = "UT" + revision = "9fd32a8b3d3d3f9d43c341bfe098430e07609480" + +[[projects]] + digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39" + name = "github.com/davecgh/go-spew" + packages = ["spew"] + pruneopts = "UT" + revision = "346938d642f2ec3594ed81d874461961cd0faa76" + version = "v1.1.0" + +[[projects]] + digest = "1:ad82949cfd8b0675ca2966a2a0167b4d13885c792cdf097b69557bfbc0559013" + name = "github.com/go-ini/ini" + packages = ["."] + pruneopts = "UT" + revision = "c437d20015c2ab6454b7a66a13109ff0fb99e17a" + +[[projects]] + digest = "1:07671f8997086ed115824d1974507d2b147d1e0463675ea5dbf3be89b1c2c563" + name = "github.com/hashicorp/errwrap" + packages = ["."] + pruneopts = "UT" + revision = "7554cd9344cec97297fa6649b055a8c98c2a1e55" + +[[projects]] + digest = "1:ae263e6b149fb7aadfc0f2284a8891cc3b9d2700e58b9a613fecf70fcc6e495d" + name = "github.com/hashicorp/go-cleanhttp" + packages = ["."] + pruneopts = "UT" + revision = "3573b8b52aa7b37b9358d966a898feb387f62437" + +[[projects]] + digest = "1:a1648e42765e943bb08464a126ad141413ac423a00f827b4273b2fa6b29274a0" + name = "github.com/hashicorp/go-getter" + packages = [ + ".", + "helper/url", + ] + pruneopts = "UT" + revision = "c3d66e76678dce180a7b452653472f949aedfbcd" + +[[projects]] + digest = "1:70058d557ddb53af1a35dd41b748ae8032901e407c7c60f6ff3638c8145be5fb" + name = "github.com/hashicorp/go-multierror" + packages = ["."] + pruneopts = "UT" + revision = "ed905158d87462226a13fe39ddf685ea65f1c11f" + +[[projects]] + digest = "1:ad93e756332b116b1f63e523f233082c1316bc183bbb6d8f3c0bef8beb92416c" + name = "github.com/hashicorp/go-plugin" + packages = ["."] + pruneopts = "UT" + revision = "f72692aebca2008343a9deb06ddb4b17f7051c15" + +[[projects]] + digest = "1:b8edba99399cf7b4140dd74c9b942ab65155f02f08cccf2cf8246eb692bc5d4b" + name = "github.com/hashicorp/go-uuid" + packages = ["."] + pruneopts = "UT" + revision = "64130c7a86d732268a38cb04cfbaf0cc987fda98" + +[[projects]] + digest = "1:826df03282c5a336f1d23a07ce0ec0a26c7230e1a5d5a79a8ea4b68c0c8462b3" + name = "github.com/hashicorp/go-version" + packages = ["."] + pruneopts = "UT" + revision = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77" + +[[projects]] + digest = "1:2f7a294353f5e7ff51ae26df3a844cb699c7ed3585ff9208a29ab28de960efcd" + name = "github.com/hashicorp/hcl" + packages = [ + ".", + "hcl/ast", + "hcl/parser", + "hcl/scanner", + "hcl/strconv", + "hcl/token", + "json/parser", + "json/scanner", + "json/token", + ] + pruneopts = "UT" + revision = "630949a3c5fa3c613328e1b8256052cbc2327c9b" + +[[projects]] + digest = "1:73ee4fb45f1d87037acaa1e62e362c8a52cb53a60d0a3f77df2a682790abea71" + name = "github.com/hashicorp/hil" + packages = [ + ".", + "ast", + "parser", + "scanner", + ] + pruneopts = "UT" + revision = "5b8d13c8c5c2753e109fab25392a1dbfa2db93d2" + +[[projects]] + digest = "1:ce3f7860fd68bd2dd4c3735e2aed8c9de7c7d05bd6ad7d97a6bedcf4fe7b84fb" + name = "github.com/hashicorp/logutils" + packages = ["."] + pruneopts = "UT" + revision = "0dc08b1671f34c4250ce212759ebd880f743d883" + +[[projects]] + digest = "1:60d08342587693f51cf3a682dfebf5cba16323560e471937ce5ffb576aca661e" + name = "github.com/hashicorp/terraform" + packages = [ + "config", + "config/module", + "dag", + "flatmap", + "helper/config", + "helper/experiment", + "helper/hashcode", + "helper/hilmapstructure", + "helper/logging", + "helper/resource", + "helper/schema", + "helper/shadow", + "plugin", + "terraform", + ] + pruneopts = "UT" + revision = "99c8c5302b5fd49f20e906ce26c5d50f88e600a6" + +[[projects]] + digest = "1:f70324149a251e89d03333d2b627cb87bf360d1c576b218d8e8649c925316fe8" + name = "github.com/hashicorp/yamux" + packages = ["."] + pruneopts = "UT" + revision = "d1caa6c97c9fc1cc9e83bbe34d0603f9ff0ce8bd" + +[[projects]] + digest = "1:777a19f55da89883fe86477b3ffcaaebece9a20efa6e9d161c08beb4b3bd83be" + name = "github.com/jmespath/go-jmespath" + packages = ["."] + pruneopts = "UT" + revision = "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d" + +[[projects]] + digest = "1:fa20c5befe61ffcce412048bbb2251d236cd847610e2d37162c234ff2fe00ff2" + name = "github.com/mitchellh/copystructure" + packages = ["."] + pruneopts = "UT" + revision = "f81071c9d77b7931f78c90b416a074ecdc50e959" + +[[projects]] + digest = "1:12ae6210bdbdad658a9a67fd95cd9c99f7fdbf12f6d36eaf0af704e69dacf4f5" + name = "github.com/mitchellh/go-homedir" + packages = ["."] + pruneopts = "UT" + revision = "b8bc1bf767474819792c23f32d8286a45736f1c6" + +[[projects]] + digest = "1:3b6bb6060d008e84abb4d3d2dd2c50df391c4479056d66e2b4a22e5b0c83255c" + name = "github.com/mitchellh/hashstructure" + packages = ["."] + pruneopts = "UT" + revision = "ab25296c0f51f1022f01cd99dfb45f1775de8799" + +[[projects]] + digest = "1:ce8a529f61eb119be5e84417a77e71fe380d09ddcd8b69b1372d9261a27f9539" + name = "github.com/mitchellh/mapstructure" + packages = ["."] + pruneopts = "UT" + revision = "db1efb556f84b25a0a13a04aad883943538ad2e0" + +[[projects]] + digest = "1:1df968c4c20f1e0fa1c88e9b7d86a4cea6ca45e5f133f11bfc3bb3f251ddf21e" + name = "github.com/mitchellh/reflectwalk" + packages = ["."] + pruneopts = "UT" + revision = "417edcfd99a4d472c262e58f22b4bfe97580f03e" + +[[projects]] + digest = "1:34bf609f0bc576cd648a993bd711fb9b25f13dcd4ec1d1f5b4137b9d3ed0ff2f" + name = "github.com/satori/go.uuid" + packages = ["."] + pruneopts = "UT" + revision = "b061729afc07e77a8aa4fad0a2fd840958f1942a" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + input-imports = [ + "github.com/Cox-Automotive/alks-go", + "github.com/aws/aws-sdk-go/aws", + "github.com/aws/aws-sdk-go/aws/credentials", + "github.com/aws/aws-sdk-go/aws/session", + "github.com/aws/aws-sdk-go/service/sts", + "github.com/hashicorp/terraform/helper/resource", + "github.com/hashicorp/terraform/helper/schema", + "github.com/hashicorp/terraform/plugin", + "github.com/hashicorp/terraform/terraform", + "github.com/mitchellh/go-homedir", + ] + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 00000000..d7072c22 --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,30 @@ +# Gopkg.toml example +# +# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html +# for detailed Gopkg.toml documentation. +# +# required = ["github.com/user/thing/cmd/thing"] +# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +# +# [[constraint]] +# name = "github.com/user/project" +# version = "1.0.0" +# +# [[constraint]] +# name = "github.com/user/project2" +# branch = "dev" +# source = "github.com/myfork/project2" +# +# [[override]] +# name = "github.com/x/y" +# version = "2.4.0" +# +# [prune] +# non-go = false +# go-tests = true +# unused-packages = true + + +[prune] + go-tests = true + unused-packages = true diff --git a/vendor/github.com/hashicorp/terraform/examples/aws-networking/region/numbering.tf b/vendor/github.com/hashicorp/terraform/examples/aws-networking/region/numbering.tf new file mode 120000 index 00000000..49f7617b --- /dev/null +++ b/vendor/github.com/hashicorp/terraform/examples/aws-networking/region/numbering.tf @@ -0,0 +1 @@ +../numbering/variables.tf \ No newline at end of file diff --git a/vendor/github.com/hashicorp/terraform/examples/aws-networking/subnet/numbering.tf b/vendor/github.com/hashicorp/terraform/examples/aws-networking/subnet/numbering.tf new file mode 120000 index 00000000..49f7617b --- /dev/null +++ b/vendor/github.com/hashicorp/terraform/examples/aws-networking/subnet/numbering.tf @@ -0,0 +1 @@ +../numbering/variables.tf \ No newline at end of file diff --git a/vendor/github.com/hashicorp/terraform/website/LICENSE.md b/vendor/github.com/hashicorp/terraform/website/LICENSE.md new file mode 100644 index 00000000..3189f43a --- /dev/null +++ b/vendor/github.com/hashicorp/terraform/website/LICENSE.md @@ -0,0 +1,10 @@ +# Proprietary License + +This license is temporary while a more official one is drafted. However, +this should make it clear: + +The text contents of this website are MPL 2.0 licensed. + +The design contents of this website are proprietary and may not be reproduced +or reused in any way other than to run the website locally. The license for +the design is owned solely by HashiCorp, Inc. From d94e42be0fac8e700b2fe739b207280da0b40eb1 Mon Sep 17 00:00:00 2001 From: Webb Barker Date: Mon, 14 Jan 2019 09:26:35 -0500 Subject: [PATCH 03/10] Update Alks-Go dependancy --- Gopkg.lock | 5 +++-- resource_alks_iamrole.go | 6 +++--- .../Cox-Automotive/alks-go/iam_role.go | 16 ++++++++++------ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index dbbbdbb6..54ae6625 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,11 +2,12 @@ [[projects]] - digest = "1:222804d5fb195251b4c21f704e39672590154664475bc69381c545a9ecfc39b2" + branch = "master" + digest = "1:a12cb904f8fb247c1e8ffb36a57607d286319acd3d734a5b1d59370883a19117" name = "github.com/Cox-Automotive/alks-go" packages = ["."] pruneopts = "UT" - revision = "4a87d235c4553dba29ddd235db623425c68aa851" + revision = "b8d8670a4cf3cefd352e73dc532f22880085dede" [[projects]] digest = "1:672133929e2786ef49ada5ea7476fa154e251d04da8fa79ae0be0694562ef94e" diff --git a/resource_alks_iamrole.go b/resource_alks_iamrole.go index 9482084a..364f52e6 100644 --- a/resource_alks_iamrole.go +++ b/resource_alks_iamrole.go @@ -4,7 +4,7 @@ import ( "log" "time" - "github.com/Cox-Automotive/alks-go" + alks "github.com/Cox-Automotive/alks-go" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) @@ -95,7 +95,7 @@ func resourceAlksIamRoleCreate(d *schema.ResourceData, meta interface{}) error { var incDefPol = d.Get("include_default_policies").(bool) client := meta.(*alks.Client) - resp, err := client.CreateIamRole(roleName, roleType, incDefPol) + resp, err := client.CreateIamRole(roleName, roleType, incDefPol, false) if err != nil { return err @@ -123,7 +123,7 @@ func resourceAlksIamTrustRoleCreate(d *schema.ResourceData, meta interface{}) er var resp *alks.IamRoleResponse err := resource.Retry(2*time.Minute, func() *resource.RetryError { var err error - resp, err = client.CreateIamTrustRole(roleName, roleType, trustArn) + resp, err = client.CreateIamTrustRole(roleName, roleType, trustArn, false) if err != nil { return resource.RetryableError(err) } diff --git a/vendor/github.com/Cox-Automotive/alks-go/iam_role.go b/vendor/github.com/Cox-Automotive/alks-go/iam_role.go index 41aca26e..ee86e83d 100644 --- a/vendor/github.com/Cox-Automotive/alks-go/iam_role.go +++ b/vendor/github.com/Cox-Automotive/alks-go/iam_role.go @@ -13,13 +13,15 @@ type IamRoleRequest struct { RoleName string `json:"roleName"` RoleType string `json:"roleType"` IncDefPols int `json:"includeDefaultPolicy"` + AlksAccess bool `json:"enableAlksAccess"` } // IamTrustRoleRequest is used to represent a new IAM Trust Role request. type IamTrustRoleRequest struct { - RoleName string `json:"roleName"` - RoleType string `json:"roleType"` - TrustArn string `json:"trustArn"` + RoleName string `json:"roleName"` + RoleType string `json:"roleType"` + TrustArn string `json:"trustArn"` + AlksAccess bool `json:"enableAlksAccess"` } // IamRoleResponse is used to represent a a IAM Role. @@ -55,10 +57,10 @@ type DeleteRoleResponse struct { // CreateIamRole will create a new IAM role on AWS. If no error is returned // then you will receive a IamRoleResponse object representing the new role. -func (c *Client) CreateIamRole(roleName string, roleType string, includeDefaultPolicies bool) (*IamRoleResponse, error) { +func (c *Client) CreateIamRole(roleName string, roleType string, includeDefaultPolicies, enableAlksAccess bool) (*IamRoleResponse, error) { log.Printf("[INFO] Creating IAM role: %s", roleName) - var include int = 0 + var include int if includeDefaultPolicies { include = 1 } @@ -67,6 +69,7 @@ func (c *Client) CreateIamRole(roleName string, roleType string, includeDefaultP roleName, roleType, include, + enableAlksAccess, } var b []byte @@ -113,13 +116,14 @@ func (c *Client) CreateIamRole(roleName string, roleType string, includeDefaultP // CreateIamTrustRole will create a new IAM trust role on AWS. If no error is returned // then you will receive a IamRoleResponse object representing the new role. -func (c *Client) CreateIamTrustRole(roleName string, roleType string, trustArn string) (*IamRoleResponse, error) { +func (c *Client) CreateIamTrustRole(roleName string, roleType string, trustArn string, enableAlksAccess bool) (*IamRoleResponse, error) { log.Printf("[INFO] Creating IAM trust role: %s", roleName) iam := IamTrustRoleRequest{ roleName, roleType, trustArn, + enableAlksAccess, } var b []byte From 825b0deef263980cc416e6280f457d08a9e0a626 Mon Sep 17 00:00:00 2001 From: Webb Barker Date: Mon, 14 Jan 2019 09:40:15 -0500 Subject: [PATCH 04/10] Add EC2Role Credential provider --- Gopkg.lock | 1 + Gopkg.toml | 3 +++ config.go | 10 ++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 54ae6625..b8bae3ea 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -245,6 +245,7 @@ "github.com/Cox-Automotive/alks-go", "github.com/aws/aws-sdk-go/aws", "github.com/aws/aws-sdk-go/aws/credentials", + "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", "github.com/aws/aws-sdk-go/aws/session", "github.com/aws/aws-sdk-go/service/sts", "github.com/hashicorp/terraform/helper/resource", diff --git a/Gopkg.toml b/Gopkg.toml index d7072c22..528f5a0c 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -28,3 +28,6 @@ [prune] go-tests = true unused-packages = true + +[[constraint]] + name = "github.com/aws/aws-sdk-go" diff --git a/config.go b/config.go index e94334c6..8ac02c26 100644 --- a/config.go +++ b/config.go @@ -3,12 +3,14 @@ package main import ( "errors" "fmt" - "github.com/Cox-Automotive/alks-go" + "log" + + alks "github.com/Cox-Automotive/alks-go" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sts" - "log" ) type Config struct { @@ -21,6 +23,9 @@ type Config struct { } func getCredentials(c *Config) *credentials.Credentials { + // Follow the same priority as the AWS Terraform Provider + // https://www.terraform.io/docs/providers/aws/#authentication + providers := []credentials.Provider{ &credentials.StaticProvider{Value: credentials.Value{ AccessKeyID: c.AccessKey, @@ -32,6 +37,7 @@ func getCredentials(c *Config) *credentials.Credentials { Filename: c.CredsFilename, Profile: c.Profile, }, + &ec2rolecreds.EC2RoleProvider{}, } return credentials.NewChainCredentials(providers) From 96e833abe37932253d8e15751f97a811f004bff1 Mon Sep 17 00:00:00 2001 From: Webb Barker Date: Mon, 14 Jan 2019 09:43:35 -0500 Subject: [PATCH 05/10] Address linter warnings about proper Go style --- config.go | 6 ++++-- provider.go | 4 ++-- resource_alks_iamrole_test.go | 7 +++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config.go b/config.go index 8ac02c26..ec250e54 100644 --- a/config.go +++ b/config.go @@ -13,8 +13,9 @@ import ( "github.com/aws/aws-sdk-go/service/sts" ) +// Config stores ALKS configuration and credentials type Config struct { - Url string + URL string AccessKey string SecretKey string Token string @@ -43,6 +44,7 @@ func getCredentials(c *Config) *credentials.Credentials { return credentials.NewChainCredentials(providers) } +// Client returns a properly configured ALKS client or an appropriate error if initialization fails func (c *Config) Client() (*alks.Client, error) { log.Println("[DEBUG] Validting STS credentials") @@ -78,7 +80,7 @@ providing credentials for the ALKS Provider`) } // got good creds, create alks sts client - client, err := alks.NewSTSClient(c.Url, cp.AccessKeyID, cp.SecretAccessKey, cp.SessionToken) + client, err := alks.NewSTSClient(c.URL, cp.AccessKeyID, cp.SecretAccessKey, cp.SessionToken) if err != nil { return nil, err diff --git a/provider.go b/provider.go index 9dd33fbb..8343da19 100644 --- a/provider.go +++ b/provider.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" - "github.com/mitchellh/go-homedir" + homedir "github.com/mitchellh/go-homedir" ) // Provider returns a terraform.ResourceProvider. @@ -72,7 +72,7 @@ func Provider() terraform.ResourceProvider { func providerConfigure(d *schema.ResourceData) (interface{}, error) { config := Config{ - Url: d.Get("url").(string), + URL: d.Get("url").(string), AccessKey: d.Get("access_key").(string), SecretKey: d.Get("secret_key").(string), Token: d.Get("token").(string), diff --git a/resource_alks_iamrole_test.go b/resource_alks_iamrole_test.go index 87b30510..c4c58967 100644 --- a/resource_alks_iamrole_test.go +++ b/resource_alks_iamrole_test.go @@ -5,10 +5,9 @@ import ( "log" "testing" + alks "github.com/Cox-Automotive/alks-go" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - - "github.com/Cox-Automotive/alks-go" ) func TestAccAlksIamRole_Basic(t *testing.T) { @@ -118,7 +117,7 @@ func testAccCheckAlksIamRoleAttributes(role *alks.IamRoleResponse) resource.Test } } -const testAccCheckAlksIamRoleConfig_basic = ` +const testAccCheckAlksIamRoleConfigBasic = ` resource "alks_iamrole" "foo" { name = "bar420" type = "Amazon EC2" @@ -126,7 +125,7 @@ resource "alks_iamrole" "foo" { } ` -const testAccCheckAlksIamTrustRoleConfig_basic = ` +const testAccCheckAlksIamTrustRoleConfigBasic = ` resource "alks_iamrole" "foo" { name = "foo" type = "Amazon EC2" From c30a57a0f8ad5f0807414797f9d59dd1c7772722 Mon Sep 17 00:00:00 2001 From: Webb Barker Date: Mon, 14 Jan 2019 09:47:52 -0500 Subject: [PATCH 06/10] Update tests with new names --- resource_alks_iamrole_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resource_alks_iamrole_test.go b/resource_alks_iamrole_test.go index c4c58967..f7e19979 100644 --- a/resource_alks_iamrole_test.go +++ b/resource_alks_iamrole_test.go @@ -19,7 +19,7 @@ func TestAccAlksIamRole_Basic(t *testing.T) { CheckDestroy: testAccCheckAlksIamRoleDestroy(&resp), Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccCheckAlksIamRoleConfig_basic, + Config: testAccCheckAlksIamRoleConfigBasic, Check: resource.ComposeTestCheckFunc( // testAccCheckAlksIamRoleExists("bar420", &resp), // testAccCheckAlksIamRoleAttributes(&resp), @@ -44,7 +44,7 @@ func TestAccAlksIamTrustRole_Basic(t *testing.T) { CheckDestroy: testAccCheckAlksIamRoleDestroy(&resp), Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccCheckAlksIamTrustRoleConfig_basic, + Config: testAccCheckAlksIamTrustRoleConfigBasic, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( "alks_iamtrustrole.bar", "name", "bar"), From 8714c54c8e5174aafe7dc5d6f7bfb86bc3dee535 Mon Sep 17 00:00:00 2001 From: Webb Barker Date: Mon, 14 Jan 2019 15:01:02 -0500 Subject: [PATCH 07/10] add assume_role pattern --- config.go | 41 ++++++++++++++++++++++++++++++++++++++++- provider.go | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/config.go b/config.go index ec250e54..23e05ed7 100644 --- a/config.go +++ b/config.go @@ -5,6 +5,8 @@ import ( "fmt" "log" + "github.com/aws/aws-sdk-go/aws/credentials/stscreds" + alks "github.com/Cox-Automotive/alks-go" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" @@ -21,6 +23,14 @@ type Config struct { Token string CredsFilename string Profile string + AssumeRole assumeRoleDetails +} + +type assumeRoleDetails struct { + RoleARN string + SessionName string + ExternalID string + Policy string } func getCredentials(c *Config) *credentials.Credentials { @@ -70,8 +80,37 @@ providing credentials for the ALKS Provider`) return nil, fmt.Errorf("Error creating session from STS. (%v)", err) } + var stsconn *sts.STS + // we need to assume another role before creating an ALKS client + if c.AssumeRole.RoleARN != "" { + arCreds := stscreds.NewCredentials(sess, c.AssumeRole.RoleARN, func(p *stscreds.AssumeRoleProvider) { + if c.AssumeRole.SessionName != "" { + p.RoleSessionName = c.AssumeRole.SessionName + } + + if c.AssumeRole.ExternalID != "" { + p.ExternalID = &c.AssumeRole.ExternalID + } + + if c.AssumeRole.Policy != "" { + p.Policy = &c.AssumeRole.Policy + } + }) + + cp, cpErr = arCreds.Get() + if cpErr != nil { + return nil, fmt.Errorf("The role %q cannot be assumed. Please verify the role ARN and your base AWS credentials", c.AssumeRole.RoleARN) + } + + stsconn = sts.New(sess, &aws.Config{ + Region: aws.String("us-east-1"), + Credentials: arCreds, + }) + } else { + stsconn = sts.New(sess) + } + // make a basic api call to test creds are valid - stsconn := sts.New(sess) _, serr := stsconn.GetCallerIdentity(&sts.GetCallerIdentityInput{}) // check for valid creds diff --git a/provider.go b/provider.go index 8343da19..fcae2e17 100644 --- a/provider.go +++ b/provider.go @@ -59,6 +59,7 @@ func Provider() terraform.ResourceProvider { Description: "The path to the shared credentials file. If not set this defaults to ~/.aws/credentials.", DefaultFunc: schema.EnvDefaultFunc("AWS_SHARED_CREDENTIALS_FILE", nil), }, + "assume_role": assumeRoleSchema(), }, ResourcesMap: map[string]*schema.Resource{ @@ -70,6 +71,38 @@ func Provider() terraform.ResourceProvider { } } +func assumeRoleSchema() *schema.Schema { + return &schema.Schema{ + Type: schema.TypeSet, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "role_arn": { + Type: schema.TypeString, + Optional: true, + Description: "(Required) Role ARN to assume before calling ALKS", + }, + "session_name": { + Type: schema.TypeString, + Optional: true, + Description: "(Optional) Session name to use when making the AssumeRole call. See AWS SDK for more details.", + }, + "external_id": { + Type: schema.TypeString, + Optional: true, + Description: "(Optional) The external ID to use when making the AssumeRole call. See AWS SDK for more details.", + }, + "policy": { + Type: schema.TypeString, + Optional: true, + Description: "(Optional) Additional policy restrictions to apply to the result STS session. See AWS SDK for more details.", + }, + }, + }, + } +} + func providerConfigure(d *schema.ResourceData) (interface{}, error) { config := Config{ URL: d.Get("url").(string), @@ -79,6 +112,15 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { Profile: d.Get("profile").(string), } + assumeRoleList := d.Get("assume_role").(*schema.Set).List() + if len(assumeRoleList) == 1 { + assumeRole := assumeRoleList[0].(map[string]interface{}) + config.AssumeRole.RoleARN = assumeRole["role_arn"].(string) + config.AssumeRole.SessionName = assumeRole["session_name"].(string) + config.AssumeRole.ExternalID = assumeRole["external_id"].(string) + config.AssumeRole.Policy = assumeRole["policy"].(string) + } + // Set CredsFilename, expanding home directory credsPath, err := homedir.Expand(d.Get("shared_credentials_file").(string)) if err != nil { From 79252e9c00e32ab00fd74fc9c312fb0161cfde54 Mon Sep 17 00:00:00 2001 From: Webb Barker Date: Thu, 17 Jan 2019 09:39:42 -0500 Subject: [PATCH 08/10] Adds EC2 metadata session for the EC2 role provider --- config.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/config.go b/config.go index ec250e54..092659b4 100644 --- a/config.go +++ b/config.go @@ -5,6 +5,8 @@ import ( "fmt" "log" + "github.com/aws/aws-sdk-go/aws/ec2metadata" + alks "github.com/Cox-Automotive/alks-go" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" @@ -27,6 +29,9 @@ func getCredentials(c *Config) *credentials.Credentials { // Follow the same priority as the AWS Terraform Provider // https://www.terraform.io/docs/providers/aws/#authentication + // needed for the EC2MetaData service + sess := session.Must(session.NewSession()) + providers := []credentials.Provider{ &credentials.StaticProvider{Value: credentials.Value{ AccessKeyID: c.AccessKey, @@ -38,7 +43,9 @@ func getCredentials(c *Config) *credentials.Credentials { Filename: c.CredsFilename, Profile: c.Profile, }, - &ec2rolecreds.EC2RoleProvider{}, + &ec2rolecreds.EC2RoleProvider{ + Client: ec2metadata.New(sess), + }, } return credentials.NewChainCredentials(providers) From 7f19a9a9ece0e06f5d3bbeefa444327004870402 Mon Sep 17 00:00:00 2001 From: Webb Barker Date: Fri, 18 Jan 2019 10:10:48 -0500 Subject: [PATCH 09/10] Improve error suggestion --- config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.go b/config.go index 23e05ed7..59319111 100644 --- a/config.go +++ b/config.go @@ -99,7 +99,7 @@ providing credentials for the ALKS Provider`) cp, cpErr = arCreds.Get() if cpErr != nil { - return nil, fmt.Errorf("The role %q cannot be assumed. Please verify the role ARN and your base AWS credentials", c.AssumeRole.RoleARN) + return nil, fmt.Errorf("The role %q cannot be assumed. Please verify the role ARN, role policies and your base AWS credentials", c.AssumeRole.RoleARN) } stsconn = sts.New(sess, &aws.Config{ From 712318e04f9ec0d1f67bb0f4e266157d730b565e Mon Sep 17 00:00:00 2001 From: Webb Barker Date: Fri, 18 Jan 2019 11:19:37 -0500 Subject: [PATCH 10/10] Removes merge tag artifacts --- resource_alks_iamrole.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/resource_alks_iamrole.go b/resource_alks_iamrole.go index 084437a5..e10ea533 100644 --- a/resource_alks_iamrole.go +++ b/resource_alks_iamrole.go @@ -108,11 +108,7 @@ func resourceAlksIamRoleCreate(d *schema.ResourceData, meta interface{}) error { var enableAlksAccess = d.Get("enable_alks_access").(bool) client := meta.(*alks.Client) -<<<<<<< HEAD - resp, err := client.CreateIamRole(roleName, roleType, incDefPol, false) -======= resp, err := client.CreateIamRole(roleName, roleType, incDefPol, enableAlksAccess) ->>>>>>> master if err != nil { return err @@ -141,11 +137,7 @@ func resourceAlksIamTrustRoleCreate(d *schema.ResourceData, meta interface{}) er var resp *alks.IamRoleResponse err := resource.Retry(2*time.Minute, func() *resource.RetryError { var err error -<<<<<<< HEAD - resp, err = client.CreateIamTrustRole(roleName, roleType, trustArn, false) -======= resp, err = client.CreateIamTrustRole(roleName, roleType, trustArn, enableAlksAccess) ->>>>>>> master if err != nil { return resource.RetryableError(err) }