seira 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed12fc57ff19d790cf26102987d8c48792fabe688cb7c1d517caf62b8073f210
-  data.tar.gz: 4d296bb7e6bb748b706c2cbb093d89626fe160d3d41000a272c6a394ff5ba441
+  metadata.gz: c722513894391b3837c18f6a434d3f101b3093ecf82e55ed0604d6d566340753
+  data.tar.gz: fff690cfc3fef81d40d4d2247804055df50cde174d0408b7f17245402efc43a2
 SHA512:
-  metadata.gz: 1c48eea1958850e0b70397ee952ce8bcf61013aa18b36d190d87e63c4f934493c2957d2c5389237da07a2fc90765948913a7bed0c16262d66cdd5c8d41bc1fb9
-  data.tar.gz: e0b3d410c3bcbc91f843aca207e229f049917d21ce9346130f11606991c886e3c635fc1dc19861a9f807379b48f5883d3f4018736dbb7c32c23665d3c1ffeb6e
+  metadata.gz: a5e225e2ec2d383997139a8f2aa13fb35ab6039e56ca3dcb9bf2ed68bd67a580c4f581ec9236eb7f62fb8584a9e2b3bf4051d045c809d263b3da1a934817af1e
+  data.tar.gz: c027903654bea1c9e42e83c8adf599a2f71f334081f74e32f658ad6ef67993110056120ea9531233c7631d157387ff2674c3d3699775e05e8cd99315be9de106

data/lib/helpers.rb

@@ -4,10 +4,12 @@ module Seira
 
     class << self
       def rails_env(context:)
-        if context[:cluster] == 'internal'
+        parsed_env = context[:settings].settings['seira']['clusters'][context[:cluster]]['environment']
+        parsed_env = context[:cluster] if parsed_env.nil?
+        if parsed_env == 'internal'
           'production'
         else
-          context[:cluster]
+          parsed_env
         end
       end
 

data/lib/seira/db.rb

@@ -14,7 +14,7 @@ module Seira
       analyze create-readonly-user psql table-sizes
       index-sizes vacuum unused-indexes unused-indices
       user-connections info alter-proxyuser-roles add
-      write-pgbouncer-yaml
+      configure write-pgbouncer-yaml
     ].freeze
     SUMMARY = "Manage your Cloud SQL Postgres databases.".freeze
 
@@ -35,6 +35,8 @@ module Seira
         run_create
       when 'add'
         run_add
+      when 'configure'
+        run_configure
       when 'delete'
         run_delete
       when 'list'
@@ -95,6 +97,7 @@ module Seira
         analyze:                Display database performance information
         connect:                Open a psql command prompt via gcloud connect. You will be shown the password needed before the prompt opens.
         create:                 Create a new postgres instance in cloud sql. Supports creating replicas and other numerous flags.
+        configure:              Configure users and related secrets for existing db instance --instance= with optional --master= for read replica.
         add:                    Adds a new database to the given project. Requires --prefix=my-prefix to prefix the random name
         create-readonly-user:   Create a database user named by --username=<name> with only SELECT access privileges
         delete:                 Delete a postgres instance from cloud sql. Use with caution, and remove all kubernetes configs first.
@@ -122,6 +125,26 @@ module Seira
       Seira::Db::Create.new(app: app, action: action, args: args, context: context).add(existing_instances)
     end
 
+    def run_configure
+      instance_name = nil
+      master_name = nil
+      args.each do |arg|
+        if arg.start_with? '--instance='
+          instance_name = arg.split('=')[1]
+        elsif arg.start_with? '--master='
+          master_name = arg.split('=')[1]
+        else
+          puts "Warning: Unrecognized argument '#{arg}'"
+        end
+      end
+
+      if instance_name.nil? || instance_name.strip.chomp == ''
+        puts "Please specify the db instance name, like --instance=name"
+        exit(1)
+      end
+      Seira::Db::Create.new(app: app, action: action, args: args, context: context).configure(instance_name, master_name)
+    end
+
     def run_alter_proxyuser_roles
       Seira::Db::AlterProxyuserRoles.new(app: app, action: action, args: args, context: context).run
     end

data/lib/seira/db/create.rb

@@ -33,17 +33,7 @@ module Seira
 
         run_create_command
 
-        if replica_for.nil?
-          update_root_password
-          create_proxy_user
-        end
-
-        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."
-        puts "To make this database the primary, promote it using the CLI and update the DATABASE_URL."
+        configure_created_db
       end
 
       def add(existing_instances)
@@ -71,8 +61,29 @@ module Seira
         puts "Credentials were saved in #{secrets_name}"
       end
 
+      def configure(instance_name, master_name)
+        @name = instance_name
+        @replica_for = master_name
+
+        configure_created_db
+      end
+
       private
 
+      def configure_created_db
+        if replica_for.nil?
+          update_root_password
+          create_proxy_user
+        end
+
+        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."
+        puts "To make this database the primary, promote it using the CLI and update the DATABASE_URL."
+      end
+
       def run_create_command
         # The 'beta' is needed for HA and other beta features
         create_command = "beta sql instances create #{name}"

data/lib/seira/version.rb

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

metadata

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