rockette 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b09df3f177186a45f823508dab42147ee6edb53904d9d36a16ee30fb8022cd7
-  data.tar.gz: 1a2545edb027108b655cd7eefdc2c96b70fac34cc0babb3fbfb924108f10e18a
+  metadata.gz: ee0d2270c8442e3e6b696cce15e9ac765a5d2c42e6a7ab84dc2c2a9b057d90e8
+  data.tar.gz: 70d91cff0436629fe0cdcf50f7f5201047daee8a6504ef87a3ffc009c0143035
 SHA512:
-  metadata.gz: f35882caea1f6cf7a168097993b42b69410d3965e077d83b86aeb43ac924e9e0c34f11760174760f2823efb86b14ff120e1f00b40790a64b54016b512385e9e6
-  data.tar.gz: c72fa95ef890e46a0527465c82eb8dfa075448a69070a6d75401434e7d19af3ca478c4f47021d768d8b1a6bd84d3f4724c6f3ad5f33f96c543c7bdcd2ccbbfed
+  metadata.gz: 9c7afa7c6b7c0a4f39a4ebfa16ae70fa9b15e4a83e32930e30f2dbbae1aafa04850061de0b63e44f5023eb346e3ac42eaa68e56bd8d0a7db2b1b1cf3efc6b32f
+  data.tar.gz: 0ac4932e7d0302bcdf9e3df9b9c8d6c4ce12a16e0831b8de9fe947a3850ca45633fa79cbdf1409ecd833bd76a42172beb6b681128d72177421eea068d4b8c418

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    rockette (0.0.2)
+    rockette (0.0.5)
+      oci (~> 2.0)
       pastel (~> 0.0)
       rest-client (~> 2.0)
       thor (~> 1.0)
@@ -20,42 +21,49 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
+    inifile (3.0.0)
+    json (2.5.1)
+    jwt (2.2.3)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2021.0901)
     minitest (5.14.4)
     netrc (0.11.0)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    oci (2.15.0)
+      inifile (~> 3.0, >= 3.0.0)
+      json (>= 1.4.6, < 3.0.0)
+      jwt (~> 2.1)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.1.1)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.4)
-    rubocop (1.11.0)
+    rexml (3.2.5)
+    rubocop (1.21.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     strings (0.2.1)
       strings-ansi (~> 0.2)
@@ -64,12 +72,12 @@ GEM
     strings-ansi (0.2.0)
     thor (1.1.0)
     tty-color (0.6.0)
-    tty-config (0.4.0)
+    tty-config (0.5.0)
     tty-cursor (0.7.1)
-    tty-editor (0.6.0)
+    tty-editor (0.7.0)
       tty-prompt (~> 0.22)
     tty-font (0.5.0)
-    tty-prompt (0.23.0)
+    tty-prompt (0.23.1)
       pastel (~> 0.8)
       tty-reader (~> 0.8)
     tty-reader (0.9.0)
@@ -85,12 +93,13 @@ GEM
       tty-screen (~> 0.8)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (2.0.0)
+    unf_ext (0.0.8)
+    unicode-display_width (2.1.0)
     unicode_utils (1.4.0)
     wisper (2.0.1)
 
 PLATFORMS
+  ruby
   x86_64-darwin-19
 
 DEPENDENCIES

data/lib/requirements.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require           "base64"
 require           "erb"
 require           "json"
+require           "oci"
 require           "pastel"
 require           "psych"
 require           "rest-client"

data/lib/rockette/cli.rb

@@ -19,13 +19,13 @@ module Rockette
     method_option :help, aliases: "-h", type: :boolean,
                          desc: "Display usage information"
     option :app_id, aliases: "-a", default: "0",
-                    desc: "Update this App ID with export set by '-f' Leave off or pass '-c' to copy export to target"
+                    desc: "Update this App ID with export set by '-f' Omitting '-a' copies export to target"
     option :file, aliases: "-f", required: true,
                   desc: "Provide an APEX application export file (sql)"
     option :url, aliases: "-u", required: true,
                  desc: "Provide a valid APEX deployment url"
-    option :copy, aliases: "-c", required: false,
-                  desc: "Use this flag if you are copying an application instead of overwriting"
+    option :secret, aliases: "-s", required: false,
+                  desc: "Use this flag if you are using managed secrets"
     def deploy(*)
       if options[:help]
         invoke :help, ["deploy"]

data/lib/rockette/commands/deploy.rb

@@ -12,11 +12,37 @@ module Rockette
         super()
         @options = options
         @filey = @options[:file]
-        @conf = Psych.load(File.read(CONF))
-        @body = @conf["deploy_body"]
-        @body["app_id_src"] = "1" # @options[:app_id]
-        @body["app_id_tgt"] = @options[:copy] ? 0 : @options[:app_id]
-        @body["blob_url"] = @filey
+        if @options[:secret]
+          secret_id = @options[:secret]
+          signer = OCI::Auth::Signers::InstancePrincipalsSecurityTokenSigner.new
+          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))
+        else
+          @conf = Psych.load(File.read(CONF))
+        end
+        @body = @conf["token_body"]
+        @hdrs = @conf["token_hdrs"]
+        @token = get_token
+        @hdrs["Authorization"] = "Bearer " + @token
+        @hdrs["Content-Type"] = "application/sql"
+      end
+
+      def check_version(filey)
+        app_url = "#{@options[:url]}deploy/apps/#{@options[:app_id]}"
+        response = Rester.new(url: app_url, headers: @hdrs).rest_try
+        bail unless response
+        abort padder("App ID: #{@options[:app_id]}, not found. Received: #{response.code}") unless response.code == 200
+        deployed_version = JSON.parse(response.body)["version"]
+        fh = File.open(filey, 'r')
+        export_version = ''
+        fh.each_line do |line|
+          if line.match(/,p_flow_version=>'/)
+            export_version = line.match(/^,p_flow_version=>'(.*?)'$/)[1]
+          end
+        end
+        return deployed_version == export_version
       end
 
       def file_finder
@@ -26,22 +52,20 @@ module Rockette
         end
       end
 
-      def importer
-        url = "#{@options[:url]}deploy/app"
-        response = Rester.new(meth: "Post", params: @body, url: url).rest_try
-        bail unless response
-        abort padder("Error. Got back response code: #{response.code}") unless (200..201).include? response.code
-        response
+      def get_token
+        token_url = "#{@options[: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 pusher
-        push_hdrs = @conf["push_hdrs"]
-        push_hdrs["file_name"] = @filey
-        push_url = "#{@options[:url]}data_loader/blob"
-        # Push the chosen export file to the target system
+      def deployer
+        push_url = "#{@options[:url]}deploy/app/#{@options[:app_id]}/"
         filey = file_finder
         file_not_found if filey.is_a?(Array)
-        response = Rester.new(headers: push_hdrs, meth: "Post", params: File.open(filey), url: push_url).rest_try
+        if @options[:app_id] != '0' then
+          abort padder("Error. Versions are identical, unable to deploy export") if check_version(filey)
+        end
+        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
         response
@@ -49,13 +73,10 @@ module Rockette
 
       def execute(input: $stdin, output: $stdout)
         check_input(input)
-        # Create and download export
+        filey = file_finder
+        file_not_found if filey.is_a?(Array)
         output.puts padder("Attempting to deploy export file #{@filey}...")
-        pusher
-        output.puts padder("Pushed #{@filey} to instance and attempting import now...")
-        # If push was successful, request application import
-        sleep 1
-        importer
+        deployer
         output.puts padder("Deployed #{@filey} to target APEX instance: #{@options[:url]}")
       end
     end

data/lib/rockette/commands/export.rb

@@ -11,12 +11,17 @@ module Rockette
       def initialize(options)
         super()
         @options = options
+        @conf = Psych.load(File.read(CONF))
+        @body = @conf["token_body"]
+        @hdrs = @conf["token_hdrs"]
         @filey = "f#{@options[:app_id]}.sql"
+        @token = get_token
+        @hdrs["Authorization"] = "Bearer " + @token
       end
 
       def checker
         app_url = "#{@options[:url]}deploy/apps/#{@options[:app_id]}"
-        response = Rester.new(url: app_url).rest_try
+        response = Rester.new(url: app_url, headers: @hdrs).rest_try
         bail unless response
         abort padder("App ID: #{@options[:app_id]}, not found. Received: #{response.code}") unless response.code == 200
       end
@@ -24,29 +29,22 @@ module Rockette
       def exporter
         checker
         puts padder("Found Application ID: #{@options[:app_id]}, proceeding...")
-        body = { "app_id" => @options[:app_id] }
-        export_url = "#{@options[:url]}deploy/app_export"
-        response = Rester.new(meth: "Post", params: body, url: export_url).rest_try
+        export_url = "#{@options[:url]}deploy/app/#{@options[:app_id]}"
+        response = Rester.new(url: export_url, headers: @hdrs).rest_try
         bail unless response
-        abort padder("Export failed for App ID: #{@options[:app_id]}.") unless (200..201).include? response.code
+        abort padder("Download failed for App ID: #{@options[:app_id]}.") unless (200..201).include? response.code
         response
       end
 
-      def grabber
-        export_url = "#{@options[:url]}deploy/app_export/#{@filey}"
-        response = Rester.new(url: export_url).rest_try
-        bail unless response
-        abort padder("Download failed for App ID: #{@options[:app_id]}.") unless (200..201).include? response.code
-        response
+      def get_token
+        token_url = "#{@options[: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 execute(input: $stdin, output: $stdout)
         check_input(input)
-        # Create and download export
-        exporter
-        output.puts padder("Export created, downloading...")
-        sleep 1
-        response = grabber
+        response = exporter
         # Write file if export was grabbed.
         save_file = @options[:file] || @filey
         File.open(File.join(EXPORT_DIR, save_file), "wb") { |file| file.write(response.body) }

data/lib/rockette/controller/viewer.rb

@@ -12,7 +12,8 @@ module Rockette
       @pastel = Pastel.new
       @prompt = TTY::Prompt.new
       @spinner = TTY::Spinner.new # ("[:spinner] Loading APEX environments ...", format: pulse_2)
-      @view_actions = { "🏔  APEX Environments" => 1, "🎭 Registered Applications" => 2, "⬅️  Go Back" => 3 }
+      @view_actions = { "🏔  APEX Environments" => 1, "🎭 Registered Applications" => 2,
+                        "🌎 Applications by Environment" => 3, "⬅️  Go Back" => 4 }
     end
 
     def launch!
@@ -22,7 +23,7 @@ module Rockette
       # input/action loop
       loop do
         action = @prompt.select("Which would you like to see?", @view_actions)
-        break if action == 3
+        break if action == 4
 
         do_action(action)
       end
@@ -33,15 +34,20 @@ module Rockette
       when 1
         puts
         environments unless @table_env
-        @spinner.auto_spin
-        sleep(1)
-        @spinner.stop
-        puts @table_env.render(:ascii)
+        spinner(0.5)
+        puts @table_env.render(:unicode, resize: true, border: { style: :yellow })
         puts
       when 2
         puts
         registered unless @table_reg
-        puts @table_reg.render(:ascii)
+        puts @table_reg.render(:unicode, resize: true, border: { style: :yellow })
+        puts
+      when 3
+        puts
+        puts "This can take a while...hang tight!"
+        puts
+        all_apps unless @table_all_apps
+        puts @table_all_apps.render(:unicode, resize: true, border: { style: :yellow })
         puts
       else
         puts "\nI don't understand that command.\n\n"
@@ -78,5 +84,25 @@ module Rockette
         @table_reg << [h["registered_name"], h["src_app_id"], h["src_url"], h["tgt_app_id"], h["tgt_url"]]
       end
     end
+
+    def all_apps
+      environments unless @table_env
+      @table_all_apps = TTY::Table.new(header: ["Environment Name", "Application Name", "Application ID"])
+      @table_env.each do |env|
+        next if env[0] == "Environment Name"
+
+        apps = applications(env[1])
+        apps.each do |app|
+          @table_all_apps << [env[0], app["application_name"], app["application_id"]]
+        end
+      end
+    end
+
+    def spinner(dur=1)
+      @spinner.auto_spin
+      sleep(dur)
+      @spinner.stop
+    end
+
   end
 end

data/lib/rockette/controller.rb

@@ -44,6 +44,9 @@ module Rockette
       puts @pastel.yellow(font.write("Rockette"))
       puts
       puts "-" * 85
+      puts "Version: " + VERSION
+      puts "-" * 14
+      puts
       puts "Rockette helps export and deploy APEX applications."
       puts
     end

data/lib/rockette/version.rb

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

data/lib/rockette.rb

@@ -3,7 +3,7 @@
 require_relative "requirements"
 
 # Set paths
-APP_PATH = if File.exist?(File.join("/", "usr", "app")) # Why Docker, why?
+APP_PATH = if File.exist?(File.join("/", "usr", "app"))
              File.join("/", "usr", "app", ".rockette")
            elsif File.exist?(Dir.home)
              File.join(Dir.home, ".rockette")

data/rockette.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry", "~> 0.0"
 
   # Dependencies
+  spec.add_dependency "oci", "~> 2.0"
   spec.add_dependency "pastel", "~> 0.0"
   spec.add_dependency "rest-client", "~> 2.0"
   spec.add_dependency "thor", "~> 1.0"
@@ -42,5 +43,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "tty-prompt", "~> 0.0"
   spec.add_dependency "tty-spinner", "~> 0.0"
   spec.add_dependency "tty-table", "~> 0.0"
-
 end

data/templates/config.yml.erb

@@ -1,20 +1,8 @@
 ---
-push_hdrs:
-  Content-Type: application/json
-  created_by: dcs_automation
-  message_date: ''
-  msg_from_addr: ''
-  msg_from_name: ''
-  file_charset: UTF-8
-  file_mimetype: text/plain
-  file_name: ''
-  file_type: sql
-  tags: ''
-  target_use: push_deployment
-deploy_body:
-  app_id_src: ''
-  app_id_tgt: ''
-  blob_url: https://local.data_loader
+token_body:
+  grant_type: client_credentials
+token_hdrs:
+  Content-Type: application/x-www-form-urlencoded
 rockette:
   check_for_url: true
   controller_url: ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rockette
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kody Wilson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: oci
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Oracle APEX Deployment Assistant