Merge pull request #231 from lorengordon/feat/remove-python-dep

Removes sleep due to inability to reproduce error in recent aws provider versions

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.0.0
+current_version = 4.1.0
 commit = True
 message = Bumps version to {new_version}
 tag = False

README.md

@@ -14,13 +14,13 @@ provider configs for the tests require that you use a profiles with the names `r
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37.0 |
 
 ## Resources
 

modules/cross_account_principal_association/README.md

@@ -6,13 +6,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37.0 |
 
 ## Resources
 

modules/cross_account_principal_association/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source                = "hashicorp/aws"
-      version               = ">= 3.0"
+      version               = ">= 5.37.0"
       configuration_aliases = [aws.owner]
     }
   }

modules/principal_association/README.md

@@ -6,13 +6,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37.0 |
 
 ## Resources
 

modules/principal_association/main.tf

@@ -1,9 +1,4 @@
 resource "aws_ram_principal_association" "this" {
   principal          = var.principal
   resource_share_arn = var.resource_share_arn
-
-  # The invitation sometime takes a few seconds to propagate
-  provisioner "local-exec" {
-    command = "python -c 'import time; time.sleep(10)'"
-  }
 }

modules/principal_association/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.0"
+      version = ">= 5.37.0"
     }
   }
 }

modules/resource_association/README.md

@@ -6,13 +6,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37.0 |
 
 ## Resources
 

modules/resource_association/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.0"
+      version = ">= 5.37.0"
     }
   }
 }

modules/share_accepter/README.md

@@ -6,13 +6,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.37.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.37.0 |
 
 ## Resources
 

modules/share_accepter/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.0"
+      version = ">= 5.37.0"
     }
   }
 }

tests/cross_account/main.tf

@@ -29,68 +29,16 @@ module "share" {
 
   allow_external_principals = true
 
-  resources = [
-    {
-      name         = "resolver-rule"
-      resource_arn = aws_route53_resolver_rule.this.arn
-    }
-  ]
-
   tags = {
     Environment = "testing"
   }
 }
 
-module "vpc" {
-  source = "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v3.16.1"
-
-  name            = "tardigrade-ram-${random_string.this.result}"
-  cidr            = "10.0.0.0/16"
-  azs             = ["us-east-1a", "us-east-1b"]
-  private_subnets = ["10.0.1.0/24", "10.0.2.0/24"]
-}
-
-resource "aws_security_group" "this" {
-  name        = "empty_sg"
-  description = "empty_sg for testing"
-  vpc_id      = module.vpc.vpc_id
-}
-
-resource "aws_route53_resolver_endpoint" "this" {
-  name      = "tardigrade-resolver-${random_string.this.result}"
-  direction = "OUTBOUND"
-
-  security_group_ids = [
-    aws_security_group.this.id,
-  ]
-
-  ip_address {
-    subnet_id = module.vpc.private_subnets[0]
-    ip        = "10.0.1.4"
-  }
-
-  ip_address {
-    subnet_id = module.vpc.private_subnets[1]
-    ip        = "10.0.2.8"
-  }
-}
-
-resource "aws_route53_resolver_rule" "this" {
-  domain_name          = "${random_string.this.result}.com"
-  name                 = "tardigrate-rr-${random_string.this.result}"
-  rule_type            = "FORWARD"
-  resolver_endpoint_id = aws_route53_resolver_endpoint.this.id
-
-  target_ip {
-    ip = "123.45.67.89"
-  }
-}
-
 resource "random_string" "this" {
   length  = 6
   upper   = false
   special = false
-  number  = false
+  numeric = false
 }
 
 output "share" {

tests/share/main.tf

@@ -23,7 +23,7 @@ module "share" {
 }
 
 module "vpc" {
-  source = "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v3.16.1"
+  source = "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v5.15.0"
 
   name            = "tardigrade-ram-${random_string.this.result}"
   cidr            = "10.0.0.0/16"
@@ -71,7 +71,7 @@ resource "random_string" "this" {
   length  = 6
   upper   = false
   special = false
-  number  = false
+  numeric = false
 }
 
 output "share" {

versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.0"
+      version = ">= 5.37.0"
     }
   }
 }