terra_boi 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c382da963578bc9a256096419450cd02796054b7ca75d5ce77307e41897ddcd
-  data.tar.gz: 3caba8cc044c94d98caa8b175de6b7c9b55ad183c8c0ed5d0d83321f50d34c53
+  metadata.gz: 50db3bc71d89b0a78756301d74e8ac147204e7921292de6da18284ab5fd586b2
+  data.tar.gz: 5719552ec7305be6f56edd10a27fc49f84104b247e9268df1b8b372549346603
 SHA512:
-  metadata.gz: b528539a06aa276113e51118ca006171e062e0c43a8121db229d066ef5cf16626b15f409a2fddf8b254bae37691061d874db9776a255bef348e5b6a9d5793bc0
-  data.tar.gz: 554494154794a213f00a7985867ad8672ef48f844dc234284a27227290ea876c8d7ef2162497a2247c9ad2315e3ad96f99b612cf6e9753e7cdf778a967ba3078
+  metadata.gz: 2b8719f11ff23ab4d90b02e7bfceb74c4fcf4272093ecf13ff1a7f44587acdaf1fe3ef0019077e41e34ad230f84deb7d683de5c9308a6dc9b8e696ecf86870f1
+  data.tar.gz: a1537c090cbcb908a88d186c79c26f4a9533b138a60041c9166317222553deaa6b545bcad9e905c591f9a1a54c5637f54a14ca28d05ccce2d7f43ca35d5da8d0

data/README.md

@@ -54,6 +54,8 @@ export AWS_SECRET_ACCESS_KEY=your_secret_access_key
 
 Then run `source ~/.zprofile` (or equivalent command for your shell if not using .zsh)
 
+Note: SSH access to created EC2 instances is granted using SSH keys existing at `~/.ssh/id_rsa.pub` and `~/.ssh/id_rsa` on your local machine. If they do not exist, create them.
+
 ### Installation - generate infrastructure code
 
 To generate boilerplate infrastructure code (config.host initializer filer, Dockerfile, Packer repository, and terraform repository):
@@ -170,6 +172,16 @@ terraform init # IF NOT ALREADY RUN
 terraform apply
 ```
 
+### Usage - ssh access
+
+ssh into ec2 instance and run bash in container:
+
+```
+ssh ubuntu@PUBLICIPOFINSTANCE
+
+docker container exec -it APP_NAME bash
+```
+
 
 
 ## Infrastructure created

data/lib/generators/terra_boi/boilerplate_generator.rb

@@ -29,6 +29,7 @@ module TerraBoi
 	  	generate "terra_boi:dockerfile --ruby_version #{class_options[:ruby_version]}"
 	  	generate "terra_boi:host_initializer --domain_name #{class_options[:domain_name]}"
 	  	generate "terra_boi:db_config"
+	  	generate "terra_boi:data_config"
 	  	generate "terra_boi:packer"
 	  end
 

data/lib/generators/terra_boi/data_config_generator.rb

@@ -0,0 +1,25 @@
+require "generators/extensions"
+
+module TerraBoi
+	class DataConfigGenerator < Rails::Generators::Base
+	  attr_accessor :application_name
+	  source_root File.expand_path('templates', __dir__)
+
+	  desc (<<-EOF
+		  Generate storage.yml (default S3 config)
+		  
+		  To execute, run rails generate terra_boi:data_config
+		  EOF
+	  	.gsub(/\t/, '')
+	  )
+
+	  def init
+	  	# defined in lib/generators/extensions
+	  	self.application_name = generate_application_name
+	  end
+
+	  def create_data_config_file
+	  	template "data_storage_config.erb", "config/storage.yml"
+	  end
+	end
+end

data/lib/generators/terra_boi/templates/data_main.erb

@@ -20,7 +20,7 @@ variable "db_username" {}
 variable "db_password" {}
 
 module "db_and_s3" {
-  source = "github.com/charliereese/terraform_modules//data?ref=v0.0.11"
+  source = "github.com/charliereese/terraform_modules//data?ref=v0.0.14"
 
   env               = "<%= config[:env] %>"
   app_name          = "<%= application_name %>"

data/lib/generators/terra_boi/templates/data_storage_config.erb

@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+amazon:
+  service: S3
+  access_key_id: <%%= ENV["AWS_ACCESS_KEY_ID"] %>
+  secret_access_key: <%%= ENV["AWS_SECRET_ACCESS_KEY"] %>
+  region: us-east-2
+  bucket: <%= application_name %>-<%%= ENV["INFRASTRUCTURE_ENV"] %>-web-assets
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]

data/lib/generators/terra_boi/templates/packer_ami_build.erb

@@ -6,8 +6,10 @@ sudo apt -y install docker.io
 docker --version
 
 # Set DB and DockerHub usernames
-export DB_PASSWORD=$DB_PASSWORD
-export DOCKERHUB_USERNAME=$DOCKERHUB_USERNAME
+echo "DB_PASSWORD=$DB_PASSWORD" >> /etc/environment
+echo "DOCKERHUB_USERNAME=$DOCKERHUB_USERNAME" >> /etc/environment
+echo "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> /etc/environment
+echo "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> /etc/environment
 
 # # Start the Docker service
 sudo service docker start

data/lib/generators/terra_boi/templates/packer_application.erb

@@ -36,7 +36,10 @@
 		"environment_vars": [
     	"DOCKERHUB_ACCESS_TOKEN={{user `DOCKERHUB_ACCESS_TOKEN`}}",
     	"DOCKERHUB_USERNAME={{user `DOCKERHUB_USERNAME`}}",
-    	"DB_PASSWORD={{user `DB_PASSWORD`}}"
+    	"DB_PASSWORD={{user `DB_PASSWORD`}}",
+    	"AWS_ACCESS_KEY_ID={{user `AWS_ACCESS_KEY_ID`}}",
+    	"AWS_SECRET_ACCESS_KEY={{user `AWS_SECRET_ACCESS_KEY`}}"
+
     ],
 		"script": "ami_build.sh"
 	}]

data/lib/generators/terra_boi/templates/state_main.erb

@@ -3,7 +3,7 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 module "remote_state_locking" {
-  source = "github.com/charliereese/terraform_modules//state?ref=v0.0.11"
+  source = "github.com/charliereese/terraform_modules//state?ref=v0.0.14"
 
   app_name = "<%= application_name %>"
   region   = "us-east-2"

data/lib/generators/terra_boi/templates/web_servers_main.erb

@@ -17,15 +17,15 @@ terraform {
 # ---------------------------------------------------------------------------------------------------------------------
 
 module "webserver_cluster" {
-  source = "github.com/charliereese/terraform_modules//web_servers?ref=v0.0.11"
+  source = "github.com/charliereese/terraform_modules//web_servers?ref=v0.0.14"
 
-  instance_type       = "t2.micro"
-  env                 = "<%= config[:env] %>"
-  app_name            = "<%= application_name %>"
-  domain_name         = "<%= config[:domain_name] %>"
-  id_rsa_pub					= "<%= id_rsa_pub %>"
-  min_size            = 1
-  max_size            = 1
-  business_hours_size = 1
-  night_hours_size    = 1
+  instance_type       	= "t2.micro"
+  env                 	= "<%= config[:env] %>"
+  app_name            	= "<%= application_name %>"
+  domain_name         	= "<%= config[:domain_name] %>"
+  id_rsa_pub						= "<%= id_rsa_pub %>"
+  min_size            	= 1
+  max_size            	= 1
+  business_hours_size 	= 1
+  night_hours_size    	= 1
 }

data/lib/generators/terra_boi/templates/web_servers_user_data.erb

@@ -0,0 +1,23 @@
+#!/bin/bash
+sleep 5
+
+# Set ENV vars from terraform
+echo "APPLICATION_NAME=${application_name}" >> /etc/environment
+echo "DB_HOST=${db_address}" >> /etc/environment
+echo "DB_USERNAME=${db_username}" >> /etc/environment
+echo "RAILS_ENV=production" >> /etc/environment
+echo "INFRASTRUCTURE_ENV=${env}" >> /etc/environment
+
+# Set DB environment variables in docker container and
+# start rails container
+sudo docker container run -p 3000:3000 --name $APPLICATION_NAME --restart always -d \
+-e DB_HOST=$DB_HOST \
+-e DB_USERNAME=$DB_USERNAME \
+-e RAILS_ENV=$RAILS_ENV \
+-e INFRASTRUCTURE_ENV=$INFRASTRUCTURE_ENV \
+-e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \
+-e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \
+$DOCKERHUB_USERNAME/$APPLICATION_NAME:latest
+
+# Run outstanding DB migrations
+docker container exec $APPLICATION_NAME RAILS_ENV=$RAILS_ENV rake db:migrate

data/lib/generators/terra_boi/web_servers_generator.rb

@@ -36,5 +36,13 @@ module TerraBoi
 	  		env: ['staging', 'prod']
 	  	})
 	  end
+
+	  def create_user_data_terraform_file
+	  	generate_terraform_files({
+	  		template: 'web_servers_user_data.erb',
+	  		file_path: 'web_servers/user-data.sh',
+	  		env: ['staging', 'prod']
+	  	})
+	  end
 	end
 end

data/lib/terra_boi/version.rb

@@ -1,3 +1,3 @@
 module TerraBoi
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terra_boi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Charlie Reese
@@ -48,6 +48,7 @@ files:
 - Rakefile
 - lib/generators/extensions.rb
 - lib/generators/terra_boi/boilerplate_generator.rb
+- lib/generators/terra_boi/data_config_generator.rb
 - lib/generators/terra_boi/data_generator.rb
 - lib/generators/terra_boi/db_config_generator.rb
 - lib/generators/terra_boi/dockerfile_generator.rb
@@ -57,6 +58,7 @@ files:
 - lib/generators/terra_boi/templates/Dockerfile.erb
 - lib/generators/terra_boi/templates/data_main.erb
 - lib/generators/terra_boi/templates/data_output.erb
+- lib/generators/terra_boi/templates/data_storage_config.erb
 - lib/generators/terra_boi/templates/db_config.erb
 - lib/generators/terra_boi/templates/host_initializer.erb
 - lib/generators/terra_boi/templates/packer_ami_build.erb
@@ -64,6 +66,7 @@ files:
 - lib/generators/terra_boi/templates/state_main.erb
 - lib/generators/terra_boi/templates/web_servers_main.erb
 - lib/generators/terra_boi/templates/web_servers_output.erb
+- lib/generators/terra_boi/templates/web_servers_user_data.erb
 - lib/generators/terra_boi/web_servers_generator.rb
 - lib/tasks/terra_boi_tasks.rake
 - lib/terra_boi.rb