souls 1.9.8 → 1.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0894d11de68247464cb9e18e72d8669ab76bc595aba139a7755d0dd03095a6e4'
-  data.tar.gz: 1c83ac29578d9197df03f50c5a9d496953989456736d5fbd7fc4fb5d52b4c241
+  metadata.gz: 30e75a60a55603333c57c9cfbd45ec5c9a16854cda31c29d1a840439c221967f
+  data.tar.gz: 2019911a647b0784122a025f8225b8b277544bbe96055e6851277e2da7974ebc
 SHA512:
-  metadata.gz: 5c38578d8bd6c041b865972362b32f2b31b6fdb323752772a357e43e15be4dc2cd854a096046a01183a6d238913d06ed082036b96ac686e3ae7ec08c5556cd9d
-  data.tar.gz: b0663a6b95b83a7f4f49a8b95e864e08d723f8430eb8631de8c70518b05a0ea4a56b504caf6820ac3ad74c6eeb2fdb535f289df76f90ee101e3979ec86753de1
+  metadata.gz: d75036d900131455cd301b3170b51a778c99bae004123e9be4ffc0ace011bcdc98848a931ad76713cf4a8f10afe57bca4d7e41ecf14bd328e9fbdd5696fd46fc
+  data.tar.gz: e5d25f3dfd8617030124e34de5e0c1ad374099e5a57da3c4bdf44c63354adc72e907d106e3cb9173dab7d29093f8d26f77104386e43e6ed45d309a33932ffd75

data/README.md

@@ -21,22 +21,27 @@
   <a aria-label="License" href="https://github.com/elsoul/souls/blob/master/LICENSE.txt">
     <img alt="" src="https://badgen.net/badge/license/Apache/blue">
   </a>
+    <a aria-label="Code of Conduct" href="https://github.com/elsoul/souls/blob/master/CODE_OF_CONDUCT.md">
+    <img alt="" src="https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg">
+  </a>
 </p>
 
 
-## SOULs Serverless Application Framework Document
+## Ruby Serverless Application Framework SOULs Document
 
 - [Go to SOULs Document](https://souls.elsoul.nl/)
 
 <p>
-  <a aria-label="SOULs Document" href="https://souls.elsoul.nl/">
+  <a aria-label="Ruby Serverless Application Framework SOULs Document" href="https://souls.elsoul.nl/">
     <img src="https://souls.elsoul.nl/imgs/gifs/souls-new-video.gif">
   </a>
 </p>
 
 ## What's SOULs?
 
-Welcome to SOULs Serverless Application Framework!
+Ruby Serverless Framework 'SOULs'. 
+
+The SOULs project was launched with the goal of reducing software development, operation and maintenance costs. 
 
 Build Serverless Apps faster like Rails.
 Powered by Ruby GraphQL, RBS/Steep, Active Record, RSpec, RuboCop, and Google Cloud. 

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

@@ -2,11 +2,13 @@ module Souls
   class Iam < Thor
     desc "setup_key", "Create Google Cloud IAM Service Account Key And Set All Permissions"
     def setup_key
+      region = Souls.configuration.region
       Souls::Gcloud.new.auth_login
       create_service_account
       create_service_account_key
       Souls::Gcloud.new.enable_permissions
       add_permissions
+      system("gcloud app create --region=#{region} --quiet")
       begin
         set_gh_secret_json
       rescue StandardError
@@ -92,7 +94,8 @@ module Souls
         "roles/run.admin",
         "roles/storage.admin",
         "roles/storage.objectAdmin",
-        "roles/cloudscheduler.admin"
+        "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,15 +15,44 @@ module Souls
       require("./app")
       Souls::Gcloud.new.config_set
       project_id = Souls.configuration.project_id
-      region = Souls.configuration.region
+
+      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}" --location=#{region}
-          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.8".freeze
+  VERSION = "1.9.12".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.9.8
+1.9.12

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.9.8
+1.9.12

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.9.8
+  version: 1.9.12
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -110,8 +110,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
-description: "Build Serverless Apps faster like Rails.\n  Powered by Ruby GraphQL,
-  RBS/Steep, Active Record, RSpec, RuboCop, and Google Cloud. "
+description: "Ruby Serverless Framework 'SOULs'. The SOULs project was launched with
+  the goal of reducing software development, operation and maintenance costs. Build
+  Serverless Apps faster like Rails.\n  Powered by Ruby GraphQL, RBS/Steep, Active
+  Record, RSpec, RuboCop, and Google Cloud. "
 email:
 - f.kawasaki@elsoul.nl
 - s.kishi@elsoul.nl
@@ -128,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
@@ -229,7 +232,7 @@ licenses:
 - Apache-2.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -244,9 +247,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.2.32
+signing_key: 
 specification_version: 4
-summary: Build Serverless Apps faster like Rails. Powered by Ruby GraphQL, RBS/Steep,
-  Active Record, RSpec, RuboCop, and Google Cloud.
+summary: Ruby Serverless Framework 'SOULs'. The SOULs project was launched with the
+  goal of reducing software development, operation and maintenance costs. Build Serverless
+  Apps faster like Rails. Powered by Ruby GraphQL, RBS/Steep, Active Record, RSpec,
+  RuboCop, and Google Cloud.
 test_files: []