rockette 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0d2270c8442e3e6b696cce15e9ac765a5d2c42e6a7ab84dc2c2a9b057d90e8
-  data.tar.gz: 70d91cff0436629fe0cdcf50f7f5201047daee8a6504ef87a3ffc009c0143035
+  metadata.gz: 26e8d73d2c9b1c9a543b41dfd95dda73efea46e5bb14d444a5f50ada2af968ce
+  data.tar.gz: 44b7d193c2ad1ff6dcb9efad3ab7b5a70c87ba8942fb919aec5fa2302c4282b4
 SHA512:
-  metadata.gz: 9c7afa7c6b7c0a4f39a4ebfa16ae70fa9b15e4a83e32930e30f2dbbae1aafa04850061de0b63e44f5023eb346e3ac42eaa68e56bd8d0a7db2b1b1cf3efc6b32f
-  data.tar.gz: 0ac4932e7d0302bcdf9e3df9b9c8d6c4ce12a16e0831b8de9fe947a3850ca45633fa79cbdf1409ecd833bd76a42172beb6b681128d72177421eea068d4b8c418
+  metadata.gz: 0124ec971be8e538d810582967a512dc26efbaa2ed9e6e9f61fd9f1a954b40b2d3e6625e0b91aa813eac9902350cb3df2ce9f8c1f018edcc9aabdfaa87c73e43
+  data.tar.gz: aabc39c4210d4ec7dc7ca56cede861c433349fe395088657eba03744c3ced88ca91d7227ddba1488a48d238e87d1d92c05bda232a0d0907a057e7b90d61a193e

data/lib/rockette/commands/deploy.rb

@@ -18,15 +18,15 @@ module Rockette
           identity_client = OCI::Identity::IdentityClient.new(config: OCI::Config.new, signer: signer)
           secret_client = OCI::Secrets::SecretsClient.new(config: OCI::Config.new, signer: signer)
           secret_response = secret_client.get_secret_bundle(secret_id).data.secret_bundle_content.content
-          @conf = JSON.parse(Base64.decode64(secret_response))
+          @conf = Psych.load(Base64.decode64(secret_response))
         else
           @conf = Psych.load(File.read(CONF))
         end
         @body = @conf["token_body"]
         @hdrs = @conf["token_hdrs"]
+        @hdrs["Authorization"] = @conf["web_creds"][@options[:cred]] if @options[:cred]
         @token = get_token
         @hdrs["Authorization"] = "Bearer " + @token
-        @hdrs["Content-Type"] = "application/sql"
       end
 
       def check_version(filey)
@@ -65,6 +65,7 @@ module Rockette
         if @options[:app_id] != '0' then
           abort padder("Error. Versions are identical, unable to deploy export") if check_version(filey)
         end
+        @hdrs["Content-Type"] = "application/sql"
         response = Rester.new(headers: @hdrs, meth: "Post", params: File.open(filey), url: push_url).rest_try
         bail unless response
         abort padder("Error. Got back response code: #{response.code}") unless (200..201).include? response.code

data/lib/rockette/commands/export.rb

@@ -14,6 +14,7 @@ module Rockette
         @conf = Psych.load(File.read(CONF))
         @body = @conf["token_body"]
         @hdrs = @conf["token_hdrs"]
+        @hdrs["Authorization"] = @conf["web_creds"][@options[:cred]] if @options[:cred]
         @filey = "f#{@options[:app_id]}.sql"
         @token = get_token
         @hdrs["Authorization"] = "Bearer " + @token

data/lib/rockette/controller/configurator.rb

@@ -47,6 +47,18 @@ module Rockette
       end
     end
 
+    def add_controller_cred
+      puts "Now that you have entered a controller url, please enter the OAuth client credentials for the controller."
+      user = @prompt.ask("User:")
+      pass = @prompt.ask("Pass:")
+      basey = 'Basic ' + Base64.encode64(user + ":" + pass).tr("\n", "")
+      @config.set(:rockette, :controller_cred, value: basey)
+      @config.write(force: true)
+      refresh_conf
+      puts "Choose View Resources and then All Applications to automate adding client credentials for each environment."
+      puts "You will need these credentials to use Rockette to deploy, export, and update applications."
+    end
+
     def add_url
       uri = @prompt.ask("Please enter APEX deployment URI (base path):") do |u|
         u.validate(%r{^https://\w+.\w+})
@@ -70,6 +82,7 @@ module Rockette
       response = @prompt.yes?("Would you like to enter a URI?")
       if response == true
         add_url
+        add_controller_cred
       else
         response = @prompt.yes?("Would you like to disable these checks in the future?")
         @config.set(:rockette, :check_for_url, value: false) if response == true

data/lib/rockette/controller/deployer.rb

@@ -45,19 +45,20 @@ module Rockette
     def add_app
       puts padder("Let's choose an export to add")
       file = choose_file
-      url = choose_env
+      env = choose_env
+      url = env[0]
       puts padder("You chose to add #{file} to the environment at #{url}")
       puts
       return unless @prompt.yes?("Proceed with the deployment?")
 
       options = Thor::CoreExt::HashWithIndifferentAccess.new "app_id" => "0", "url" => url, "file" => file,
-                                                             "force" => true
+                                                             "cred" => env[1], "force" => true
       Rockette::Commands::Deploy.new(options).execute
       puts
     end
 
-    def choose_app(apps_url)
-      apps = Rockette::Viewer.new.applications(apps_url)
+    def choose_app(apps_url, cred)
+      apps = Rockette::Viewer.new.applications(apps_url, cred)
       list = list_builder(apps)
       action = @prompt.slider("Application to update => ", list, default: 1)
 
@@ -68,7 +69,7 @@ module Rockette
       enviros = Rockette::Viewer.new.environments
       list = list_builder(enviros)
       action = @prompt.select("Which environment?", list)
-      enviros[action - 1]["deployment_api"]
+      [enviros[action - 1]["deployment_api"], enviros[action - 1]["web_cred"]]
     end
 
     def choose_file
@@ -90,15 +91,16 @@ module Rockette
     def updater
       puts padder("Please choose the export with your updated application code")
       file = choose_file
-      url = choose_env
-      app = choose_app(url)
+      env = choose_env
+      url = env[0]
+      app = choose_app(url, env[1])
       puts "Application: #{app["application_name"]} | App ID: #{app["application_id"]} | Env URI: #{url}"
       puts "will be updated with the code from export: #{file}"
       puts
       return unless @prompt.yes?("Proceed with the deployment?")
 
       options = Thor::CoreExt::HashWithIndifferentAccess.new "app_id" => app["application_id"], "url" => url,
-                                                             "file" => file, "force" => true
+                                                             "cred" => env[1], "file" => file, "force" => true
       Rockette::Commands::Deploy.new(options).execute
       puts
     end

data/lib/rockette/controller/exporter.rb

@@ -27,19 +27,20 @@ module Rockette
         break if action == list.length
 
         apps_url = enviros[action - 1]["deployment_api"]
-        choose_app(apps_url)
+        cred = enviros[action - 1]["web_cred"]
+        choose_app(apps_url, cred)
       end
     end
 
-    def do_export(app_id, apps_url)
+    def do_export(app_id, apps_url, cred)
       response = @prompt.yes?("Would you like to enter a filename for the export?")
       if response == true
         file = @prompt.ask("Please enter your desired filename:")
-        options = Thor::CoreExt::HashWithIndifferentAccess.new "app_id" => app_id, "url" => apps_url, "file" => file,
-                                                               "force" => true
+        options = Thor::CoreExt::HashWithIndifferentAccess.new "app_id" => app_id, "url" => apps_url, "cred" => cred,
+                                                               "file" => file, "force" => true
       else
         puts padder("Saving under default file name: f#{app_id}.sql")
-        options = Thor::CoreExt::HashWithIndifferentAccess.new "app_id" => app_id, "url" => apps_url, "force" => true
+        options = Thor::CoreExt::HashWithIndifferentAccess.new "app_id" => app_id, "url" => apps_url, "cred" => cred, "force" => true
       end
       Rockette::Commands::Export.new(options).execute
       puts
@@ -47,15 +48,15 @@ module Rockette
 
     protected
 
-    def choose_app(apps_url)
+    def choose_app(apps_url, cred)
       loop do
-        apps = Rockette::Viewer.new.applications(apps_url)
+        apps = Rockette::Viewer.new.applications(apps_url, cred)
         list = list_builder(apps)
         action = @prompt.slider("Download application => ", list, default: 1)
         break if action == list.length
 
         app_id = apps[action - 1]["application_id"]
-        do_export(app_id, apps_url)
+        do_export(app_id, apps_url, cred)
       end
     end
 

data/lib/rockette/controller/viewer.rb

@@ -8,7 +8,16 @@ module Rockette
     include TextHelper
 
     def initialize
+      @config = TTY::Config.new
+      @config.append_path APP_PATH
+      @config.read
       @conf = Psych.load(File.read(CONF))
+      @body = @conf["token_body"]
+      @hdrs = @conf["token_hdrs"]
+      #@hdrs["Authorization"] = @conf["web_creds"]["controller_cred"]
+      token_url = @conf["rockette"]["controller_url"].sub!('deploy/', '')
+      @token = get_token(token_url, "controller_cred")
+      @hdrs["Authorization"] = "Bearer " + @token
       @pastel = Pastel.new
       @prompt = TTY::Prompt.new
       @spinner = TTY::Spinner.new # ("[:spinner] Loading APEX environments ...", format: pulse_2)
@@ -16,6 +25,10 @@ module Rockette
                         "🌎 Applications by Environment" => 3, "⬅️  Go Back" => 4 }
     end
 
+    def self.config
+      @config ||= self.class.new.config
+    end
+
     def launch!
       puts padder("You can view environments or registered applications")
       puts
@@ -54,25 +67,49 @@ module Rockette
       end
     end
 
-    def ape_e_i(uri)
-      response = Rester.new(url: uri).rest_try
+    def add_web_cred(env_cred, env_name)
+      puts "You are attempting to access a resource that requires authentication."
+      puts "Please enter the OAuth client credentials for the #{env_name} environment."
+      user = @prompt.ask("User:")
+      pass = @prompt.ask("Pass:")
+      basey = 'Basic ' + Base64.encode64(user + ":" + pass).tr("\n", "")
+      @config.set(:web_creds, env_cred.to_sym, value: basey)
+      @config.write(force: true)
+      refresh_conf
+    end
+
+    def ape_e_i(uri, headers = @hdrs)
+      response = Rester.new(url: uri, headers: headers).rest_try
       bail unless response
       abort padder("#{uri} didn't work. Received: #{response.code}") unless response.code == 200
       response
     end
 
-    def applications(url)
-      uri = "#{url}deploy/apps"
-      response = ape_e_i(uri)
+    def applications(url, cred)
+      headers = @hdrs
+      #@hdrs["Authorization"] = @conf["web_creds"][cred]
+      @token = get_token(url, cred)
+      @hdrs["Authorization"] = "Bearer " + @token
+      uri = "#{url}deploy/apps/"
+
+      response = ape_e_i(uri, @hdrs)
+      @hdrs = headers
       JSON.parse(response.body)["items"]
     end
 
     def environments
       uri = "#{@conf["rockette"]["controller_url"]}deploy/environments/"
       response = ape_e_i(uri)
-      @table_env = TTY::Table.new(header: ["Environment Name", "API", "Domain", "Owner", "Workspace"])
+      @table_env = TTY::Table.new(header: ["Environment Name", "API", "Domain", "Owner", "Workspace", "Web Cred"])
       items = JSON.parse(response.body)["items"]
-      items.each { |h| @table_env << [h["name"], h["deployment_api"], h["domain"], h["owner"], h["workspace"]] }
+      items.each { |h| @table_env << [h["name"], h["deployment_api"], h["domain"], h["owner"], h["workspace"], h["web_cred"]] }
+    end
+
+    def get_token(url, cred)
+      @hdrs["Authorization"] = @conf["web_creds"][cred]
+      token_url = url + "oauth/token"
+      response = Rester.new(headers: @hdrs, meth: "Post", params: @body, url: token_url).rest_try
+      return JSON.parse(response.body)["access_token"]
     end
 
     def registered
@@ -91,13 +128,22 @@ module Rockette
       @table_env.each do |env|
         next if env[0] == "Environment Name"
 
-        apps = applications(env[1])
+        creds = Hash.new
+        creds = @conf["web_creds"]
+        add_web_cred(env[5], env[0]) unless creds.has_key?(env[5])
+
+        apps = applications(env[1], env[5])
         apps.each do |app|
           @table_all_apps << [env[0], app["application_name"], app["application_id"]]
         end
       end
     end
 
+    def refresh_conf
+      @config.read
+      @conf = Psych.load(File.read(CONF))
+    end
+
     def spinner(dur=1)
       @spinner.auto_spin
       sleep(dur)

data/lib/rockette/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rockette
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/templates/config.yml.erb

@@ -5,4 +5,5 @@ token_hdrs:
   Content-Type: application/x-www-form-urlencoded
 rockette:
   check_for_url: true
+  controller_cred: ''
   controller_url: ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rockette
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kody Wilson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry