souls 0.23.8 → 0.23.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc320e49967853fb86acf2df6ce6a16b1c8540f15e260377d1745709a7f437ca
-  data.tar.gz: 163a19136e695cda578091a7953385a70b2ea540bf3e59e5cfc3b2cacd256e2d
+  metadata.gz: 0ac8f535bffb1cffc5cc10019b62891735f888982c000bd50e8412a887983bf5
+  data.tar.gz: a5458cc6c2b9f94452a2362f4b62f4e33f98ce5d4e68de038586f9dc0f5ce218
 SHA512:
-  metadata.gz: 9246426b3d5c941316b6d1db26fa42bb028b572749c4bbe0781a8582f04c95fbfec432863f1e59a065cc2bc8e9e0d8211e19b25cd3516392975340f81030d2a6
-  data.tar.gz: 9f5545b04138034d4c4bd7ac4caef9172754fa6e42538730266ee9722cb6e98e66f573762f40433790f1cc928906b1b75d743ee807abe400772e0317efc8528c
+  metadata.gz: 27c3d5389d371076afe009ea9839dd23ff97701bf3ef5b901a7d5c80eb01bdb2b76f01cec1ffd771cab42acec5cbe64b2baa74846a68dc982a78c46cef3e752c
+  data.tar.gz: e70e36f757202fcc306401e95414de79c671797aeccd27646b2f1b7fdf85552b6f8fcfb7fed0e51d9ecfc55fc1a67bbabe1240e4757349e0e68d36292d425e17

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.23.7)
+    souls (0.23.8)
       paint (= 2.2.1)
       whirly (= 0.3.0)
 

data/config/souls.rb

@@ -1,5 +1,5 @@
 Souls.configure do |config|
   config.app = "souls-app"
-  config.project_id = "souls-app"
+  config.project_id = "el-soul"
   config.strain = "api"
 end

data/exe/souls

@@ -69,7 +69,22 @@ begin
     Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
       Whirly.status = status
       send_method = ARGV[1]
-      Souls::Gcloud.public_send(send_method)
+
+      case send_method
+      when "create_pubsub_topic"
+        topic_name = ARGV[2]
+        args = { topic_name: topic_name }
+        Souls::Gcloud.public_send(send_method, args)
+      when "create_pubsub_subscription"
+        project_id = Souls.configuration.project_id
+        topic_name = ARGV[2]
+        service_account = "#{Souls.configuration.app}@#{project_id}iam.gserviceaccount.com"
+        endpoint = Souls.configuration.endpoint
+        args = { project_id: project_id, topic_name: topic_name, service_account: service_account, endpoint: endpoint }
+        Souls::Gcloud.public_send(send_method, args)
+      else
+        Souls::Gcloud.public_send(send_method)
+      end
       Whirly.status = "Done!"
     end
   when "-v", "--version"

data/lib/souls.rb

@@ -185,14 +185,15 @@ module Souls
   end
 
   class Configuration
-    attr_accessor :app, :strain, :project_id, :worker_name, :api_name
+    attr_accessor :app, :strain, :project_id, :worker_repo, :api_repo, :worker_endpoint
 
     def initialize
       @app = nil
       @project_id = nil
       @strain = nil
-      @worker_name = nil
-      @api_name = nil
+      @worker_repo = nil
+      @api_repo = nil
+      @worker_endpoint = nil
     end
   end
 end

data/lib/souls/gcloud.rb

@@ -1,5 +1,6 @@
 require_relative "./gcloud/compute"
 require_relative "./gcloud/iam"
+require_relative "./gcloud/pubsub"
 
 module Souls
   module Gcloud

data/lib/souls/gcloud/compute.rb

@@ -1,71 +1,73 @@
 module Souls
   module Gcloud
-    def self.auth_login
-      project_id = Souls.configuration.project_id
-      system("gcloud config set project #{project_id}")
-      system("gcloud auth login")
-    end
+    class << self
+      def auth_login
+        project_id = Souls.configuration.project_id
+        system("gcloud config set project #{project_id}")
+        system("gcloud auth login")
+      end
 
-    def self.enable_permissions
-      system("gcloud services enable compute.googleapis.com")
-      puts("Operating permission to compute.googleapis.com ...")
-      system("gcloud services enable iam.googleapis.com")
-      puts("Operating permission to iam.googleapis.com ...")
-      system("gcloud services enable dns.googleapis.com")
-      puts("Operating permission to dns.googleapis.com ...")
-      system("gcloud services enable sqladmin.googleapis.com")
-      puts("Operating permission to sqladmin.googleapis.com ...")
-      system("gcloud services enable sql-component.googleapis.com")
-      puts("Operating permission to sql-component.googleapis.com ...")
-      system("gcloud services enable servicenetworking.googleapis.com")
-      puts("Operating permission to servicenetworking.googleapis.com ...")
-      system("gcloud services enable containerregistry.googleapis.com")
-      puts("Operating permission to containerregistry.googleapis.com")
-      system("gcloud services enable run.googleapis.com")
-      puts("Operating permission to run.googleapis.com")
-    end
+      def enable_permissions
+        system("gcloud services enable compute.googleapis.com")
+        puts("Operating permission to compute.googleapis.com ...")
+        system("gcloud services enable iam.googleapis.com")
+        puts("Operating permission to iam.googleapis.com ...")
+        system("gcloud services enable dns.googleapis.com")
+        puts("Operating permission to dns.googleapis.com ...")
+        system("gcloud services enable sqladmin.googleapis.com")
+        puts("Operating permission to sqladmin.googleapis.com ...")
+        system("gcloud services enable sql-component.googleapis.com")
+        puts("Operating permission to sql-component.googleapis.com ...")
+        system("gcloud services enable servicenetworking.googleapis.com")
+        puts("Operating permission to servicenetworking.googleapis.com ...")
+        system("gcloud services enable containerregistry.googleapis.com")
+        puts("Operating permission to containerregistry.googleapis.com")
+        system("gcloud services enable run.googleapis.com")
+        puts("Operating permission to run.googleapis.com")
+      end
 
-    def self.create_network
-      return "Error: Please Set Souls.configuration" if Souls.configuration.app.nil?
+      def create_network
+        return "Error: Please Set Souls.configuration" if Souls.configuration.app.nil?
 
-      network = Souls.configuration.app
-      system("gcloud compute networks create #{network}")
-    rescue StandardError => e
-      raise(StandardError, e)
-    end
+        network = Souls.configuration.app
+        system("gcloud compute networks create #{network}")
+      rescue StandardError => e
+        raise(StandardError, e)
+      end
 
-    def self.create_firewall(ip_range: "10.140.0.0/20")
-      network = Souls.configuration.app
-      system(
-        "gcloud compute firewall-rules create #{network}
-      --network #{network}
-      --allow tcp,udp,icmp
-      --source-ranges #{ip_range}"
-      )
-      system("gcloud compute firewall-rules create #{network}-ssh --network #{network} --allow tcp:22,tcp:3389,icmp")
-    end
+      def create_firewall(ip_range: "10.140.0.0/20")
+        network = Souls.configuration.app
+        system(
+          "gcloud compute firewall-rules create #{network}
+          --network #{network}
+          --allow tcp,udp,icmp
+          --source-ranges #{ip_range}"
+        )
+        system("gcloud compute firewall-rules create #{network}-ssh --network #{network} --allow tcp:22,tcp:3389,icmp")
+      end
 
-    def self.create_private_access
-      network = Souls.configuration.app
-      project_id = Souls.configuration.project_id
-      system(
-        "gcloud compute addresses create #{network}-my-network \
-      --global \
-      --purpose=VPC_PEERING \
-      --prefix-length=16 \
-      --description='peering range for SOULs' \
-      --network=#{network} \
-      --project=#{project_id}"
-      )
-    end
+      def create_private_access
+        network = Souls.configuration.app
+        project_id = Souls.configuration.project_id
+        system(
+          "gcloud compute addresses create #{network}-my-network \
+          --global \
+          --purpose=VPC_PEERING \
+          --prefix-length=16 \
+          --description='peering range for SOULs' \
+          --network=#{network} \
+          --project=#{project_id}"
+        )
+      end
 
-    def self.create_sql_instance(root_pass: "Postgre123!", zone: "asia-northeast1-b")
-      app = "#{Souls.configuration.app}-db"
-      system(
-        "gcloud sql instances create #{app}
-        --database-version=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone}
-        --root-password='#{root_pass}' --database-flags cloudsql.iam_authentication=on"
-      )
+      def create_sql_instance(root_pass: "Postgre123!", zone: "asia-northeast1-b")
+        app = "#{Souls.configuration.app}-db"
+        system(
+          "gcloud sql instances create #{app}
+            --database-version=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone}
+            --root-password='#{root_pass}' --database-flags cloudsql.iam_authentication=on"
+        )
+      end
     end
   end
 end

data/lib/souls/gcloud/iam.rb

@@ -1,30 +1,32 @@
 module Souls
   module Gcloud
-    def self.create_service_account(service_account: "souls-app")
-      `gcloud iam service-accounts create #{service_account} \
-      --description="Souls Service Account" \
-      --display-name="#{service_account}"`
-    end
+    class << self
+      def create_service_account(service_account: "souls-app")
+        `gcloud iam service-accounts create #{service_account} \
+        --description="Souls Service Account" \
+        --display-name="#{service_account}"`
+      end
 
-    def self.create_service_account_key(service_account: "souls-app")
-      project_id = Souls.configuration.project_id
-      `gcloud iam service-accounts keys create ./config/keyfile.json \
-        --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com`
-    end
+      def create_service_account_key(service_account: "souls-app")
+        project_id = Souls.configuration.project_id
+        `gcloud iam service-accounts keys create ./config/keyfile.json \
+          --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com`
+      end
 
-    def self.add_service_account_role(service_account: "souls-app", role: "roles/firebase.admin")
-      project_id = Souls.configuration.project_id
-      `gcloud projects add-iam-policy-binding #{project_id} \
-      --member="serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com" \
-      --role="#{role}"`
-    end
+      def add_service_account_role(service_account: "souls-app", role: "roles/firebase.admin")
+        project_id = Souls.configuration.project_id
+        `gcloud projects add-iam-policy-binding #{project_id} \
+        --member="serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com" \
+        --role="#{role}"`
+      end
 
-    def self.add_permissions(service_account: "souls-app")
-      add_service_account_role(service_account: service_account, role: "roles/cloudsql.serviceAgent")
-      add_service_account_role(service_account: service_account, role: "roles/containerregistry.ServiceAgent")
-      add_service_account_role(service_account: service_account, role: "roles/pubsub.serviceAgent")
-      add_service_account_role(service_account: service_account, role: "roles/firestore.serviceAgent")
-      add_service_account_role(service_account: service_account, role: "roles/iam.serviceAccountUser")
+      def add_permissions(service_account: "souls-app")
+        add_service_account_role(service_account: service_account, role: "roles/cloudsql.serviceAgent")
+        add_service_account_role(service_account: service_account, role: "roles/containerregistry.ServiceAgent")
+        add_service_account_role(service_account: service_account, role: "roles/pubsub.serviceAgent")
+        add_service_account_role(service_account: service_account, role: "roles/firestore.serviceAgent")
+        add_service_account_role(service_account: service_account, role: "roles/iam.serviceAccountUser")
+      end
     end
   end
 end

data/lib/souls/gcloud/pubsub.rb

@@ -0,0 +1,21 @@
+module Souls
+  module Gcloud
+    class << self
+      def create_pubsub_topic(args)
+        system("gcloud pubsub topics create #{args[:topic_name]}")
+      end
+
+      def create_pubsub_subscription(args)
+        system(
+          "gcloud pubsub subscriptions create #{args[:topic_name]}-sub \
+          --topic #{args[:topic_name]} \
+          --topic-project #{args[:project_id]} \
+          --push-auth-service-account #{args[:service_account]} \
+          --push-endpoint #{args[:endpoint]} \
+          --expiration-period never
+           "
+        )
+      end
+    end
+  end
+end

data/lib/souls/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.23.8
+  version: 0.23.9
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -75,6 +75,7 @@ files:
 - lib/souls/gcloud.rb
 - lib/souls/gcloud/compute.rb
 - lib/souls/gcloud/iam.rb
+- lib/souls/gcloud/pubsub.rb
 - lib/souls/generate.rb
 - lib/souls/generate/application.rb
 - lib/souls/generate/connection.rb