souls 0.34.1 → 0.35.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11ea0d3d152bfd921a5536ea3a98a693d2e9ba78d6a6fc6a9e4355dc23c51923
-  data.tar.gz: 7370f5e2720a8969e8ec600ab77b2096eabf623418135c5d7393cc324cafcbe6
+  metadata.gz: dacb9b58643bb6a26a4cb2a994296c6c1ed81a761ff5244141d28fdf1343958a
+  data.tar.gz: ed557b37c4e6c39471795b1b7fc08e1f75fae7521179099738a2becb3b630eb5
 SHA512:
-  metadata.gz: d84214351d9bfdc3f50e8a01a5c0904ff416bb7851c5bb55730cea38fa24ead6173b57abd9346cded335f8648330ab6ec84c478a83061a9ce9378f8455d9eefd
-  data.tar.gz: 560e3f0e0dc305f684a80fe2b6b3f0b8d993cbafc5ad39f0e5b60b469a1c41fdcdef27cab2ffe5bc0257de8d752265d612787d2d8cbcacda9043ac0f1847366b
+  metadata.gz: 6a61f4d5a83f359dfe38e787e99584e00a0f245d810058468185843c7f13559cc9a4323bcd718f5130973c14cf9bd09bccbc606ebc793ae0183fbf14b5406070
+  data.tar.gz: 208239db7f27943c5cd0b4ac2cb13fec2e3af7c7a76bce43cdc044d51ba66ea235b4549cb4e0d5ef94930a1ebf613aa15218033c1151b2ec31a53fb81706ba70

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

@@ -0,0 +1,77 @@
+module Souls
+  module Gcloud
+    module Compute
+      class << self
+        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_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)
+        end
+
+        def create_network(app_name: "")
+          app_name = Souls.configuration.app if app_name.blank?
+          system("gcloud compute networks create #{app_name}")
+        end
+
+        def create_firewall_tcp(app_name: "", range: "10.124.0.0/28")
+          app_name = Souls.configuration.app if app_name.blank?
+          system(
+            "gcloud compute firewall-rules create #{app_name} \
+                  --network #{app_name} --allow tcp,udp,icmp --source-ranges #{range}"
+          )
+        end
+
+        def create_firewall_ssh(app_name: "")
+          app_name = Souls.configuration.app if app_name.blank?
+          system(
+            "gcloud compute firewall-rules create #{app_name}-ssh --network #{app_name} \
+            --allow tcp:22,tcp:3389,icmp"
+          )
+        end
+
+        def create_subnet(app_name: "", region: "asia-northeast1", range: "10.124.0.0/28")
+          app_name = Souls.configuration.app if app_name.blank?
+          system(
+            "gcloud compute networks subnets create #{app_name}-subnet \
+            --range=#{range} --network=#{app_name} --region=#{region}"
+          )
+        end
+
+        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?
+          system(
+            "gcloud compute networks vpc-access connectors create #{app_name}-connector \
+              --region=#{region} \
+              --subnet-project=#{project_id} \
+              --subnet=#{app_name}-subnet"
+          )
+        end
+
+        def create_external_ip(app_name: "", region: "asia-northeast1")
+          app_name = Souls.configuration.app if app_name.blank?
+          system("gcloud compute addresses create #{app_name}-worker-ip --region=#{region}")
+        end
+
+        def create_nat(app_name: "", region: "asia-northeast1")
+          app_name = Souls.configuration.app if app_name.blank?
+          system(
+            "gcloud compute routers nats create #{app_name}-worker-nat \
+                  --router=#{app_name}-router \
+                  --region=#{region} \
+                  --nat-custom-subnet-ip-ranges=#{app_name}-subnet \
+                  --nat-external-ip-pool=#{app_name}-worker-ip"
+          )
+        end
+
+        def network_list
+          system("gcloud compute network list")
+        end
+      end
+    end
+  end
+end

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

@@ -28,7 +28,7 @@ module Souls
           end
           key = text.join(",").gsub(/^,/, "").chomp!
           github_repo = `git remote show origin -n | grep 'Fetch URL:' | awk '{print $3}'`.strip
-          github_repo = "https://github.com/#{github_repo.match(/\:(.+).git/)[1]}" if github_repo.include?("git@github")
+          github_repo = "https://github.com/#{github_repo.match(/:(.+).git/)[1]}" if github_repo.include?("git@github")
           puts(Paint[key, :white])
           puts(Paint["======= above（ここまで）=======", :cyan])
           github_secret_url = "#{github_repo}/settings/secrets/actions"
@@ -53,7 +53,9 @@ module Souls
           FileUtils.rm(file_path)
         end
 
-        def add_service_account_role(service_account: "souls-app", project_id: "souls-app", role: "roles/firebase.admin")
+        def add_service_account_role(
+          service_account: "souls-app", project_id: "souls-app", role: "roles/firebase.admin"
+        )
           system(
             "gcloud projects add-iam-policy-binding #{project_id} \
           --member='serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com' \

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

@@ -2,6 +2,7 @@ require_relative "./iam/index"
 require_relative "./pubsub/index"
 require_relative "./run/index"
 require_relative "./sql/index"
+require_relative "./compute/index"
 
 module Souls
   module Gcloud

data/lib/souls/cli/sync/model.rb

@@ -42,9 +42,10 @@ module Souls
         else
           api_file_data = file_diff(Dir["#{api_dir}/*.rb"])
           worker_file_data = file_diff(Dir["#{worker_dir}/*.rb"])
-
-          api_latest_date = Time.parse(api_file_data.max)
-          worker_latest_date = Time.parse(worker_file_data.max)
+          # rubocop:disable Style/DateTime
+          api_latest_date = DateTime.parse(api_file_data.max)
+          worker_latest_date = DateTime.parse(worker_file_data.max)
+          # rubocop:enable Style/DateTime
         end
 
         if api_latest_date < worker_latest_date

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.13.1
+0.14.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.13.1
+0.14.2

data/lib/souls/worker/generate/index.rb

@@ -1,2 +1,2 @@
 require_relative "./mailer"
-require_relative "./mutation"
+require_relative "./mutation"

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.34.1
+  version: 0.35.2
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,6 +126,7 @@ files:
 - lib/souls/api/update/rspec_resolver.rb
 - lib/souls/api/update/type.rb
 - lib/souls/cli/docker/index.rb
+- lib/souls/cli/gcloud/compute/index.rb
 - lib/souls/cli/gcloud/iam/index.rb
 - lib/souls/cli/gcloud/index.rb
 - lib/souls/cli/gcloud/pubsub/index.rb
@@ -145,7 +146,6 @@ files:
 - lib/souls/version.rb
 - lib/souls/versions/.souls_api_version
 - lib/souls/versions/.souls_worker_version
-- lib/souls/worker/generate.rb
 - lib/souls/worker/generate/index.rb
 - lib/souls/worker/generate/mailer.rb
 - lib/souls/worker/generate/mutation.rb
@@ -157,7 +157,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 +173,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 ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。