souls 0.50.0 → 0.52.0

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

@@ -1,120 +1,127 @@
 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)
-          create_subnet(app_name: app_name, region: region, range: range)
-          create_connector(app_name: app_name, region: region)
-          create_router(app_name: app_name, region: region)
-          create_external_ip(app_name: app_name, region: region)
-          create_nat(app_name: app_name, region: region)
-          nat_credit(app_name: app_name)
-        end
+  class Compute < Thor
+    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
+      create_network
+      create_firewall_tcp(range: options[:range])
+      create_firewall_ssh
+      create_subnet(range: options[:range])
+      create_connector
+      create_router
+      create_external_ip
+      create_nat
+      nat_credit
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+
+    private
 
-        def create_network(app_name: "")
-          app_name = Souls.configuration.app if app_name.blank?
-          system("gcloud compute networks create #{app_name}")
-        end
+    def create_network
+      app_name = Souls.configuration.app
+      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} \
+    def create_firewall_tcp(range: "10.124.0.0/28")
+      app_name = Souls.configuration.app
+      system(
+        "gcloud compute firewall-rules create #{app_name} \
                   --network #{app_name} --allow tcp,udp,icmp --source-ranges #{range}"
-          )
-        end
+      )
+    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} \
+    def create_firewall_ssh
+      app_name = Souls.configuration.app
+      system(
+        "gcloud compute firewall-rules create #{app_name}-ssh --network #{app_name} \
             --allow tcp:22,tcp:3389,icmp"
-          )
-        end
+      )
+    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 \
+    def create_subnet(range: "10.124.0.0/28")
+      app_name = Souls.configuration.app
+      region = Souls.configuration.region
+      system(
+        "gcloud compute networks subnets create #{app_name}-subnet \
             --range=#{range} --network=#{app_name} --region=#{region}"
-          )
-        end
+      )
+    end
 
-        def create_connector(app_name: "", region: "asia-northeast1")
-          app_name = Souls.configuration.app if app_name.blank?
-          project_id = Souls.configuration.project_id
-          system(
-            "gcloud compute networks vpc-access connectors create #{app_name}-connector \
+    def create_connector
+      app_name = Souls.configuration.app
+      project_id = Souls.configuration.project_id
+      region = Souls.configuration.region
+      system(
+        "gcloud compute networks vpc-access connectors create #{app_name}-connector \
               --region=#{region} \
               --subnet-project=#{project_id} \
               --subnet=#{app_name}-subnet"
-          )
-        end
+      )
+    end
 
-        def create_router(app_name: "", region: "asia-northeast1")
-          app_name = Souls.configuration.app if app_name.blank?
-          system("gcloud compute routers create #{app_name}-router --network=#{app_name} --region=#{region}")
-        end
+    def create_router
+      app_name = Souls.configuration.app
+      region = Souls.configuration.region
+      system("gcloud compute routers create #{app_name}-router --network=#{app_name} --region=#{region}")
+    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_external_ip
+      app_name = Souls.configuration.app
+      region = Souls.configuration.region
+      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 \
+    def create_nat
+      app_name = Souls.configuration.app
+      region = Souls.configuration.region
+      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
+      )
+    end
 
-        def network_list
-          system("gcloud compute network list")
-        end
+    def network_list
+      system("gcloud compute network list")
+    end
 
-        def nat_credit(app_name: "")
-          app_name = Souls.configuration.app if app_name.blank?
-          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
+    def nat_credit
+      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`
+        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 \
+        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)
-        end
-      end
+      TEXT
+      cd = Paint[endroll, :white]
+      puts(cd)
+      puts(line)
     end
   end
 end

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

@@ -1,83 +1,98 @@
 module Souls
-  module Gcloud
-    module Iam
-      class << self
-        def create_service_account(service_account: "souls-app")
-          system(
-            "gcloud iam service-accounts create #{service_account} \
+  class Iam < Thor
+    desc "setup_key", "Create Google Cloud IAM Service Account Key And Set All Permissions"
+    def setup_key
+      Souls::Gcloud.new.auth_login
+      create_service_account
+      create_service_account_key
+      Souls::Gcloud.new.enable_permissions
+      add_permissions
+      export_key_to_console
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+
+    private
+
+    desc "create_service_account", "Create Google Cloud IAM Service Account"
+    def create_service_account
+      app_name = Souls.configuration.app
+      system(
+        "gcloud iam service-accounts create #{app_name} \
           --description='Souls Service Account' \
-          --display-name=#{service_account}"
-          )
-        end
+          --display-name=#{app_name}"
+      )
+    end
 
-        def create_service_account_key(service_account: "souls-app", project_id: "souls-app")
-          system(
-            "gcloud iam service-accounts keys create ./config/keyfile.json \
-            --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com"
-          )
-        end
+    desc "create_service_account_key", "Create Google Cloud Service Account Key"
+    def create_service_account_key
+      app_name = Souls.configuration.app
+      project_id = Souls.configuration.project_id
+      system(
+        "gcloud iam service-accounts keys create ./config/keyfile.json \
+            --iam-account #{app_name}@#{project_id}.iam.gserviceaccount.com"
+      )
+    end
 
-        def export_key_to_console
-          file_path = "config/keyfile.json"
-          puts(Paint["======= below（ここから）=======", :cyan])
-          text = []
-          File.open(file_path, "r") do |line|
-            line.each_line do |l|
-              text << l
-            end
-          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")
-          puts(Paint[key, :white])
-          puts(Paint["======= above（ここまで）=======", :cyan])
-          github_secret_url = "#{github_repo}/settings/secrets/actions"
-          souls_doc_url = "https://souls.elsoul.nl/docs/tutorial/zero-to-deploy/#github-シークレットキーの登録"
-          txt1 = <<~TEXT
+    def export_key_to_console
+      file_path = "config/keyfile.json"
+      puts(Paint["======= below（ここから）=======", :cyan])
+      text = []
+      File.open(file_path, "r") do |line|
+        line.each_line do |l|
+          text << l
+        end
+      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")
+      puts(Paint[key, :white])
+      puts(Paint["======= above（ここまで）=======", :cyan])
+      github_secret_url = "#{github_repo}/settings/secrets/actions"
+      souls_doc_url = "https://souls.elsoul.nl/docs/tutorial/zero-to-deploy/#github-シークレットキーの登録"
+      txt1 = <<~TEXT
 
-            ⬆⬆⬆　Copy the service account key above　⬆⬆⬆⬆
+        ⬆⬆⬆　Copy the service account key above　⬆⬆⬆⬆
 
-                            And
+                        And
 
-            Go to %{yellow_text}
+        Go to %{yellow_text}
 
-            Reference: %{yellow_text2}
-          TEXT
-          puts(
-            Paint % [
-              txt1,
-              :white,
-              { yellow_text: [github_secret_url, :yellow], yellow_text2: [souls_doc_url, :yellow] }
-            ]
-          )
-          FileUtils.rm(file_path)
-        end
+        Reference: %{yellow_text2}
+      TEXT
+      puts(
+        Paint % [
+          txt1,
+          :white,
+          { yellow_text: [github_secret_url, :yellow], yellow_text2: [souls_doc_url, :yellow] }
+        ]
+      )
+      FileUtils.rm(file_path)
+    end
 
-        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' \
+    def add_service_account_role(role: "roles/firebase.admin")
+      app_name = Souls.configuration.app
+      project_id = Souls.configuration.project_id
+      system(
+        "gcloud projects add-iam-policy-binding #{project_id} \
+          --member='serviceAccount:#{app_name}@#{project_id}.iam.gserviceaccount.com' \
           --role=#{role}"
-          )
-        end
+      )
+    end
 
-        def add_permissions(service_account: "souls-app", project_id: "souls-app")
-          roles = [
-            "roles/cloudsql.editor",
-            "roles/containerregistry.ServiceAgent",
-            "roles/pubsub.editor",
-            "roles/datastore.user",
-            "roles/iam.serviceAccountUser",
-            "roles/run.admin",
-            "roles/storage.admin",
-            "roles/storage.objectAdmin"
-          ]
-          roles.each do |role|
-            add_service_account_role(service_account: service_account, project_id: project_id, role: role)
-          end
-        end
+    def add_permissions
+      roles = [
+        "roles/cloudsql.editor",
+        "roles/containerregistry.ServiceAgent",
+        "roles/pubsub.editor",
+        "roles/datastore.user",
+        "roles/iam.serviceAccountUser",
+        "roles/run.admin",
+        "roles/storage.admin",
+        "roles/storage.objectAdmin"
+      ]
+      roles.each do |role|
+        add_service_account_role(role: role)
       end
     end
   end

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

@@ -5,45 +5,46 @@ require_relative "./sql/index"
 require_relative "./compute/index"
 
 module Souls
-  module Gcloud
-    class << self
-      def auth_login(project_id: "")
-        project_id = Souls.configuration.project_id if project_id.blank?
-        system("gcloud config set project #{project_id}")
-        system("gcloud auth login")
-      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")
-        system("gcloud services enable vpcaccess.googleapis.com")
-        puts("Operating permission to vpcaccess.googleapis.com")
-      end
-    end
-    module Iam
-    end
+  class Gcloud < Thor
+    desc "iam [COMMAND]", "souls gcloud iam Commands"
+    subcommand "iam", Iam
 
-    module Pubsub
-    end
+    desc "pubsub [COMMAND]", "souls gcloud pubsub Commands"
+    subcommand "pubsub", Pubsub
+
+    desc "sql [COMMAND]", "souls gcloud sql Commands"
+    subcommand "sql", Sql
+
+    desc "compute [COMMAND]", "souls gcloud compute Commands"
+    subcommand "compute", Compute
+
+    desc "run [COMMAND]", "souls gcloud run Commands"
+    subcommand "cloud_run", CloudRun
+
+    map run: "cloud_run"
 
-    module Run
+    desc "auth_login", "gcloud config set and gcloud auth login"
+    def auth_login
+      project_id = Souls.configuration.project_id
+      system("gcloud config set project #{project_id}")
+      system("gcloud auth login")
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
     end
 
-    module Sql
+    desc "enable_permissions", "Enable Google Cloud APIs for SOULs Framework"
+    def enable_permissions
+      system("gcloud services enable compute.googleapis.com")
+      system("gcloud services enable iam.googleapis.com")
+      system("gcloud services enable dns.googleapis.com")
+      system("gcloud services enable sqladmin.googleapis.com")
+      system("gcloud services enable sql-component.googleapis.com")
+      system("gcloud services enable servicenetworking.googleapis.com")
+      system("gcloud services enable containerregistry.googleapis.com")
+      system("gcloud services enable run.googleapis.com")
+      system("gcloud services enable vpcaccess.googleapis.com")
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
     end
   end
 end