seira 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c722513894391b3837c18f6a434d3f101b3093ecf82e55ed0604d6d566340753
-  data.tar.gz: fff690cfc3fef81d40d4d2247804055df50cde174d0408b7f17245402efc43a2
+  metadata.gz: 13c209df481a4a1d50f03aab6f2a990bb1bf30fb0253fe1cf21772827af5a07d
+  data.tar.gz: caa64cea11c75f486bad0f59d9b7ea07211817b0b087cb74e2ca7531ce2f7bf6
 SHA512:
-  metadata.gz: a5e225e2ec2d383997139a8f2aa13fb35ab6039e56ca3dcb9bf2ed68bd67a580c4f581ec9236eb7f62fb8584a9e2b3bf4051d045c809d263b3da1a934817af1e
-  data.tar.gz: c027903654bea1c9e42e83c8adf599a2f71f334081f74e32f658ad6ef67993110056120ea9531233c7631d157387ff2674c3d3699775e05e8cd99315be9de106
+  metadata.gz: c14f15cf05981d38d85a9064380bbb2de9826b1e1cc7505fed06b9b07ad282c49583e2ecbc054764c717e456bb94f57e7c9c4bef4b777157c667133f335bf23d
+  data.tar.gz: a260b2297ee4136d4517be460b569c3f7e7c5b10c29281f81f10d65635e30f0964a050e102ed22b7746692c87ad5b2e26a395c159bf4afe9e45b278a94b90c18

data/lib/seira/db.rb

@@ -1,7 +1,6 @@
 require 'securerandom'
 require 'English'
 
-require_relative 'db/alter_proxyuser_roles'
 require_relative 'db/write_pgbouncer_yaml'
 require_relative 'db/create'
 
@@ -146,7 +145,18 @@ module Seira
     end
 
     def run_alter_proxyuser_roles
-      Seira::Db::AlterProxyuserRoles.new(app: app, action: action, args: args, context: context).run
+      instance_name = nil
+      args.each do |arg|
+        if arg.start_with? '--instance='
+          instance_name = arg.split('=')[1]
+        else
+          puts "Warning: Unrecognized argument '#{arg}'"
+        end
+      end
+
+      command = "ALTER ROLE proxyuser NOCREATEDB NOCREATEROLE;"
+      execute_db_command(command, instance_name: instance_name, as_admin: true)
+      puts "Removed Create role and Create DB roles from proxyuser"
     end
 
     def run_write_pgbouncer_yaml

data/lib/seira/db/create.rb

@@ -78,9 +78,10 @@ module Seira
 
         set_secrets
 
-        alter_proxy_user_roles if replica_for.nil?
-
         puts "To use this database, use write-pgbouncer-yaml command and deploy the pgbouncer config file that was created and use the ENV that was set."
+        if replica_for.nil?
+          puts "After deploying, make sure to run alter-proxyuser-roles for the created instance."
+        end
         puts "To make this database the primary, promote it using the CLI and update the DATABASE_URL."
       end
 
@@ -175,10 +176,6 @@ module Seira
         end
       end
 
-      def alter_proxy_user_roles
-        Seira::Db::AlterProxyuserRoles.new(app: app, action: action, args: [name, root_password], context: context).run
-      end
-
       def set_secrets
         env_name = name.tr('-', '_').upcase
 

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.6.6".freeze
+  VERSION = "0.7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -125,7 +125,6 @@ files:
 - lib/seira/commands/kubectl.rb
 - lib/seira/config.rb
 - lib/seira/db.rb
-- lib/seira/db/alter_proxyuser_roles.rb
 - lib/seira/db/create.rb
 - lib/seira/db/write_pgbouncer_yaml.rb
 - lib/seira/jobs.rb

data/lib/seira/db/alter_proxyuser_roles.rb

@@ -1,42 +0,0 @@
-module Seira
-  class Db
-    class AlterProxyuserRoles
-      include Seira::Commands
-
-      attr_reader :name, :root_password
-
-      def initialize(app:, action:, args:, context:)
-        if args.length != 2
-          puts 'Specify db name and root password as the positional arguments'
-          exit(1)
-        end
-
-        @name = args[0]
-        @root_password = args[1]
-      end
-
-      def run
-        # Connect to the instance and remove some of the default group memberships and permissions
-        # from proxyuser, leaving it with only what it needs to be able to do
-        expect_script = <<~BASH
-          set timeout 90
-          spawn gcloud sql connect #{name}
-          expect "Password for user postgres:"
-          send "#{root_password}\\r"
-          expect "postgres=>"
-          send "ALTER ROLE proxyuser NOCREATEDB NOCREATEROLE;\\r"
-          expect "postgres=>"
-        BASH
-        if system("expect <<EOF\n#{expect_script}EOF")
-          puts "Successfully removed unnecessary permissions from proxyuser"
-        else
-          puts "Failed to remove unnecessary permissions from proxyuser."
-          puts "You may need to whitelist the correct IP in the gcloud UI."
-          puts "You can get the correct IP from https://www.whatismyip.com/"
-          puts "Make sure to remove it from the whitelist after successfully running db alter-proxyuser-roles"
-          exit(1)
-        end
-      end
-    end
-  end
-end