seira 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c56a6815270947a2915bcb6cb95f9fbeecc50b607557be8bafa0d957590cf4d
-  data.tar.gz: 8be5c3f5488ce6aa79a79e5b4ec574325ac70f9d999c63c7ece6fea14df97d16
+  metadata.gz: 57d3df41212e06d4182e97edc51ff948019596f2063696fee21327f6d79e7820
+  data.tar.gz: a1530d5bfd8142524600d9e73e6346668a32ab9aef4326366e0d173be4850f94
 SHA512:
-  metadata.gz: 45e01a9b78960db1e1a9bce63169b90f913321a8f18acbfb7657c1aa930390ba493bc2074e1f8a485f38df04e011ef837af598ab3b268273ce3583c0d6ec1348
-  data.tar.gz: 4383b3e47a808a5ee602e6d7c4a9f95327f24b4ffddd0414e95067e04cac0a00ca86cffd56bf42ebefa4b6e25fddae65729f5fdfca963e693c2708c97d16c498
+  metadata.gz: c2c2e1d7e7f52832046653fcca340d1cb30addecbb2325979b02a822d0a38757344216dc8cbc363fc8f02ec01905d57fecbe713e467c2fa59c40184b0783e392
+  data.tar.gz: 7a6cd149ff5338938ece13e6ff2c157c2e0145bf08f4af1974150f259765fc8fd2c5243f4780223799d02f2326626c0547a7062f63560afd942195dec8565003

data/README.md

@@ -83,6 +83,15 @@ seira:
 
 This specification is read in and used to determine what `gcloud` context to use and what `kubectl` cluster to use when operating commands. For example, `seira internal` will connect to `org-internal` gcloud configuration and `gke_org-internal_us-central1-a_internal` kubectl cluster. For shorthand, `seira i` shorthand is specified as an alias.
 
+### Application Configuration Files
+
+Each app can also define configuration files. These files specify details that allow seira to execute commands with minimal user input, and declare aspects of the application. This file lives in the app folder with the name `.seira.app.yaml`. An example configuration file:
+
+```
+# The name of the sql instance as it shows in GCP Cloud SQL UI
+primary_sql_instance: app-database-name
+```
+
 ### Regions and Zones
 
 All clusters should have a `region` option specified. For zonal clusters (clusters that are NOT regional) should also specify their `zone`.

data/lib/helpers.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Seira
   class Helpers
     include Seira::Commands
@@ -37,6 +39,13 @@ module Seira
         Secrets.new(app: context[:app], action: 'get', args: [], context: context).get(key)
       end
 
+      def get_seira_app_config(context:)
+        yaml_file_path = "kubernetes/#{context[:cluster]}/#{context[:app]}/.seira.app.yaml"
+        YAML.load_file(yaml_file_path)
+      rescue
+        fail "Failed to load the configuration file at #{yaml_file_path}. Please add configuration file and retry."
+      end
+
       def get_current_replicas(deployment:, context:)
         output = Seira::Commands.kubectl("get deployment #{deployment} -o json", context: context, return_output: true)
         JSON.parse(output)['spec']['replicas']

data/lib/seira/db.rb

@@ -75,16 +75,8 @@ module Seira
       end
     end
 
-    # NOTE: Relies on the pgbouncer instance being named based on the db name, as is done in create command
     def primary_instance
-      database_url = Helpers.get_secret(context: context, key: 'DATABASE_URL')
-      return nil unless database_url
-
-      primary_uri = URI.parse(database_url)
-      host = primary_uri.host
-
-      # Convert handshake-onyx-burmese-pgbouncer-service to handshake-onyx-burmese
-      host.gsub('-pgbouncer-service', '')
+      Seira::Helpers.get_seira_app_config(context: context)['primary_sql_instance']
     end
 
     private
@@ -331,10 +323,13 @@ module Seira
 
     def run_psql
       as_admin = false
+      instance_name = nil
 
       args.each do |arg|
         if arg == '--as-root-user'
           as_admin = true
+        elsif arg.start_with? '--instance='
+          instance_name = arg.split('=')[1]
         else
           puts "Warning: Unrecognized argument '#{arg}'"
         end
@@ -344,7 +339,7 @@ module Seira
         puts "!! Warning !!! You are running as root PSQL user `postgres`. This super user account has full admin priveleges. Use with extreme care."
       end
 
-      execute_db_command(nil, interactive: true, as_admin: as_admin)
+      execute_db_command(nil, interactive: true, instance_name: instance_name, as_admin: as_admin)
     end
 
     def run_table_sizes
@@ -488,6 +483,8 @@ module Seira
       # TODO(josh): move pgbouncer naming logic here and in Create to a common location
       instance_name ||= primary_instance
       private_ip = Helpers.sql_ips(instance_name, context: context)[:private]
+
+      # NOTE: Relies on the pgbouncer instance being named based on the db name, as is done in create command
       pgbouncer_tier ||= instance_name.gsub("#{app}-", '')
       matching_pods = Helpers.fetch_pods(context: context, filters: { tier: pgbouncer_tier })
       if matching_pods.empty?

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.7.3".freeze
+  VERSION = "0.7.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline