souls 1.4.11 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e66a13420316392b4b913b18b0352ed38df204993a6f85de7c2dd49404459b30
-  data.tar.gz: a86643dbd67d217b146f01623627f38729b7027d3983c6bd7a5e8e5bf4df9d50
+  metadata.gz: 4b723d5fe6fdbb86fb785d308781dc7d0c5a13fcf6db3e714141a4d97c03d9d9
+  data.tar.gz: aa7ba7e1d4848499fa60ce609fada98d04167890f45275e485e1abe385a2fb36
 SHA512:
-  metadata.gz: 6ccfe8988855e7a467a02ae39874d4f56868f7a0077c3bb69b359d8e32dd0f9953f307841ca24341c442d6a0c43e6cd960f29ca8d042ffa5199467355504eb44
-  data.tar.gz: bae7c03ca1dd9feefcd21098e5b552a08362317d3b7dba2c87576024bcf65c762d1dd4b441c388f6bd6a3143ab1197455be5f5c5eb1a20ad1c33a25fca888097
+  metadata.gz: 2e141c28f1b61173a62faa5dbfcf1cb1d3e98d1ba68579ec1111583c03f34f43fec5a674caea856daf13912b3a0e0a7921c569cdf1b1d9de798fe1a70fa63ac1
+  data.tar.gz: 4ed055384cad39d2f1d82b7457cc8d3d08a3226e9af975ddb93b1340dc0e71c4939e483d6612d54b5a82ea49807618fc263042d96a674fddca3c4e8e77a19340

data/lib/souls/cli/gcloud/run/index.rb

@@ -23,7 +23,7 @@ module Souls
     desc "get_endpoint", "Show Worker's Endpoint"
     def get_endpoint(worker_name: "")
       project_id = Souls.configuration.project_id
-      `gcloud run services list  --project #{project_id} | grep #{worker_name} | awk '{print $4}'`
+      `gcloud run services list  --project #{project_id} | grep -x #{worker_name} | awk '{print $4}'`
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end

data/lib/souls/cli/gcloud/sql/index.rb

@@ -8,21 +8,22 @@ module Souls
       password = prompt.mask("Set DB PassWord:")
       app_name = Souls.configuration.app
       project_id = Souls.configuration.project_id
-      instance_name = Souls.configuration.instance_name if instance_name.blank?
+      instance_name = Souls.configuration.instance_name
       region = Souls.configuration.region if options[:region].blank?
       db_type = options[:mysql] ? "MYSQL_8_0" : "POSTGRES_13"
 
       zone = "#{region}-b"
       system(
         "gcloud sql instances create #{instance_name} \
-              --database-version=#{db_type} --cpu=1 --memory=3750MB --zone=#{zone} \
+              --database-version=#{db_type} --cpu=1 --memory=4096MB --zone=#{zone} \
               --root-password='#{password}' --database-flags cloudsql.iam_authentication=on"
       )
+      instance_ip = `gcloud sql instances list | grep -x #{instance_name} | awk '{print $5}'`.strip
       Dir.chdir(Souls.get_api_path.to_s) do
         file_path = ".env"
         File.open(file_path, "w") do |line|
           line.write(<<~TEXT)
-            SOULS_DB_HOST=#{get_sql_ip.strip}
+            SOULS_DB_HOST=#{instance_ip}
             SOULS_DB_PW=#{password}
             SOULS_DB_USER=postgres
             SOULS_GCP_PROJECT_ID=#{project_id}
@@ -36,7 +37,7 @@ module Souls
         File.open(file_path, "w") do |line|
           line.write(<<~TEXT)
             SOULS_DB_HOST="/cloudsql/#{project_id}:#{region}:#{instance_name}"
-            SOULS_DB_PW=#{options[:root_password]}
+            SOULS_DB_PW=#{password}
             SOULS_DB_USER=postgres
             SOULS_APP_NAME=#{app_name}
             SOULS_GCP_PROJECT_ID=#{project_id}
@@ -133,10 +134,6 @@ module Souls
 
     private
 
-    def get_sql_ip
-      `gcloud sql instances list | grep james | awk '{print $5}'`
-    end
-
     def region_to_timezone(region: "asia-northeast1")
       if region.include?("asia")
         "Asia/Tokyo"

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module Souls
-  VERSION = "1.4.11".freeze
+  VERSION = "1.5.2".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.4.11
+1.5.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.4.11
+1.5.2

data/lib/souls.rb

@@ -9,6 +9,7 @@ require "paint"
 require "whirly"
 require "tty-prompt"
 require "thor"
+require "resolv"
 
 module Souls
   extend Souls::Utils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.4.11
+  version: 1.5.2
 platform: ruby
 authors:
 - POPPIN-FUMI