Merge pull request #7 from rhythmictech/hotfix/null-dep

relax dependency restrictions

Author: Scott Miller

.pre-commit-config.yaml

@@ -1,21 +1,19 @@
+exclude: ".terraform"
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.31.0
+    rev: v1.50.0
     hooks:
       - id: terraform_docs
         always_run: true
         args:
           - --args=--sort-by-required
       - id: terraform_fmt
-      - id: terraform_tflint
-        alias: terraform_tflint_deep
-        name: terraform_tflint_deep
-        args:
-          - --args=--deep
       - id: terraform_tflint
         alias: terraform_tflint_nocreds
         name: terraform_tflint_nocreds
       - id: terraform_tfsec
+        args:
+          - "--args=--exclude-downloaded-modules"
   - repo: local
     hooks:
       - id: terraform_validate
@@ -33,14 +31,15 @@ repos:
               cd $(dirname "$FILE")
               terraform init --backend=false
               terraform validate .
+              cd ..
             done
           '
         language: system
         verbose: true
         files: \.tf(vars)?$
         exclude: examples
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.0.0
+    rev: v3.4.0
     hooks:
       - id: check-case-conflict
       - id: check-json

.terraform-version

@@ -0,0 +1 @@
+latest:^0.14

.tflint.hcl

@@ -1,6 +1,5 @@
 config {
   module     = true
-  deep_check = false
 }
 
 rule "terraform_deprecated_interpolation" {

README.md

@@ -33,51 +33,73 @@ Creates a password with a Lambda data source and saves it in a secrets manager s
 
 | Name | Version |
 |------|---------|
-| terraform | >= 0.12.28 |
-| aws | >= 2.45, < 4.0 |
-| external | ~> 1.2 |
-| null | ~> 2.1 |
-| random | ~> 2.3 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.28 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 2.45 |
+| <a name="requirement_external"></a> [external](#requirement\_external) | >= 1.2 |
+| <a name="requirement_null"></a> [null](#requirement\_null) | >= 2.1 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.3 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | >= 2.45, < 4.0 |
-| external | ~> 1.2 |
-| null | ~> 2.1 |
-| random | ~> 2.3 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 2.45 |
+| <a name="provider_external"></a> [external](#provider\_external) | >= 1.2 |
+| <a name="provider_null"></a> [null](#provider\_null) | >= 2.1 |
+| <a name="provider_random"></a> [random](#provider\_random) | >= 2.3 |
+
+## Modules
+
+| Name | Source | Version |
+|------|--------|---------|
+| <a name="module_lambda_invocation"></a> [lambda\_invocation](#module\_lambda\_invocation) | matti/resource/shell | ~>1.0.7 |
+| <a name="module_lambda_invocation_result"></a> [lambda\_invocation\_result](#module\_lambda\_invocation\_result) | matti/resource/shell | ~>1.0.7 |
+| <a name="module_lambda_version"></a> [lambda\_version](#module\_lambda\_version) | rhythmictech/find-release-by-semver/github | ~> 1.0 |
+
+## Resources
+
+| Name | Type |
+|------|------|
+| [aws_iam_role.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
+| [aws_iam_role_policy.secret_write](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
+| [aws_iam_role_policy_attachment.lambda_basic_execution](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
+| [aws_lambda_function.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function) | resource |
+| [aws_secretsmanager_secret.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/secretsmanager_secret) | resource |
+| [null_resource.lambda_zip](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
+| [random_string.trigger](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
+| [aws_iam_policy_document.assume](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
+| [aws_iam_policy_document.secret_write](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
+| [external_external.sha](https://registry.terraform.io/providers/hashicorp/external/latest/docs/data-sources/external) | data source |
 
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| length | Length of the password to be created | `number` | n/a | yes |
-| name | Moniker to apply to all resources in the module | `string` | n/a | yes |
-| keepers | Arbitrary map of values that when changed will force a new password | `map(string)` | `{}` | no |
-| lambda\_version\_constraint | NPM-style version constraint for the version of the lambda code you want to use | `string` | `"^1.0.3"` | no |
-| lower | Whether to use lower case characters | `bool` | `true` | no |
-| min\_lower | Minimum number of lowercase letters | `number` | `0` | no |
-| min\_numeric | Minimum number of numeric characters to use. Must be at least 1 | `number` | `1` | no |
-| min\_special | Minimum number of special characters to use. Must be at least 1 | `number` | `1` | no |
-| min\_upper | Minimum number of uppercase characters to use. Must be at least 1 | `number` | `1` | no |
-| number | Whether to use numbers | `bool` | `true` | no |
-| override\_special | Supply your own list of special characters to use for string generation | `string` | `"!@#$%&*()-_=+[]{}<>:?"` | no |
-| secret\_description | Set a description for the secret | `string` | `"A password created by Terraform"` | no |
-| special | Whether to use special characters | `bool` | `true` | no |
-| tags | User-Defined tags | `map(string)` | `{}` | no |
-| upper | Whether to use uppercase characters | `bool` | `true` | no |
+| <a name="input_length"></a> [length](#input\_length) | Length of the password to be created | `number` | n/a | yes |
+| <a name="input_name"></a> [name](#input\_name) | Moniker to apply to all resources in the module | `string` | n/a | yes |
+| <a name="input_keepers"></a> [keepers](#input\_keepers) | Arbitrary map of values that when changed will force a new password | `map(string)` | `{}` | no |
+| <a name="input_lambda_version_constraint"></a> [lambda\_version\_constraint](#input\_lambda\_version\_constraint) | NPM-style version constraint for the version of the lambda code you want to use | `string` | `"^1.0.3"` | no |
+| <a name="input_lower"></a> [lower](#input\_lower) | Whether to use lower case characters | `bool` | `true` | no |
+| <a name="input_min_lower"></a> [min\_lower](#input\_min\_lower) | Minimum number of lowercase letters | `number` | `0` | no |
+| <a name="input_min_numeric"></a> [min\_numeric](#input\_min\_numeric) | Minimum number of numeric characters to use. Must be at least 1 | `number` | `1` | no |
+| <a name="input_min_special"></a> [min\_special](#input\_min\_special) | Minimum number of special characters to use. Must be at least 1 | `number` | `1` | no |
+| <a name="input_min_upper"></a> [min\_upper](#input\_min\_upper) | Minimum number of uppercase characters to use. Must be at least 1 | `number` | `1` | no |
+| <a name="input_number"></a> [number](#input\_number) | Whether to use numbers | `bool` | `true` | no |
+| <a name="input_override_special"></a> [override\_special](#input\_override\_special) | Supply your own list of special characters to use for string generation | `string` | `"!@#$%&*()-_=+[]{}<>:?"` | no |
+| <a name="input_secret_description"></a> [secret\_description](#input\_secret\_description) | Set a description for the secret | `string` | `"A password created by Terraform"` | no |
+| <a name="input_special"></a> [special](#input\_special) | Whether to use special characters | `bool` | `true` | no |
+| <a name="input_tags"></a> [tags](#input\_tags) | User-Defined tags | `map(string)` | `{}` | no |
+| <a name="input_upper"></a> [upper](#input\_upper) | Whether to use uppercase characters | `bool` | `true` | no |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
-| lambda\_version | The selected version of the Lambda code |
-| lambda\_version\_info | all information about the selected version of the Lambda code |
-| result | String result of Lambda execution |
-| secret\_arn | ARN of the secret containing the password |
-| secret\_name | Name of the secret containing the password |
-
+| <a name="output_lambda_version"></a> [lambda\_version](#output\_lambda\_version) | The selected version of the Lambda code |
+| <a name="output_lambda_version_info"></a> [lambda\_version\_info](#output\_lambda\_version\_info) | all information about the selected version of the Lambda code |
+| <a name="output_result"></a> [result](#output\_result) | String result of Lambda execution |
+| <a name="output_secret_arn"></a> [secret\_arn](#output\_secret\_arn) | ARN of the secret containing the password |
+| <a name="output_secret_name"></a> [secret\_name](#output\_secret\_name) | Name of the secret containing the password |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 ## The Giants Underneath this Module

bin/install-macos.sh

@@ -14,5 +14,4 @@ git config --global init.templateDir ~/.git-template
 pre-commit init-templatedir ~/.git-template
 
 echo 'installing terraform with tfenv'
-tfenv install min-required
-tfenv use min-required
+tfenv install

bin/install-ubuntu.sh

@@ -3,8 +3,9 @@
 echo 'installing dependencies'
 sudo apt install python3-pip gawk &&\
 pip3 install pre-commit
-curl -sL "$(curl -sL https://api.github.com/repos/segmentio/terraform-docs/releases/latest | grep -o -E "https://.+?-linux-amd64")" > terraform-docs && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/
-curl -sL "$(curl -sL https://api.github.com/repos/terraform-linters/tflint/releases/latest | grep -o -E "https://.+?_linux_amd64.zip")" > tflint.zip && unzip tflint.zip && rm tflint.zip && sudo mv tflint /usr/bin/
+tfdocs_latest_dl_url=$(curl -sL https://api.github.com/repos/terraform-docs/terraform-docs/releases/latest | grep -o -E "https://.+?-linux-amd64" | tail -n1)
+curl -L "$tfdocs_latest_dl_url" > terraform-docs && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/
+curl -L "$(curl -sL https://api.github.com/repos/terraform-linters/tflint/releases/latest | grep -o -E "https://.+?_linux_amd64.zip")" > tflint.zip && unzip tflint.zip && rm tflint.zip && sudo mv tflint /usr/bin/
 env GO111MODULE=on go get -u github.com/liamg/tfsec/cmd/tfsec
 git clone https://github.com/tfutils/tfenv.git ~/.tfenv || true
 mkdir -p ~/.local/bin/
@@ -19,5 +20,4 @@ git config --global init.templateDir ~/.git-template
 pre-commit init-templatedir ~/.git-template
 
 echo 'installing terraform with tfenv'
-tfenv install min-required
-tfenv use min-required
+tfenv install

bin/install.sh

@@ -0,0 +1,10 @@
+#! /bin/bash
+unameOut="$(uname -s)"
+case "${unameOut}" in
+  Linux*)
+    ./bin/install-ubuntu.sh
+    ;;
+  Darwin*)
+    ./bin/install-macos.sh
+    ;;
+esac

versions.tf

@@ -4,22 +4,22 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 2.45, < 4.0"
+      version = ">= 2.45"
     }
 
     external = {
       source  = "hashicorp/external"
-      version = "~> 1.2"
+      version = ">= 1.2"
     }
 
     null = {
       source  = "hashicorp/null"
-      version = "~> 2.1"
+      version = ">= 2.1"
     }
 
     random = {
       source  = "hashicorp/random"
-      version = "~> 2.3"
+      version = ">= 2.3"
     }
   }
 }