convox_installer 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c08b32666153594de1c3464ab4c8ea4f324952115facc72fc159d75de7d1a85e
-  data.tar.gz: 2f162d039ab30ebea6ecd8086bc88b30da9c50234c614594c43725036f75f2cb
+  metadata.gz: 6a149716dcd959d0f5dc6b3eae5e4840a354ea07df9c8cf4b35efab5e8df1bbf
+  data.tar.gz: 3d5e5ee559ec366960955b0103ac55c1208ae5d7a877eda07ca8b1d0ea82d740
 SHA512:
-  metadata.gz: cdaf7159e5bebdde39ffed648fab4be85c5d2a556818b30ec8587ba52e920de44c09434edd654e894501ecb8a68c756c1c64e9de8939412d320dc753ab156163
-  data.tar.gz: 219b697d883f91bd173e214402af2d3f5ec988881a025e894f4e3aafef1970af61a1bb2905b886fac437788a18812f9dbbc1e6307aa2d80f1997fdc0d800f0be
+  metadata.gz: 28484a1e6a93193426e7258e706da77fef934bcf5a5066b0a5cf7db59105a6787dedd4af2fac4601c5add8a1c2627a43d04487908d0baea7cd0e79bbc7c40f18
+  data.tar.gz: 3ee1dc4d183a3e31bf25113a33f881dc772ccd185e01868dd092eddfaa4798daf58f665327c0eea931153a557cbff151bd4bc3be8727abe7eafb05fb71f37619

data/README.md

@@ -253,8 +253,8 @@ Adds an RDS database to your Terraform config.
 - **Optional Config:**
   - `database_allocated_storage` _(default: 30)_
   - `database_engine` _(default: 'postgres')_
-  - `database_engine_version` _(default: '14.2')_
-  - `database_instance_class` _(default: 'db.t3.medium')_
+  - `database_engine_version` _(default: '14.8')_
+  - `database_instance_class` _(default: 'db.t3.small')_
   - `database_multi_az` _(default: true)_
 
 #### `add_elasticache_cluster`

data/convox_installer.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
   s.name = 'convox_installer'
   s.version = ConvoxInstaller::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ['Form Applications Inc.']
-  s.email = ['support@formapi.io']
-  s.homepage = 'https://github.com/FormAPI/convox_installer'
+  s.authors = ['DocSpring, Inc.']
+  s.email = ['support@docspring.com']
+  s.homepage = 'https://github.com/DocSpring/convox_installer'
   s.summary = 'Build a Convox installation workflow'
   s.description = 'Build a Convox installation workflow'
   s.license = 'MIT'

data/lib/convox/client.rb

@@ -16,7 +16,6 @@ module Convox
                           File.expand_path('~/.convox').freeze
                         end
 
-    AUTH_FILE = File.join(CONVOX_CONFIG_DIR, 'auth')
     CURRENT_FILE = File.join(CONVOX_CONFIG_DIR, 'current')
 
     attr_accessor :logger, :config
@@ -55,10 +54,6 @@ module Convox
         cli_version < Gem::Version.new('4.0.0')
     end
 
-    def auth
-      load_auth_from_file
-    end
-
     def initialize(options = {})
       @logger = Logger.new($stdout)
       logger.level = options[:log_level] || Logger::INFO
@@ -132,16 +127,8 @@ module Convox
 
     def rack_already_installed?
       require_config(%i[aws_region stack_name])
-
-      return unless File.exist?(AUTH_FILE)
-
-      # region = config.fetch(:aws_region)
-      stack_name = config.fetch(:stack_name)
       return true if File.exist?(rack_dir)
 
-      auth.each do |rack_name, _password|
-        return true if rack_name == stack_name
-      end
       false
     end
 
@@ -443,16 +430,6 @@ module Convox
 
     private
 
-    def load_auth_from_file
-      return {} unless File.exist?(AUTH_FILE)
-
-      begin
-        JSON.parse(File.read(AUTH_FILE))
-      rescue StandardError
-        {}
-      end
-    end
-
     def require_config(required_keys)
       required_keys.each do |k|
         raise "#{k} is missing from the config!" unless config[k]

data/lib/convox_installer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ConvoxInstaller
-  VERSION = '3.0.1'
+  VERSION = '3.1.0'
 end

data/spec/lib/convox/client_spec.rb

@@ -5,15 +5,6 @@ require 'convox/client'
 RSpec.describe Convox::Client do
   let(:home_dir) { File.expand_path('~') }
 
-  it 'finds the authentication details in ~/.convox/auth' do
-    expect(File).to receive(:exist?).with("#{home_dir}/.convox/auth").and_return(true)
-    expect(File).to receive(:read).with("#{home_dir}/.convox/auth").and_return(
-      '{ "test.example.com": "1234567890" }'
-    )
-    client = described_class.new
-    expect(client.auth).to eq('test.example.com' => '1234567890')
-  end
-
   describe 'Convox CLI version' do
     let(:client) { described_class.new }
 
@@ -107,84 +98,5 @@ RSpec.describe Convox::Client do
         client.validate_convox_rack_and_write_current!
       end.to raise_error('aws_region is missing from the config!')
     end
-
-    it 'raises an error if auth file is missing' do
-      client = described_class.new(
-        config: {
-          aws_region: 'us-east-1',
-          stack_name: 'asdf'
-        }
-      )
-      expect(File).to receive(:exist?).with(
-        "#{home_dir}/.convox/auth"
-      ).and_return(false)
-
-      expect do
-        client.validate_convox_rack_and_write_current!
-      end.to raise_error(/Could not find auth file at /)
-    end
-
-    it 'sets ~/.convox/host if a matching host is found in the auth file' do
-      expect(File).to receive(:exist?).with(
-        "#{home_dir}/.convox/auth"
-      ).twice.and_return(true)
-
-      expect(File).to receive(:read).with("#{home_dir}/.convox/auth").and_return(
-        '{ "convox-test-697645520.us-west-2.elb.amazonaws.com": "1234567890" }'
-      )
-      client = described_class.new(
-        config: {
-          aws_region: 'us-west-2',
-          stack_name: 'convox-test'
-        }
-      )
-      expect(client).to receive(:write_current).with(
-        'convox-test-697645520.us-west-2.elb.amazonaws.com'
-      )
-      expect(client.validate_convox_rack_and_write_current!).to(
-        eq('convox-test-697645520.us-west-2.elb.amazonaws.com')
-      )
-    end
-
-    it 'raises an error if no matching host is found' do
-      expect(File).to receive(:exist?).with(
-        "#{home_dir}/.convox/auth"
-      ).twice.and_return(true)
-
-      expect(File).to receive(:read).with("#{home_dir}/.convox/auth").and_return(
-        '{ "convox-test-697645520.us-west-2.elb.amazonaws.com": "1234567890" }'
-      )
-      client = described_class.new(
-        config: {
-          aws_region: 'us-east-1',
-          stack_name: 'convox-test'
-        }
-      )
-      expect do
-        client.validate_convox_rack_and_write_current!
-      end.to raise_error('Could not find matching authentication for ' \
-                         'region: us-east-1, stack: convox-test')
-    end
-
-    it 'raises an error if it finds multiple matching hosts' do
-      expect(File).to receive(:exist?).with(
-        "#{home_dir}/.convox/auth"
-      ).twice.and_return(true)
-
-      expect(File).to receive(:read).with("#{home_dir}/.convox/auth").and_return(
-        '{ "convox-test-697645520.us-west-2.elb.amazonaws.com": "1234567890", ' \
-        '"convox-test-1234123412.us-west-2.elb.amazonaws.com": "1234567890" }'
-      )
-      client = described_class.new(
-        config: {
-          aws_region: 'us-west-2',
-          stack_name: 'convox-test'
-        }
-      )
-      expect do
-        client.validate_convox_rack_and_write_current!
-      end.to raise_error('Found multiple matching hosts for ' \
-                         'region: us-west-2, stack: convox-test')
-    end
   end
 end

data/terraform/rds.tf.erb

@@ -1,8 +1,8 @@
 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' %>"
+  engine_version       = "<%= config[:database_engine_version] || '14.8' %>"
+  instance_class       = "<%= config[:database_instance_class] || 'db.t3.small' %>"
   name                 = "<%= config.fetch(:stack_name).gsub('-', '_') %>_database"
   identifier           = "<%= config.fetch(:stack_name) %>-rds-<%= config.fetch(:random_id) %>"
   multi_az             = <%= config[:database_multi_az] || true %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convox_installer
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
-- Form Applications Inc.
+- DocSpring, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-13 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -82,7 +82,7 @@ dependencies:
         version: 1.0.1
 description: Build a Convox installation workflow
 email:
-- support@formapi.io
+- support@docspring.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -112,7 +112,7 @@ files:
 - terraform/elasticache.tf.erb
 - terraform/rds.tf.erb
 - terraform/s3_bucket.tf.erb
-homepage: https://github.com/FormAPI/convox_installer
+homepage: https://github.com/DocSpring/convox_installer
 licenses:
 - MIT
 metadata:
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Build a Convox installation workflow