souls 0.35.2 → 0.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dacb9b58643bb6a26a4cb2a994296c6c1ed81a761ff5244141d28fdf1343958a
-  data.tar.gz: ed557b37c4e6c39471795b1b7fc08e1f75fae7521179099738a2becb3b630eb5
+  metadata.gz: d6a59673cbe8fbbc5fd02e75a7ca5d04d5e190e0555be86f721c3ef3c1d33624
+  data.tar.gz: c4f4e094d3bc26d79c9d1bc37c2f15361f191335cc15fcc29a74e3c85af392ae
 SHA512:
-  metadata.gz: 6a61f4d5a83f359dfe38e787e99584e00a0f245d810058468185843c7f13559cc9a4323bcd718f5130973c14cf9bd09bccbc606ebc793ae0183fbf14b5406070
-  data.tar.gz: 208239db7f27943c5cd0b4ac2cb13fec2e3af7c7a76bce43cdc044d51ba66ea235b4549cb4e0d5ef94930a1ebf613aa15218033c1151b2ec31a53fb81706ba70
+  metadata.gz: 1957d2a8a3a1389a2c6306c3a695f2c4e5e7b6ff03c46c9e552961a77c8f277a9a58c12a92ba27b5dc6d2791bfdf2a85a888decab54c0481ac2df8464fcdf6c4
+  data.tar.gz: 936917a7190919b9fb48b0aa69a08e09cfa9225b12bbbf94209bfc70e6acbca4a0e1d3f2568851e2dba2c88906315ca3673d7f676c4c436a974611fdf3be6558

data/exe/souls

@@ -151,7 +151,8 @@ begin
     service_name = ARGV[1]
     case service_name
     when "worker"
-      Souls::Init.download_worker
+      worker_name = ARGV[2]
+      Souls::Create.worker(worker_name: worker_name)
     else
       puts(Paint["Coming Soon...", :green])
     end

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

@@ -0,0 +1,196 @@
+module Souls
+  module Create
+    class << self
+      def worker(worker_name: "mailer")
+        workers = Souls.configuration.workers
+        port = 3000 + workers.size
+        download_worker(worker_name: worker_name)
+        souls_conf_update(worker_name: worker_name)
+        souls_conf_update(worker_name: worker_name, strain: "api")
+        workflow(worker_name: worker_name)
+        procfile(worker_name: worker_name, port: port)
+        mother_procfile(worker_name: worker_name)
+      end
+
+      def procfile(worker_name: "mailer", port: 3000)
+        file_dir = "apps/#{worker_name}"
+        file_path = "#{file_dir}/Procfile.dev"
+        File.open(file_path, "w") do |f|
+          f.write("web: bundle exec puma -p #{port} -e development")
+        end
+      end
+
+      def mother_procfile(worker_name: "mailer")
+        file_path = "Procfile.dev"
+        File.open(file_path, "a") do |f|
+          f.write("\n#{worker_name}: foreman start -f ./apps/#{worker_name}/Procfile")
+        end
+      end
+
+      def souls_conf_update(worker_name: "", strain: "mother")
+        workers = Souls.configuration.workers
+        port = 3000 + workers.size
+        file_path = strain == "mother" ? "config/souls.rb" : "apps/api/config/souls.rb"
+        new_file_path = "souls.rb"
+        worker_switch = false
+        File.open(new_file_path, "w") do |new_line|
+          File.open(file_path, "r") do |f|
+            f.each_line do |line|
+              worker_switch = true if line.include?("config.workers")
+              next if line.strip == "end"
+
+              new_line.write(line) unless worker_switch
+
+              next unless worker_switch
+
+              new_line.write("  config.workers = [\n")
+              workers.each do |worker|
+                new_line.write(<<-TEXT)
+    {
+      name: "#{worker[:name]}",
+      endpoint: "#{worker[:endpoint]}",
+      port: #{worker[:port]}
+    },
+                TEXT
+              end
+              break
+            end
+          end
+          new_line.write(<<-TEXT)
+    {
+      name: "#{worker_name}",
+      endpoint: "",
+      port: #{port}
+    }
+  ]
+end
+          TEXT
+        end
+        FileUtils.rm(file_path)
+        FileUtils.mv(new_file_path, file_path)
+      end
+
+      def workflow(worker_name: "")
+        file_dir = ".github/workflows"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}/#{worker_name}.yml"
+        worker_name = worker_name.underscore
+        worker_name_camelize = worker_name.camelize
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            name: #{worker_name_camelize}
+
+            on:
+              push:
+                branches:
+                  - master
+                paths:
+                  - "apps/#{worker_name}/**"
+                  - ".github/workflows/#{worker_name}.yml"
+
+            jobs:
+              build:
+
+                runs-on: ubuntu-20.04
+
+                services:
+                  db:
+                    image: postgres:13
+                    ports: ["5433:5432"]
+                    env:
+                      POSTGRES_PASSWORD: postgres
+                    options: >-
+                      --health-cmd pg_isready
+                      --health-interval 10s
+                      --health-timeout 5s
+                      --health-retries 5
+
+                steps:
+                - uses: actions/checkout@v2
+                - name: Set up Ruby 3.0
+                  uses: actions/setup-ruby@v1
+                  with:
+                    ruby-version: 3.0
+                - name: Build and test with Rake
+                  env:
+                    PGHOST: 127.0.0.1
+                    PGUSER: postgres
+                    RACK_ENV: test
+                  run: |
+                    sudo apt-get -yqq install libpq-dev
+                    cd apps/worker
+                    gem install bundler
+                    bundle install --jobs 4 --retry 3
+                    bundle exec rake db:create RACK_ENV=test
+                    bundle exec rake db:migrate RACK_ENV=test
+                    bundle exec rspec
+
+                - name: Checkout the repository
+                  uses: actions/checkout@v2
+
+                - name: GCP Authenticate
+                  uses: google-github-actions/setup-gcloud@master
+                  with:
+                    version: "323.0.0"
+                    project_id: ${{ secrets.GCP_PROJECT_ID }}
+                    service_account_key: ${{ secrets.GCP_SA_KEY }}
+                    export_default_credentials: true
+
+                - name: Configure Docker
+                  run: gcloud auth configure-docker --quiet
+
+                - name: Build Docker container
+                  run: docker build -f ./apps/#{worker_name}/Dockerfile ./apps/#{worker_name} -t gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}-#{worker_name}
+
+                - name: Push to Container Resistory
+                  run: docker push gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}-#{worker_name}
+
+                - name: Deploy to Cloud Run
+                  run: |
+                      gcloud run deploy ${{ secrets.APP_NAME }}-#{worker_name} \\
+                        --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 \\
+                        --allow-unauthenticated \\
+                        --platform=managed \\
+                        --quiet \\
+                        --concurrency=80 \\
+                        --port=8080 \\
+                        --set-cloudsql-instances=${{ secrets.GCLOUDSQL_INSTANCE }} \\
+                        --set-env-vars="DB_USER=${{ secrets.DB_USER }}" \\
+                        --set-env-vars="DB_PW=${{ secrets.DB_PW }}" \\
+                        --set-env-vars="DB_HOST=${{ secrets.DB_HOST }}" \\
+                        --set-env-vars="TZ=${{ secrets.TZ }}" \\
+                        --set-env-vars="SLACK=${{ secrets.SLACK }}" \\
+                        --set-env-vars="SECRET_KEY_BASE=${{ secrets.SECRET_KEY_BASE }}" \\
+                        --set-env-vars="PROJECT_ID=${{ secrets.GCP_PROJECT_ID }}"
+          TEXT
+        end
+        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+        file_path
+      rescue StandardError => e
+        raise(StandardError, e)
+      end
+
+      def download_worker(worker_name: "mailer")
+        raise(StandardError, "Can't use `worker` for worker. Change Name.") if worker_name == "worker"
+
+        current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+        wrong_dir = %w[apps api worker]
+        if wrong_dir.include?(current_dir_name)
+          raise(StandardError, "You are at wrong directory!Go to Mother Directory!")
+        end
+
+        version = Souls.get_latest_version_txt(service_name: "worker").join(".")
+        file_name = "worker-v#{version}.tgz"
+        url = "https://storage.googleapis.com/souls-bucket/boilerplates/workers/#{file_name}"
+        system("curl -OL #{url}")
+        system("tar -zxvf ./#{file_name} -C ./apps/")
+        system("mv apps/worker apps/#{worker_name}")
+        system("cp ./apps/api/config/database.yml ./apps/#{worker_name}/config/")
+        FileUtils.rm(file_name)
+      end
+    end
+  end
+end

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

@@ -5,11 +5,12 @@ module Souls
         def setup_vpc_nat(app_name: "", region: "asia-northeast1", range: "10.124.0.0/28")
           create_network(app_name: app_name)
           create_firewall_tcp(app_name: app_name, range: range)
-          create_firewall_ssh(app_name: app_name, range: range)
+          create_firewall_ssh(app_name: app_name)
           create_subnet(app_name: app_name, region: region, range: range)
           create_connector(app_name: app_name, region: region)
           create_external_ip(app_name: app_name, region: region)
           create_nat(app_name: app_name, region: region)
+          nat_credit(app_name: app_name)
         end
 
         def create_network(app_name: "")
@@ -43,7 +44,7 @@ module Souls
 
         def create_connector(app_name: "", region: "asia-northeast1")
           app_name = Souls.configuration.app if app_name.blank?
-          project_id = Souls.configuration.app if project_id.blank?
+          project_id = Souls.configuration.project_id
           system(
             "gcloud compute networks vpc-access connectors create #{app_name}-connector \
               --region=#{region} \
@@ -71,6 +72,42 @@ module Souls
         def network_list
           system("gcloud compute network list")
         end
+
+        def nat_credit(app_name: "")
+          app_name = Souls.configuration.app if app_name.blank?
+          line = Paint["====================================", :yellow]
+          puts("\n")
+          puts(line)
+          txt2 = <<~TEXT
+               _____ ____  __  ____#{'        '}
+              / ___// __ \\/ / / / /   %{red1}
+              \\__ \\/ / / / / / / /   %{red2}
+             ___/ / /_/ / /_/ / /___%{red3}#{' '}
+            /____/\\____/\\____/_____%{red4}#{'  '}
+          TEXT
+          red1 = ["_____", :red]
+          red2 = ["/ ___/", :red]
+          red3 = ["(__  )", :red]
+          red4 = ["/____/", :red]
+          ms = Paint % [txt2, :cyan, { red1: red1, red2: red2, red3: red3, red4: red4 }]
+          puts(ms)
+          puts(line)
+          welcome = Paint["VPC Network is All Set!", :white]
+          puts(welcome)
+          puts(line)
+          endroll = <<~TEXT
+
+            Edit  `.github/workflow/worker.yml`
+
+            Add these 2 options in `- name: Deploy to Cloud Run` step
+            --vpc-connector=#{app_name}-connector \
+            --vpc-egress=all \
+
+          TEXT
+          cd = Paint[endroll, :white]
+          puts(cd)
+          puts(line)
+        end
       end
     end
   end

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

@@ -30,6 +30,8 @@ module Souls
         puts("Operating permission to containerregistry.googleapis.com")
         system("gcloud services enable run.googleapis.com")
         puts("Operating permission to run.googleapis.com")
+        system("gcloud services enable vpcaccess.googleapis.com")
+        puts("Operating permission to vpcaccess.googleapis.com")
       end
     end
     module Iam

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

@@ -14,6 +14,10 @@ module Souls
           project_id = Souls.configuration.project_id if project_id.blank?
           system("gcloud run services list --project #{project_id}")
         end
+
+        def get_endpoint(worker_name: "")
+          system("gcloud run services list | grep #{worker_name} | awk '{print $4}'")
+        end
       end
     end
   end

data/lib/souls/cli/index.rb

@@ -1,3 +1,4 @@
+require_relative "./create/index"
 require_relative "./docker/index"
 require_relative "./gcloud/index"
 require_relative "./release/index"
@@ -5,6 +6,9 @@ require_relative "./sync/index"
 require_relative "./upgrade/index"
 
 module Souls
+  module Create
+  end
+
   module Docker
   end
 

data/lib/souls/init.rb

@@ -44,6 +44,7 @@ module Souls
             config.project_id = "#{app_name}-project"
             config.strain = "api"
             config.fixed_gems = ["excluded_gem"]
+            config.workers = []
           end
         TEXT
       end
@@ -72,6 +73,7 @@ module Souls
             config.project_id = "#{app_name}-project"
             config.strain = "mother"
             config.fixed_gems = ["excluded_gem"]
+            config.workers = []
           end
         TEXT
       end
@@ -145,55 +147,5 @@ module Souls
       puts(cd)
       puts(line)
     end
-
-    def self.download_worker
-      current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
-      wrong_dir = %w[apps api worker]
-      raise(StandardError, "You are at wrong directory!Go to Mother Directory!") if wrong_dir.include?(current_dir_name)
-
-      version = Souls.get_latest_version_txt(service_name: "worker").join(".")
-      file_name = "worker-v#{version}.tgz"
-      url = "https://storage.googleapis.com/souls-bucket/boilerplates/workers/#{file_name}"
-      system("curl -OL #{url}")
-      system("mkdir -p ./apps/worker")
-      system("tar -zxvf ./#{file_name} -C ./apps/")
-      system("cp ./apps/api/config/database.yml ./apps/worker/config/")
-      FileUtils.rm(file_name)
-      line = Paint["====================================", :yellow]
-      puts("\n")
-      puts(line)
-      txt2 = <<~TEXT
-           _____ ____  __  ____#{'        '}
-          / ___// __ \\/ / / / /   %{red1}
-          \\__ \\/ / / / / / / /   %{red2}
-         ___/ / /_/ / /_/ / /___%{red3}#{' '}
-        /____/\\____/\\____/_____%{red4}#{'  '}
-      TEXT
-      red1 = ["_____", :red]
-      red2 = ["/ ___/", :red]
-      red3 = ["(__  )", :red]
-      red4 = ["/____/", :red]
-      ms = Paint % [txt2, :cyan, { red1: red1, red2: red2, red3: red3, red4: red4 }]
-      puts(ms)
-      puts(line)
-      welcome = Paint["SOULs Worker Activated!", :white]
-      puts(welcome)
-      souls_ver = Paint["SOULs Version: #{Souls::VERSION}", :white]
-      puts(souls_ver)
-      puts(line)
-      endroll = <<~TEXT
-        Easy to Run
-        $ cd ./apps/worker
-        $ bundle
-        $ souls sync model
-        $ souls s
-        Go To : http://localhost:3000
-
-        Doc: https://souls.elsoul.nl
-      TEXT
-      cd = Paint[endroll, :white]
-      puts(cd)
-      puts(line)
-    end
   end
 end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.14.2
+0.15.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.14.2
+0.15.1

data/lib/souls.rb

@@ -246,7 +246,7 @@ module Souls
   end
 
   class Configuration
-    attr_accessor :app, :strain, :project_id, :github_repo, :worker_endpoint, :fixed_gems
+    attr_accessor :app, :strain, :project_id, :github_repo, :worker_endpoint, :fixed_gems, :workers
 
     def initialize
       @app = nil
@@ -255,6 +255,7 @@ module Souls
       @github_repo = nil
       @worker_endpoint = nil
       @fixed_gems = nil
+      @workers = nil
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.35.2
+  version: 0.36.1
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -125,6 +125,7 @@ files:
 - lib/souls/api/update/rspec_mutation.rb
 - lib/souls/api/update/rspec_resolver.rb
 - lib/souls/api/update/type.rb
+- lib/souls/cli/create/index.rb
 - lib/souls/cli/docker/index.rb
 - lib/souls/cli/gcloud/compute/index.rb
 - lib/souls/cli/gcloud/iam/index.rb
@@ -157,7 +158,7 @@ metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
   changelog_uri: https://github.com/elsoul/souls
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -173,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
   クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。