harmony-service 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aee765841ab62f1baa21ec099762a81614bcf7f
-  data.tar.gz: e175a67b0159a1f74a8ad156726052d55d38b63c
+  metadata.gz: 517ce4bdacc892b142714cc33993b5a9eca1ab5d
+  data.tar.gz: 6c38fc1b33244ea9d090fcf291bc1d2a7ed08042
 SHA512:
-  metadata.gz: 19d56126f965e80b9992bc66a6ac78bf2eb1ce77f33dc025e272dd336b44a58602dca7ed4efe7f9ff1ea4230ec829d0c15757b5e7a3c17ddf02f5acee548008d
-  data.tar.gz: af465a9c745b58c782c40653ed9f8f42cca48a560b1eaab056a9b0998d57e9c2ddee398ce55a75574a77eef104b2534d62d25920fdd093ed2be41750c0fcf635
+  metadata.gz: 75013f6bc6e4a20e38be17bcf4672e3caca1c723e8eabfd8943ba4855ab68894acb1810f29b31e19f84da7f2555d56a03bcdd2e0ad48f03b64ddb0c9def5a27b
+  data.tar.gz: 1c95cd487990d0d074ae08d75b19df57262574e64ebfd4cdc1d93039d2a186e97be3718d53c104afa886b69d8dfcba37808cfa24d6587062a94125086da24853

data/bin/harmony_service

@@ -9,8 +9,12 @@ handler_class = ARGV[0]
 puts "Starting Harmony Service with handler: #{handler_class}"
 load File.expand_path(ARGV[2])
 
+# load env secrets
+Harmony::Service::Utils::Secrets.load
+
+abort "ENV['ampq_address'] must be defined." unless ENV['ampq_address']
 opts = {
-  amqp: ENV['ampq_address'] || 'amqp://localhost:5672',
+  amqp: ENV['ampq_address'],
   vhost: ENV['ampq_vhost'] || '/',
   exchange: 'sneakers',
   exchange_type: :direct,

data/harmony-service.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "oj", '~> 2.17.4'
   spec.add_dependency 'redis', '~> 3.3', '>= 3.3.3'
   spec.add_dependency 'hashdiff', '~> 0.3.4'
+  spec.add_dependency 'sekrets'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/harmony/service.rb

@@ -10,6 +10,9 @@ require 'harmony/service/error_response'
 require 'harmony/service/attribute_names_request'
 require 'harmony/service/attribute_names_response'
 
+require 'harmony/service/oauth_token_request'
+require 'harmony/service/oauth_token_response'
+
 require 'harmony/service/calculator/request'
 require 'harmony/service/calculator/response'
 
@@ -31,5 +34,6 @@ require 'harmony/service/notification/app_response'
 
 require 'harmony/service/utils/diff'
 require 'harmony/service/utils/storage'
+require 'harmony/service/utils/secrets'
 
 

data/lib/harmony/service/oauth_token_request.rb

@@ -0,0 +1,3 @@
+class Harmony::Service::OauthTokenRequest < Harmony::Service::Request
+	attr_accessor :auth_code
+end

data/lib/harmony/service/oauth_token_response.rb

@@ -0,0 +1,2 @@
+class Harmony::Service::OauthTokenResponse < Harmony::Service::Response
+end

data/lib/harmony/service/rake_tasks.rb

@@ -0,0 +1,19 @@
+require 'rake'
+require 'optparse'
+
+namespace :harmony do
+  desc 'Write initial secrets to encrypted file.'
+  task :write_secrets  do |t, args|
+    abort "ENV['SEKRETS_KEY'] must be set." unless ENV['SEKRETS_KEY'] 
+    abort "ENV['QUEUE_NAME'] must be set." unless ENV['QUEUE_NAME']
+    abort "ENV['STAGING_AMPQ_URL'] must be set." unless ENV['STAGING_AMPQ_URL'] 
+    abort "ENV['PRODUCTION_AMPQ_URL'] must be set." unless ENV['PRODUCTION_AMPQ_URL'] 
+        
+    secrets = {
+      development: {harmony_queue: ENV['QUEUE_NAME'], ampq_address: ENV['STAGING_AMPQ_URL'], ampq_vhost: 'harmony-staging-queue'},
+      staging: {harmony_queue: ENV['QUEUE_NAME'], ampq_address: ENV['STAGING_AMPQ_URL'], ampq_vhost: 'harmony-staging-queue'},
+      production: {harmony_queue: ENV['QUEUE_NAME'], ampq_address: ENV['PRODUCTION_AMPQ_URL'], ampq_vhost: 'harmony'}
+    }
+    `ruby -r yaml -e'puts(#{secrets}.to_yaml)' | sekrets write config/settings.yml.enc --key #{ENV['SEKRETS_KEY']}`
+  end  
+end

data/lib/harmony/service/response.rb

@@ -1,4 +1,4 @@
 class Harmony::Service::Response < Harmony::Service::Message
-
+	attr_accessor :refresh_token, :access_token
 end
 

data/lib/harmony/service/rpc_service.rb

@@ -9,69 +9,66 @@ module Harmony
     class RpcService
       include Sneakers::Worker
       from_queue ENV['harmony_queue'], timeout_job_after: 10, threads: 1
-  
-      def work_with_params(message, delivery_info, metadata)
-        begin
-          logger.debug "Request: #{message}"
-          request = Oj.load(message)
-          request_class = request.class
-          response_classes = request_response_mapping[request_class]
-          raise "Unacceptable request class: #{request_class}" if response_classes.nil?
-          
-          result = new_handler.work_with_request(request)
-          raise "Unacceptable response class: #{result.class}" unless response_classes.include?(result.class)
-          
-          send_response(result, metadata)
-          ack!
-        rescue StandardError => error
-          logger.error error.message
-          logger.error error.backtrace.join("\n")
-                    
-          error_response = ErrorResponse.new message: error.message, exception: error
-          send_response(error_response, metadata)
-          reject!
-        end
+
+      def work_with_params(message, _delivery_info, metadata)
+        logger.debug "Request: #{message}"
+        request = Oj.load(message)
+        request_class = request.class
+        response_classes = request_response_mapping[request_class]
+        raise "Unacceptable request class: #{request_class}" if response_classes.nil?
+
+        result = new_handler.work_with_request(request)
+        raise "Unacceptable response class: #{result.class}" unless response_classes.include?(result.class)
+
+        send_response(result, metadata)
+        ack!
+      rescue StandardError => error
+        logger.error error.message
+        logger.error error.backtrace.join("\n")
+
+        error_response = ErrorResponse.new message: error.message, exception: error
+        send_response(error_response, metadata)
+        reject!
       end
-  
+
       def stop
         super
-        #reply_to_exchange.close # not working
+        # reply_to_exchange.close # not working
         reply_to_connection.close
       end
-  
+
       def reply_to_connection
         @reply_to_connection ||= create_reply_to_connection
       end
-  
+
       def create_reply_to_connection
         opts = Sneakers::CONFIG
-        conn = Bunny.new(opts[:amqp], :vhost => opts[:vhost], :heartbeat => opts[:heartbeat], :logger => Sneakers::logger)
+        conn = Bunny.new(opts[:amqp], vhost: opts[:vhost], heartbeat: opts[:heartbeat], logger: Sneakers.logger)
         conn.start
         conn
       end
-  
+
       def reply_to_exchange
         @reply_to_queue ||= create_reply_to_exchange
       end
-  
+
       def create_reply_to_exchange
         ch = reply_to_connection.create_channel
-        ch.exchange(AMQ::Protocol::EMPTY_STRING, :auto_delete => true)    
+        ch.exchange(AMQ::Protocol::EMPTY_STRING, auto_delete: true)
       end
-  
-      
+
       private
+
       def send_response(result, metadata)
         json = Oj.dump(result)
         logger.debug "Response: #{json}"
         send_response_json(json, metadata.reply_to, metadata.correlation_id)
       end
-      
+
       def send_response_json(json, routing_key, correlation_id)
-        reply_to_exchange.publish(json, :routing_key => routing_key, :correlation_id => correlation_id)        
+        reply_to_exchange.publish(json, routing_key: routing_key, correlation_id: correlation_id)
       end
-      
-      
+
       def request_response_mapping
         {
           Calculator::Request => [Calculator::Response],
@@ -82,19 +79,20 @@ module Harmony
           Form::GetRequest => [Form::GetResponse],
           Flow::EndedRequest => [Response],
           Notification::Request => [Notification::AppResponse, Response],
-          AttributeNamesRequest => [AttributeNamesResponse]
+          AttributeNamesRequest => [AttributeNamesResponse],
+          OauthTokenRequest => [OauthTokenResponse]
         }
       end
-      
+
       def new_handler
         handler_class = Sneakers::CONFIG[:handler_class]
-        raise "No handler specified" if handler_class.nil? 
-        
+        raise 'No handler specified' if handler_class.nil?
+
         handler = Object.const_get(handler_class).new
         raise "Unable to create handler: #{handler_class}" if handler.nil?
-        
+
         handler
       end
     end
   end
-end
+end

data/lib/harmony/service/utils/secrets.rb

@@ -0,0 +1,13 @@
+require 'sekrets'
+
+class Harmony::Service::Utils::Secrets
+  
+  def self.load
+    env = ENV['HARMONY_ENV']
+    abort "ENV['HARMONY_ENV'] must be set." unless env
+    
+    secrets = Sekrets.settings_for('./config/settings.yml.enc')[env] 
+    secrets.each_pair{|k,v| ENV[k] = v.to_s }   
+  end
+  
+end

data/lib/harmony/service/version.rb

@@ -1,6 +1,6 @@
 module Harmony
   module Service
-    VERSION = "0.4.4"
+    VERSION = "0.5.0"
   end
 end
 

data/spec/harmony/service/rpc_service_spec.rb

@@ -86,6 +86,13 @@ describe Harmony::Service::RpcService do
         it { expect(subject).to have_received(:send_response_json).with("{\"^o\":\"Harmony::Service::AttributeNamesResponse\",\"options\":{}}", "harmony.trello", "abc123") }
         it { expect(subject).to have_received(:ack!) }
       end
+
+      context "oauth_token" do
+        let(:request) { Harmony::Service::OauthTokenRequest.new }
+        let(:response) { Harmony::Service::OauthTokenResponse.new}
+        it { expect(subject).to have_received(:send_response_json).with("{\"^o\":\"Harmony::Service::OauthTokenResponse\"}", "harmony.trello", "abc123") }
+        it { expect(subject).to have_received(:ack!) }
+      end
       
       context "exception" do
         let(:handler) do 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harmony-service
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sneakers
@@ -86,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.4
+- !ruby/object:Gem::Dependency
+  name: sekrets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -166,10 +180,14 @@ files:
 - lib/harmony/service/message.rb
 - lib/harmony/service/notification/app_response.rb
 - lib/harmony/service/notification/request.rb
+- lib/harmony/service/oauth_token_request.rb
+- lib/harmony/service/oauth_token_response.rb
+- lib/harmony/service/rake_tasks.rb
 - lib/harmony/service/request.rb
 - lib/harmony/service/response.rb
 - lib/harmony/service/rpc_service.rb
 - lib/harmony/service/utils/diff.rb
+- lib/harmony/service/utils/secrets.rb
 - lib/harmony/service/utils/storage.rb
 - lib/harmony/service/version.rb
 - spec/harmony/service/rpc_service_spec.rb
@@ -196,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Gem which helps you to build Harmony services