souls 1.9.11 → 1.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f30491de141e0ea11f97bdb7a03b14cbe70ac161f7e480ff7ea235cf730324ca
-  data.tar.gz: 53f3b274ba7834e0279be8b304ff669183861c282125db8d5576f22cd5168f61
+  metadata.gz: 30e75a60a55603333c57c9cfbd45ec5c9a16854cda31c29d1a840439c221967f
+  data.tar.gz: 2019911a647b0784122a025f8225b8b277544bbe96055e6851277e2da7974ebc
 SHA512:
-  metadata.gz: fd53298937c0438c4b6542483fe195f63322218802e16b5c52e7147b1d60bf11a2af259b730e3016a2f11ae812df717ad15460ff9a1c40e67a49f851b25c8cba
-  data.tar.gz: 267823450763ccb227c9f258965603ee60c359f14404d16b0ae4e8b941051a61da67cda2b5d5bf07875bcf937f44c415a4ef8599dcf31b9d0851a1b4a4f1c14c
+  metadata.gz: d75036d900131455cd301b3170b51a778c99bae004123e9be4ffc0ace011bcdc98848a931ad76713cf4a8f10afe57bca4d7e41ecf14bd328e9fbdd5696fd46fc
+  data.tar.gz: e5d25f3dfd8617030124e34de5e0c1ad374099e5a57da3c4bdf44c63354adc72e907d106e3cb9173dab7d29093f8d26f77104386e43e6ed45d309a33932ffd75

data/lib/souls/app/index.rb

@@ -1,4 +1,5 @@
 require_relative "graphql/souls_query"
+require_relative "utils/souls_logger"
 
 module Souls
 end

data/lib/souls/app/utils/souls_logger.rb

@@ -0,0 +1,55 @@
+module Souls
+  module SoulsLogger
+    class Configuration
+      attr_accessor :logger
+
+      def initialize
+        @logger = nil
+      end
+    end
+
+    class << self
+      attr_writer :configuration
+    end
+
+    def self.configuration
+      @configuration ||= Configuration.new
+    end
+
+    def self.configure
+      yield(configuration)
+    end
+
+    def self.critical_log(message)
+      entry = write_log(message)
+      entry.critical!
+
+      configuration.logger.write_entries(entry)
+    end
+
+    def self.warning_log(message)
+      entry = write_log(message)
+      entry.warning!
+
+      configuration.logger.write_entries(entry)
+    end
+
+    def self.info_log(message)
+      entry = write_log(message)
+      entry.info!
+
+      configuration.logger.write_entries(entry)
+    end
+
+    def self.write_log(message)
+      entry = configuration.logger.entry
+      entry.payload = "#{message}\n #{message.backtrace.join("\n")}"
+      entry.log_name = "error"
+      entry.resource.type = "cloud_run_revision"
+      entry.resource.labels[:service_name] = "souls"
+      entry.resource.labels[:revision_name] = Souls::VERSION
+
+      entry
+    end
+  end
+end

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

@@ -95,8 +95,7 @@ module Souls
         "roles/storage.admin",
         "roles/storage.objectAdmin",
         "roles/cloudscheduler.admin",
-        "roles/appengine.appCreator",
-        "roles/cloudscheduler.admin"
+        "roles/appengine.appCreator"
       ]
       roles.each do |role|
         add_service_account_role(role: role)

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

@@ -15,14 +15,44 @@ module Souls
       require("./app")
       Souls::Gcloud.new.config_set
       project_id = Souls.configuration.project_id
+
+      schedules_list = current_schedules
+
       Queries::BaseQuery.all_schedules.each do |k, v|
         worker_name = FileUtils.pwd.split("/").last
-        job_name = "#{worker_name}_#{k.to_s.underscore}"
-        system("gcloud scheduler jobs delete #{job_name} -q >/dev/null 2>&1")
-        system(
-          <<~COMMAND)
-            gcloud scheduler jobs create pubsub #{job_name} --project=#{project_id} --quiet --schedule="#{v}" --topic="#{k}" --attributes="" --message-body="#{k}"
-          COMMAND
+        job_name = "#{worker_name}_#{k.to_s.underscore}".to_sym
+
+        if schedules_list.include?(job_name)
+          schedule = schedules_list[job_name]
+          schedules_list.delete(job_name)
+          next if schedule == v
+
+          system(
+            <<~COMMAND)
+              gcloud scheduler jobs update pubsub #{job_name} --project=#{project_id} --quiet --schedule="#{v}" --topic="#{k}" --attributes="" --message-body="#{k}"
+            COMMAND
+        else
+          system(
+            <<~COMMAND)
+              gcloud scheduler jobs create pubsub #{job_name} --project=#{project_id} --quiet --schedule="#{v}" --topic="#{k}" --attributes="" --message-body="#{k}"
+            COMMAND
+        end
+      end
+
+      schedule_list.each do |k, _|
+        system("gcloud scheduler jobs delete #{k} -q >/dev/null 2>&1")
+      end
+    end
+
+    private
+
+    def current_schedules
+      current_schedules = {}
+      `gcloud scheduler jobs list`.split("\n")[1..].each do |line|
+        columns = line.split(/\t| {2,}/)
+        job_name = columns[0].to_sym
+        crontab = columns[2].split(" (")[0]
+        current_schedules[job_name] = crontab
       end
     end
   end

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

@@ -105,16 +105,38 @@ module Souls
     end
 
     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 if instance_name.blank?
-      instance_name = Souls.configuration.instance_name if instance_name.blank?
+    method_option :ip, default: "", aliases: "--ip", desc: "Adding IP to Google Cloud SQL White List: e.g.'11.11.1.1'"
+    def assign_ip
+      project_id = Souls.configuration.project_id
+      instance_name = Souls.configuration.instance_name
+      ips = []
+      ip =
+        if options[:ip].blank?
+          `curl inet-ip.info`.strip
+        else
+          options[:ip].strip
+        end
+      ips << ip
+      cloud_sql = JSON.parse(
+        `curl -X GET \
+        -H "Authorization: Bearer "$(gcloud auth print-access-token) \
+        "https://sqladmin.googleapis.com/v1/projects/#{project_id}/instances/#{instance_name}?fields=settings"`
+      )
+      unless cloud_sql["settings"]["ipConfiguration"]["authorizedNetworks"].blank?
+        white_ips =
+          cloud_sql["settings"]["ipConfiguration"]["authorizedNetworks"].map do |sql_ips|
+            sql_ips["value"]
+          end
+        ips = (ips + white_ips).uniq
+      end
+      ips = ips.join(",")
       system(
         "
             gcloud sql instances patch #{instance_name} \
               --project=#{project_id} \
               --assign-ip \
-              --authorized-networks=#{ip}
+              --authorized-networks=#{ips} \
+              --quiet
             "
       )
     end

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

@@ -2,6 +2,7 @@ module Souls
   class Sync < Thor
     desc "pubsub", "Sync Worker Jobs & Google Cloud Pubsub Subscriptions"
     def pubsub
+      get_worker_endpoints
       Souls::Gcloud.new.config_set
       get_topics(workers: get_workers)
       puts(Paint["All Jobs Synced with PubSub Subscription!", :green])
@@ -9,6 +10,17 @@ module Souls
 
     private
 
+    def get_worker_endpoints
+      require("#{Souls.get_mother_path}/config/souls")
+      worker_paths = Souls.configuration.workers
+      worker_paths.each do |worker|
+        endpoint = worker[:endpoint]
+        unless endpoint.include?("https://")
+          raise(StandardError, "You need to set endpoint.\nPlease Run:\n\n$ souls sync conf\n\n")
+        end
+      end
+    end
+
     def get_topics(workers: {})
       project_id = Souls.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.9.11
+1.9.12

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.9.11
+1.9.12

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.9.11
+  version: 1.9.12
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -130,6 +130,7 @@ files:
 - lib/souls.rb
 - lib/souls/app/graphql/souls_query.rb
 - lib/souls/app/index.rb
+- lib/souls/app/utils/souls_logger.rb
 - lib/souls/cli.rb
 - lib/souls/cli/cli_exception.rb
 - lib/souls/cli/console/index.rb