Merge pull request #115 from lorengordon/cleanup-provider

plus3it · Jan 19, 2021 · b8ebd5a · b8ebd5a
2 parents 837dc63 + 6b0d02a
commit b8ebd5a
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 631 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.0
+current_version = 2.0.1
 commit = True
 message = Bumps version to {new_version}
 tag = False

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,26 +5,11 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-- package-ecosystem: pip
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-- package-ecosystem: gomod
-  directory: "/tests"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
 - package-ecosystem: terraform
   directory: "/tests/use_all_variables"
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-- package-ecosystem: terraform
-  directory: "/tests/no_create_sg"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
 - package-ecosystem: terraform
   directory: "/tests/create_sg"
   schedule:

diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,8 @@ tardigrade-ci/
 # eclint
 .git/
 
+# terratest packaging
+tests/go.*
+
+# terraform lock-file
+.terraform.lock.hcl
diff --git a/main.tf b/main.tf
@@ -1,11 +1,11 @@
-provider "aws" {
-}
-
 resource "aws_security_group" "this" {
-
   name        = var.name
   description = var.description
   vpc_id      = var.vpc_id
+  tags        = var.tags
+
+  revoke_rules_on_delete = var.revoke_rules_on_delete
+
   dynamic "ingress" {
     for_each = var.ingress_rules
     content {
@@ -35,6 +35,4 @@ resource "aws_security_group" "this" {
       to_port          = lookup(egress.value, "to_port", null)
     }
   }
-  revoke_rules_on_delete = var.revoke_rules_on_delete
-  tags                   = var.tags
 }
diff --git a/requirements/dev.txt b/requirements/dev.txt
diff --git a/tests/create_sg/main.tf b/tests/create_sg/main.tf
@@ -4,19 +4,13 @@ provider "aws" {
 
 module "vpc" {
   source = "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v2.15.0"
-  providers = {
-    aws = aws
-  }
 
   name = "tardigrade-security-group-testing"
   cidr = "10.0.0.0/16"
 }
 
 module "create_security_group" {
   source = "../../"
-  providers = {
-    aws = aws
-  }
 
   name   = "tardigrade-security-group-testing"
   vpc_id = module.vpc.vpc_id

diff --git a/tests/go.mod b/tests/go.mod
diff --git a/tests/go.sum b/tests/go.sum
diff --git a/tests/use_all_variables/main.tf b/tests/use_all_variables/main.tf
@@ -4,22 +4,23 @@ provider "aws" {
 
 module "vpc" {
   source = "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v2.15.0"
-  providers = {
-    aws = aws
-  }
 
   name = "tardigrade-security-group-testing"
   cidr = "10.0.0.0/16"
 }
 
 module "use_all_variables" {
   source = "../../"
-  providers = {
-    aws = aws
-  }
 
   name   = "tardigrade-security-group-testing"
   vpc_id = module.vpc.vpc_id
+
+  revoke_rules_on_delete = true
+
+  tags = {
+    environment = "testing"
+  }
+
   ingress_rules = [
     {
       "from_port"   = "0",
@@ -37,9 +38,4 @@ module "use_all_variables" {
       "cidr_blocks" = ["0.0.0.0/0"]
     }
   ]
-
-  revoke_rules_on_delete = true
-  tags = {
-    environment = "testing"
-  }
 }