souls 1.6.11 → 1.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cda650024d8bfad36aa09580eb77b9906cb7018f439cc4a38972df53370a9cc
-  data.tar.gz: 513b8be99b2b0413e6fd61bbf32a2c6fd9a1b594066d7fee582e8c7959cf0e7f
+  metadata.gz: d3f025bcadbd709efbfe575c70bd72c7d097afe3f3ffff21afb6eed5ce7ff6a4
+  data.tar.gz: 38abcac4ffeca852239ebc179c3384638525c46cea878753d79e2a620364ca68
 SHA512:
-  metadata.gz: 3eeb9ad75e81304efd6bbad45948cdc18e85c8dfdb4a7e6f0d2d5334b712c3e35cdb097a5e8fdfb6fe1bae4202f1a9af85a1ca3f2a91882fa997078dd5569536
-  data.tar.gz: a5881285cd642596d676d4829597c2a040b91956a85531ce87077c60f06a6a7065477237ce8db11905a4547ecfde6627c2e914fb23128ec0f117862bd184baec
+  metadata.gz: bfce0b57fd661955b8d0ee99b9ddcf4b6dbd3a28e856177c5825d9da62980a6cfdd35e3001b01e280a47966ee18ce89845c2023bc6f9e0d96851547e68db332e
+  data.tar.gz: 6ec755000b1d602ae2314cf5cc225e34a041f5a3081edeed5e0f60f9c587ea03fb2cf58b0f7e70aae0690a039568659608636c04b6af3c41aa7ba4119f765ba9

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

@@ -3,6 +3,7 @@ module Souls
     desc "setup_vpc_nat", "Set Up VPC Cloud Nat"
     method_option :range, default: "10.124.0.0/28", aliases: "--range", desc: "GCP VPC Network IP Range"
     def setup_vpc_nat
+      puts(Paint["Initializing NAT Setup This process might take about 5 min...", :yellow])
       create_network
       create_firewall_tcp(range: options[:range])
       create_firewall_ssh
@@ -11,7 +12,10 @@ module Souls
       create_router
       create_external_ip
       create_nat
-      nat_credit
+      Souls::Sql.new.invoke(:setup_private_ip)
+      update_workflows
+      puts(Paint["Cloud NAT is All Set!", :green])
+      true
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
@@ -88,40 +92,24 @@ module Souls
       system("gcloud compute networks list")
     end
 
-    def nat_credit
+    def update_workflows
       app_name = Souls.configuration.app
-      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 \n`- name: Deploy to Cloud Run` step
-        \n--vpc-connector=#{app_name}-connector \
-        \n--vpc-egress=all \
-
-      TEXT
-      cd = Paint[endroll, :white]
-      puts(cd)
-      puts(line)
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        api_workflow_path = ".github/workflows/api.yml"
+        worker_workflow_paths = Dir[".github/workflows/*.yml"]
+        worker_workflow_paths.delete(api_workflow_path)
+        File.open(api_workflow_path, "a") do |line|
+          line.write(" \\ \n            --vpc-connector=#{app_name}-connector")
+        end
+        puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [api_workflow_path.to_s, :white] }])
+        worker_workflow_paths.each do |file_path|
+          File.open(file_path, "a") do |line|
+            line.write(" \\             --vpc-connector=#{app_name}-connector \\")
+            line.write("\n            --vpc-egress=all")
+          end
+          puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+        end
+      end
     end
   end
 end

data/lib/souls/cli/release/release.rb

@@ -33,10 +33,7 @@ module Souls
         puts("before build")
         system("rake build")
         system("rake release")
-        system(
-          "git -c log.ShowSignature=false log v#{current_souls_ver.join('.')}... \
-            --reverse --merges --grep='Merge pull request' --pretty=format:%B > ./CHANGELOG.md"
-        )
+        write_changelog(current_souls_ver: current_souls_ver)
         system("gh release create v#{souls_new_ver} -t v#{souls_new_ver} -F ./CHANGELOG.md")
         system("gsutil -m -q cp -r coverage gs://souls-bucket/souls-coverage")
         Whirly.status = Paint["soul-v#{souls_new_ver} successfully updated!"]
@@ -45,6 +42,22 @@ module Souls
 
     private
 
+    def write_changelog(current_souls_ver:)
+      doc =
+        `git -c log.ShowSignature=false log v#{current_souls_ver.join(".")}... \
+          --reverse --merges --grep='Merge pull request' --pretty=format:%B`
+
+      md = ""
+      doc.each_line do |l|
+        md << if l.include?("Merge pull request")
+                "### #{l}"
+              else
+                l
+              end
+      end
+      File.open("./CHANGELOG.md", "w") { |f| f.write(md) }
+    end
+
     def update_repo(service_name: "api", update_kind: "patch")
       current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
       current_ver = Souls.get_latest_version_txt(service_name: service_name)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.6.11
+1.6.15

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.6.11
+1.6.15

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.6.11
+  version: 1.6.15
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -232,7 +232,7 @@ licenses:
 metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
-  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.6.11
+  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.6.15
 post_install_message: 
 rdoc_options: []
 require_paths: