seira 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d08df8b0745e2685212efae00e131197ce665fbf90afb3cd7a72b150450e20
-  data.tar.gz: 4c81a2a27b8edbe069375535b4848ad17d38cf2b803679a939ff1f970d3a6d0b
+  metadata.gz: 16a43b30639713b47c035cd97dbfc2392dedd8ffd85dd3f8d188fbdef0d9efd9
+  data.tar.gz: c11ee4d7151e0ae9dc068c2b91bee0bc4c00d184d688e7ddcab6a7872420f0ee
 SHA512:
-  metadata.gz: a0dc529337d4d8dc6f5826953d111a7f1d18d6c5558e262c01b7a50b4b064b1e4054edfee62c5127564b3aca1490bc4ccbcb3280f8bc065215ec39e4cd01c5f5
-  data.tar.gz: ec8c5a215f0b0382bc55c1207055377a9bec7cffba0a2882783eb0b3619e704d7859d094ddafd0065ef88f16ebc854983a0702e3635783c635b60e476019c405
+  metadata.gz: 26069ed21b7f53110b877a372867497e308e58a7e7239108caf7473d4d42d07fe548bddc80032b8ffec3f35268b35f4a372f839a2d979a7107869b0fc87b4ce9
+  data.tar.gz: 6e58dc0e409d35ed00de7bd3950afd98300f303f0e78644dd83134a9cfbf8c8ec6e3b6c9db0cf06e80ae0666e2e75da6b96ca41893d81bb8ea536bb35806e829

data/lib/helpers.rb

@@ -45,6 +45,14 @@ module Seira
       rescue
         'unknown'
       end
+
+      def sql_ips(name, context:)
+        describe_command = "sql instances describe #{name}"
+        json = JSON.parse(Seira::Commands.gcloud(describe_command, context: context, format: :json))
+        private_ip = json['ipAddresses'].find { |address| address['type'] == 'PRIVATE' }['ipAddress']
+        public_ip = json['ipAddresses'].find { |address| address['type'] == 'PRIMARY' }['ipAddress']
+        { private: private_ip, public: public_ip }
+      end
     end
   end
 end

data/lib/seira.rb

@@ -56,6 +56,8 @@ module Seira
       # arg is not in the ARGV array and should be skipped over
       if ARGV[0] == 'help'
         @category = reversed_args.pop
+      elsif ARGV[0] == 'version'
+        @category = reversed_args.pop
       elsif ARGV[1] == 'cluster'
         cluster = reversed_args.pop
         @category = reversed_args.pop
@@ -100,6 +102,9 @@ module Seira
       if category == 'help'
         run_base_help
         exit(0)
+      elsif category == 'version'
+        puts "Seira version: #{Seira::VERSION}"
+        exit(0)
       elsif category == 'setup'
         Seira::Setup.new(target: cluster, args: args, settings: settings).run
         exit(0)
@@ -136,8 +141,8 @@ module Seira
         cluster: cluster,
         project: project,
         settings: settings,
-        region: cluster['region'],
-        zone: cluster['zone'],
+        region: settings.region_for_cluster(cluster),
+        zone: settings.zone_for_cluster(cluster),
         app: app,
         action: action,
         args: args
@@ -151,7 +156,7 @@ module Seira
         exit(1)
       end
 
-      unless system("kubectl version > /dev/null 2>&1")
+      unless system("kubectl version -c > /dev/null 2>&1")
         puts "Kubectl library not installed properly. Please install `kubectl` before using seira.".red
         exit(1)
       end

data/lib/seira/db.rb

@@ -245,7 +245,7 @@ module Seira
       end
 
       password = SecureRandom.urlsafe_base64(32)
-      if gcloud("sql users create #{user_name} '' --instance=#{instance_name} --password=#{password}", context: context, format: :boolean)
+      if gcloud("sql users create #{user_name} --instance=#{instance_name} --password=#{password}", context: context, format: :boolean)
         puts "Created user '#{user_name}' with password #{password}"
       else
         puts "Failed to create user '#{user_name}'"
@@ -264,6 +264,8 @@ module Seira
           GRANT SELECT ON ALL TABLES IN SCHEMA public TO #{user_name};
           ALTER DEFAULT PRIVILEGES IN SCHEMA "public" GRANT SELECT ON TABLES TO #{user_name};
         SQL
+
+      puts "Connecting"
       execute_db_command(admin_commands, as_admin: true)
       execute_db_command(database_commands)
     end
@@ -412,6 +414,7 @@ module Seira
     def execute_db_command(sql_command, 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
+      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 })
       if matching_pods.empty?
@@ -422,9 +425,9 @@ module Seira
       psql_command =
         if as_admin
           root_password = Helpers.get_secret(context: context, key: "#{instance_name.tr('-', '_').upcase}_ROOT_PASSWORD")
-          "psql postgres://postgres:#{root_password}@127.0.0.1:5432"
+          "psql postgres://postgres:#{root_password}@#{private_ip}:5432"
         else
-          'psql'
+          "psql"
         end
       system_command = "kubectl exec #{pod_name} --namespace #{app}"
       system_command += ' -ti' if interactive

data/lib/seira/db/create.rb

@@ -188,13 +188,7 @@ module Seira
       end
 
       def ips
-        @_ips ||= begin
-          describe_command = "sql instances describe #{name}"
-          json = JSON.parse(gcloud(describe_command, context: context, format: :json))
-          private_ip = json['ipAddresses'].find { |address| address['type'] == 'PRIVATE' }['ipAddress']
-          public_ip = json['ipAddresses'].find { |address| address['type'] == 'PRIMARY' }['ipAddress']
-          { private: private_ip, public: public_ip }
-        end
+        @ips ||= Helpers.sql_ips(name, context: context)
       end
 
       def write_pgbouncer_yaml

data/lib/seira/node_pools.rb

@@ -58,7 +58,7 @@ module Seira
     # TODO: Info about what is running on it?
     # TODO: What information do we get in the json format we could include here?
     def run_list
-      gcloud("container node-pools list --cluster #{context[:cluster]}", context: context, format: :boolean)
+      gcloud("container node-pools list --cluster #{context[:cluster]} --region=#{context[:region]}", context: context, format: :boolean)
     end
 
     def run_list_nodes
@@ -157,7 +157,7 @@ module Seira
 
       exit(1) unless HighLine.agree "Node pool has successfully been cordoned and drained, and should be safe to delete. Continue deleting node pool #{node_pool_name}?"
 
-      if gcloud("container node-pools delete #{node_pool_name} --cluster #{context[:cluster]}", context: context, format: :boolean)
+      if gcloud("container node-pools delete #{node_pool_name} --cluster #{context[:cluster]} --region=#{context[:region]}", context: context, format: :boolean)
         puts 'Node pool deleted successfully'
       else
         puts 'Failed to delete old pool'
@@ -167,7 +167,7 @@ module Seira
 
     # TODO: Represent by a ruby object?
     def node_pools
-      JSON.parse(gcloud("container node-pools list --cluster #{context[:cluster]}", context: context, format: :json))
+      JSON.parse(gcloud("container node-pools list --cluster #{context[:cluster]} --region=#{context[:region]}", context: context, format: :json))
     end
 
     def nodes_for_pool(pool_name)

data/lib/seira/settings.rb

@@ -56,6 +56,14 @@ module Seira
       settings['seira']['clusters'][cluster]['project']
     end
 
+    def region_for_cluster(cluster)
+      settings['seira']['clusters'][cluster]['region']
+    end
+
+    def zone_for_cluster(cluster)
+      settings['seira']['clusters'][cluster]['zone']
+    end
+
     def expected_environment_variable_during_deploys
       settings['seira']['expected_environment_variable_during_deploys']
     end

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.5.3".freeze
+  VERSION = "0.5.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline