diff --git a/README.md b/README.md index 191a9d7..5b44ce9 100644 --- a/README.md +++ b/README.md @@ -12,52 +12,40 @@ the arguments should include the -a|--action flag which calls the function (acti #The following example validates there are no duplicate environments under two different data layers: required_providers { toluna = { - source = "toluna-terraform/toluna" + source = "toluna-terraform/toluna-v2" } } } -data "toluna_validate_configuration" "app_json" { - dynamic "rule_set" { - for_each = local.app_config - content { - key_name = rule_set.value["key_name"] - rule = rule_set.value["rule"] - value = rule_set.value["value"] - } - } - json_config = data.consul_keys.appjson.var -} +data "toluna_environment_config" "app_json" { + address = "consul-cluster-test.consul.1234546-abcd-efgh-ijkl-12345678.aws.hashicorp.cloud" + scheme = "https" + path = "terraform/app-name/app-env.json" + validation_rules = "terraform/validations/app-config.json" +} ``` ## Toggles #### Validate arguments: -```yaml -arguments = command line arguments to pass to the validation script I.E. -a funcation name to run -f some file to validate -``` ## Requirements -| Name | Version | -|------|---------| -| [terraform](#requirement\_terraform) | >= 1.0.0 | - - ## Providers | Name | Version | |------|---------| -| [assert](https://github.com/bwoznicki/terraform-provider-assert) | >= 0.0.1 | +| [assert](https://github.com/toluna-terraform/terraform-provider-toluna-v2) | >= 1.0.2 | ## Modules +## Resources + +## DataSource | Name | Source | Version | |------|--------|---------| -| [validate](#module\validate) | ../../ | | - -## Resources +| [toluna_environment_config](#data\toluna_environment_config) | ../../ | | No Resources. diff --git a/docs/data-sources/toluna_environment_config.md b/docs/data-sources/toluna_environment_config.md new file mode 100644 index 0000000..497778b --- /dev/null +++ b/docs/data-sources/toluna_environment_config.md @@ -0,0 +1,30 @@ +--- +# generated by https://github.com/hashicorp/terraform-plugin-docs +page_title: "toluna_environment_config Data Source - terraform-provider-toluna-v2" +subcategory: "" +description: |- + +--- + +# toluna_environment_config (Data Source) + + + + + + +## Schema + +### Required + +- `address` (String) +- `path` (String) +- `scheme` (String) +- `validation_rules` (String) + +### Read-Only + +- `configuration` (String) +- `id` (Number) The ID of this resource. + + diff --git a/docs/index.md b/docs/index.md index f27be0b..8115587 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,92 +1,20 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "toluna Provider" +page_title: "toluna-v2 Provider" subcategory: "" description: |- --- -# toluna Provider -The Toluna provider provides resources to allow custom action on terraform resources +# toluna-v2 Provider -## Example Usage -```terraform -terraform { - required_providers { - toluna = { - source = "toluna-terraform/toluna" - version = ">=0.0.9" - } - } -} -provider "aws" { - region = "us-east-1" - profile = "my-profile" -} -provider "toluna" { - -} - - -resource "toluna_invoke_lambda" "example" { - region = "us-east-1" - aws_profile = "my-profile" - function_name = "my_lambda" - payload = jsonencode({"name": "example pay load"}) -} - -resource "toluna_start_codebuild" "example" { - region = "us-east-1" - aws_profile = "my-profile" - project_name = "my_project" - environment_variables { - name = "my-variable" - value = "FOO" - type = "PLAINTEXT" - } - environment_variables { - name = "my-secret-variable" - value = "BAR" - type = "PARAMETER_STORE" - } - environment_variables { - name = "my-other-secret-variable" - value = "BAR" - type = "SECRETS_MANAGER" - } -} + +## Schema -data "toluna_validate_configuration" "example" { - rule_set { - key_name = "key" - rule ="unique" - value = "nil" - } - rule_set { - key_name = "$..env_index" - rule ="odd" - value = "nil" - } - rule_set { - key_name = "$..env_index" - rule =">" - value = "6" - } - rule_set { - key_name = "$..env_index" - rule ="<" - value = "21" - } - rule_set { - key_name = "key" - rule ="~=" - value = "example" - } - json_config = data.consul_keys.appjson.var -} -``` +### Optional +- `strict_module_validation` (Boolean) Defaults to `false`. diff --git a/docs/resources/invoke_lambda.md b/docs/resources/invoke_lambda.md deleted file mode 100644 index 14fae76..0000000 --- a/docs/resources/invoke_lambda.md +++ /dev/null @@ -1,58 +0,0 @@ ---- -# generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "toluna_invoke_lambda Resource - terraform-provider-toluna" -subcategory: "" -description: |- - ---- - -# toluna_invoke_lambda (Resource) - - - - - - -## Schema - -### Required - -- `function_name` (String) -- `payload` (String) -- `region` (String) - -### Optional - -- `aws_profile` (String) -- `id` (String) The ID of this resource. - - -## Example Usage - -```terraform - -terraform { - required_providers { - toluna = { - source = "toluna-terraform/toluna" - version = ">=0.0.9" - } - } -} - -provider "aws" { - region = "us-east-1" - profile = "my-profile" -} - -provider "toluna" { - -} - -resource "toluna_invoke_lambda" "example" { - region = "us-east-1" - aws_profile = "my-profile" - function_name = "my_lambda" - payload = jsonencode({"name": "example pay load"}) -} -``` \ No newline at end of file diff --git a/docs/resources/start_codebuild.md b/docs/resources/start_codebuild.md deleted file mode 100644 index 9e156aa..0000000 --- a/docs/resources/start_codebuild.md +++ /dev/null @@ -1,72 +0,0 @@ ---- -# generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "toluna_start_codebuild Resource - terraform-provider-toluna" -subcategory: "" -description: |- - ---- - -# toluna_start_codebuild (Resource) - - - - - - -## Schema - -### Required - -- `project_name` (String) -- `region` (String) - -### Optional - -- `aws_profile` (String) -- `id` (String) The ID of this resource. -- `payload` (String) - - -## Example Usage - -```terraform - -terraform { - required_providers { - toluna = { - source = "toluna-terraform/toluna" - version = ">=0.0.9" - } - } -} - -provider "aws" { - region = "us-east-1" - profile = "my-profile" -} - -provider "toluna" { - -} - -resource "toluna_start_codebuild" "example" { - region = "us-east-1" - aws_profile = "my-profile" - project_name = "my_project" - environment_variables { - name = "my-variable" - value = "FOO" - type = "PLAINTEXT" - } - environment_variables { - name = "my-secret-variable" - value = "BAR" - type = "PARAMETER_STORE" - } - environment_variables { - name = "my-other-secret-variable" - value = "BAR" - type = "SECRETS_MANAGER" - } -} -``` \ No newline at end of file diff --git a/docs/resources/toluna_invoke_lambda.md b/docs/resources/toluna_invoke_lambda.md new file mode 100644 index 0000000..2cba2e5 --- /dev/null +++ b/docs/resources/toluna_invoke_lambda.md @@ -0,0 +1,29 @@ +--- +# generated by https://github.com/hashicorp/terraform-plugin-docs +page_title: "toluna_invoke_lambda Resource - terraform-provider-toluna-v2" +subcategory: "" +description: |- + +--- + +# toluna_invoke_lambda (Resource) + + + + + + +## Schema + +### Required + +- `function_name` (String) +- `payload` (String) +- `region` (String) + +### Optional + +- `aws_profile` (String) +- `id` (String) The ID of this resource. + + diff --git a/docs/resources/toluna_start_codebuild.md b/docs/resources/toluna_start_codebuild.md new file mode 100644 index 0000000..8f48578 --- /dev/null +++ b/docs/resources/toluna_start_codebuild.md @@ -0,0 +1,38 @@ +--- +# generated by https://github.com/hashicorp/terraform-plugin-docs +page_title: "toluna_start_codebuild Resource - terraform-provider-toluna-v2" +subcategory: "" +description: |- + +--- + +# toluna_start_codebuild (Resource) + + + + + + +## Schema + +### Required + +- `project_name` (String) +- `region` (String) + +### Optional + +- `aws_profile` (String) +- `environment_variables` (Block Set) (see [below for nested schema](#nestedblock--environment_variables)) +- `id` (String) The ID of this resource. + + +### Nested Schema for `environment_variables` + +Required: + +- `name` (String) +- `type` (String) +- `value` (String) + + diff --git a/docs/resources/validate_configuration.md b/docs/resources/validate_configuration.md deleted file mode 100644 index a08961d..0000000 --- a/docs/resources/validate_configuration.md +++ /dev/null @@ -1,80 +0,0 @@ ---- -# generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "toluna_validate_configuration Data Source - terraform-provider-toluna" -subcategory: "" -description: |- - ---- - -# toluna_invoke_lambda (Resource) - - - - - - -## Schema - -### Required - -- `rule_set` (Block) - - key_name (String) - - rule (String) - - value (String) -- `json_config` (Map) - - -### Optional - - -## Example Usage - -```terraform - -terraform { - required_providers { - toluna = { - source = "toluna-terraform/toluna" - version = ">=0.0.9" - } - } -} - -provider "aws" { - region = "us-east-1" - profile = "my-profile" -} - -provider "toluna" { - -} - -data "toluna_validate_configuration" "example" { - rule_set { - key_name = "key" - rule ="unique" - value = "nil" - } - rule_set { - key_name = "$..env_index" - rule ="odd" - value = "nil" - } - rule_set { - key_name = "$..env_index" - rule =">" - value = "6" - } - rule_set { - key_name = "$..env_index" - rule ="<" - value = "21" - } - rule_set { - key_name = "key" - rule ="~=" - value = "example" - } - json_config = data.consul_keys.appjson.var -} -``` \ No newline at end of file diff --git a/examples/basic/main.tf b/examples/basic/main.tf index 147453a..6fda485 100644 --- a/examples/basic/main.tf +++ b/examples/basic/main.tf @@ -46,31 +46,13 @@ resource "toluna_start_codebuild" "example" { } } -data "toluna_validate_configuration" "example" { - rule_set { - key_name = "key" - rule ="unique" - value = "nil" - } - rule_set { - key_name = "$..env_index" - rule ="odd" - value = "nil" - } - rule_set { - key_name = "$..env_index" - rule =">" - value = "6" - } - rule_set { - key_name = "$..env_index" - rule ="<" - value = "21" - } - rule_set { - key_name = "key" - rule ="~=" - value = "example" - } - json_config = data.consul_keys.appjson.var -} \ No newline at end of file +data "toluna_environment_config" "app_json" { + address = "consul-cluster-test.consul.1234546-abcd-efgh-ijkl-12345678.aws.hashicorp.cloud" + scheme = "https" + path = "terraform/app-name/app-env.json" + validation_rules = "terraform/validations/app-config.json" +} + +locals { + env_vars = jsondecode("${data.toluna_environment_config.app_json.configuration}")[local.env_name] +} \ No newline at end of file diff --git a/examples/terraform-custom-validations/README.md b/examples/terraform-custom-validations/README.md deleted file mode 100644 index 571de6e..0000000 --- a/examples/terraform-custom-validations/README.md +++ /dev/null @@ -1,68 +0,0 @@ -Adding custom validations to Terraform [Terraform module](https://registry.terraform.io/modules/toluna-terraform/validations/latest) - -### Description -This module supports adding custom validations not supported by out of the box Terraform validations upon plan. -This is achieved by running a bash script containing custom functions , that can be call wit h different arguments, -the arguments should include the -a|--action flag which calls the function (action = function name) and any other flags required by the specific function. - - -## Usage - -```hcl -#The following example validates there are no duplicate environments under two different data layers: -module "validate" { - source = "toluna-terraform/validations/custom" - version = "~>0.0.1" // Change to the required version. - arguments = "-a validate_duplicate_env -f ${path.module}/some_json_file.json" -} -#The following example validates you cannot enter a negative value as an index number or an index higher then maximum possible ciders in a json file: -module "validate" { - source = "toluna-terraform/validations/custom" - version = "~>0.0.1" // Change to the required version. - arguments = "-a validate_min_max_env -f ${path.module}/some_json_file.json -m 15" -} -#The following example validates you cannot enter a duplicate index number in a json file: -module "validate" { - source = "toluna-terraform/validations/custom" - version = "~>0.0.1" // Change to the required version. - arguments = "-a validate_duplicate_index -f ${path.module}/some_json_file.json" -} -``` - -## Toggles -#### Validate arguments: -```yaml -arguments = command line arguments to pass to the validation script I.E. -a funcation name to run -f some file to validate -``` - -## Requirements - -| Name | Version | -|------|---------| -| [terraform](#requirement\_terraform) | >= 1.0.0 | - - -## Providers - -| Name | Version | -|------|---------| -| [assert](https://github.com/bwoznicki/terraform-provider-assert) | >= 0.0.1 | - - -## Modules - -| Name | Source | Version | -|------|--------|---------| -| [validate](#module\validate) | ../../ | | - -## Resources - -No Resources. - -## Inputs - -No inputs. - -## Outputs - -No outputs. diff --git a/examples/terraform-custom-validations/main.tf b/examples/terraform-custom-validations/main.tf deleted file mode 100644 index c038db8..0000000 --- a/examples/terraform-custom-validations/main.tf +++ /dev/null @@ -1,15 +0,0 @@ -module "validate_max_index" { - source = "../../" - arguments = "-a validate_min_max_env -f ${path.module}/myJsonFile.json -m 15" -} - -module "validate_duplicate_index" { - source = "../../" - arguments = "-a validate_duplicate_index -f ${path.module}/myJsonFile.json" -} - -module "validate_duplicate_env" { - source = "../../" - arguments = "-a validate_duplicate_env -f ${path.module}/myJsonFile.json" -} - diff --git a/go.mod b/go.mod index 7486cc4..3370de8 100644 --- a/go.mod +++ b/go.mod @@ -10,17 +10,16 @@ require ( require ( github.com/armon/go-metrics v0.3.10 // indirect - github.com/gobwas/glob v0.2.3 // indirect + github.com/go-test/deep v1.0.7 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-immutable-radix v1.3.0 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/serf v0.9.7 // indirect - github.com/jstemmer/go-junit-report v1.0.0 // indirect - github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/kr/pretty v0.3.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/olekukonko/tablewriter v0.0.5 // indirect + github.com/sergi/go-diff v1.2.0 // indirect ) require ( @@ -31,7 +30,7 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/hashicorp/consul/api v1.15.3 - github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect github.com/hashicorp/go-hclog v1.2.1 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -47,9 +46,6 @@ require ( github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect - github.com/keilerkonzept/terraform-module-versions v0.0.0-20220805224222-92ba05627f69 - github.com/kr/pretty v0.2.1 // indirect - github.com/kr/text v0.2.0 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect @@ -58,7 +54,6 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/oklog/run v1.0.0 // indirect - github.com/sgreben/flagvar v1.10.1 github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect github.com/vmihailenco/tagparser v0.1.1 // indirect diff --git a/go.sum b/go.sum index a640868..ecbe5e7 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,6 @@ github.com/PaesslerAG/gval v1.0.0/go.mod h1:y/nm5yEyTeX6av0OfKJNp9rBNj2XrGhAf5+v github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= github.com/PaesslerAG/jsonpath v0.1.1 h1:c1/AToHQMVsduPAa4Vh6xp2U0evy4t8SWp8imEsylIk= github.com/PaesslerAG/jsonpath v0.1.1/go.mod h1:lVboNxFGal/VwW6d9JzIy56bUsYAP6tH/x80vjnCseY= -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/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -64,9 +62,8 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= -github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= -github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M= +github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -88,6 +85,7 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -105,9 +103,11 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.15.3 h1:WYONYL2rxTXtlekAqblR2SCdJsizMDIj/uXb5wNy9zU= github.com/hashicorp/consul/api v1.15.3/go.mod h1:/g/qgcoBcEXALCNZgRRisyTW0nY86++L0KbeAMXYCeY= +github.com/hashicorp/consul/sdk v0.11.0 h1:HRzj8YSCln2yGgCumN5CL8lYlD3gBurnervJRJAZyC4= github.com/hashicorp/consul/sdk v0.11.0/go.mod h1:yPkX5Q6CsxTFMjQQDJwzeNmUUF5NUGGbrDsv9wTb8cw= -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/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= @@ -122,6 +122,7 @@ github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrhxx+FVELeXpVPE= github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= @@ -133,6 +134,7 @@ github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= @@ -146,8 +148,6 @@ github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+DbLISwf2B8WXEolNRA8BGCwI9jws= -github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/hcl/v2 v2.14.1 h1:x0BpjfZ+CYdbiz+8yZTQ+gdLO7IXvOut7Da+XJayx34= @@ -156,6 +156,7 @@ github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.3.1 h1:MXgUXLqva1QvpVEDQW1IQLG0wivQAtmFlHRQ+1vWZfM= github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.9.7 h1:hkdgbqizGQHuU5IPqYM1JdSMV8nKfpuOnZYXssk9muY= github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= @@ -180,17 +181,14 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jstemmer/go-junit-report v1.0.0 h1:8X1gzZpR+nVQLAht+L/foqOeX2l9DTZoaIPbEQHxsds= -github.com/jstemmer/go-junit-report v1.0.0/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/keilerkonzept/terraform-module-versions v0.0.0-20220805224222-92ba05627f69 h1:TKBcj3RAo0lrRbf7YIMsSeXg43hDM5T3IpaZ/dL1y0c= -github.com/keilerkonzept/terraform-module-versions v0.0.0-20220805224222-92ba05627f69/go.mod h1:LDC3iYOmwYvtdSwLSk70xzQZanBgwEI+L1J/W1jvKMU= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= 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= @@ -210,10 +208,9 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= @@ -223,7 +220,6 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= -github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= @@ -241,12 +237,12 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k+Mg7cowZ8yv4Trqw9UsJby758= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.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= @@ -265,14 +261,18 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/sgreben/flagvar v1.10.1 h1:ukN3zqVj9T9U7CiKG6owmejxswJYMbAg9Mxkhi1B4tw= -github.com/sgreben/flagvar v1.10.1/go.mod h1:AxDmbFDIxZ4dHj2zg8LxuJn5CSwSS28iY/Wy56e+nhI= +github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/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/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -420,6 +420,7 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/terraform-provider-toluna-v2 b/terraform-provider-toluna-v2 deleted file mode 100755 index 66984ba..0000000 Binary files a/terraform-provider-toluna-v2 and /dev/null differ