souls 1.2.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfd94cb490b6572839d1bbe81210f365501d29746db52da19b7802a989389f78
-  data.tar.gz: ff24ba19313ef53a5b0be3650902963aa1035e86f26a44819431ec2c9a9290e0
+  metadata.gz: 56948b07884486be23ef9be575ff30331999c0fbcdf02d63991d30d23a161a57
+  data.tar.gz: dec91f275f65b3c2d8e2bc114eecfc6c43fd7d16473905b60866db5453c38816
 SHA512:
-  metadata.gz: 71400c705f4fef455e14adf98ac5f2ad51ff98ec751a6ee3ff0f08ad828d238d3383256464f7e9932035ac86dc7bfb10de756c2bb1dc90932ee812304d1bab73
-  data.tar.gz: 0c19435dad07d1e8f69213a52522d8f46c48140b415c3f420eb556a8448d003a70626132d4229a413d5518835bcf2e5c55ffe63a2cb510e2f2bc0d32987a42ec
+  metadata.gz: 04a255e490b590891b25e1f4c33409fba65ff677e556bca9dd90ff5eb62358cf5f80b0ec840b09c301a85bcabc06786e4d44a1512004c32f134e399317bfaad3
+  data.tar.gz: b2278cc9e0b024cee8559972a71d99f26e880bd22da4b44c9453500e2fd492601ecad085c4725de4e2a2d5cf0cce16d55a7a2b364235b7827ec1bf57bccfce78

data/lib/souls/cli/create/index.rb

@@ -192,7 +192,7 @@ end
                         --service-account=${{ secrets.APP_NAME }}@${{ secrets.GCP_PROJECT_ID }}.iam.gserviceaccount.com \\
                         --image=gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}-#{worker_name} \\
                         --memory=4Gi \\
-                        --region=asia-northeast1 \\
+                        --region=${{ secrets.GCP_REGION }} \\
                         --allow-unauthenticated \\
                         --platform=managed \\
                         --quiet \\

data/lib/souls/cli/db/index.rb

@@ -55,7 +55,6 @@ module Souls
         system("rake db:migrate:reset RACK_ENV=production DISABLE_DATABASE_ENVIRONMENT_CHECK=1")
       else
         system("rake db:migrate:reset")
-        system("rake db:migrate:reset RACK_ENV=test")
       end
     rescue Thor::Error => e
       raise(Thor::Error, e)

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

@@ -3,15 +3,51 @@ module Souls
     desc "create_instance", "Create Google Cloud SQL - PostgreSQL13"
     method_option :region, default: "", aliases: "--region", desc: "Google Cloud Platform Region"
     method_option :root_password, default: "", aliases: "--root-password", desc: "Set Cloud SQL Root Password"
+    method_option :mysql, type: :boolean, default: false, aliases: "--mysql", desc: "Set Cloud SQL Type to MySQL"
     def create_instance
-      instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
+      app_name = Souls.configuration.app
+      project_id = Souls.configuration.project_id
+      region = Souls.configuration.region
+      instance_name = Souls.configuration.instance_name if instance_name.blank?
       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=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone} \
+              --database-version=#{db_type} --cpu=1 --memory=3750MB --zone=#{zone} \
               --root-password='#{options[:root_password]}' --database-flags cloudsql.iam_authentication=on"
       )
+      Dir.chdir(Souls.get_api_path.to_s) do
+        file_path = ".env"
+        File.open(file_path, "w") do |line|
+          line.write(<<~TEXT)
+            DB_HOST=#{get_sql_ip.strip}
+            DB_PW=#{options[:root_password]}
+            DB_USER=postgres
+            SLACK=YOUR_WEB_HOOK_URL
+            TZ="Asia/Tokyo"
+            SECRET_KEY_BASE=xxxxxxxxxxxxxx
+          TEXT
+        end
+      end
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_path = ".env.production"
+        File.open(file_path, "w") do |line|
+          line.write(<<~TEXT)
+            DB_HOST="/cloudsql/#{project_id}:#{region}:#{instance_name}"
+            DB_PW=#{options[:root_password]}
+            DB_USER=postgres
+            APP_NAME=#{app_name}
+            GCP_PROJECT_ID=#{project_id}
+            GCP_REGION=#{region}
+            GCLOUDSQL_INSTANCE="#{project_id}:#{region}:#{instance_name}"
+            TZ="Asia/Tokyo"
+            SLACK="https://YOUR.WEB_HOOK_URL"
+            SECRET_KEY_BASE="XXXXXXXSecureTokenXXXXXXXXXX"
+          TEXT
+        end
+      end
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
@@ -35,7 +71,7 @@ module Souls
     desc "assign_network", "Assign Network"
     def assign_network
       app_name = Souls.configuration.app
-      instance_name = "#{Souls.configuration.app}-db"
+      instance_name = Souls.configuration.instance_name
       project_id = Souls.configuration.project_id
       system("gcloud beta sql instances patch #{instance_name} --project=#{project_id} --network=#{app_name}")
     rescue Thor::Error => e
@@ -80,8 +116,8 @@ module Souls
     desc "assgin_ip", "Add Current Grobal IP to White List"
     def assign_ip(instance_name: "", ip: "")
       ip = `curl inet-ip.info` if ip.blank?
-      project_id = Souls.configuration.project_id
-      instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
+      project_id = Souls.configuration.project_id if instance_name.blank?
+      instance_name = Souls.configuration.instance_name if instance_name.blank?
       system(
         "
             gcloud beta sql instances patch #{instance_name} \
@@ -94,5 +130,11 @@ module Souls
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
+
+    private
+
+    def get_sql_ip
+      `gcloud sql instances list | grep james | awk '{print $5}'`
+    end
   end
 end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.2.2
+1.3.3

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.2.2
+1.3.3

data/lib/souls.rb

@@ -49,5 +49,9 @@ module Souls
       @fixed_gems = nil
       @workers = nil
     end
+
+    def instance_name
+      "souls-#{@app}-db"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.3
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport