seira 0.3.3 → 0.3.6

data/lib/seira/db/create.rb

@@ -1,6 +1,8 @@
 module Seira
   class Db
     class Create
+      include Seira::Commands
+
       attr_reader :app, :action, :args, :context
 
       attr_reader :name, :version, :cpu, :memory, :storage, :replica_for, :make_highly_available
@@ -46,7 +48,7 @@ module Seira
 
       def run_create_command
         # The 'beta' is needed for HA and other beta features
-        create_command = "gcloud beta sql instances create #{name}"
+        create_command = "beta sql instances create #{name}"
 
         args.each do |arg|
           if arg.start_with? '--version='
@@ -95,10 +97,8 @@ module Seira
           create_command += " --async"
         end
 
-        puts "Running: #{create_command}"
-
         # Create the sql instance with the specified/default parameters
-        if system(create_command)
+        if gcloud(create_command, context: context, format: :boolean)
           async_additional =
             unless replica_for.nil?
               ". Database is still being created and may take some time to be available."
@@ -115,7 +115,7 @@ module Seira
         # Set the root user's password to something secure
         @root_password = SecureRandom.urlsafe_base64(32)
 
-        if system("gcloud sql users set-password postgres '' --instance=#{name} --password=#{root_password}")
+        if gcloud("sql users set-password postgres '' --instance=#{name} --password=#{root_password}", context: context, format: :boolean)
           puts "Set root password to #{root_password}"
         else
           puts "Failed to set root password"
@@ -127,7 +127,7 @@ module Seira
         # Create proxyuser with secure password
         @proxyuser_password = SecureRandom.urlsafe_base64(32)
 
-        if system("gcloud sql users create proxyuser '' --instance=#{name} --password=#{proxyuser_password}")
+        if gcloud("sql users create proxyuser '' --instance=#{name} --password=#{proxyuser_password}", context: context, format: :boolean)
           puts "Created proxyuser with password #{proxyuser_password}"
         else
           puts "Failed to create proxyuser"
@@ -160,12 +160,13 @@ module Seira
         if replica_for.nil?
           create_pgbouncer_secret(db_user: 'proxyuser', db_password: proxyuser_password)
           Secrets.new(app: app, action: 'set', args: ["#{env_name}_ROOT_PASSWORD=#{root_password}"], context: context).run
-          write_database_env(key: "DATABASE_URL", db_user: 'proxyuser', db_password: proxyuser_password)
+          # Set DATABASE_URL if not already set
+          write_database_env(key: "DATABASE_URL", db_user: 'proxyuser', db_password: proxyuser_password) if Helpers.get_secret(app: app, key: "DATABASE_URL").nil?
           write_database_env(key: "#{env_name}_DB_URL", db_user: 'proxyuser', db_password: proxyuser_password)
         else
           # When creating a replica, we cannot manage users on the replica. We must manage the users on the primary, which the replica
           # inherits. For now we will use the same credentials that the primary uses.
-          primary_uri = URI.parse(Secrets.new(app: app, action: 'get', args: [], context: context).get('DATABASE_URL'))
+          primary_uri = URI.parse(Helpers.get_secret(app: app, key: 'DATABASE_URL'))
           primary_user = primary_uri.user
           primary_password = primary_uri.password
           create_pgbouncer_secret(db_user: primary_user, db_password: primary_password)
@@ -174,7 +175,7 @@ module Seira
       end
 
       def create_pgbouncer_secret(db_user:, db_password:)
-        puts `kubectl create secret generic #{pgbouncer_secret_name} --namespace #{app} --from-literal=DB_USER=#{db_user} --from-literal=DB_PASSWORD=#{db_password}`
+        kubectl("create secret generic #{pgbouncer_secret_name} --from-literal=DB_USER=#{db_user} --from-literal=DB_PASSWORD=#{db_password}", context: context)
       end
 
       def write_database_env(key:, db_user:, db_password:)

data/lib/seira/jobs.rb

@@ -2,6 +2,8 @@ require 'json'
 
 module Seira
   class Jobs
+    include Seira::Commands
+
     VALID_ACTIONS = %w[help list delete run].freeze
     SUMMARY = "Manage your application's jobs.".freeze
 
@@ -39,11 +41,11 @@ module Seira
     end
 
     def run_list
-      puts `kubectl get jobs --namespace=#{app} -o wide`
+      kubectl("get jobs -o wide", context: context)
     end
 
     def run_delete
-      puts `kubectl delete job #{job_name} --namespace=#{app}`
+      kubectl("delete job #{job_name}", context: context)
     end
 
     def run_run
@@ -109,8 +111,9 @@ module Seira
         end
         File.open("#{destination}/#{file_name}", 'w') { |file| file.write(new_contents) }
 
-        puts "Running 'kubectl apply -f #{destination}'"
-        system("kubectl apply -f #{destination}")
+        kubectl("apply -f #{destination}", context: context)
+        log_link = Helpers.log_link(context: context, app: app, query: unique_name)
+        puts "View logs at: #{log_link}" unless log_link.nil?
       end
 
       unless async
@@ -118,7 +121,7 @@ module Seira
         print 'Waiting for job to complete...'
         job_spec = nil
         loop do
-          job_spec = JSON.parse(`kubectl --namespace=#{app} get job #{unique_name} -o json`)
+          job_spec = JSON.parse(kubectl("get job #{unique_name} -o json", context: context, return_output: true, clean_output: true))
           break if !job_spec['status']['succeeded'].nil? || !job_spec['status']['failed'].nil?
           print '.'
           sleep 3
@@ -137,7 +140,7 @@ module Seira
           puts "Job finished with status #{status}. Leaving Job object in cluster, clean up manually when confirmed."
         else
           print "Job finished with status #{status}. Deleting Job from cluster for cleanup."
-          system("kubectl delete job #{unique_name} -n #{app}")
+          kubectl("delete job #{unique_name}", context: context)
         end
       end
     end

data/lib/seira/node_pools.rb

@@ -5,6 +5,8 @@ require 'fileutils'
 # Example usages:
 module Seira
   class NodePools
+    include Seira::Commands
+
     VALID_ACTIONS = %w[help list list-nodes add cordon drain delete].freeze
     SUMMARY = "For managing node pools for a cluster.".freeze
 
@@ -56,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
-      puts `gcloud container node-pools list --cluster #{context[:cluster]}`
+      gcloud("container node-pools list --cluster #{context[:cluster]}", context: context, format: :boolean)
     end
 
     def run_list_nodes
@@ -89,7 +91,7 @@ module Seira
       end
 
       command =
-        "gcloud container node-pools create #{new_pool_name} \
+        "container node-pools create #{new_pool_name} \
         --cluster=#{context[:cluster]} \
         --disk-size=#{disk_size} \
         --image-type=#{image_type} \
@@ -97,7 +99,7 @@ module Seira
         --num-nodes=#{num_nodes} \
         --service-account=#{service_account}"
 
-      if system(command)
+      if gcloud(command, conext: context, format: :boolean)
         puts 'New pool created successfully'
       else
         puts 'Failed to create new pool'
@@ -112,7 +114,7 @@ module Seira
       nodes = nodes_for_pool(node_pool_name)
 
       nodes.each do |node|
-        unless system("kubectl cordon #{node}")
+        unless kubectl("cordon #{node}", context: :none)
           puts "Failed to cordon node #{node}"
           exit(1)
         end
@@ -135,7 +137,7 @@ module Seira
         # --delete-local-data prevents failing due to presence of local data, which cannot be moved
         #   but is bad practice to use for anything that can't be lost
         puts "Draining #{node}"
-        unless system("kubectl drain --force --ignore-daemonsets --delete-local-data #{node}")
+        unless kubectl("drain --force --ignore-daemonsets --delete-local-data #{node}", context: :none)
           puts "Failed to drain node #{node}"
           exit(1)
         end
@@ -155,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 system("gcloud container node-pools delete #{node_pool_name} --cluster #{context[:cluster]}")
+      if gcloud("container node-pools delete #{node_pool_name} --cluster #{context[:cluster]}", context: context, format: :boolean)
         puts 'Node pool deleted successfully'
       else
         puts 'Failed to delete old pool'
@@ -165,11 +167,11 @@ module Seira
 
     # TODO: Represent by a ruby object?
     def node_pools
-      JSON.parse(`gcloud container node-pools list --cluster #{context[:cluster]} --format json`)
+      JSON.parse(gcloud("container node-pools list --cluster #{context[:cluster]}", context: context, format: :json))
     end
 
     def nodes_for_pool(pool_name)
-      `kubectl get nodes -l cloud.google.com/gke-nodepool=#{pool_name} -o name`.split("\n")
+      kubectl("get nodes -l cloud.google.com/gke-nodepool=#{pool_name} -o name", context: :none, return_output: true).split("\n")
     end
 
     def fail_if_lone_node_pool

data/lib/seira/pods.rb

@@ -2,6 +2,8 @@ require 'json'
 
 module Seira
   class Pods
+    include Seira::Commands
+
     VALID_ACTIONS = %w[help list delete logs top run connect].freeze
     SUMMARY = "Manage your application's pods.".freeze
 
@@ -45,19 +47,19 @@ module Seira
     end
 
     def run_list
-      puts `kubectl get pods --namespace=#{app} -o wide`
+      kubectl("get pods -o wide", context: context)
     end
 
     def run_delete
-      puts `kubectl delete pod #{pod_name} --namespace=#{app}`
+      kubectl("delete pod #{pod_name}", context: context)
     end
 
     def run_logs
-      puts `kubectl logs #{pod_name} --namespace=#{app} -c #{app}`
+      kubectl("logs #{pod_name} -c #{app}")
     end
 
     def run_top
-      puts `kubectl top pod #{pod_name} --namespace=#{app} --containers`
+      kubectl("top pod #{pod_name} --containers", context: context)
     end
 
     def run_connect

data/lib/seira/proxy.rb

@@ -1,5 +1,7 @@
 module Seira
   class Proxy
+    include Seira::Commands
+
     SUMMARY = "Open up the proxy UI for a given cluster.".freeze
 
     def initialize
@@ -7,7 +9,7 @@ module Seira
 
     def run
       begin
-        system("kubectl proxy")
+        kubectl("proxy", context: :none)
       rescue
       end
     end

data/lib/seira/secrets.rb

@@ -8,6 +8,8 @@ require 'base64'
 # TODO: Can we avoid writing to disk completely and instead pipe in raw json?
 module Seira
   class Secrets
+    include Seira::Commands
+
     VALID_ACTIONS = %w[help get set unset list list-decoded].freeze
     PGBOUNCER_SECRETS_NAME = 'pgbouncer-secrets'.freeze
     SUMMARY = "Manage your application's secrets and environment variables.".freeze
@@ -45,7 +47,7 @@ module Seira
 
     def copy_secret_across_namespace(key:, to:, from:)
       puts "Copying the #{key} secret from namespace #{from} to #{to}."
-      json_string = `kubectl get secret #{key} --namespace #{from} -o json`
+      json_string = kubectl("get secret #{key} -o json", context: context, return_output: true)
       secrets = JSON.parse(json_string)
 
       # At this point we would preferably simply do a write_secrets call, but the metadata is highly coupled to old
@@ -145,10 +147,10 @@ module Seira
         end
 
         # The command we use depends on if it already exists or not
-        secret_exists = system("kubectl get secret #{secret_name} --namespace #{app} > /dev/null")
+        secret_exists = kubectl("get secret #{secret_name}", context: context) # TODO: Do not log, pipe output to dev/null
         command = secret_exists ? "replace" : "create"
 
-        if system("kubectl #{command} --namespace #{app} -f #{file_name}")
+        if kubectl("#{command} -f #{file_name}", context: context)
           puts "Successfully created/replaced #{secret_name} secret #{key} in cluster #{Seira::Cluster.current_cluster}"
         else
           puts "Failed to update secret"
@@ -158,7 +160,7 @@ module Seira
 
     # Returns the still-base64encoded secrets hashmap
     def fetch_current_secrets
-      json_string = `kubectl get secret #{main_secret_name} --namespace #{app} -o json`
+      json_string = kubectl("get secret #{main_secret_name} -o json", context: context, return_output: true)
       json = JSON.parse(json_string)
       fail "Unexpected Kind" unless json['kind'] == 'Secret'
       json

data/lib/seira/settings.rb

@@ -4,7 +4,7 @@ require 'yaml'
 module Seira
   class Settings
     DEFAULT_CONFIG_PATH = '.seira.yml'.freeze
-    
+
     attr_reader :config_path
 
     def initialize(config_path: DEFAULT_CONFIG_PATH)
@@ -40,6 +40,10 @@ module Seira
       settings['seira']['clusters']
     end
 
+    def log_link_format
+      settings['seira']['log_link_format']
+    end
+
     def full_cluster_name_for_shorthand(shorthand)
       return shorthand if valid_cluster_names.include?(shorthand)
 

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.3.3".freeze
+  VERSION = "0.3.6".freeze
 end

data/seira.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "0.51.0"
+  spec.add_development_dependency "rubocop", "0.54.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.6
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.54.0
 description: An opinionated library for building applications on Kubernetes.
 email:
 - scott@joinhandshake.com
@@ -120,6 +120,9 @@ files:
 - lib/seira.rb
 - lib/seira/app.rb
 - lib/seira/cluster.rb
+- lib/seira/commands.rb
+- lib/seira/commands/gcloud.rb
+- lib/seira/commands/kubectl.rb
 - lib/seira/db.rb
 - lib/seira/db/create.rb
 - lib/seira/jobs.rb