From f496f150f16556fda1e5f317adf34e903676ad4e Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Sat, 21 Nov 2020 19:55:28 -0600 Subject: [PATCH 01/12] Plugin SDK V2 automated upgrade changes This is the result of running the tf-sdk-migrator tool --- go.mod | 4 +- go.sum | 361 ++++++++++++++++-- main.go | 2 +- tfe/data_source_agent_pool.go | 2 +- tfe/data_source_agent_pool_test.go | 2 +- tfe/data_source_oauth_client.go | 2 +- tfe/data_source_oauth_client_test.go | 2 +- tfe/data_source_organization_membership.go | 2 +- ...ata_source_organization_membership_test.go | 2 +- tfe/data_source_ssh_key.go | 2 +- tfe/data_source_ssh_key_test.go | 2 +- tfe/data_source_team.go | 2 +- tfe/data_source_team_access.go | 2 +- tfe/data_source_team_access_test.go | 2 +- tfe/data_source_team_test.go | 2 +- tfe/data_source_workspace.go | 2 +- tfe/data_source_workspace_ids.go | 2 +- tfe/data_source_workspace_ids_test.go | 2 +- tfe/data_source_workspace_test.go | 2 +- tfe/provider.go | 6 +- tfe/provider_test.go | 4 +- tfe/resource_tfe_agent_pool.go | 2 +- tfe/resource_tfe_agent_pool_test.go | 4 +- ...resource_tfe_notification_configuration.go | 6 +- ...rce_tfe_notification_configuration_test.go | 4 +- tfe/resource_tfe_oauth_client.go | 4 +- tfe/resource_tfe_oauth_client_test.go | 4 +- tfe/resource_tfe_organization.go | 4 +- tfe/resource_tfe_organization_membership.go | 2 +- ...source_tfe_organization_membership_test.go | 4 +- tfe/resource_tfe_organization_test.go | 4 +- tfe/resource_tfe_organization_token.go | 2 +- tfe/resource_tfe_organization_token_test.go | 4 +- tfe/resource_tfe_policy_set.go | 4 +- tfe/resource_tfe_policy_set_parameter.go | 2 +- tfe/resource_tfe_policy_set_parameter_test.go | 4 +- tfe/resource_tfe_policy_set_test.go | 4 +- tfe/resource_tfe_registry_module.go | 4 +- tfe/resource_tfe_registry_module_test.go | 4 +- tfe/resource_tfe_run_trigger.go | 6 +- tfe/resource_tfe_run_trigger_test.go | 4 +- tfe/resource_tfe_sentinel_policy.go | 4 +- tfe/resource_tfe_sentinel_policy_test.go | 4 +- tfe/resource_tfe_ssh_key.go | 2 +- tfe/resource_tfe_ssh_key_test.go | 4 +- tfe/resource_tfe_team.go | 4 +- tfe/resource_tfe_team_access.go | 4 +- tfe/resource_tfe_team_access_migrate.go | 4 +- tfe/resource_tfe_team_access_test.go | 4 +- tfe/resource_tfe_team_member.go | 2 +- tfe/resource_tfe_team_member_test.go | 4 +- tfe/resource_tfe_team_members.go | 2 +- tfe/resource_tfe_team_members_test.go | 6 +- tfe/resource_tfe_team_organization_member.go | 2 +- ...ource_tfe_team_organization_member_test.go | 4 +- tfe/resource_tfe_team_test.go | 4 +- tfe/resource_tfe_team_token.go | 2 +- tfe/resource_tfe_team_token_test.go | 4 +- tfe/resource_tfe_variable.go | 6 +- tfe/resource_tfe_variable_migrate.go | 4 +- tfe/resource_tfe_variable_test.go | 4 +- tfe/resource_tfe_workspace.go | 4 +- tfe/resource_tfe_workspace_migrate.go | 2 +- tfe/resource_tfe_workspace_test.go | 6 +- tfe/tfe_sweeper_test.go | 2 +- 65 files changed, 426 insertions(+), 147 deletions(-) diff --git a/go.mod b/go.mod index 776f38d41..0e83c37e9 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.14 require ( github.com/hashicorp/go-tfe v0.11.1 - github.com/hashicorp/go-version v1.2.0 + github.com/hashicorp/go-version v1.2.1 github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce - github.com/hashicorp/terraform-plugin-sdk v1.13.1 + github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.3 github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 ) diff --git a/go.sum b/go.sum index f5d94f216..1709456b4 100644 --- a/go.sum +++ b/go.sum @@ -5,8 +5,34 @@ cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6A cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1 h1:lRi0CHyU+ytlvylOlFKKq0af6JncuyoRh1J+QJBqQx0= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.61.0 h1:NLQf5e1OMspfNT1RAHOB3ublr1TW3YTXO8OiWwVjK2U= +cloud.google.com/go v0.61.0/go.mod h1:XukKJg4Y7QsUu0Hxg3qQKUWR4VuWivmyMK2+rUyxAqw= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8= @@ -14,6 +40,10 @@ github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/apparentlymart/go-cidr v1.0.1 h1:NmIwLZ/KdsjIUlhf+/Np40atNXm/+lZ5txfTJ/SpF+U= github.com/apparentlymart/go-cidr v1.0.1/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3 h1:ZSTrOEhiM5J5RFxEaFvMZVEAM1KvT1YzbEOwB2EAGjA= @@ -22,10 +52,11 @@ github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFU github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= +github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aws/aws-sdk-go v1.15.78 h1:LaXy6lWR0YK7LKyuU0QWy2ws/LWTPfYV/UgfiBu4tvY= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.25.3 h1:uM16hIw9BotjZKMZlX05SN2EFtaWfi/NonPKIARiBLQ= @@ -36,24 +67,55 @@ github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= +github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= +github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM= +github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-git-fixtures/v4 v4.0.1 h1:q+IFMfLx200Q3scvt2hN79JsEzy4AmBTp/pqnefH+Bc= +github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= +github.com/go-git/go-git/v5 v5.1.0 h1:HxJn9g/E7eYvKW3Fm7Jt4ee8LXfPOm/H1cdDu8vEssk= +github.com/go-git/go-git/v5 v5.1.0/go.mod h1:ZKfuPUoY1ZqIG4QG9BDBh3G4gLM5zvPuSJAozQrZuyM= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -63,6 +125,15 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +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 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= 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= @@ -71,32 +142,48 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a 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= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0 h1:pMen7vLs8nvgEYhywH3KDWJIJTeEr2ULsVWHWYHQyBs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU= +github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg= github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI= +github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs= github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw= github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= +github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 h1:l1KB3bHVdvegcIf5upQ5mjcHjs2qsWnKh4Yr9xgIuu8= +github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-plugin v1.0.1 h1:4OtAfUGbnKC6yS48p0CtMX2oFYtzFZVv6rok3cRWgnE= -github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= +github.com/hashicorp/go-plugin v1.3.0 h1:4d/wJojzvHV1I4i/rrjVaeuyxWrLzDE1mDCyDy8fXS8= +github.com/hashicorp/go-plugin v1.3.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0= github.com/hashicorp/go-retryablehttp v0.5.2 h1:AoISa4P4IsW0/m4T6St8Yw38gTl5GtBAgfkhYh1xAz4= github.com/hashicorp/go-retryablehttp v0.5.2/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= @@ -105,66 +192,76 @@ github.com/hashicorp/go-slug v0.4.1 h1:/jAo8dNuLgSImoLXaX7Od7QB4TfYCVPam+OpAt5bZ github.com/hashicorp/go-slug v0.4.1/go.mod h1:I5tq5Lv0E2xcNXNkmx7BSfzi1PsJ2cNjs3cC3LwyhK8= github.com/hashicorp/go-tfe v0.11.1 h1:BD0HlSTcptjHkIYLgZ2+mgfyfXRBXnkkHoJpzWP4vkI= github.com/hashicorp/go-tfe v0.11.1/go.mod h1:XAV72S4O1iP8BDaqiaPLmL2B4EE6almocnOn8E8stHc= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce h1:xdsDDbiBDQTKASoGEZ+pEmF1OnWuu8AQ9I8iNbHNeno= github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= -github.com/hashicorp/hcl/v2 v2.0.0 h1:efQznTz+ydmQXq3BOnRa3AXzvCeTq1P4dKj/z5GLlY8= -github.com/hashicorp/hcl/v2 v2.0.0/go.mod h1:oVVDG71tEinNGYCxinCYadcmKU9bglqW9pV3txagJ90= +github.com/hashicorp/hcl/v2 v2.3.0 h1:iRly8YaMwTBAKhn1Ybk7VSdzbnopghktCD031P8ggUE= +github.com/hashicorp/hcl/v2 v2.3.0/go.mod h1:d+FwDBbOLvpAM3Z6J7gPj/VoAGkNe/gm352ZhjJ/Zv8= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 h1:+RyjwU+Gnd/aTJBPZVDNm903eXVjjqhbaR4Ypx3xYyY= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= -github.com/hashicorp/terraform-json v0.4.0 h1:KNh29iNxozP5adfUFBJ4/fWd0Cu3taGgjHB38JYqOF4= -github.com/hashicorp/terraform-json v0.4.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU= -github.com/hashicorp/terraform-plugin-sdk v1.13.1 h1:kWq+V+4BMFKtzIuO8wb/k4SRGB/VVF8g468VSFmAnKM= -github.com/hashicorp/terraform-plugin-sdk v1.13.1/go.mod h1:HiWIPD/T9HixIhQUwaSoDQxo4BLFdmiBi/Qz5gjB8Q0= -github.com/hashicorp/terraform-plugin-test v1.3.0 h1:hU5LoxrOn9qvOo+LTKN6mSav2J+dAMprbdxJPEQvp4U= -github.com/hashicorp/terraform-plugin-test v1.3.0/go.mod h1:QIJHYz8j+xJtdtLrFTlzQVC0ocr3rf/OjIpgZLK56Hs= +github.com/hashicorp/terraform-exec v0.10.0 h1:3nh/1e3u9gYRUQGOKWp/8wPR7ABlL2F14sZMZBrp+dM= +github.com/hashicorp/terraform-exec v0.10.0/go.mod h1:tOT8j1J8rP05bZBGWXfMyU3HkLi1LWyqL3Bzsc3CJjo= +github.com/hashicorp/terraform-json v0.5.0 h1:7TV3/F3y7QVSuN4r9BEXqnWqrAyeOtON8f0wvREtyzs= +github.com/hashicorp/terraform-json v0.5.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.3 h1:X7VmKpcIxq+rIbuqe5TPN27KLzbO9aXQcjG4c5iC3tk= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.3/go.mod h1:oz4kkpfTJ/hA2VMD0WpITTd3yPDGpT4uN7CiKdre/YI= +github.com/hashicorp/terraform-plugin-test/v2 v2.1.2 h1:p96IIn+XpvVjw7AtN8y9MKxn0x69S7wtbGf7JgDJoIk= +github.com/hashicorp/terraform-plugin-test/v2 v2.1.2/go.mod h1:jerO5mrd+jVNALy8aiq+VZOg/CR8T2T1QR3jd6JKGOI= github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 h1:hjyO2JsNZUKT1ym+FAdlBEkGPevazYsmVgIMw7dVELg= github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= +github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= +github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba h1:NARVGAAgEXvoMeNPHhPFt1SBt1VMznA3Gnz9d0qj+co= github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= 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= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mitchellh/cli v1.0.0 h1:iGBIsUe3+HZ/AD/Vd7DErOt5sU9fa8Uj7A2s1aggv1Y= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ= -github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= +github.com/mitchellh/cli v1.1.1/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -173,6 +270,8 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.0.4 h1:ZU1VNC02qyufSZsjjs7+khruk2fKvbQ3TwRV/IBCeFA= +github.com/mitchellh/go-testing-interface v1.0.4/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= @@ -183,59 +282,100 @@ github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/I github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1 h1:ccV59UEOTzVDnDUEFdT95ZzHVZ+5+158q8+SJb2QV5w= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.1 h1:LrvDIY//XNo65Lq84G/akBuMGlawHvGBABv8f/ZN6DI= -github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DKN0g6uH7E= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= 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/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d h1:Z4EH+5EffvBEhh37F0C0DnpklTMh00JOkjW5zK3ofBI= github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod h1:BSTlc8jOjh0niykqEGVXOLXdi9o0r0kR8tCYiMvjFgw= github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok= github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= +github.com/ulikunitz/xz v0.5.7 h1:YvTNdFzX6+W5m9msiYg/zpkSURPPtOlzbqYjrFn7Yt4= +github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= 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/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= +github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= github.com/zclconf/go-cty v1.2.1 h1:vGMsygfmeCl4Xb6OA5U5XVAaQZ69FvoG7X2jUtQujb8= github.com/zclconf/go-cty v1.2.1/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= -github.com/zclconf/go-cty-yaml v1.0.1 h1:up11wlgAaDvlAGENcFDnZgkn0qUJurso7k6EpURKNF8= -github.com/zclconf/go-cty-yaml v1.0.1/go.mod h1:IP3Ylp0wQpYm50IHK8OZWKMu6sPJIUgKa8XhiVHura0= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -247,14 +387,32 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191009170851-d66e71096ffb h1:TR699M2v0qoKTOHxeLgp6zPqaQNs74f01a/ob9W0qko= golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= 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 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -263,11 +421,13 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -277,17 +437,38 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w 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-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/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= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -298,18 +479,66 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed h1:+qzWo37K31KxduIYaBeMqJ8MUOyTayOQKpH9aDPLMSY= +golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0 h1:jbyannxz0XFD3zdjgrSUsaJbgpH4eTrkdhRChkHPfO8= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0 h1:BaiDisFir8O4IJxvAabCGGkQ6yCJegNQqSVoYUNAnbk= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -319,23 +548,73 @@ google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRn 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= -google.golang.org/grpc v1.14.0 h1:ArxJuB1NWfPY6r9Gp9gqwplT0Ge7nqv9msgu03lHLmo= -google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200711021454-869866162049 h1:YFTFpQhgvrLrmxtiIncJxFXeCyq84ixuKWVCaCAi9Oc= +google.golang.org/genproto v0.0.0-20200711021454-869866162049/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +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= 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.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0 h1:M5a8xTlYTxwMn5ZFkwhRabsygDY5G8TYLyQDBxJNAxE= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= 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/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/main.go b/main.go index dfcf4475f..1de216e77 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/hashicorp/terraform-plugin-sdk/plugin" + "github.com/hashicorp/terraform-plugin-sdk/v2/plugin" "github.com/hashicorp/terraform-provider-tfe/tfe" ) diff --git a/tfe/data_source_agent_pool.go b/tfe/data_source_agent_pool.go index 686db9f3c..2ac2e1bb5 100644 --- a/tfe/data_source_agent_pool.go +++ b/tfe/data_source_agent_pool.go @@ -4,7 +4,7 @@ import ( "fmt" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceTFEAgentPool() *schema.Resource { diff --git a/tfe/data_source_agent_pool_test.go b/tfe/data_source_agent_pool_test.go index fd547b894..cea924824 100644 --- a/tfe/data_source_agent_pool_test.go +++ b/tfe/data_source_agent_pool_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccTFEAgentPoolDataSource_basic(t *testing.T) { diff --git a/tfe/data_source_oauth_client.go b/tfe/data_source_oauth_client.go index 97a878bea..97620d277 100644 --- a/tfe/data_source_oauth_client.go +++ b/tfe/data_source_oauth_client.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceTFEOAuthClient() *schema.Resource { diff --git a/tfe/data_source_oauth_client_test.go b/tfe/data_source_oauth_client_test.go index 04979b9d6..5876e3ecc 100644 --- a/tfe/data_source_oauth_client_test.go +++ b/tfe/data_source_oauth_client_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccTFEOAuthClientDataSource_basic(t *testing.T) { diff --git a/tfe/data_source_organization_membership.go b/tfe/data_source_organization_membership.go index 33cf21906..16c73b5ff 100644 --- a/tfe/data_source_organization_membership.go +++ b/tfe/data_source_organization_membership.go @@ -3,7 +3,7 @@ package tfe import ( "fmt" "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceTFEOrganizationMembership() *schema.Resource { diff --git a/tfe/data_source_organization_membership_test.go b/tfe/data_source_organization_membership_test.go index 145a02afa..5aa475e18 100644 --- a/tfe/data_source_organization_membership_test.go +++ b/tfe/data_source_organization_membership_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccTFEOrganizationMembershipDataSource_basic(t *testing.T) { diff --git a/tfe/data_source_ssh_key.go b/tfe/data_source_ssh_key.go index 7e2d558f7..fa8d4f661 100644 --- a/tfe/data_source_ssh_key.go +++ b/tfe/data_source_ssh_key.go @@ -4,7 +4,7 @@ import ( "fmt" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceTFESSHKey() *schema.Resource { diff --git a/tfe/data_source_ssh_key_test.go b/tfe/data_source_ssh_key_test.go index ce8a12d0b..19e75fd0d 100644 --- a/tfe/data_source_ssh_key_test.go +++ b/tfe/data_source_ssh_key_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccTFESSHKeyDataSource_basic(t *testing.T) { diff --git a/tfe/data_source_team.go b/tfe/data_source_team.go index 24094fbad..670f3032c 100644 --- a/tfe/data_source_team.go +++ b/tfe/data_source_team.go @@ -4,7 +4,7 @@ import ( "fmt" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceTFETeam() *schema.Resource { diff --git a/tfe/data_source_team_access.go b/tfe/data_source_team_access.go index b601a1cbc..a4b6c6570 100644 --- a/tfe/data_source_team_access.go +++ b/tfe/data_source_team_access.go @@ -4,7 +4,7 @@ import ( "fmt" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceTFETeamAccess() *schema.Resource { diff --git a/tfe/data_source_team_access_test.go b/tfe/data_source_team_access_test.go index d60577724..e58dc05d8 100644 --- a/tfe/data_source_team_access_test.go +++ b/tfe/data_source_team_access_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccTFETeamAccessDataSource_basic(t *testing.T) { diff --git a/tfe/data_source_team_test.go b/tfe/data_source_team_test.go index 1dd798d27..f7682a3fa 100644 --- a/tfe/data_source_team_test.go +++ b/tfe/data_source_team_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccTFETeamDataSource_basic(t *testing.T) { diff --git a/tfe/data_source_workspace.go b/tfe/data_source_workspace.go index 9dea013cf..38667f8a3 100644 --- a/tfe/data_source_workspace.go +++ b/tfe/data_source_workspace.go @@ -5,7 +5,7 @@ import ( "log" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceTFEWorkspace() *schema.Resource { diff --git a/tfe/data_source_workspace_ids.go b/tfe/data_source_workspace_ids.go index f602036f8..21be1665d 100644 --- a/tfe/data_source_workspace_ids.go +++ b/tfe/data_source_workspace_ids.go @@ -4,7 +4,7 @@ import ( "fmt" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceTFEWorkspaceIDs() *schema.Resource { diff --git a/tfe/data_source_workspace_ids_test.go b/tfe/data_source_workspace_ids_test.go index 1389f556b..a4f16833e 100644 --- a/tfe/data_source_workspace_ids_test.go +++ b/tfe/data_source_workspace_ids_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccTFEWorkspaceIDsDataSource_basic(t *testing.T) { diff --git a/tfe/data_source_workspace_test.go b/tfe/data_source_workspace_test.go index 5cca2c3ad..10dded9fa 100644 --- a/tfe/data_source_workspace_test.go +++ b/tfe/data_source_workspace_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccTFEWorkspaceDataSource_basic(t *testing.T) { diff --git a/tfe/provider.go b/tfe/provider.go index b5fbe892f..d8613d19d 100644 --- a/tfe/provider.go +++ b/tfe/provider.go @@ -15,9 +15,9 @@ import ( tfe "github.com/hashicorp/go-tfe" version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl" - "github.com/hashicorp/terraform-plugin-sdk/helper/logging" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" providerVersion "github.com/hashicorp/terraform-provider-tfe/version" svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/auth" diff --git a/tfe/provider_test.go b/tfe/provider_test.go index 792c597fb..23b0a9960 100644 --- a/tfe/provider_test.go +++ b/tfe/provider_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "github.com/hashicorp/terraform-provider-tfe/version" "github.com/hashicorp/terraform-svchost/disco" ) diff --git a/tfe/resource_tfe_agent_pool.go b/tfe/resource_tfe_agent_pool.go index 0a4400287..b7ec3728f 100644 --- a/tfe/resource_tfe_agent_pool.go +++ b/tfe/resource_tfe_agent_pool.go @@ -5,7 +5,7 @@ import ( "log" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFEAgentPool() *schema.Resource { diff --git a/tfe/resource_tfe_agent_pool_test.go b/tfe/resource_tfe_agent_pool_test.go index 9691b1fd8..0c0e49def 100644 --- a/tfe/resource_tfe_agent_pool_test.go +++ b/tfe/resource_tfe_agent_pool_test.go @@ -7,8 +7,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFEAgentPool_basic(t *testing.T) { diff --git a/tfe/resource_tfe_notification_configuration.go b/tfe/resource_tfe_notification_configuration.go index 4dbe455e2..d91fc0930 100644 --- a/tfe/resource_tfe_notification_configuration.go +++ b/tfe/resource_tfe_notification_configuration.go @@ -2,12 +2,12 @@ package tfe import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/helper/customdiff" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "log" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceTFENotificationConfiguration() *schema.Resource { diff --git a/tfe/resource_tfe_notification_configuration_test.go b/tfe/resource_tfe_notification_configuration_test.go index 108afa7a5..9567ed8b9 100644 --- a/tfe/resource_tfe_notification_configuration_test.go +++ b/tfe/resource_tfe_notification_configuration_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFENotificationConfiguration_basic(t *testing.T) { diff --git a/tfe/resource_tfe_oauth_client.go b/tfe/resource_tfe_oauth_client.go index a321ae2d2..9de33e3a3 100644 --- a/tfe/resource_tfe_oauth_client.go +++ b/tfe/resource_tfe_oauth_client.go @@ -5,8 +5,8 @@ import ( "log" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceTFEOAuthClient() *schema.Resource { diff --git a/tfe/resource_tfe_oauth_client_test.go b/tfe/resource_tfe_oauth_client_test.go index 854cd6ef7..c883714bc 100644 --- a/tfe/resource_tfe_oauth_client_test.go +++ b/tfe/resource_tfe_oauth_client_test.go @@ -3,8 +3,8 @@ package tfe import ( "fmt" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "math/rand" "testing" "time" diff --git a/tfe/resource_tfe_organization.go b/tfe/resource_tfe_organization.go index a06a56faa..c9945ead6 100644 --- a/tfe/resource_tfe_organization.go +++ b/tfe/resource_tfe_organization.go @@ -5,8 +5,8 @@ import ( "log" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceTFEOrganization() *schema.Resource { diff --git a/tfe/resource_tfe_organization_membership.go b/tfe/resource_tfe_organization_membership.go index 0afb13a7d..48d6072ed 100644 --- a/tfe/resource_tfe_organization_membership.go +++ b/tfe/resource_tfe_organization_membership.go @@ -5,7 +5,7 @@ import ( "log" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFEOrganizationMembership() *schema.Resource { diff --git a/tfe/resource_tfe_organization_membership_test.go b/tfe/resource_tfe_organization_membership_test.go index 7a3a3b3b6..5948eca7e 100644 --- a/tfe/resource_tfe_organization_membership_test.go +++ b/tfe/resource_tfe_organization_membership_test.go @@ -7,8 +7,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFEOrganizationMembership_basic(t *testing.T) { diff --git a/tfe/resource_tfe_organization_test.go b/tfe/resource_tfe_organization_test.go index 0f00ae319..11640a4ed 100644 --- a/tfe/resource_tfe_organization_test.go +++ b/tfe/resource_tfe_organization_test.go @@ -8,8 +8,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFEOrganization_basic(t *testing.T) { diff --git a/tfe/resource_tfe_organization_token.go b/tfe/resource_tfe_organization_token.go index cce6de715..c6e9557e5 100644 --- a/tfe/resource_tfe_organization_token.go +++ b/tfe/resource_tfe_organization_token.go @@ -5,7 +5,7 @@ import ( "log" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFEOrganizationToken() *schema.Resource { diff --git a/tfe/resource_tfe_organization_token_test.go b/tfe/resource_tfe_organization_token_test.go index 9eb093969..78b287267 100644 --- a/tfe/resource_tfe_organization_token_test.go +++ b/tfe/resource_tfe_organization_token_test.go @@ -8,8 +8,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFEOrganizationToken_basic(t *testing.T) { diff --git a/tfe/resource_tfe_policy_set.go b/tfe/resource_tfe_policy_set.go index 2692bb895..e69132e0a 100644 --- a/tfe/resource_tfe_policy_set.go +++ b/tfe/resource_tfe_policy_set.go @@ -6,8 +6,8 @@ import ( "regexp" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceTFEPolicySet() *schema.Resource { diff --git a/tfe/resource_tfe_policy_set_parameter.go b/tfe/resource_tfe_policy_set_parameter.go index e82b753be..823ed8d68 100644 --- a/tfe/resource_tfe_policy_set_parameter.go +++ b/tfe/resource_tfe_policy_set_parameter.go @@ -6,7 +6,7 @@ import ( "strings" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFEPolicySetParameter() *schema.Resource { diff --git a/tfe/resource_tfe_policy_set_parameter_test.go b/tfe/resource_tfe_policy_set_parameter_test.go index 808a9df0c..6518e54cb 100644 --- a/tfe/resource_tfe_policy_set_parameter_test.go +++ b/tfe/resource_tfe_policy_set_parameter_test.go @@ -7,8 +7,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFEPolicySetParameter_basic(t *testing.T) { diff --git a/tfe/resource_tfe_policy_set_test.go b/tfe/resource_tfe_policy_set_test.go index b7e7e9818..f72a155a0 100644 --- a/tfe/resource_tfe_policy_set_test.go +++ b/tfe/resource_tfe_policy_set_test.go @@ -3,8 +3,8 @@ package tfe import ( "fmt" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "math/rand" "regexp" "testing" diff --git a/tfe/resource_tfe_registry_module.go b/tfe/resource_tfe_registry_module.go index 583bfac5e..9687df1a8 100644 --- a/tfe/resource_tfe_registry_module.go +++ b/tfe/resource_tfe_registry_module.go @@ -7,8 +7,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFERegistryModule() *schema.Resource { diff --git a/tfe/resource_tfe_registry_module_test.go b/tfe/resource_tfe_registry_module_test.go index 4d88eeaeb..d4f2f004b 100644 --- a/tfe/resource_tfe_registry_module_test.go +++ b/tfe/resource_tfe_registry_module_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFERegistryModule_vcs(t *testing.T) { diff --git a/tfe/resource_tfe_run_trigger.go b/tfe/resource_tfe_run_trigger.go index 2228c7ab8..245abb61a 100644 --- a/tfe/resource_tfe_run_trigger.go +++ b/tfe/resource_tfe_run_trigger.go @@ -2,14 +2,14 @@ package tfe import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/helper/customdiff" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "log" "strings" "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFERunTrigger() *schema.Resource { diff --git a/tfe/resource_tfe_run_trigger_test.go b/tfe/resource_tfe_run_trigger_test.go index 5c27d1c67..abea9ccb9 100644 --- a/tfe/resource_tfe_run_trigger_test.go +++ b/tfe/resource_tfe_run_trigger_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFERunTrigger_basic(t *testing.T) { diff --git a/tfe/resource_tfe_sentinel_policy.go b/tfe/resource_tfe_sentinel_policy.go index 5656ecf03..a94030613 100644 --- a/tfe/resource_tfe_sentinel_policy.go +++ b/tfe/resource_tfe_sentinel_policy.go @@ -6,8 +6,8 @@ import ( "strings" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceTFESentinelPolicy() *schema.Resource { diff --git a/tfe/resource_tfe_sentinel_policy_test.go b/tfe/resource_tfe_sentinel_policy_test.go index 38702f62b..62179b150 100644 --- a/tfe/resource_tfe_sentinel_policy_test.go +++ b/tfe/resource_tfe_sentinel_policy_test.go @@ -7,8 +7,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFESentinelPolicy_basic(t *testing.T) { diff --git a/tfe/resource_tfe_ssh_key.go b/tfe/resource_tfe_ssh_key.go index adf279551..562dedf35 100644 --- a/tfe/resource_tfe_ssh_key.go +++ b/tfe/resource_tfe_ssh_key.go @@ -5,7 +5,7 @@ import ( "log" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFESSHKey() *schema.Resource { diff --git a/tfe/resource_tfe_ssh_key_test.go b/tfe/resource_tfe_ssh_key_test.go index 56011b475..2357b3e09 100644 --- a/tfe/resource_tfe_ssh_key_test.go +++ b/tfe/resource_tfe_ssh_key_test.go @@ -7,8 +7,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFESSHKey_basic(t *testing.T) { diff --git a/tfe/resource_tfe_team.go b/tfe/resource_tfe_team.go index 29a45430f..42434ddc5 100644 --- a/tfe/resource_tfe_team.go +++ b/tfe/resource_tfe_team.go @@ -5,10 +5,10 @@ import ( "log" "strings" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFETeam() *schema.Resource { diff --git a/tfe/resource_tfe_team_access.go b/tfe/resource_tfe_team_access.go index fe45bfc31..2fd103d7d 100644 --- a/tfe/resource_tfe_team_access.go +++ b/tfe/resource_tfe_team_access.go @@ -6,8 +6,8 @@ import ( "strings" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceTFETeamAccess() *schema.Resource { diff --git a/tfe/resource_tfe_team_access_migrate.go b/tfe/resource_tfe_team_access_migrate.go index e1047b8b6..45d48e13f 100644 --- a/tfe/resource_tfe_team_access_migrate.go +++ b/tfe/resource_tfe_team_access_migrate.go @@ -4,8 +4,8 @@ import ( "fmt" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceTfeTeamAccessResourceV0() *schema.Resource { diff --git a/tfe/resource_tfe_team_access_test.go b/tfe/resource_tfe_team_access_test.go index 62aa5f956..73ba6d2d4 100644 --- a/tfe/resource_tfe_team_access_test.go +++ b/tfe/resource_tfe_team_access_test.go @@ -7,8 +7,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFETeamAccess_write(t *testing.T) { diff --git a/tfe/resource_tfe_team_member.go b/tfe/resource_tfe_team_member.go index 2458c298f..04b9e2329 100644 --- a/tfe/resource_tfe_team_member.go +++ b/tfe/resource_tfe_team_member.go @@ -6,7 +6,7 @@ import ( "strings" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFETeamMember() *schema.Resource { diff --git a/tfe/resource_tfe_team_member_test.go b/tfe/resource_tfe_team_member_test.go index a4d270441..610636e3b 100644 --- a/tfe/resource_tfe_team_member_test.go +++ b/tfe/resource_tfe_team_member_test.go @@ -7,8 +7,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestPackTeamMemberID(t *testing.T) { diff --git a/tfe/resource_tfe_team_members.go b/tfe/resource_tfe_team_members.go index dc8e12a41..3e9e6df44 100644 --- a/tfe/resource_tfe_team_members.go +++ b/tfe/resource_tfe_team_members.go @@ -5,7 +5,7 @@ import ( "log" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFETeamMembers() *schema.Resource { diff --git a/tfe/resource_tfe_team_members_test.go b/tfe/resource_tfe_team_members_test.go index 62a1b1070..09cccff6b 100644 --- a/tfe/resource_tfe_team_members_test.go +++ b/tfe/resource_tfe_team_members_test.go @@ -8,9 +8,9 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFETeamMembers_basic(t *testing.T) { diff --git a/tfe/resource_tfe_team_organization_member.go b/tfe/resource_tfe_team_organization_member.go index ef5769147..ae8037956 100644 --- a/tfe/resource_tfe_team_organization_member.go +++ b/tfe/resource_tfe_team_organization_member.go @@ -6,7 +6,7 @@ import ( "strings" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFETeamOrganizationMember() *schema.Resource { diff --git a/tfe/resource_tfe_team_organization_member_test.go b/tfe/resource_tfe_team_organization_member_test.go index b87820cd8..075da85ae 100644 --- a/tfe/resource_tfe_team_organization_member_test.go +++ b/tfe/resource_tfe_team_organization_member_test.go @@ -7,8 +7,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestPackTeamOrganizationMemberID(t *testing.T) { diff --git a/tfe/resource_tfe_team_test.go b/tfe/resource_tfe_team_test.go index 634312206..751bb5b7d 100644 --- a/tfe/resource_tfe_team_test.go +++ b/tfe/resource_tfe_team_test.go @@ -7,8 +7,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFETeam_basic(t *testing.T) { diff --git a/tfe/resource_tfe_team_token.go b/tfe/resource_tfe_team_token.go index 8c716b7f4..a8624820c 100644 --- a/tfe/resource_tfe_team_token.go +++ b/tfe/resource_tfe_team_token.go @@ -5,7 +5,7 @@ import ( "log" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTFETeamToken() *schema.Resource { diff --git a/tfe/resource_tfe_team_token_test.go b/tfe/resource_tfe_team_token_test.go index 47a21e512..4008f707f 100644 --- a/tfe/resource_tfe_team_token_test.go +++ b/tfe/resource_tfe_team_token_test.go @@ -8,8 +8,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFETeamToken_basic(t *testing.T) { diff --git a/tfe/resource_tfe_variable.go b/tfe/resource_tfe_variable.go index a540c6c95..33875456d 100644 --- a/tfe/resource_tfe_variable.go +++ b/tfe/resource_tfe_variable.go @@ -6,9 +6,9 @@ import ( "strings" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/customdiff" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceTFEVariable() *schema.Resource { diff --git a/tfe/resource_tfe_variable_migrate.go b/tfe/resource_tfe_variable_migrate.go index 034024fec..193ac1936 100644 --- a/tfe/resource_tfe_variable_migrate.go +++ b/tfe/resource_tfe_variable_migrate.go @@ -4,8 +4,8 @@ import ( "fmt" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceTfeVariableResourceV0() *schema.Resource { diff --git a/tfe/resource_tfe_variable_test.go b/tfe/resource_tfe_variable_test.go index be3881e0a..82c4a1a1d 100644 --- a/tfe/resource_tfe_variable_test.go +++ b/tfe/resource_tfe_variable_test.go @@ -7,8 +7,8 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFEVariable_basic(t *testing.T) { diff --git a/tfe/resource_tfe_workspace.go b/tfe/resource_tfe_workspace.go index 6aa6d55da..22be579cd 100644 --- a/tfe/resource_tfe_workspace.go +++ b/tfe/resource_tfe_workspace.go @@ -6,8 +6,8 @@ import ( "regexp" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) var workspaceIdRegexp = regexp.MustCompile("^ws-[a-zA-Z0-9]{16}$") diff --git a/tfe/resource_tfe_workspace_migrate.go b/tfe/resource_tfe_workspace_migrate.go index 990ad4a5e..070d1b055 100644 --- a/tfe/resource_tfe_workspace_migrate.go +++ b/tfe/resource_tfe_workspace_migrate.go @@ -1,7 +1,7 @@ package tfe import ( - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceTfeWorkspaceResourceV0() *schema.Resource { diff --git a/tfe/resource_tfe_workspace_test.go b/tfe/resource_tfe_workspace_test.go index 2e15d8d5c..3d8ac9dd8 100644 --- a/tfe/resource_tfe_workspace_test.go +++ b/tfe/resource_tfe_workspace_test.go @@ -9,9 +9,9 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFEWorkspace_basic(t *testing.T) { diff --git a/tfe/tfe_sweeper_test.go b/tfe/tfe_sweeper_test.go index 76edc5903..948dff3d9 100644 --- a/tfe/tfe_sweeper_test.go +++ b/tfe/tfe_sweeper_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestMain(m *testing.M) { From 978d00f5ebbec7848d6def6be449c16a4112db71 Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Sat, 21 Nov 2020 20:04:20 -0600 Subject: [PATCH 02/12] SDK2 upgrade: Remove terraform.ResourceProvider https://www.terraform.io/docs/extend/guides/v2-upgrade-guide.html#removal-of-the-terraform-resourceprovider-interface --- tfe/provider.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tfe/provider.go b/tfe/provider.go index d8613d19d..3560ce99c 100644 --- a/tfe/provider.go +++ b/tfe/provider.go @@ -17,7 +17,6 @@ import ( "github.com/hashicorp/hcl" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" providerVersion "github.com/hashicorp/terraform-provider-tfe/version" svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/auth" @@ -45,7 +44,7 @@ type ConfigHost struct { var ctx = context.Background() // Provider returns a terraform.ResourceProvider. -func Provider() terraform.ResourceProvider { +func Provider() *schema.Provider { return &schema.Provider{ Schema: map[string]*schema.Schema{ "hostname": { From b9a90c681e76ae6869369d2d231811dfea24e366 Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Sat, 21 Nov 2020 20:27:04 -0600 Subject: [PATCH 03/12] SDK2 upgrade: Change signatures which require a context now https://www.terraform.io/docs/extend/guides/v2-upgrade-guide.html#more-support-for-context-context --- tfe/resource_tfe_notification_configuration.go | 8 +++++--- tfe/resource_tfe_run_trigger.go | 8 +++++--- tfe/resource_tfe_team_access.go | 3 ++- tfe/resource_tfe_team_access_migrate.go | 3 ++- tfe/resource_tfe_variable.go | 3 ++- tfe/resource_tfe_variable_migrate.go | 3 ++- tfe/resource_tfe_workspace.go | 3 ++- tfe/resource_tfe_workspace_migrate.go | 4 +++- 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/tfe/resource_tfe_notification_configuration.go b/tfe/resource_tfe_notification_configuration.go index d91fc0930..414731c30 100644 --- a/tfe/resource_tfe_notification_configuration.go +++ b/tfe/resource_tfe_notification_configuration.go @@ -1,10 +1,12 @@ package tfe import ( + "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "log" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" + tfe "github.com/hashicorp/go-tfe" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -24,7 +26,7 @@ func resourceTFENotificationConfiguration() *schema.Resource { // If workspace_external_id is changing from an empty value to a non-empty value or a non-empty value // to an empty value, we know we are switching between workspace_external_id and workspace_id because // we ensure later that one of them has to be set. - customdiff.ForceNewIfChange("workspace_external_id", func(old, new, meta interface{}) bool { + customdiff.ForceNewIfChange("workspace_external_id", func(_ context.Context, old, new, meta interface{}) bool { oldWorkspaceExternalID := old.(string) newWorkspaceExternalID := new.(string) return oldWorkspaceExternalID != "" && newWorkspaceExternalID != "" @@ -34,7 +36,7 @@ func resourceTFENotificationConfiguration() *schema.Resource { // If workspace_id is changing from an empty value to a non-empty value or a non-empty value // to an empty value, we know we are switching between workspace_external_id and workspace_id because // we ensure later that one of them has to be set. - customdiff.ForceNewIfChange("workspace_id", func(old, new, meta interface{}) bool { + customdiff.ForceNewIfChange("workspace_id", func(_ context.Context, old, new, meta interface{}) bool { oldWorkspaceID := old.(string) newWorkspaceID := new.(string) return oldWorkspaceID != "" && newWorkspaceID != "" diff --git a/tfe/resource_tfe_run_trigger.go b/tfe/resource_tfe_run_trigger.go index 245abb61a..8533b3908 100644 --- a/tfe/resource_tfe_run_trigger.go +++ b/tfe/resource_tfe_run_trigger.go @@ -1,12 +1,14 @@ package tfe import ( + "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "log" "strings" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" + tfe "github.com/hashicorp/go-tfe" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -26,7 +28,7 @@ func resourceTFERunTrigger() *schema.Resource { // If workspace_external_id is changing from an empty value to a non-empty value or a non-empty value // to an empty value, we know we are switching between workspace_external_id and workspace_id because // we ensure later that one of them has to be set. - customdiff.ForceNewIfChange("workspace_external_id", func(old, new, meta interface{}) bool { + customdiff.ForceNewIfChange("workspace_external_id", func(_ context.Context, old, new, meta interface{}) bool { oldWorkspaceExternalID := old.(string) newWorkspaceExternalID := new.(string) return oldWorkspaceExternalID != "" && newWorkspaceExternalID != "" @@ -35,7 +37,7 @@ func resourceTFERunTrigger() *schema.Resource { // If workspace_id is changing from an empty value to a non-empty value or a non-empty value // to an empty value, we know we are switching between workspace_external_id and workspace_id because // we ensure later that one of them has to be set. - customdiff.ForceNewIfChange("workspace_id", func(old, new, meta interface{}) bool { + customdiff.ForceNewIfChange("workspace_id", func(_ context.Context, old, new, meta interface{}) bool { oldWorkspaceID := old.(string) newWorkspaceID := new.(string) return oldWorkspaceID != "" && newWorkspaceID != "" diff --git a/tfe/resource_tfe_team_access.go b/tfe/resource_tfe_team_access.go index 2fd103d7d..5155f8073 100644 --- a/tfe/resource_tfe_team_access.go +++ b/tfe/resource_tfe_team_access.go @@ -1,6 +1,7 @@ package tfe import ( + "context" "fmt" "log" "strings" @@ -351,7 +352,7 @@ func resourceTFETeamAccessImporter(d *schema.ResourceData, meta interface{}) ([] // This CustomizeDiff function is what allows the provider resource to model the right API behavior with these // limitations, rooting out the user's intentions to figure out when to automatically assign 'access' to custom and/or // recompute 'permissions'. -func setCustomOrComputedPermissions(d *schema.ResourceDiff, meta interface{}) error { +func setCustomOrComputedPermissions(_ context.Context, d *schema.ResourceDiff, meta interface{}) error { if _, ok := d.GetOk("access"); ok { if d.HasChange("access") { // If access is being added or changed to a known value, all permissions diff --git a/tfe/resource_tfe_team_access_migrate.go b/tfe/resource_tfe_team_access_migrate.go index 45d48e13f..975a16ef3 100644 --- a/tfe/resource_tfe_team_access_migrate.go +++ b/tfe/resource_tfe_team_access_migrate.go @@ -1,6 +1,7 @@ package tfe import ( + "context" "fmt" tfe "github.com/hashicorp/go-tfe" @@ -41,7 +42,7 @@ func resourceTfeTeamAccessResourceV0() *schema.Resource { } } -func resourceTfeTeamAccessStateUpgradeV0(rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { +func resourceTfeTeamAccessStateUpgradeV0(_ context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { tfeClient := meta.(*tfe.Client) humanID := rawState["workspace_id"].(string) diff --git a/tfe/resource_tfe_variable.go b/tfe/resource_tfe_variable.go index 33875456d..a179fcf14 100644 --- a/tfe/resource_tfe_variable.go +++ b/tfe/resource_tfe_variable.go @@ -1,6 +1,7 @@ package tfe import ( + "context" "fmt" "log" "strings" @@ -84,7 +85,7 @@ func resourceTFEVariable() *schema.Resource { }, }, - CustomizeDiff: customdiff.ForceNewIf("key", func(d *schema.ResourceDiff, m interface{}) bool { + CustomizeDiff: customdiff.ForceNewIf("key", func(_ context.Context, d *schema.ResourceDiff, m interface{}) bool { return d.Get("sensitive").(bool) }), } diff --git a/tfe/resource_tfe_variable_migrate.go b/tfe/resource_tfe_variable_migrate.go index 193ac1936..69fe66bb4 100644 --- a/tfe/resource_tfe_variable_migrate.go +++ b/tfe/resource_tfe_variable_migrate.go @@ -1,6 +1,7 @@ package tfe import ( + "context" "fmt" tfe "github.com/hashicorp/go-tfe" @@ -57,7 +58,7 @@ func resourceTfeVariableResourceV0() *schema.Resource { } } -func resourceTfeVariableStateUpgradeV0(rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { +func resourceTfeVariableStateUpgradeV0(_ context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { tfeClient := meta.(*tfe.Client) humanID := rawState["workspace_id"].(string) diff --git a/tfe/resource_tfe_workspace.go b/tfe/resource_tfe_workspace.go index 22be579cd..95eb59b11 100644 --- a/tfe/resource_tfe_workspace.go +++ b/tfe/resource_tfe_workspace.go @@ -1,6 +1,7 @@ package tfe import ( + "context" "fmt" "log" "regexp" @@ -441,7 +442,7 @@ func resourceTFEWorkspaceDelete(d *schema.ResourceData, meta interface{}) error // An agent pool can only be specified when execution_mode is set to "agent". You currently cannot specify a // schema validation based on a different argument's value, so we do so here at plan time instead. -func validateAgentExecution(d *schema.ResourceDiff, meta interface{}) error { +func validateAgentExecution(_ context.Context, d *schema.ResourceDiff, meta interface{}) error { if executionMode, ok := d.GetOk("execution_mode"); ok { if executionMode.(string) != "agent" && d.Get("agent_pool_id") != "" { return fmt.Errorf("execution_mode must be set to 'agent' to assign agent_pool_id") diff --git a/tfe/resource_tfe_workspace_migrate.go b/tfe/resource_tfe_workspace_migrate.go index 070d1b055..662bbeba6 100644 --- a/tfe/resource_tfe_workspace_migrate.go +++ b/tfe/resource_tfe_workspace_migrate.go @@ -1,6 +1,8 @@ package tfe import ( + "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) @@ -105,7 +107,7 @@ func resourceTfeWorkspaceResourceV0() *schema.Resource { } } -func resourceTfeWorkspaceStateUpgradeV0(rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { +func resourceTfeWorkspaceStateUpgradeV0(_ context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { rawState["id"] = rawState["external_id"] return rawState, nil } From 939edaa234f91d2e8a9ce87fd66929b294060c75 Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Sat, 21 Nov 2020 21:03:03 -0600 Subject: [PATCH 04/12] SDK2 upgrade: Remove MaxItems validation from sometimes-computed fields This complex API behavior (https://github.com/hashicorp/terraform-provider-tfe/blob/1836332f965b90962c2b852b86baa7b9482bbcac/website/docs/r/team_access.html.markdown#L41-L52) was bound to have _something_ to change in V2 of the SDK. Per https://github.com/hashicorp/terraform-plugin-sdk/commit/83c83c4a1d88cce479df5a8832a31f14667a6f1d : These schema validations are now not allowed for computed attributes, as it is assumed that computed attributes are *always* computed; this API, however, relies on the fact that a user can specify either "access" or "permissions" and whichever is not specified is computed, and vice-versa. With this removal, it's sadly possible to specify multiple "permissions" blocks without an error (but there should be); this will result in a plan attempting to add a second set of permissions that results in a no-op (as only the first item in the permissions list is used). It's probably possible to munge further into the CustomizeDiff logic to just return an error ourselves at plan time should there be data at "permissions.1.*", but I'm not going to touch that right now. --- tfe/data_source_team_access.go | 1 - tfe/resource_tfe_team_access.go | 1 - 2 files changed, 2 deletions(-) diff --git a/tfe/data_source_team_access.go b/tfe/data_source_team_access.go index a4b6c6570..9d89eeda8 100644 --- a/tfe/data_source_team_access.go +++ b/tfe/data_source_team_access.go @@ -19,7 +19,6 @@ func dataSourceTFETeamAccess() *schema.Resource { "permissions": { Type: schema.TypeList, - MaxItems: 1, Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ diff --git a/tfe/resource_tfe_team_access.go b/tfe/resource_tfe_team_access.go index 5155f8073..e1e8c72cc 100644 --- a/tfe/resource_tfe_team_access.go +++ b/tfe/resource_tfe_team_access.go @@ -52,7 +52,6 @@ func resourceTFETeamAccess() *schema.Resource { "permissions": { Type: schema.TypeList, - MaxItems: 1, Optional: true, Computed: true, Elem: &schema.Resource{ From 26b94eac583f491123428f5e274e0d663690bbc2 Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Sat, 21 Nov 2020 21:36:14 -0600 Subject: [PATCH 05/12] Require Terraform 0.12+ --- README.md | 75 +++++++++++++++++--------------- website/docs/index.html.markdown | 22 +++++----- 2 files changed, 50 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 99d9dfb41..8bd4b29cb 100644 --- a/README.md +++ b/README.md @@ -23,42 +23,66 @@ non-breaking changes. ## Installation -Declare the provider in your configuration and `terraform init` will automatically fetch and install the provider for you from the [Terraform Registry](https://registry.terraform.io/) (Terraform version 0.12.0+): +Declare the provider in your configuration and `terraform init` will automatically fetch and install the provider for you from the [Terraform Registry](https://registry.terraform.io/): -``` +```hcl terraform { required_providers { - tfe = "~> 0.22.0" + tfe = { + version = "~> 0.24.0" + } } } ``` -For production use, you should constrain the acceptable provider versions via configuration, -to ensure that new versions with breaking changes will not be automatically installed by -`terraform init` in future. As this provider is still at version zero, you should constrain -the acceptable provider versions on the minor version. +For production use, you should constrain the acceptable provider versions via +configuration (as above), to ensure that new versions with breaking changes will +not be automatically installed by `terraform init` in future. As this provider +is still at version zero, you should constrain the acceptable provider versions +on the minor version. -If you are using Terraform CLI version 0.11.x, you can constrain this provider to 0.15.x versions -by adding the version constraint to the `tfe` provider block. +The above snippet using `required_providers` is for Terraform 0.13+; if you are using Terraform version 0.12, you can constrain by adding the version constraint to the `provider` block instead: -``` +```hcl provider "tfe" { - version = "~> 0.15.0" + version = "~> 0.24.0" ... } ``` +Since v0.24.0, this provider requires [Terraform](https://www.terraform.io/downloads.html) >= 0.12 + For more information on provider installation and constraining provider versions, see the [Provider Requirements documentation](https://www.terraform.io/docs/configuration/provider-requirements.html). -### Manually building the provider +## Usage + +[Create a user or team API token in Terraform Cloud/Enterprise](https://www.terraform.io/docs/cloud/users-teams-organizations/api-tokens.html), and use the token in the provider configuration block: + +```hcl +provider "tfe" { + hostname = "${var.hostname}" # Optional, for use with Terraform Enterprise. Defaults to app.terraform.io. + token = "${var.token}" +} + +# Create an organization +resource "tfe_organization" "org" { + # ... +} +``` + +There are several other ways to configure the authentication token, depending on +your use case. For other methods, see the [Authentication documentation](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs#authentication) + +For more information on configuring providers in general, see the [Provider Configuration documentation](https://www.terraform.io/docs/configuration/providers.html). + + +## Manually building the provider You might prefer to manually build the provider yourself - perhaps access to the Terraform Registry or the official release binaries on [releases.hashicorp.com](https://releases.hashicorp.com/terraform-provider-tfe/) are not available in your operating environment, or you're looking to contribute to the provider and are testing out a custom build. -#### Requirements -- [Terraform](https://www.terraform.io/downloads.html) >= 0.11.x -- [Go](https://golang.org/doc/install) >= 1.14 +Building the provider requires [Go](https://golang.org/doc/install) >= 1.14 Clone the repository, enter the directory, and build the provider: @@ -82,27 +106,6 @@ See the [Provider Requirements](https://www.terraform.io/docs/configuration/prov * You can create your test Terraform configurations in the same directory as your provider binary or you can copy the provider binary into the same directory as your test configurations. * You can copy the provider binary into the same location as your `terraform` binary. -## Usage - -[Create a user or team API token in Terraform Cloud/Enterprise](https://www.terraform.io/docs/cloud/users-teams-organizations/api-tokens.html), and use the token in the provider configuration block: - -```hcl -provider "tfe" { - hostname = "${var.hostname}" # Optional, for use with Terraform Enterprise. Defaults to app.terraform.io. - token = "${var.token}" -} - -# Create an organization -resource "tfe_organization" "org" { - # ... -} -``` - -There are several other ways to configure the authentication token, depending on -your use case. For other methods, see the [Authentication documentation](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs#authentication) - -For more information on configuring providers in general, see the [Provider Configuration documentation](https://www.terraform.io/docs/configuration/providers.html). - ## Contributing Thanks for your interest in contributing; we appreciate your help! If you're unsure or afraid of anything, you can diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index b9e5ce5df..2db29ed64 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -15,6 +15,8 @@ Terraform Cloud, this provider supports both Cloud and Enterprise. Use the navigation to the left to read about the available resources. +Since v0.24.0, this provider requires Terraform >= 0.12 + ~> **Important:** For production use, you should constrain the acceptable provider versions via configuration, to ensure that new versions with breaking changes will not be automatically installed. For more information, see [Versions](#versions). @@ -67,28 +69,26 @@ the [CLI Configuration File documentation](/docs/commands/cli-config.html). For production use, you should constrain the acceptable provider versions via configuration, to ensure that new versions with breaking changes will not be -automatically installed by `terraform init` in the future. As this provider is still -at version zero, you should constrain the acceptable provider versions on the -minor version. - -If you are using Terraform CLI version 0.12.x+, you can constrain this provider -to 0.15.x versions by adding a `required_providers` block inside a `terraform` -block: +automatically installed by `terraform init` in the future: ```hcl terraform { required_providers { - tfe = "~> 0.15.0" + tfe = { + version = "~> 0.24.0" + } } } ``` -If you are using Terraform CLI version 0.11.x, you can constrain this provider -to 0.15.x versions by adding the version constraint to the tfe provider block: +As this provider is still at version zero, you should constrain the acceptable +provider versions on the minor version. + +The above snippet using `required_providers` is for Terraform 0.13+; if you are using Terraform version 0.12, you can constrain by adding the version constraint to the `provider` block instead: ```hcl provider "tfe" { - version = "~> 0.15.0" + version = "~> 0.24.0" ... } ``` From 8454e974ea402b4ad3d2b364efa27b6571a5fb4c Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Sat, 21 Nov 2020 21:51:16 -0600 Subject: [PATCH 06/12] Fix misleading docstring --- tfe/provider.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tfe/provider.go b/tfe/provider.go index 3560ce99c..8070b6e44 100644 --- a/tfe/provider.go +++ b/tfe/provider.go @@ -43,7 +43,7 @@ type ConfigHost struct { // ctx is used as default context.Context when making TFE calls. var ctx = context.Background() -// Provider returns a terraform.ResourceProvider. +// Provider returns a schema.Provider func Provider() *schema.Provider { return &schema.Provider{ Schema: map[string]*schema.Schema{ From 163162fb2763e94c183f9945dee7f08e749d7f68 Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Sat, 21 Nov 2020 22:35:17 -0600 Subject: [PATCH 07/12] SDK2 upgrade: Fix compile-time test errors --- tfe/provider_test.go | 20 +++++++++++++------- tfe/resource_tfe_team_access_migrate_test.go | 3 ++- tfe/resource_tfe_variable_migrate_test.go | 3 ++- tfe/resource_tfe_workspace_migrate_test.go | 3 ++- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tfe/provider_test.go b/tfe/provider_test.go index 23b0a9960..e60d88a58 100644 --- a/tfe/provider_test.go +++ b/tfe/provider_test.go @@ -1,34 +1,36 @@ package tfe import ( + "context" "os" "strings" "testing" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "github.com/hashicorp/terraform-provider-tfe/version" "github.com/hashicorp/terraform-svchost/disco" ) -var testAccProviders map[string]terraform.ResourceProvider +var testAccProviders map[string]*schema.Provider var testAccProvider *schema.Provider func init() { - testAccProvider = Provider().(*schema.Provider) - testAccProviders = map[string]terraform.ResourceProvider{ + testAccProvider = Provider() + testAccProviders = map[string]*schema.Provider{ "tfe": testAccProvider, } } func TestProvider(t *testing.T) { - if err := Provider().(*schema.Provider).InternalValidate(); err != nil { + if err := Provider().InternalValidate(); err != nil { t.Fatalf("err: %s", err) } } func TestProvider_impl(t *testing.T) { - var _ terraform.ResourceProvider = Provider() + var _ *schema.Provider = Provider() } func TestProvider_versionConstraints(t *testing.T) { @@ -93,8 +95,12 @@ func TestProvider_versionConstraints(t *testing.T) { func testAccPreCheck(t *testing.T) { // The credentials must be provided by the CLI config file for testing. - if err := Provider().Configure(&terraform.ResourceConfig{}); err != nil { - t.Fatalf("err: %s", err) + if diags := Provider().Configure(context.Background(), &terraform.ResourceConfig{}); diags.HasError() { + for _, d := range diags { + if d.Severity == diag.Error { + t.Fatalf("err: %s", d.Summary) + } + } } } diff --git a/tfe/resource_tfe_team_access_migrate_test.go b/tfe/resource_tfe_team_access_migrate_test.go index e28bb367e..df09b28d2 100644 --- a/tfe/resource_tfe_team_access_migrate_test.go +++ b/tfe/resource_tfe_team_access_migrate_test.go @@ -1,6 +1,7 @@ package tfe import ( + "context" "reflect" "testing" @@ -28,7 +29,7 @@ func TestResourceTfeTeamAccessStateUpgradeV0(t *testing.T) { }) expected := testResourceTfeTeamAccessStateDataV1() - actual, err := resourceTfeTeamAccessStateUpgradeV0(testResourceTfeTeamAccessStateDataV0(), client) + actual, err := resourceTfeTeamAccessStateUpgradeV0(context.Background(), testResourceTfeTeamAccessStateDataV0(), client) if err != nil { t.Fatalf("error migrating state: %s", err) } diff --git a/tfe/resource_tfe_variable_migrate_test.go b/tfe/resource_tfe_variable_migrate_test.go index 1bec7ef0d..4126cc4a7 100644 --- a/tfe/resource_tfe_variable_migrate_test.go +++ b/tfe/resource_tfe_variable_migrate_test.go @@ -1,6 +1,7 @@ package tfe import ( + "context" "reflect" "testing" @@ -28,7 +29,7 @@ func TestResourceTfeVariableStateUpgradeV0(t *testing.T) { }) expected := testResourceTfeVariableStateDataV1() - actual, err := resourceTfeVariableStateUpgradeV0(testResourceTfeVariableStateDataV0(), client) + actual, err := resourceTfeVariableStateUpgradeV0(context.Background(), testResourceTfeVariableStateDataV0(), client) if err != nil { t.Fatalf("error migrating state: %s", err) } diff --git a/tfe/resource_tfe_workspace_migrate_test.go b/tfe/resource_tfe_workspace_migrate_test.go index 213b07b22..4bee163f6 100644 --- a/tfe/resource_tfe_workspace_migrate_test.go +++ b/tfe/resource_tfe_workspace_migrate_test.go @@ -1,6 +1,7 @@ package tfe import ( + "context" "reflect" "testing" ) @@ -22,7 +23,7 @@ func testResourceTfeWorkspaceStateDataV1() map[string]interface{} { func TestResourceTfeWorkspaceStateUpgradeV0(t *testing.T) { expected := testResourceTfeWorkspaceStateDataV1() - actual, err := resourceTfeWorkspaceStateUpgradeV0(testResourceTfeWorkspaceStateDataV0(), nil) + actual, err := resourceTfeWorkspaceStateUpgradeV0(context.Background(), testResourceTfeWorkspaceStateDataV0(), nil) if err != nil { t.Fatalf("error migrating state: %s", err) } From dd48cfc641c9650ee2dfb621435b5fc7ff49db19 Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Sat, 21 Nov 2020 23:29:36 -0600 Subject: [PATCH 08/12] SDK2 upgrade: Convert to 0.12 syntax (no string interpolation necessary anymore) --- README.md | 4 +- tfe/data_source_agent_pool_test.go | 6 +- tfe/data_source_oauth_client_test.go | 4 +- tfe/data_source_ssh_key_test.go | 6 +- tfe/data_source_team_access_test.go | 12 +-- tfe/data_source_team_test.go | 6 +- tfe/data_source_workspace_ids_test.go | 18 ++-- tfe/data_source_workspace_test.go | 6 +- tfe/resource_tfe_agent_pool_test.go | 4 +- ...rce_tfe_notification_configuration_test.go | 4 +- tfe/resource_tfe_oauth_client_test.go | 9 +- ...source_tfe_organization_membership_test.go | 2 +- tfe/resource_tfe_organization_token_test.go | 10 +-- tfe/resource_tfe_policy_set_parameter_test.go | 8 +- tfe/resource_tfe_policy_set_test.go | 89 ++++++++++--------- tfe/resource_tfe_run_trigger_test.go | 24 ++--- tfe/resource_tfe_sentinel_policy_test.go | 4 +- tfe/resource_tfe_ssh_key_test.go | 4 +- tfe/resource_tfe_team_access_test.go | 24 ++--- tfe/resource_tfe_team_member_test.go | 4 +- tfe/resource_tfe_team_members_test.go | 8 +- ...ource_tfe_team_organization_member_test.go | 8 +- tfe/resource_tfe_team_test.go | 6 +- tfe/resource_tfe_team_token_test.go | 16 ++-- tfe/resource_tfe_variable_test.go | 12 +-- tfe/resource_tfe_workspace_test.go | 58 ++++++------ website/docs/index.html.markdown | 4 +- website/docs/r/policy_set.html.markdown | 8 +- .../docs/r/policy_set_parameter.html.markdown | 4 +- website/docs/r/run_trigger.html.markdown | 8 +- website/docs/r/team_access.html.markdown | 4 +- website/docs/r/team_member.html.markdown | 2 +- website/docs/r/team_members.html.markdown | 2 +- .../r/team_organization_member.html.markdown | 4 +- website/docs/r/team_token.html.markdown | 2 +- website/docs/r/variable.html.markdown | 4 +- 36 files changed, 200 insertions(+), 198 deletions(-) diff --git a/README.md b/README.md index 8bd4b29cb..569ccbac9 100644 --- a/README.md +++ b/README.md @@ -60,8 +60,8 @@ For more information on provider installation and constraining provider versions ```hcl provider "tfe" { - hostname = "${var.hostname}" # Optional, for use with Terraform Enterprise. Defaults to app.terraform.io. - token = "${var.token}" + hostname = var.hostname # Optional, for use with Terraform Enterprise. Defaults to app.terraform.io. + token = var.token } # Create an organization diff --git a/tfe/data_source_agent_pool_test.go b/tfe/data_source_agent_pool_test.go index cea924824..60290330a 100644 --- a/tfe/data_source_agent_pool_test.go +++ b/tfe/data_source_agent_pool_test.go @@ -39,11 +39,11 @@ resource "tfe_organization" "foobar" { resource "tfe_agent_pool" "foobar" { name = "agent-pool-test-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } data "tfe_agent_pool" "foobar" { - name = "${tfe_agent_pool.foobar.name}" - organization = "${tfe_agent_pool.foobar.organization}" + name = tfe_agent_pool.foobar.name + organization = tfe_agent_pool.foobar.organization }`, rInt, rInt) } diff --git a/tfe/data_source_oauth_client_test.go b/tfe/data_source_oauth_client_test.go index 5876e3ecc..6a96269b3 100644 --- a/tfe/data_source_oauth_client_test.go +++ b/tfe/data_source_oauth_client_test.go @@ -41,7 +41,7 @@ func testAccTFEOAuthClientDataSourceConfig(rInt int) string { } resource "tfe_oauth_client" "test" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id api_url = "https://api.github.com" http_url = "https://github.com" oauth_token = "%s" @@ -49,7 +49,7 @@ func testAccTFEOAuthClientDataSourceConfig(rInt int) string { } data "tfe_oauth_client" "client" { - oauth_client_id = "${tfe_oauth_client.test.id}" + oauth_client_id = tfe_oauth_client.test.id } `, rInt, GITHUB_TOKEN) } diff --git a/tfe/data_source_ssh_key_test.go b/tfe/data_source_ssh_key_test.go index 19e75fd0d..6333c1e52 100644 --- a/tfe/data_source_ssh_key_test.go +++ b/tfe/data_source_ssh_key_test.go @@ -40,12 +40,12 @@ resource "tfe_organization" "foobar" { resource "tfe_ssh_key" "foobar" { name = "ssh-key-test-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id key = "SSH-KEY-CONTENT" } data "tfe_ssh_key" "foobar" { - name = "${tfe_ssh_key.foobar.name}" - organization = "${tfe_ssh_key.foobar.organization}" + name = tfe_ssh_key.foobar.name + organization = tfe_ssh_key.foobar.organization }`, rInt, rInt) } diff --git a/tfe/data_source_team_access_test.go b/tfe/data_source_team_access_test.go index e58dc05d8..049907461 100644 --- a/tfe/data_source_team_access_test.go +++ b/tfe/data_source_team_access_test.go @@ -49,22 +49,22 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "foobar" { name = "workspace-test-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_team_access" "foobar" { access = "write" - team_id = "${tfe_team.foobar.id}" - workspace_id = "${tfe_workspace.foobar.id}" + team_id = tfe_team.foobar.id + workspace_id = tfe_workspace.foobar.id } data "tfe_team_access" "foobar" { - team_id = "${tfe_team.foobar.id}" - workspace_id = "${tfe_team_access.foobar.workspace_id}" + team_id = tfe_team.foobar.id + workspace_id = tfe_team_access.foobar.workspace_id }`, rInt, rInt, rInt) } diff --git a/tfe/data_source_team_test.go b/tfe/data_source_team_test.go index f7682a3fa..d01dd1fcf 100644 --- a/tfe/data_source_team_test.go +++ b/tfe/data_source_team_test.go @@ -40,11 +40,11 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } data "tfe_team" "foobar" { - name = "${tfe_team.foobar.name}" - organization = "${tfe_team.foobar.organization}" + name = tfe_team.foobar.name + organization = tfe_team.foobar.organization }`, rInt, rInt) } diff --git a/tfe/data_source_workspace_ids_test.go b/tfe/data_source_workspace_ids_test.go index a4f16833e..56ebc3e15 100644 --- a/tfe/data_source_workspace_ids_test.go +++ b/tfe/data_source_workspace_ids_test.go @@ -141,22 +141,22 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foo" { name = "workspace-foo-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "bar" { name = "workspace-bar-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "dummy" { name = "workspace-dummy-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } data "tfe_workspace_ids" "foobar" { - names = ["${tfe_workspace.foo.name}", "${tfe_workspace.bar.name}"] - organization = "${tfe_organization.foobar.name}" + names = [tfe_workspace.foo.name, tfe_workspace.bar.name] + organization = tfe_organization.foobar.name }`, rInt, rInt, rInt, rInt) } @@ -169,21 +169,21 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foo" { name = "workspace-foo-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "bar" { name = "workspace-bar-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "dummy" { name = "workspace-dummy-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } data "tfe_workspace_ids" "foobar" { names = ["*"] - organization = "${tfe_workspace.dummy.organization}" + organization = tfe_workspace.dummy.organization }`, rInt, rInt, rInt, rInt) } diff --git a/tfe/data_source_workspace_test.go b/tfe/data_source_workspace_test.go index 10dded9fa..112959d86 100644 --- a/tfe/data_source_workspace_test.go +++ b/tfe/data_source_workspace_test.go @@ -62,7 +62,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test-%d" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id allow_destroy_plan = false auto_apply = true file_triggers_enabled = true @@ -74,7 +74,7 @@ resource "tfe_workspace" "foobar" { } data "tfe_workspace" "foobar" { - name = "${tfe_workspace.foobar.name}" - organization = "${tfe_workspace.foobar.organization}" + name = tfe_workspace.foobar.name + organization = tfe_workspace.foobar.organization }`, rInt, rInt) } diff --git a/tfe/resource_tfe_agent_pool_test.go b/tfe/resource_tfe_agent_pool_test.go index 0c0e49def..3f4bd6229 100644 --- a/tfe/resource_tfe_agent_pool_test.go +++ b/tfe/resource_tfe_agent_pool_test.go @@ -168,7 +168,7 @@ resource "tfe_organization" "foobar" { resource "tfe_agent_pool" "foobar" { name = "agent-pool-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id }`, rInt) } @@ -181,6 +181,6 @@ resource "tfe_organization" "foobar" { resource "tfe_agent_pool" "foobar" { name = "agent-pool-updated" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id }`, rInt) } diff --git a/tfe/resource_tfe_notification_configuration_test.go b/tfe/resource_tfe_notification_configuration_test.go index 9567ed8b9..db6df6c32 100644 --- a/tfe/resource_tfe_notification_configuration_test.go +++ b/tfe/resource_tfe_notification_configuration_test.go @@ -1094,7 +1094,7 @@ resource "tfe_organization_membership" "foobar" { resource "tfe_notification_configuration" "foobar" { name = "notification_generic_with_email_user_ids" destination_type = "generic" - email_user_ids = ["${tfe_organization_membership.foobar.id}"] + email_user_ids = [tfe_organization_membership.foobar.id] workspace_id = tfe_workspace.foobar.id }`, rInt) } @@ -1158,7 +1158,7 @@ resource "tfe_organization_membership" "foobar" { resource "tfe_notification_configuration" "foobar" { name = "notification_slack_with_email_user_ids" destination_type = "slack" - email_user_ids = ["${tfe_organization_membership.foobar.id}"] + email_user_ids = [tfe_organization_membership.foobar.id] workspace_id = tfe_workspace.foobar.id }`, rInt) } diff --git a/tfe/resource_tfe_oauth_client_test.go b/tfe/resource_tfe_oauth_client_test.go index c883714bc..304cb196c 100644 --- a/tfe/resource_tfe_oauth_client_test.go +++ b/tfe/resource_tfe_oauth_client_test.go @@ -2,12 +2,13 @@ package tfe import ( "fmt" - tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "math/rand" "testing" "time" + + tfe "github.com/hashicorp/go-tfe" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFEOAuthClient_basic(t *testing.T) { @@ -118,7 +119,7 @@ resource "tfe_organization" "foobar" { } resource "tfe_oauth_client" "foobar" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id api_url = "https://api.github.com" http_url = "https://github.com" oauth_token = "%s" diff --git a/tfe/resource_tfe_organization_membership_test.go b/tfe/resource_tfe_organization_membership_test.go index 5948eca7e..1bc91b28b 100644 --- a/tfe/resource_tfe_organization_membership_test.go +++ b/tfe/resource_tfe_organization_membership_test.go @@ -138,6 +138,6 @@ resource "tfe_organization" "foobar" { resource "tfe_organization_membership" "foobar" { email = "example@hashicorp.com" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id }`, rInt) } diff --git a/tfe/resource_tfe_organization_token_test.go b/tfe/resource_tfe_organization_token_test.go index 78b287267..db6ab9e10 100644 --- a/tfe/resource_tfe_organization_token_test.go +++ b/tfe/resource_tfe_organization_token_test.go @@ -176,7 +176,7 @@ resource "tfe_organization" "foobar" { } resource "tfe_organization_token" "foobar" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id }`, rInt) } @@ -188,11 +188,11 @@ resource "tfe_organization" "foobar" { } resource "tfe_organization_token" "foobar" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_organization_token" "error" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id }`, rInt) } @@ -204,11 +204,11 @@ resource "tfe_organization" "foobar" { } resource "tfe_organization_token" "foobar" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_organization_token" "regenerated" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id force_regenerate = true }`, rInt) } diff --git a/tfe/resource_tfe_policy_set_parameter_test.go b/tfe/resource_tfe_policy_set_parameter_test.go index 6518e54cb..2f80c70b6 100644 --- a/tfe/resource_tfe_policy_set_parameter_test.go +++ b/tfe/resource_tfe_policy_set_parameter_test.go @@ -201,13 +201,13 @@ resource "tfe_organization" "foobar" { resource "tfe_policy_set" "foobar" { name = "policy-set-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_policy_set_parameter" "foobar" { key = "key_test" value = "value_test" - policy_set_id = "${tfe_policy_set.foobar.id}" + policy_set_id = tfe_policy_set.foobar.id }`, rInt) } @@ -220,13 +220,13 @@ resource "tfe_organization" "foobar" { resource "tfe_policy_set" "foobar" { name = "policy-set-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_policy_set_parameter" "foobar" { key = "key_updated" value = "value_updated" sensitive = true - policy_set_id = "${tfe_policy_set.foobar.id}" + policy_set_id = tfe_policy_set.foobar.id }`, rInt) } diff --git a/tfe/resource_tfe_policy_set_test.go b/tfe/resource_tfe_policy_set_test.go index f72a155a0..e127567ed 100644 --- a/tfe/resource_tfe_policy_set_test.go +++ b/tfe/resource_tfe_policy_set_test.go @@ -2,13 +2,14 @@ package tfe import ( "fmt" - tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "math/rand" "regexp" "testing" "time" + + tfe "github.com/hashicorp/go-tfe" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTFEPolicySet_basic(t *testing.T) { @@ -782,14 +783,14 @@ resource "tfe_organization" "foobar" { resource "tfe_sentinel_policy" "foo" { name = "policy-foo" policy = "main = rule { true }" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_policy_set" "foobar" { name = "tst-terraform" description = "Policy Set" - organization = "${tfe_organization.foobar.id}" - policy_ids = ["${tfe_sentinel_policy.foo.id}"] + organization = tfe_organization.foobar.id + policy_ids = [tfe_sentinel_policy.foo.id] }`, rInt) } @@ -802,7 +803,7 @@ resource "tfe_organization" "foobar" { resource "tfe_policy_set" "foobar" { name = "tst-terraform" description = "Policy Set" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id }`, rInt) } @@ -816,19 +817,19 @@ resource "tfe_organization" "foobar" { resource "tfe_sentinel_policy" "foo" { name = "policy-foo" policy = "main = rule { true }" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "foo" { name = "workspace-foo" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_policy_set" "foobar" { name = "terraform-populated" - organization = "${tfe_organization.foobar.id}" - policy_ids = ["${tfe_sentinel_policy.foo.id}"] - workspace_external_ids = ["${tfe_workspace.foo.id}"] + organization = tfe_organization.foobar.id + policy_ids = [tfe_sentinel_policy.foo.id] + workspace_external_ids = [tfe_workspace.foo.id] }`, rInt) } @@ -842,19 +843,19 @@ resource "tfe_organization" "foobar" { resource "tfe_sentinel_policy" "foo" { name = "policy-foo" policy = "main = rule { true }" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "foo" { name = "workspace-foo" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_policy_set" "foobar" { name = "terraform-populated" - organization = "${tfe_organization.foobar.id}" - policy_ids = ["${tfe_sentinel_policy.foo.id}"] - workspace_ids = ["${tfe_workspace.foo.id}"] + organization = tfe_organization.foobar.id + policy_ids = [tfe_sentinel_policy.foo.id] + workspace_ids = [tfe_workspace.foo.id] }`, rInt) } @@ -868,30 +869,30 @@ resource "tfe_organization" "foobar" { resource "tfe_sentinel_policy" "foo" { name = "policy-foo" policy = "main = rule { true }" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_sentinel_policy" "bar" { name = "policy-bar" policy = "main = rule { false }" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "foo" { name = "workspace-foo" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "bar" { name = "workspace-bar" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_policy_set" "foobar" { name = "terraform-populated-updated" - organization = "${tfe_organization.foobar.id}" - policy_ids = ["${tfe_sentinel_policy.bar.id}"] - workspace_external_ids = ["${tfe_workspace.bar.id}"] + organization = tfe_organization.foobar.id + policy_ids = [tfe_sentinel_policy.bar.id] + workspace_external_ids = [tfe_workspace.bar.id] }`, rInt) } @@ -905,30 +906,30 @@ resource "tfe_organization" "foobar" { resource "tfe_sentinel_policy" "foo" { name = "policy-foo" policy = "main = rule { true }" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_sentinel_policy" "bar" { name = "policy-bar" policy = "main = rule { false }" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "foo" { name = "workspace-foo" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "bar" { name = "workspace-bar" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_policy_set" "foobar" { name = "terraform-populated-updated" - organization = "${tfe_organization.foobar.id}" - policy_ids = ["${tfe_sentinel_policy.bar.id}"] - workspace_ids = ["${tfe_workspace.bar.id}"] + organization = tfe_organization.foobar.id + policy_ids = [tfe_sentinel_policy.bar.id] + workspace_ids = [tfe_workspace.bar.id] }`, rInt) } @@ -942,19 +943,19 @@ resource "tfe_organization" "foobar" { resource "tfe_sentinel_policy" "foo" { name = "policy-foo" policy = "main = rule { true }" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "foo" { name = "workspace-foo" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_policy_set" "foobar" { name = "terraform-global" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id global = true - policy_ids = ["${tfe_sentinel_policy.foo.id}"] + policy_ids = [tfe_sentinel_policy.foo.id] }`, rInt) } @@ -966,7 +967,7 @@ resource "tfe_organization" "foobar" { } resource "tfe_oauth_client" "test" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id api_url = "https://api.github.com" http_url = "https://github.com" oauth_token = "%s" @@ -976,12 +977,12 @@ resource "tfe_oauth_client" "test" { resource "tfe_policy_set" "foobar" { name = "tst-terraform" description = "Policy Set" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id vcs_repo { identifier = "%s" branch = "master" ingress_submodules = true - oauth_token_id = "${tfe_oauth_client.test.oauth_token_id}" + oauth_token_id = tfe_oauth_client.test.oauth_token_id } policies_path = "%s" @@ -1001,7 +1002,7 @@ resource "tfe_organization" "foobar" { } resource "tfe_oauth_client" "test" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id api_url = "https://api.github.com" http_url = "https://github.com" oauth_token = "%s" @@ -1011,12 +1012,12 @@ resource "tfe_oauth_client" "test" { resource "tfe_policy_set" "foobar" { name = "tst-terraform" description = "Policy Set" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id vcs_repo { identifier = "%s" branch = "%s" ingress_submodules = true - oauth_token_id = "${tfe_oauth_client.test.oauth_token_id}" + oauth_token_id = tfe_oauth_client.test.oauth_token_id } policies_path = "%s" @@ -1039,13 +1040,13 @@ resource "tfe_organization" "foobar" { resource "tfe_sentinel_policy" "foo" { name = "policy-foo" policy = "main = rule { true }" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_policy_set" "foobar" { name = "not the right format" description = "Policy Set" - organization = "${tfe_organization.foobar.id}" - policy_ids = ["${tfe_sentinel_policy.foo.id}"] + organization = tfe_organization.foobar.id + policy_ids = [tfe_sentinel_policy.foo.id] }`, rInt) } diff --git a/tfe/resource_tfe_run_trigger_test.go b/tfe/resource_tfe_run_trigger_test.go index abea9ccb9..a9ee9f44d 100644 --- a/tfe/resource_tfe_run_trigger_test.go +++ b/tfe/resource_tfe_run_trigger_test.go @@ -200,17 +200,17 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "workspace" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "sourceable" { name = "sourceable-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_run_trigger" "foobar" { - workspace_external_id = "${tfe_workspace.workspace.id}" - sourceable_id = "${tfe_workspace.sourceable.id}" + workspace_external_id = tfe_workspace.workspace.id + sourceable_id = tfe_workspace.sourceable.id }`, rInt) } @@ -223,17 +223,17 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "workspace" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "sourceable" { name = "sourceable-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_run_trigger" "foobar" { - workspace_id = "${tfe_workspace.workspace.id}" - sourceable_id = "${tfe_workspace.sourceable.id}" + workspace_id = tfe_workspace.workspace.id + sourceable_id = tfe_workspace.sourceable.id }`, rInt) } @@ -246,20 +246,20 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "workspace" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "sourceable" { count = 10 name = "sourceable-test-${count.index}" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_run_trigger" "foobar" { count = 10 - workspace_external_id = "${tfe_workspace.workspace.external_id}" - sourceable_id = "${tfe_workspace.sourceable[count.index].external_id}" + workspace_external_id = tfe_workspace.workspace.external_id + sourceable_id = tfe_workspace.sourceable[count.index].external_id }`, rInt) } diff --git a/tfe/resource_tfe_sentinel_policy_test.go b/tfe/resource_tfe_sentinel_policy_test.go index 62179b150..90b79e760 100644 --- a/tfe/resource_tfe_sentinel_policy_test.go +++ b/tfe/resource_tfe_sentinel_policy_test.go @@ -198,7 +198,7 @@ resource "tfe_organization" "foobar" { resource "tfe_sentinel_policy" "foobar" { name = "policy-test" description = "A test policy" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id policy = "main = rule { true }" enforce_mode = "hard-mandatory" }`, rInt) @@ -214,7 +214,7 @@ resource "tfe_organization" "foobar" { resource "tfe_sentinel_policy" "foobar" { name = "policy-test" description = "An updated test policy" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id policy = "main = rule { false }" enforce_mode = "soft-mandatory" }`, rInt) diff --git a/tfe/resource_tfe_ssh_key_test.go b/tfe/resource_tfe_ssh_key_test.go index 2357b3e09..70b1d33a4 100644 --- a/tfe/resource_tfe_ssh_key_test.go +++ b/tfe/resource_tfe_ssh_key_test.go @@ -153,7 +153,7 @@ resource "tfe_organization" "foobar" { resource "tfe_ssh_key" "foobar" { name = "ssh-key-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id key = "SSH-KEY-CONTENT" }`, rInt) } @@ -167,7 +167,7 @@ resource "tfe_organization" "foobar" { resource "tfe_ssh_key" "foobar" { name = "ssh-key-updated" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id key = "UPDATED-SSH-KEY-CONTENT" }`, rInt) } diff --git a/tfe/resource_tfe_team_access_test.go b/tfe/resource_tfe_team_access_test.go index 73ba6d2d4..2a1c76d5e 100644 --- a/tfe/resource_tfe_team_access_test.go +++ b/tfe/resource_tfe_team_access_test.go @@ -317,18 +317,18 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_team_access" "foobar" { access = "write" - team_id = "${tfe_team.foobar.id}" - workspace_id = "${tfe_workspace.foobar.id}" + team_id = tfe_team.foobar.id + workspace_id = tfe_workspace.foobar.id }`, rInt) } @@ -341,18 +341,18 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_team_access" "foobar" { access = "plan" - team_id = "${tfe_team.foobar.id}" - workspace_id = "${tfe_workspace.foobar.id}" + team_id = tfe_team.foobar.id + workspace_id = tfe_workspace.foobar.id }`, rInt) } @@ -365,12 +365,12 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_team_access" "foobar" { @@ -381,7 +381,7 @@ resource "tfe_team_access" "foobar" { sentinel_mocks = "none" workspace_locking = false } - team_id = "${tfe_team.foobar.id}" - workspace_id = "${tfe_workspace.foobar.id}" + team_id = tfe_team.foobar.id + workspace_id = tfe_workspace.foobar.id }`, rInt) } diff --git a/tfe/resource_tfe_team_member_test.go b/tfe/resource_tfe_team_member_test.go index 610636e3b..74f5f42f3 100644 --- a/tfe/resource_tfe_team_member_test.go +++ b/tfe/resource_tfe_team_member_test.go @@ -222,11 +222,11 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_team_member" "foobar" { - team_id = "${tfe_team.foobar.id}" + team_id = tfe_team.foobar.id username = "admin" }`, rInt) } diff --git a/tfe/resource_tfe_team_members_test.go b/tfe/resource_tfe_team_members_test.go index 09cccff6b..30eb6305d 100644 --- a/tfe/resource_tfe_team_members_test.go +++ b/tfe/resource_tfe_team_members_test.go @@ -215,11 +215,11 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_team_members" "foobar" { - team_id = "${tfe_team.foobar.id}" + team_id = tfe_team.foobar.id usernames = ["%s"] }`, rInt, TFE_USER1) } @@ -233,11 +233,11 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_team_members" "foobar" { - team_id = "${tfe_team.foobar.id}" + team_id = tfe_team.foobar.id usernames = ["%s", "%s"] }`, rInt, TFE_USER1, TFE_USER2) } diff --git a/tfe/resource_tfe_team_organization_member_test.go b/tfe/resource_tfe_team_organization_member_test.go index 075da85ae..63f97ccf8 100644 --- a/tfe/resource_tfe_team_organization_member_test.go +++ b/tfe/resource_tfe_team_organization_member_test.go @@ -214,16 +214,16 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_organization_membership" "foobar" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id email = "foo@foobar.com" } resource "tfe_team_organization_member" "foobar" { - team_id = "${tfe_team.foobar.id}" - organization_membership_id = "${tfe_organization_membership.foobar.id}" + team_id = tfe_team.foobar.id + organization_membership_id = tfe_organization_membership.foobar.id }`, rInt) } diff --git a/tfe/resource_tfe_team_test.go b/tfe/resource_tfe_team_test.go index 751bb5b7d..81217688a 100644 --- a/tfe/resource_tfe_team_test.go +++ b/tfe/resource_tfe_team_test.go @@ -255,7 +255,7 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id }`, rInt) } @@ -268,7 +268,7 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id visibility = "organization" @@ -289,7 +289,7 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test-1" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id visibility = "secret" diff --git a/tfe/resource_tfe_team_token_test.go b/tfe/resource_tfe_team_token_test.go index 4008f707f..c80215ef6 100644 --- a/tfe/resource_tfe_team_token_test.go +++ b/tfe/resource_tfe_team_token_test.go @@ -166,11 +166,11 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_team_token" "foobar" { - team_id = "${tfe_team.foobar.id}" + team_id = tfe_team.foobar.id }`, rInt) } @@ -183,15 +183,15 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_team_token" "foobar" { - team_id = "${tfe_team.foobar.id}" + team_id = tfe_team.foobar.id } resource "tfe_team_token" "error" { - team_id = "${tfe_team.foobar.id}" + team_id = tfe_team.foobar.id }`, rInt) } @@ -204,15 +204,15 @@ resource "tfe_organization" "foobar" { resource "tfe_team" "foobar" { name = "team-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_team_token" "foobar" { - team_id = "${tfe_team.foobar.id}" + team_id = tfe_team.foobar.id } resource "tfe_team_token" "regenerated" { - team_id = "${tfe_team.foobar.id}" + team_id = tfe_team.foobar.id force_regenerate = true }`, rInt) } diff --git a/tfe/resource_tfe_variable_test.go b/tfe/resource_tfe_variable_test.go index 82c4a1a1d..c9621734b 100644 --- a/tfe/resource_tfe_variable_test.go +++ b/tfe/resource_tfe_variable_test.go @@ -341,7 +341,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_variable" "foobar" { @@ -349,7 +349,7 @@ resource "tfe_variable" "foobar" { value = "value_test" description = "some description" category = "env" - workspace_id = "${tfe_workspace.foobar.id}" + workspace_id = tfe_workspace.foobar.id }`, rInt) } @@ -362,7 +362,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_variable" "foobar" { @@ -372,7 +372,7 @@ resource "tfe_variable" "foobar" { category = "terraform" hcl = true sensitive = true - workspace_id = "${tfe_workspace.foobar.id}" + workspace_id = tfe_workspace.foobar.id }`, rInt) } @@ -385,7 +385,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id } resource "tfe_variable" "foobar" { @@ -395,6 +395,6 @@ resource "tfe_variable" "foobar" { category = "terraform" hcl = true sensitive = true - workspace_id = "${tfe_workspace.foobar.id}" + workspace_id = tfe_workspace.foobar.id }`, rInt) } diff --git a/tfe/resource_tfe_workspace_test.go b/tfe/resource_tfe_workspace_test.go index 3d8ac9dd8..d9d143da8 100644 --- a/tfe/resource_tfe_workspace_test.go +++ b/tfe/resource_tfe_workspace_test.go @@ -979,7 +979,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id allow_destroy_plan = false auto_apply = true }`, rInt) @@ -994,7 +994,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id auto_apply = true file_triggers_enabled = false }`, rInt) @@ -1009,7 +1009,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id operations = true }`, rInt) } @@ -1023,7 +1023,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id operations = false }`, rInt) } @@ -1037,7 +1037,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id execution_mode = "remote" }`, rInt) } @@ -1051,7 +1051,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id execution_mode = "local" }`, rInt) } @@ -1065,14 +1065,14 @@ resource "tfe_organization" "foobar" { resource "tfe_agent_pool" "foobar" { name = "agent-pool-test" - organization = "${tfe_organization.foobar.name}" + organization = tfe_organization.foobar.name } resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id execution_mode = "agent" - agent_pool_id = "${tfe_agent_pool.foobar.id}" + agent_pool_id = tfe_agent_pool.foobar.id }`, rInt) } @@ -1085,7 +1085,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id auto_apply = true speculative_enabled = false }`, rInt) @@ -1100,7 +1100,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-monorepo" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id file_triggers_enabled = true trigger_prefixes = ["/modules", "/shared"] working_directory = "/db" @@ -1116,7 +1116,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "renamed-out-of-band" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id allow_destroy_plan = false auto_apply = true }`, rInt) @@ -1131,7 +1131,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-updated" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id allow_destroy_plan = true auto_apply = false file_triggers_enabled = true @@ -1152,7 +1152,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-updated" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id auto_apply = false working_directory = "terraform/test" }`, rInt) @@ -1167,7 +1167,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-updated" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id auto_apply = false }`, rInt) } @@ -1181,15 +1181,15 @@ resource "tfe_organization" "foobar" { resource "tfe_ssh_key" "foobar" { name = "ssh-key-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id key = "SSH-KEY-CONTENT" } resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id auto_apply = true - ssh_key_id = "${tfe_ssh_key.foobar.id}" + ssh_key_id = tfe_ssh_key.foobar.id }`, rInt) } @@ -1202,13 +1202,13 @@ resource "tfe_organization" "foobar" { resource "tfe_ssh_key" "foobar" { name = "ssh-key-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id key = "SSH-KEY-CONTENT" } resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id auto_apply = true }`, rInt) } @@ -1222,7 +1222,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id trigger_prefixes = ["/modules", "/shared"] }`, rInt) } @@ -1235,7 +1235,7 @@ resource "tfe_organization" "foobar" { } resource "tfe_workspace" "foobar" { name = "workspace-test" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id auto_apply = true }`, rInt) } @@ -1248,7 +1248,7 @@ resource "tfe_organization" "foobar" { } resource "tfe_oauth_client" "test" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id api_url = "https://api.github.com" http_url = "https://github.com" oauth_token = "%s" @@ -1257,11 +1257,11 @@ resource "tfe_oauth_client" "test" { resource "tfe_workspace" "foobar" { name = "workspace-test-add-vcs-repo" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id auto_apply = true vcs_repo { identifier = "%s" - oauth_token_id = "${tfe_oauth_client.test.oauth_token_id}" + oauth_token_id = tfe_oauth_client.test.oauth_token_id } } `, @@ -1279,7 +1279,7 @@ resource "tfe_organization" "foobar" { } resource "tfe_oauth_client" "test" { - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id api_url = "https://api.github.com" http_url = "https://github.com" oauth_token = "%s" @@ -1288,11 +1288,11 @@ resource "tfe_oauth_client" "test" { resource "tfe_workspace" "foobar" { name = "workspace-test-update-vcs-repo-branch" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id auto_apply = true vcs_repo { identifier = "%s" - oauth_token_id = "${tfe_oauth_client.test.oauth_token_id}" + oauth_token_id = tfe_oauth_client.test.oauth_token_id branch = "%s" } } @@ -1313,7 +1313,7 @@ resource "tfe_organization" "foobar" { resource "tfe_workspace" "foobar" { name = "workspace-test-remove-vcs-repo" - organization = "${tfe_organization.foobar.id}" + organization = tfe_organization.foobar.id auto_apply = true } `, rInt) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 2db29ed64..62731ac96 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -99,8 +99,8 @@ For more information on provider installation and constraining provider versions ```hcl provider "tfe" { - hostname = "${var.hostname}" - token = "${var.token}" + hostname = var.hostname + token = var.token version = "~> 0.15.0" } diff --git a/website/docs/r/policy_set.html.markdown b/website/docs/r/policy_set.html.markdown index 5a40dc2ba..c76286192 100644 --- a/website/docs/r/policy_set.html.markdown +++ b/website/docs/r/policy_set.html.markdown @@ -26,13 +26,13 @@ resource "tfe_policy_set" "test" { description = "A brand new policy set" organization = "my-org-name" policies_path = "policies/my-policy-set" - workspace_ids = ["${tfe_workspace.test.id}"] + workspace_ids = [tfe_workspace.test.id] vcs_repo { identifier = "my-org-name/my-policy-set-repository" branch = "master" ingress_submodules = false - oauth_token_id = "${tfe_oauth_client.test.id}" + oauth_token_id = tfe_oauth_client.test.id } } ``` @@ -44,8 +44,8 @@ resource "tfe_policy_set" "test" { name = "my-policy-set" description = "A brand new policy set" organization = "my-org-name" - policy_ids = ["${tfe_sentinel_policy.test.id}"] - workspace_ids = ["${tfe_workspace.test.id}"] + policy_ids = [tfe_sentinel_policy.test.id] + workspace_ids = [tfe_workspace.test.id] } ``` diff --git a/website/docs/r/policy_set_parameter.html.markdown b/website/docs/r/policy_set_parameter.html.markdown index 447dc0930..539622be9 100644 --- a/website/docs/r/policy_set_parameter.html.markdown +++ b/website/docs/r/policy_set_parameter.html.markdown @@ -22,13 +22,13 @@ resource "tfe_organization" "test" { resource "tfe_policy_set" "test" { name = "my-policy-set-name" - organization = "${tfe_organization.test.id}" + organization = tfe_organization.test.id } resource "tfe_policy_set_parameter" "test" { key = "my_key_name" value = "my_value_name" - policy_set_id = "${tfe_policy_set.test.id}" + policy_set_id = tfe_policy_set.test.id } ``` diff --git a/website/docs/r/run_trigger.html.markdown b/website/docs/r/run_trigger.html.markdown index 92ca6d8a7..17db6bc19 100644 --- a/website/docs/r/run_trigger.html.markdown +++ b/website/docs/r/run_trigger.html.markdown @@ -24,17 +24,17 @@ resource "tfe_organization" "test-organization" { resource "tfe_workspace" "test-workspace" { name = "my-workspace-name" - organization = "${tfe_organization.test-organization.id}" + organization = tfe_organization.test-organization.id } resource "tfe_workspace" "test-sourceable" { name = "my-sourceable-workspace-name" - organization = "${tfe_organization.test-organization.id}" + organization = tfe_organization.test-organization.id } resource "tfe_run_trigger" "test" { - workspace_external_id = "${tfe_workspace.test-workspace.id}" - sourceable_id = "${tfe_workspace.test-sourceable.id}" + workspace_external_id = tfe_workspace.test-workspace.id + sourceable_id = tfe_workspace.test-sourceable.id } ``` diff --git a/website/docs/r/team_access.html.markdown b/website/docs/r/team_access.html.markdown index c6ea1ef72..a468e81f6 100644 --- a/website/docs/r/team_access.html.markdown +++ b/website/docs/r/team_access.html.markdown @@ -27,8 +27,8 @@ resource "tfe_workspace" "test" { resource "tfe_team_access" "test" { access = "read" - team_id = "${tfe_team.test.id}" - workspace_id = "${tfe_workspace.test.id}" + team_id = tfe_team.test.id + workspace_id = tfe_workspace.test.id } ``` diff --git a/website/docs/r/team_member.html.markdown b/website/docs/r/team_member.html.markdown index 56030b17a..6dff72710 100644 --- a/website/docs/r/team_member.html.markdown +++ b/website/docs/r/team_member.html.markdown @@ -30,7 +30,7 @@ resource "tfe_team" "test" { } resource "tfe_team_member" "test" { - team_id = "${tfe_team.test.id}" + team_id = tfe_team.test.id username = "sander" } ``` diff --git a/website/docs/r/team_members.html.markdown b/website/docs/r/team_members.html.markdown index 921384c7e..e6ab56f9f 100644 --- a/website/docs/r/team_members.html.markdown +++ b/website/docs/r/team_members.html.markdown @@ -30,7 +30,7 @@ resource "tfe_team" "test" { } resource "tfe_team_members" "test" { - team_id = "${tfe_team.test.id}" + team_id = tfe_team.test.id usernames = ["admin", "sander"] } ``` diff --git a/website/docs/r/team_organization_member.html.markdown b/website/docs/r/team_organization_member.html.markdown index 8c68e8810..46f4e0e37 100644 --- a/website/docs/r/team_organization_member.html.markdown +++ b/website/docs/r/team_organization_member.html.markdown @@ -34,8 +34,8 @@ resource "tfe_organization_membership" "test" { } resource "tfe_team_organization_member" "test" { - team_id = "${tfe_team.test.id}" - organization_membership_id = "${tfe_organization_membership.test.id}" + team_id = tfe_team.test.id + organization_membership_id = tfe_organization_membership.test.id } ``` diff --git a/website/docs/r/team_token.html.markdown b/website/docs/r/team_token.html.markdown index 717ec50c0..78c0c9763 100644 --- a/website/docs/r/team_token.html.markdown +++ b/website/docs/r/team_token.html.markdown @@ -21,7 +21,7 @@ resource "tfe_team" "test" { } resource "tfe_team_token" "test" { - team_id = "${tfe_team.test.id}" + team_id = tfe_team.test.id } ``` diff --git a/website/docs/r/variable.html.markdown b/website/docs/r/variable.html.markdown index 97ea018bb..b502a87e0 100644 --- a/website/docs/r/variable.html.markdown +++ b/website/docs/r/variable.html.markdown @@ -22,14 +22,14 @@ resource "tfe_organization" "test" { resource "tfe_workspace" "test" { name = "my-workspace-name" - organization = "${tfe_organization.test.id}" + organization = tfe_organization.test.id } resource "tfe_variable" "test" { key = "my_key_name" value = "my_value_name" category = "terraform" - workspace_id = "${tfe_workspace.test.id}" + workspace_id = tfe_workspace.test.id description = "a useful description" } ``` From 1684a4a477d84b03b96981c10d4bc19019c7b38a Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Sun, 22 Nov 2020 15:44:40 -0600 Subject: [PATCH 09/12] SDK2 upgrade: Relax regex on Notification Configurations The output in V2 of the SDK must have changed slightly, as the whitespacing looks ever so different and the messages aren't anchored to the beginning of the line as expected here, so the tests fail. The regexs here don't need to be this strict. Search for the substring and that's a-ok. --- ...rce_tfe_notification_configuration_test.go | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tfe/resource_tfe_notification_configuration_test.go b/tfe/resource_tfe_notification_configuration_test.go index db6df6c32..16117463f 100644 --- a/tfe/resource_tfe_notification_configuration_test.go +++ b/tfe/resource_tfe_notification_configuration_test.go @@ -343,11 +343,11 @@ func TestAccTFENotificationConfiguration_validateSchemaAttributesEmail(t *testin Steps: []resource.TestStep{ { Config: testAccTFENotificationConfiguration_emailWithURL(rInt), - ExpectError: regexp.MustCompile(`^.*URL cannot be set with destination type of email`), + ExpectError: regexp.MustCompile(`URL cannot be set with destination type of email`), }, { Config: testAccTFENotificationConfiguration_emailWithToken(rInt), - ExpectError: regexp.MustCompile(`^.*Token cannot be set with destination type of email`), + ExpectError: regexp.MustCompile(`Token cannot be set with destination type of email`), }, }, }) @@ -362,15 +362,15 @@ func TestAccTFENotificationConfiguration_validateSchemaAttributesGeneric(t *test Steps: []resource.TestStep{ { Config: testAccTFENotificationConfiguration_genericWithEmailAddresses(rInt), - ExpectError: regexp.MustCompile(`^.*Email addresses cannot be set with destination type of generic`), + ExpectError: regexp.MustCompile(`Email addresses cannot be set with destination type of generic`), }, { Config: testAccTFENotificationConfiguration_genericWithEmailUserIDs(rInt), - ExpectError: regexp.MustCompile(`^.*Email user IDs cannot be set with destination type of generic`), + ExpectError: regexp.MustCompile(`Email user IDs cannot be set with destination type of generic`), }, { Config: testAccTFENotificationConfiguration_genericWithoutURL(rInt), - ExpectError: regexp.MustCompile(`^.*URL is required with destination type of generic`), + ExpectError: regexp.MustCompile(`URL is required with destination type of generic`), }, }, }) @@ -385,19 +385,19 @@ func TestAccTFENotificationConfiguration_validateSchemaAttributesSlack(t *testin Steps: []resource.TestStep{ { Config: testAccTFENotificationConfiguration_slackWithEmailAddresses(rInt), - ExpectError: regexp.MustCompile(`^.*Email addresses cannot be set with destination type of slack`), + ExpectError: regexp.MustCompile(`Email addresses cannot be set with destination type of slack`), }, { Config: testAccTFENotificationConfiguration_slackWithEmailUserIDs(rInt), - ExpectError: regexp.MustCompile(`^.*Email user IDs cannot be set with destination type of slack`), + ExpectError: regexp.MustCompile(`Email user IDs cannot be set with destination type of slack`), }, { Config: testAccTFENotificationConfiguration_slackWithToken(rInt), - ExpectError: regexp.MustCompile(`^.*Token cannot be set with destination type of slack`), + ExpectError: regexp.MustCompile(`Token cannot be set with destination type of slack`), }, { Config: testAccTFENotificationConfiguration_slackWithoutURL(rInt), - ExpectError: regexp.MustCompile(`^.*URL is required with destination type of slack`), + ExpectError: regexp.MustCompile(`URL is required with destination type of slack`), }, }, }) @@ -432,11 +432,11 @@ func TestAccTFENotificationConfiguration_updateValidateSchemaAttributesEmail(t * }, { Config: testAccTFENotificationConfiguration_emailWithURL(rInt), - ExpectError: regexp.MustCompile(`^.*URL cannot be set with destination type of email`), + ExpectError: regexp.MustCompile(`URL cannot be set with destination type of email`), }, { Config: testAccTFENotificationConfiguration_emailWithToken(rInt), - ExpectError: regexp.MustCompile(`^.*Token cannot be set with destination type of email`), + ExpectError: regexp.MustCompile(`Token cannot be set with destination type of email`), }, }, }) @@ -471,15 +471,15 @@ func TestAccTFENotificationConfiguration_updateValidateSchemaAttributesGeneric(t }, { Config: testAccTFENotificationConfiguration_genericWithEmailAddresses(rInt), - ExpectError: regexp.MustCompile(`^.*Email addresses cannot be set with destination type of generic`), + ExpectError: regexp.MustCompile(`Email addresses cannot be set with destination type of generic`), }, { Config: testAccTFENotificationConfiguration_genericWithEmailUserIDs(rInt), - ExpectError: regexp.MustCompile(`^.*Email user IDs cannot be set with destination type of generic`), + ExpectError: regexp.MustCompile(`Email user IDs cannot be set with destination type of generic`), }, { Config: testAccTFENotificationConfiguration_genericWithoutURL(rInt), - ExpectError: regexp.MustCompile(`^.*URL is required with destination type of generic`), + ExpectError: regexp.MustCompile(`URL is required with destination type of generic`), }, }, }) @@ -514,19 +514,19 @@ func TestAccTFENotificationConfiguration_updateValidateSchemaAttributesSlack(t * }, { Config: testAccTFENotificationConfiguration_slackWithEmailAddresses(rInt), - ExpectError: regexp.MustCompile(`^.*Email addresses cannot be set with destination type of slack`), + ExpectError: regexp.MustCompile(`Email addresses cannot be set with destination type of slack`), }, { Config: testAccTFENotificationConfiguration_slackWithEmailUserIDs(rInt), - ExpectError: regexp.MustCompile(`^.*Email user IDs cannot be set with destination type of slack`), + ExpectError: regexp.MustCompile(`Email user IDs cannot be set with destination type of slack`), }, { Config: testAccTFENotificationConfiguration_slackWithToken(rInt), - ExpectError: regexp.MustCompile(`^.*Token cannot be set with destination type of slack`), + ExpectError: regexp.MustCompile(`Token cannot be set with destination type of slack`), }, { Config: testAccTFENotificationConfiguration_slackWithoutURL(rInt), - ExpectError: regexp.MustCompile(`^.*URL is required with destination type of slack`), + ExpectError: regexp.MustCompile(`URL is required with destination type of slack`), }, }, }) From 62029d34082c4b63148b1047e583d0bdc3470642 Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Sun, 22 Nov 2020 21:13:42 -0600 Subject: [PATCH 10/12] SDK2 upgrade: Use Terraform 0.12 for acceptance tests In V2 of the SDK, acceptance tests are done using a real Terraform binary and not via the inner workings of Terraform itself. By default, the latest version of Terraform is installed and used (unless specified via options to use a path or version) In upgrading to the V2 SDK, it seems that we actually have some test configurations that are not compatible with 0.13 (the current version, as of this writing), and cause tests to fail: === FAIL: tfe TestAccTFEOrganizationMembershipDataSource_basic (1.60s) data_source_organization_membership_****.go:16: Step 1/1 error: Error running pre-apply plan: Error: Error retrieving organization memberships: resource not found === FAIL: tfe TestAccTFEWorkspaceIDsDataSource_basic (1.56s) data_source_workspace_ids_****.go:16: Step 1/1 error: Error running pre-apply plan: Error: Error retrieving workspaces: resource not found This issue is due to a known issue with 0.13, issue number 26074 on hashicorp/terraform, and I confirmed that even using SDKv1 these tests fail if you use Terraform 0.13. Because of this, let's just force usage of 0.12 (which is how things are run now) and fix these configurations separately. --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index cadd67ee0..285cc2e74 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,7 @@ jobs: docker: - image: docker.mirror.hashicorp.services/circleci/golang:1.14.10 environment: + TF_ACC_TERRAFORM_VERSION: 0.12.29 TEST_RESULTS_DIR: *test_results_dir working_directory: /go/src/github.com/hashicorp/terraform-provider-tfe From 149447a7f89bc9f27a1c83187ac3f7fdf7d7368f Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Sun, 22 Nov 2020 22:05:23 -0600 Subject: [PATCH 11/12] SDK2 upgrade: Bump to latest (2.3.0) Now that the upgrade is complete, bump from 2.0 to 2.3 --- go.mod | 2 +- go.sum | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 0e83c37e9..2fec67699 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,6 @@ require ( github.com/hashicorp/go-tfe v0.11.1 github.com/hashicorp/go-version v1.2.1 github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce - github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.3 + github.com/hashicorp/terraform-plugin-sdk/v2 v2.3.0 github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 ) diff --git a/go.sum b/go.sum index 1709456b4..eb4754fd4 100644 --- a/go.sum +++ b/go.sum @@ -146,6 +146,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= @@ -175,8 +177,8 @@ github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUK github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs= github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw= github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= -github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 h1:l1KB3bHVdvegcIf5upQ5mjcHjs2qsWnKh4Yr9xgIuu8= -github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= +github.com/hashicorp/go-getter v1.5.0 h1:ciWJaeZWSMbc5OiLMpKp40MKFPqO44i0h3uyfXPBkkk= +github.com/hashicorp/go-getter v1.5.0/go.mod h1:a7z7NPPfNQpJWcn4rSWFtdrSldqLdLPEF3d8nFMsSLM= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= @@ -214,10 +216,10 @@ github.com/hashicorp/terraform-exec v0.10.0 h1:3nh/1e3u9gYRUQGOKWp/8wPR7ABlL2F14 github.com/hashicorp/terraform-exec v0.10.0/go.mod h1:tOT8j1J8rP05bZBGWXfMyU3HkLi1LWyqL3Bzsc3CJjo= github.com/hashicorp/terraform-json v0.5.0 h1:7TV3/F3y7QVSuN4r9BEXqnWqrAyeOtON8f0wvREtyzs= github.com/hashicorp/terraform-json v0.5.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.3 h1:X7VmKpcIxq+rIbuqe5TPN27KLzbO9aXQcjG4c5iC3tk= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.3/go.mod h1:oz4kkpfTJ/hA2VMD0WpITTd3yPDGpT4uN7CiKdre/YI= -github.com/hashicorp/terraform-plugin-test/v2 v2.1.2 h1:p96IIn+XpvVjw7AtN8y9MKxn0x69S7wtbGf7JgDJoIk= -github.com/hashicorp/terraform-plugin-test/v2 v2.1.2/go.mod h1:jerO5mrd+jVNALy8aiq+VZOg/CR8T2T1QR3jd6JKGOI= +github.com/hashicorp/terraform-plugin-go v0.1.0 h1:kyXZ0nkHxiRev/q18N40IbRRk4AV0zE/MDJkDM3u8dY= +github.com/hashicorp/terraform-plugin-go v0.1.0/go.mod h1:10V6F3taeDWVAoLlkmArKttR3IULlRWFAGtQIQTIDr4= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.3.0 h1:Egv+R1tOOjPNz643KBTx3tLT6RdFGGYJcZlyLvrPcEU= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.3.0/go.mod h1:+12dJQebYjuU/yiq94iZUPuC66abfRBrXdpVJia3ojk= github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 h1:hjyO2JsNZUKT1ym+FAdlBEkGPevazYsmVgIMw7dVELg= github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= @@ -284,6 +286,8 @@ github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY7 github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k+Mg7cowZ8yv4Trqw9UsJby758= +github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod h1:uFMI8w+ref4v2r9jz+c9i1IfIttS/OkmLfrk1jne5hs= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -310,12 +314,12 @@ github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d h1:Z4EH+5Effv github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod h1:BSTlc8jOjh0niykqEGVXOLXdi9o0r0kR8tCYiMvjFgw= github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok= github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= -github.com/ulikunitz/xz v0.5.7 h1:YvTNdFzX6+W5m9msiYg/zpkSURPPtOlzbqYjrFn7Yt4= -github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ= +github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= 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/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= +github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -584,6 +588,8 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0 h1:M5a8xTlYTxwMn5ZFkwhRabsygDY5G8TYLyQDBxJNAxE= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 3a4458197a5226edab2c1636f7436a2e030c4bc5 Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Thu, 10 Dec 2020 15:39:03 -0600 Subject: [PATCH 12/12] [skip ci] Small typo --- website/docs/index.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 62731ac96..20a8548e1 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -15,7 +15,7 @@ Terraform Cloud, this provider supports both Cloud and Enterprise. Use the navigation to the left to read about the available resources. -Since v0.24.0, this provider requires Terraform >= 0.12 +Since v0.24.0, this provider requires Terraform >= 0.12. ~> **Important:** For production use, you should constrain the acceptable provider versions via configuration, to ensure that new versions with breaking changes will not be automatically installed.