convox_installer 2.0.0 → 3.0.1

data/spec/lib/convox_installer/requirements_spec.rb

@@ -3,7 +3,7 @@
 require 'convox_installer'
 
 RSpec.describe ConvoxInstaller::Requirements do
-  let(:convox_cli_version) { '20210208170413' }
+  let(:convox_cli_version) { '3.3.4' }
 
   before do
     allow_any_instance_of(
@@ -45,8 +45,8 @@ RSpec.describe ConvoxInstaller::Requirements do
       end
     end
 
-    context 'with Convox CLI version 3.3.4' do
-      let(:convox_cli_version) { '3.3.4' }
+    context 'with Convox CLI version 20210208170413' do
+      let(:convox_cli_version) { '20210208170413' }
 
       it 'shows the correct error message and quit' do
         req = described_class.new
@@ -55,11 +55,10 @@ RSpec.describe ConvoxInstaller::Requirements do
         expect(req).to receive(:quit!)
 
         expect(req.logger).to receive(:error).with(
-          'This script requires Convox CLI version 2.x.x. Your Convox CLI version is: 3.3.4'
+          'This script requires Convox CLI version 3.x.x. Your Convox CLI version is: 20210208170413'
         )
         expect(req.logger).to receive(:error).with(
-          'Please follow the instructions here to downgrade your ' \
-          'Convox CLI version: https://docsv2.convox.com/introduction/installation'
+          "Please run 'brew update convox' or follow the instructions at https://docs.convox.com/getting-started/introduction"
         )
 
         req.ensure_requirements!

data/terraform/elasticache.tf.erb

@@ -0,0 +1,46 @@
+resource "aws_elasticache_cluster" "elasticache_cluster" {
+  cluster_id           = "<%= config.fetch(:stack_name) %>-elasticache-<%= config.fetch(:random_id) %>"
+  engine               = "<%= config[:elasticache_engine] || 'redis' %>"
+  engine_version       = "<%= config[:elasticache_engine_version] || '6.x' %>"
+  node_type            = "<%= config[:elasticache_node_type] || 'cache.t3.medium' %>"
+  num_cache_nodes      = <%= config[:elasticache_num_cache_nodes] || 1 %>
+  port                 = <%= config[:elasticache_port] || 6379 %>
+  
+  subnet_group_name = aws_elasticache_subnet_group.elasticache_subnet_group.name
+  security_group_ids = [aws_security_group.elasticache_security_group.id]
+
+  # Workaround for weird engine_version issue where 6.x works for creation, and fails for update
+  # See: https://github.com/hashicorp/terraform-provider-aws/issues/15625#issuecomment-727759811
+  # Fixed in version 3.38.0 of the Terraform AWS provider.
+  lifecycle {
+    ignore_changes = [engine_version]
+  }
+}
+
+resource "aws_elasticache_subnet_group" "elasticache_subnet_group" {
+  name       = "<%= config.fetch(:stack_name) %>-elasticache-cluster-subnetgroup-<%= config.fetch(:random_id) %>"
+  subnet_ids = module.system.cluster.subnets
+}
+
+resource "aws_security_group" "elasticache_security_group" {
+  name = "<%= config.fetch(:stack_name) %>-elasticache-securitygroup-<%= config.fetch(:random_id) %>"
+
+  description = "Elasticache Security Group (Managed by Terraform)"
+  vpc_id      = module.system.cluster.vpc
+
+  # Only Redis in
+  ingress {
+    from_port   = 6379
+    to_port     = 6379
+    protocol    = "tcp"
+    cidr_blocks = ["10.1.0.0/16"]
+  }
+
+  # Allow all outbound traffic
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+}

data/terraform/rds.tf.erb

@@ -0,0 +1,45 @@
+resource "aws_db_instance" "rds_database" {
+  allocated_storage    = <%= config[:database_allocated_storage] || 30 %>
+  engine               = "<%= config[:database_engine] || 'postgres' %>"
+  engine_version       = "<%= config[:database_engine_version] || '14.2' %>"
+  instance_class       = "<%= config[:database_instance_class] || 'db.t3.medium' %>"
+  name                 = "<%= config.fetch(:stack_name).gsub('-', '_') %>_database"
+  identifier           = "<%= config.fetch(:stack_name) %>-rds-<%= config.fetch(:random_id) %>"
+  multi_az             = <%= config[:database_multi_az] || true %>
+  username             = "<%= config.fetch(:database_username) %>"
+  password             = "<%= config.fetch(:database_password) %>"
+
+  final_snapshot_identifier = "<%= config.fetch(:stack_name) %>-rds-<%= config.fetch(:random_id) %>-final-snapshot"
+  skip_final_snapshot = false
+
+  db_subnet_group_name = aws_db_subnet_group.rds_subnet_group.name
+  vpc_security_group_ids = [aws_security_group.rds_security_group.id]
+}
+
+resource "aws_db_subnet_group" "rds_subnet_group" {
+  name       = "<%= config.fetch(:stack_name) %>-rds-subnetgroup-<%= config.fetch(:random_id) %>"
+  subnet_ids = module.system.cluster.subnets
+}
+
+resource "aws_security_group" "rds_security_group" {
+  name = "<%= config.fetch(:stack_name) %>-rds-database-securitygroup-<%= config.fetch(:random_id) %>"
+
+  description = "RDS Security Group (Managed by Terraform)"
+  vpc_id      = module.system.cluster.vpc
+
+  # Only Postgres in
+  ingress {
+    from_port   = 5432
+    to_port     = 5432
+    protocol    = "tcp"
+    cidr_blocks = ["10.1.0.0/16"]
+  }
+
+  # Allow all outbound traffic
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+}

data/terraform/s3_bucket.tf.erb

@@ -0,0 +1,73 @@
+# AWS provider version is 3.33.0
+# https://registry.terraform.io/providers/hashicorp/aws/3.33.0
+
+provider "aws" {
+  region = "<%= config[:aws_region] %>"
+}
+
+resource "aws_kms_key" "docs_kms_key" {
+  description             = "This key is used to encrypt objects in the DocSpring S3 bucket"
+  deletion_window_in_days = 14
+}
+
+# Later versions of aws provider (e.g. 4.8.0) use separate resources for 
+# aws_s3_bucket_acl and aws_s3_bucket_cors_configuration.
+# This will need to be updated in the future.
+resource "aws_s3_bucket" "docs_s3_bucket" {
+  bucket = "<%= config.fetch(:stack_name) %>-<%= config.fetch(:s3_bucket_name) %>"
+  acl   = "private"
+
+  server_side_encryption_configuration {
+    rule {
+      apply_server_side_encryption_by_default {
+        kms_master_key_id = aws_kms_key.docs_kms_key.arn
+        sse_algorithm     = "aws:kms"
+      }
+    }
+  }
+
+  <%= config[:s3_bucket_cors_rule] %>
+}
+
+resource "aws_iam_user" "docspring_s3_user" {
+  name = "<%= config.fetch(:stack_name) %>-<%= config.fetch(:s3_bucket_name) %>"
+}
+
+resource "aws_iam_access_key" "docspring_user_access_key" {
+  user = aws_iam_user.docspring_s3_user.name
+}
+
+resource "aws_iam_user_policy" "docspring_user_s3_policy" {
+  name = "docspring_user_s3_policy"
+  user = aws_iam_user.docspring_s3_user.name
+
+  policy = jsonencode({
+    "Version": "2012-10-17",
+    "Statement": [
+      {
+        "Effect": "Allow",
+        "Action": [
+            "s3:PutObject",
+            "s3:PutObjectAcl",
+            "s3:GetObject",
+            "s3:GetObjectAcl",
+            "s3:DeleteObject"
+        ],
+        "Resource": [
+          "arn:aws:s3:::<%= config.fetch(:stack_name) %>-<%= config.fetch(:s3_bucket_name) %>/*",
+        ]
+      },
+      {
+        "Effect": "Allow",
+        "Action": [
+          "kms:Encrypt",
+          "kms:Decrypt",
+          "kms:ReEncrypt*",
+          "kms:GenerateDataKey*",
+          "kms:DescribeKey"
+        ],
+        "Resource": "*"
+      }
+    ]
+  })
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convox_installer
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Form Applications Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-02 00:00:00.000000000 Z
+date: 2022-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,6 +109,9 @@ files:
 - spec/lib/convox_installer/config_spec.rb
 - spec/lib/convox_installer/requirements_spec.rb
 - spec/spec_helper.rb
+- terraform/elasticache.tf.erb
+- terraform/rds.tf.erb
+- terraform/s3_bucket.tf.erb
 homepage: https://github.com/FormAPI/convox_installer
 licenses:
 - MIT
@@ -129,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Build a Convox installation workflow