seira 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6679bfcc4bb8d3716343f223bc2e656b51c1399a3bef35eb1e6977ff8221e201
-  data.tar.gz: 4628b1b0172a88f6df751119c50d962b2eb2d9798af42083c2bec7b78d3b47d2
+  metadata.gz: ed12fc57ff19d790cf26102987d8c48792fabe688cb7c1d517caf62b8073f210
+  data.tar.gz: 4d296bb7e6bb748b706c2cbb093d89626fe160d3d41000a272c6a394ff5ba441
 SHA512:
-  metadata.gz: 75becd757e1043988df19006bf593b5e04f296e03a305124f39bcfdabbc816ed182d6a2cca817d3498ac48fd54d0242674928de71db34fe241629ebdc4b6bdfa
-  data.tar.gz: 6d843da0af0658de1b4ac31b169f1b6dd25ae5c61f380cebb2537b0b2bac37b9d0d6c720aeea97d11d75b8fcce6a6b17070bf1f4ec196c5daf1808fbe8dfcbc2
+  metadata.gz: 1c48eea1958850e0b70397ee952ce8bcf61013aa18b36d190d87e63c4f934493c2957d2c5389237da07a2fc90765948913a7bed0c16262d66cdd5c8d41bc1fb9
+  data.tar.gz: e0b3d410c3bcbc91f843aca207e229f049917d21ce9346130f11606991c886e3c635fc1dc19861a9f807379b48f5883d3f4018736dbb7c32c23665d3c1ffeb6e

data/lib/seira/db.rb

@@ -238,11 +238,16 @@ module Seira
     # Example: seira staging app-name db create-readonly-user --username=readonlyuser
     def run_create_readonly_user
       instance_name = primary_instance # Always make user changes to primary instance, and they will propogate to replicas
+      pgbouncer_tier = nil
       user_name = nil
 
       args.each do |arg|
         if arg.start_with? '--username='
           user_name = arg.split('=')[1]
+        elsif arg.start_with? '--instance='
+          instance_name = arg.split('=')[1]
+        elsif arg.start_with? '--pgbouncer-tier='
+          pgbouncer_tier = arg.split('=')[1]
         else
           puts "Warning: Unrecognized argument '#{arg}'"
         end
@@ -259,7 +264,7 @@ module Seira
         exit(1)
       end
 
-      valid_instance_names = existing_instances(remove_app_prefix: false).join(', ')
+      valid_instance_names = existing_instances(remove_app_prefix: false)
       if instance_name.nil? || instance_name.strip.chomp == '' || !valid_instance_names.include?(instance_name)
         puts "Could not find a valid instance name - does the DATABASE_URL have a value? Must be one of: #{valid_instance_names}"
         exit(1)
@@ -287,8 +292,8 @@ module Seira
         SQL
 
       puts "Connecting"
-      execute_db_command(admin_commands, as_admin: true)
-      execute_db_command(database_commands)
+      execute_db_command(admin_commands, instance_name: instance_name, pgbouncer_tier: pgbouncer_tier, as_admin: true)
+      execute_db_command(database_commands, instance_name: instance_name, pgbouncer_tier: pgbouncer_tier)
     end
 
     def run_psql
@@ -432,12 +437,12 @@ module Seira
       end
     end
 
-    def execute_db_command(sql_command, as_admin: false, interactive: false, print: true)
+    def execute_db_command(sql_command, instance_name: nil, pgbouncer_tier: nil, as_admin: false, interactive: false, print: true)
       # TODO(josh): move pgbouncer naming logic here and in Create to a common location
-      instance_name = primary_instance
+      instance_name ||= primary_instance
       private_ip = Helpers.sql_ips(instance_name, context: context)[:private]
-      tier = instance_name.gsub("#{app}-", '')
-      matching_pods = Helpers.fetch_pods(context: context, filters: { tier: tier })
+      pgbouncer_tier ||= instance_name.gsub("#{app}-", '')
+      matching_pods = Helpers.fetch_pods(context: context, filters: { tier: pgbouncer_tier })
       if matching_pods.empty?
         puts 'Could not find pgbouncer pod to connect to'
         exit 1

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.6.4".freeze
+  VERSION = "0.6.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline