aws_recon 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 212cb7795c7ff6e28ef56336bdd26de0e4d174e71b85f841fb71d60584e6967f
-  data.tar.gz: 2c25dacdbf4124361ae3a76726d72557ba5cb6ac16fbdffd0ae636f8d8ef5f86
+  metadata.gz: 8166ac8e24580b32dc3bd5144571d1ba499b7d0e193ab1051c07414f1dfc444b
+  data.tar.gz: 43a7207373c94f1aef7ff94e94a62d542595ba0f246aea7ae4c945a0c143aa9f
 SHA512:
-  metadata.gz: '08a247b20671f56f119101e26e257489ae71c81461e5cf59d0ccf9538c1f0a81d72bedae93eed1a5f3e9e18de846f4a9000e781b0a69c355355f8fd4195ba129'
-  data.tar.gz: e479cb51db2afc92493b06f17928a9ae6549b8799e345484835219e177c191d29360d3309eec32ba1ea9b5ae3a5e84cfa9c31c61c480c422f0022497d6e46a9b
+  metadata.gz: 13f36944733b6d7c3a387243713cd77e7d2880875bbd3f02fdb2deea663c11d74857a67985e988a40a3a196e5592048219c22e8a3c6ebddc350d49e13d7ef695
+  data.tar.gz: e818d1cde999ebb9e667710af47373d10b3369d52d0c53535396745cdea4ed7040f4331c95f697658d1a1afc897926542a9ae22fdfac6dd78ae28e451ff376b5

data/lib/aws_recon/version.rb

@@ -1,3 +1,3 @@
 module AwsRecon
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/terraform/cloudwatch.tf

@@ -1,6 +1,6 @@
 # https://www.terraform.io/docs/providers/aws/r/cloudwatch_event_rule.html
 resource "aws_cloudwatch_event_rule" "default" {
-  name                = "${var.aws_recon_base_name}-${random_id.rule.hex}"
+  name                = "${var.aws_recon_base_name}-${random_id.aws_recon.hex}"
   description         = "AWS Recon scheduled task"
   schedule_expression = var.schedule_expression
 }
@@ -24,7 +24,3 @@ resource "aws_cloudwatch_event_target" "default" {
     }
   }
 }
-
-resource "random_id" "rule" {
-  byte_length = 4
-}

data/terraform/ecs.tf

@@ -1,14 +1,10 @@
 resource "aws_ecs_cluster" "aws_recon" {
-  name               = "${var.aws_recon_base_name}-${random_id.cluster.hex}"
+  name               = "${var.aws_recon_base_name}-${random_id.aws_recon.hex}"
   capacity_providers = [local.ecs_task_provider]
 }
 
-resource "random_id" "cluster" {
-  byte_length = 4
-}
-
 resource "aws_ecs_task_definition" "aws_recon_task" {
-  family                   = "${var.aws_recon_base_name}-${random_id.cluster.hex}"
+  family                   = "${var.aws_recon_base_name}-${random_id.aws_recon.hex}"
   task_role_arn            = aws_iam_role.aws_recon_role.arn
   execution_role_arn       = aws_iam_role.ecs_task_execution.arn
   requires_compatibilities = [local.ecs_task_provider]
@@ -18,7 +14,7 @@ resource "aws_ecs_task_definition" "aws_recon_task" {
 
   container_definitions = jsonencode([
     {
-      name             = "${var.aws_recon_base_name}-${random_id.cluster.hex}"
+      name             = "${var.aws_recon_base_name}-${random_id.aws_recon.hex}"
       image            = "${var.aws_recon_container_name}:${var.aws_recon_container_version}"
       assign_public_ip = true
       entryPoint = [
@@ -42,7 +38,7 @@ resource "aws_ecs_task_definition" "aws_recon_task" {
 }
 
 resource "aws_cloudwatch_log_group" "aws_recon" {
-  name              = "/ecs/${var.aws_recon_base_name}-${random_id.cluster.hex}"
+  name              = "/ecs/${var.aws_recon_base_name}-${random_id.aws_recon.hex}"
   retention_in_days = var.retention_period
 }
 

data/terraform/output.tf

@@ -1,7 +1,3 @@
-output "aws_recon_s3_bucket" {
-  value = aws_s3_bucket.aws_recon.bucket
-}
-
 output "aws_recon_ecs_cluster" {
   value = aws_ecs_cluster.aws_recon.name
 }
@@ -10,4 +6,6 @@ output "aws_recon_ecs_scheduled_task" {
   value = aws_cloudwatch_event_rule.default.name
 }
 
-
+output "aws_recon_s3_bucket" {
+  value = aws_s3_bucket.aws_recon.bucket
+}

data/terraform/s3.tf

@@ -1,6 +1,7 @@
 resource "aws_s3_bucket" "aws_recon" {
-  bucket = "${var.aws_recon_base_name}-${random_id.bucket.hex}-${data.aws_iam_account_alias.current.id}"
-  acl    = "private"
+  bucket        = "${var.aws_recon_base_name}-${random_id.aws_recon.hex}-${data.aws_iam_account_alias.current.id}"
+  acl           = "private"
+  force_destroy = true
 
   lifecycle_rule {
     id      = "expire-after-${var.retention_period}-days"
@@ -12,8 +13,8 @@ resource "aws_s3_bucket" "aws_recon" {
   }
 }
 
-resource "random_id" "bucket" {
-  byte_length = 4
+resource "random_id" "aws_recon" {
+  byte_length = 6
 }
 
 data "aws_iam_account_alias" "current" {}

data/terraform/vpc.tf

@@ -3,7 +3,7 @@
 resource "aws_vpc" "vpc" {
   cidr_block = local.cidr_block
   tags = {
-    Name = "${var.aws_recon_base_name}-${random_id.vpc.hex}"
+    Name = "${var.aws_recon_base_name}-${random_id.aws_recon.hex}"
   }
 }
 
@@ -15,12 +15,12 @@ resource "aws_subnet" "subnet" {
   map_public_ip_on_launch = true
 
   tags = {
-    Name = "${var.aws_recon_base_name}-${random_id.vpc.hex}-public"
+    Name = "${var.aws_recon_base_name}-${random_id.aws_recon.hex}-public"
   }
 }
 
 resource "aws_security_group" "sg" {
-  name        = "${var.aws_recon_base_name}-${random_id.vpc.hex}"
+  name        = "${var.aws_recon_base_name}-${random_id.aws_recon.hex}"
   description = "Allow AWS Recon collection egress"
   vpc_id      = aws_vpc.vpc.id
 
@@ -32,7 +32,7 @@ resource "aws_security_group" "sg" {
   }
 
   tags = {
-    Name = "${var.aws_recon_base_name}-${random_id.vpc.hex}"
+    Name = "${var.aws_recon_base_name}-${random_id.aws_recon.hex}"
   }
 }
 
@@ -40,7 +40,7 @@ resource "aws_internet_gateway" "igw" {
   vpc_id = aws_vpc.vpc.id
 
   tags = {
-    Name = "${var.aws_recon_base_name}-${random_id.vpc.hex}"
+    Name = "${var.aws_recon_base_name}-${random_id.aws_recon.hex}"
   }
 }
 
@@ -53,7 +53,7 @@ resource "aws_route_table" "rt" {
   }
 
   tags = {
-    Name = "${var.aws_recon_base_name}-${random_id.vpc.hex}"
+    Name = "${var.aws_recon_base_name}-${random_id.aws_recon.hex}"
   }
 }
 
@@ -67,10 +67,6 @@ locals {
   subnet_cidr_block = cidrsubnet(local.cidr_block, 8, 0)
 }
 
-resource "random_id" "vpc" {
-  byte_length = 4
-}
-
 data "aws_region" "current" {}
 
 data "aws_availability_zones" "available" {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_recon
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Josh Larsen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk