removing dependencies

tomarv2 · tomarv2 · commit dc4bebe2a24e · 2022-03-03T08:55:07.000-08:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,33 +1,38 @@
 repos:
   - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.48.0
+    rev: v1.60.0
     hooks:
       - id: terraform_fmt
       - id: terraform_tflint
         args:
           - '--args=--only=terraform_deprecated_interpolation'
           - '--args=--only=terraform_deprecated_index'
-          - '--args=--only=terraform_unused_declarations' #
+          - '--args=--only=terraform_unused_declarations'
           - '--args=--only=terraform_comment_syntax'
           - '--args=--only=terraform_documented_outputs'
           - '--args=--only=terraform_documented_variables'
           - '--args=--only=terraform_typed_variables'
           - '--args=--only=terraform_module_pinned_source'
           - '--args=--only=terraform_naming_convention'
-          - '--args=--only=terraform_standard_module_structure' #
+          - '--args=--only=terraform_required_providers'
+          - '--args=--only=terraform_standard_module_structure'
           - '--args=--only=terraform_workspace_remote'
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v4.1.0
     hooks:
       - id: trailing-whitespace
-      - id: check-merge-conflict
       - id: end-of-file-fixer
+      - id: check-docstring-first
       - id: check-yaml
+      - id: debug-statements
+      - id: double-quote-string-fixer
+      - id: name-tests-test
+      - id: requirements-txt-fixer
 
   - repo: https://github.com/bridgecrewio/checkov.git
-    rev: '2.0.469'
+    rev: '2.0.914'
     hooks:
     - id: checkov
       verbose: true
-      args: [-d, '.', --framework,'terraform', --skip-check, 'CKV_AWS_158']
+      args: [-d, '.', --framework,'terraform', --skip-check, 'CKV_AWS_158', --download-external-modules, 'True']
diff --git a/README.md b/README.md
@@ -111,3 +111,55 @@ module "target_group" {
 ```
 
 Please refer to examples directory [link](examples) for references.
+
+## Requirements
+
+| Name | Version |
+|------|---------|
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.1 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.63 |
+
+## Providers
+
+| Name | Version |
+|------|---------|
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 3.47.0 |
+
+## Modules
+
+| Name | Source | Version |
+|------|--------|---------|
+| <a name="module_global"></a> [global](#module\_global) | git::git@github.com:tomarv2/terraform-global.git//aws | v0.0.1 |
+
+## Resources
+
+| Name | Type |
+|------|------|
+| [aws_lb_target_group.target_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lb_target_group) | resource |
+| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
+| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
+
+## Inputs
+
+| Name | Description | Type | Default | Required |
+|------|-------------|------|---------|:--------:|
+| <a name="input_deploy_target_group"></a> [deploy\_target\_group](#input\_deploy\_target\_group) | feature flag, true or false | `bool` | `true` | no |
+| <a name="input_deregistration_delay"></a> [deregistration\_delay](#input\_deregistration\_delay) | deregistration delay | `string` | `"300"` | no |
+| <a name="input_healthcheck_interval"></a> [healthcheck\_interval](#input\_healthcheck\_interval) | health check interval | `string` | `""` | no |
+| <a name="input_healthcheck_matcher"></a> [healthcheck\_matcher](#input\_healthcheck\_matcher) | healthcheck matcher (e.g. 200) | `string` | `""` | no |
+| <a name="input_healthcheck_path"></a> [healthcheck\_path](#input\_healthcheck\_path) | target group health check path | `string` | `""` | no |
+| <a name="input_healthcheck_timeout"></a> [healthcheck\_timeout](#input\_healthcheck\_timeout) | health check timeout | `string` | `""` | no |
+| <a name="input_healthy_threshold"></a> [healthy\_threshold](#input\_healthy\_threshold) | target group health check threshold | `string` | `""` | no |
+| <a name="input_lb_port"></a> [lb\_port](#input\_lb\_port) | load balancer port | `list(any)` | <pre>[<br>  80<br>]</pre> | no |
+| <a name="input_lb_protocol"></a> [lb\_protocol](#input\_lb\_protocol) | load balancer protocol | `string` | `"HTTP"` | no |
+| <a name="input_prjid"></a> [prjid](#input\_prjid) | Name of the project/stack e.g: mystack, nifieks, demoaci. Should not be changed after running 'tf apply' | `string` | n/a | yes |
+| <a name="input_stickiness"></a> [stickiness](#input\_stickiness) | Target group sticky configuration | <pre>object({<br>    cookie_duration = number<br>    enabled         = bool<br>  })</pre> | `null` | no |
+| <a name="input_target_type"></a> [target\_type](#input\_target\_type) | target type | `string` | `"instance"` | no |
+| <a name="input_teamid"></a> [teamid](#input\_teamid) | Name of the team/group e.g. devops, dataengineering. Should not be changed after running 'tf apply' | `string` | n/a | yes |
+| <a name="input_unhealthy_threshold"></a> [unhealthy\_threshold](#input\_unhealthy\_threshold) | target group unhealthy health check threshold | `string` | `""` | no |
+
+## Outputs
+
+| Name | Description |
+|------|-------------|
+| <a name="output_target_group_arn"></a> [target\_group\_arn](#output\_target\_group\_arn) | Target group arn |
diff --git a/examples/sample/main.tf b/examples/sample/main.tf
@@ -1,12 +1,19 @@
+terraform {
+  required_version = ">= 1.0.1"
+  required_providers {
+    aws = {
+      version = "~> 3.63"
+    }
+  }
+}
+
 provider "aws" {
-  region  = "us-west-2"
-  profile = "default"
+  region = var.region
 }
 
 module "target_group" {
   source = "../../"
 
-  account_id           = "12345679012"
   lb_protocol          = "HTTP"
   lb_port              = [80]
   healthcheck_path     = "/"
diff --git a/examples/sample/variables.tf b/examples/sample/variables.tf
@@ -1,9 +1,15 @@
 variable "teamid" {
-  description = "(Required) Name of the team/group e.g. devops, dataengineering. Should not be changed after running 'tf apply'"
+  description = "Name of the team/group e.g. devops, dataengineering. Should not be changed after running 'tf apply'"
   type        = string
 }
 
 variable "prjid" {
-  description = "(Required) Name of the project/stack e.g: mystack, nifieks, demoaci. Should not be changed after running 'tf apply'"
+  description = "Name of the project/stack e.g: mystack, nifieks, demoaci. Should not be changed after running 'tf apply'"
+  type        = string
+}
+
+variable "region" {
+  description = "AWS region to create resources"
+  default     = "us-west-2"
   type        = string
 }
diff --git a/locals.tf b/locals.tf
@@ -10,8 +10,8 @@ locals {
       "project" = var.prjid
     }
   )
-  account_info        = var.account_id != null ? var.account_id : data.aws_caller_identity.current.account_id
-  override_aws_region = var.aws_region != null ? var.aws_region : data.aws_region.current.name
+  account_id = data.aws_caller_identity.current.account_id
+  region     = data.aws_region.current.name
 }
 
 data "aws_region" "current" {}
diff --git a/main.tf b/main.tf
@@ -8,7 +8,7 @@ resource "aws_lb_target_group" "target_group" {
   port     = element(var.lb_port, count.index)
   protocol = var.lb_protocol
 
-  vpc_id = module.global.vpc[local.account_info][local.override_aws_region]
+  vpc_id = module.global.vpc[local.account_id][local.region]
   tags   = merge(local.shared_tags)
 
   deregistration_delay = var.deregistration_delay
diff --git a/variables.tf b/variables.tf
@@ -1,20 +1,10 @@
 variable "teamid" {
-  description = "(Required) Name of the team/group e.g. devops, dataengineering. Should not be changed after running 'tf apply'"
+  description = "Name of the team/group e.g. devops, dataengineering. Should not be changed after running 'tf apply'"
   type        = string
 }
 
 variable "prjid" {
-  description = "(Required) Name of the project/stack e.g: mystack, nifieks, demoaci. Should not be changed after running 'tf apply'"
-  type        = string
-}
-
-variable "aws_region" {
-  description = "The AWS region to create resources"
-  type        = string
-}
-
-variable "account_id" {
-  description = "AWS account id (used to pull values from shared base module like vpc info, subnet ids)"
+  description = "Name of the project/stack e.g: mystack, nifieks, demoaci. Should not be changed after running 'tf apply'"
   type        = string
 }
 
diff --git a/versions.tf b/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_version = ">= 1.0.1"
   required_providers {
     aws = {
-      version = ">= 3.63"
+      version = "~> 3.63"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ locals {`
`10`	`10`	`"project" = var.prjid`
`11`	`11`	`}`
`12`	`12`	`)`
`13`		`- account_info = var.account_id != null ? var.account_id : data.aws_caller_identity.current.account_id`
`14`		`- override_aws_region = var.aws_region != null ? var.aws_region : data.aws_region.current.name`
	`13`	`+ account_id = data.aws_caller_identity.current.account_id`
	`14`	`+ region = data.aws_region.current.name`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`data "aws_region" "current" {}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ terraform {`
`2`	`2`	`required_version = ">= 1.0.1"`
`3`	`3`	`required_providers {`
`4`	`4`	`aws = {`
`5`		`- version = ">= 3.63"`
	`5`	`+ version = "~> 3.63"`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`