ksconnect 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea648d37bdf08e22c193648dc2ef8e06c396069a
-  data.tar.gz: 663bc01a5c9a1e26c6255f2e90556721153a56ff
+  metadata.gz: 6730d75198a54bf80d6a387229b7d60d3e905d6b
+  data.tar.gz: 3647c8d45e3e9834e7932b95584fcfb336ec977c
 SHA512:
-  metadata.gz: e8d1aef99fafb2166cda2b51271237abe3fae887074b8dec65ba9d6fb63951fe8169025b02fcf7ebd51ddb474182ac01d610eeb75334e7deffa2a3da8b669d30
-  data.tar.gz: 9fd0ed41cab42654b170f31d8b4b100d7be9bbb45be598ccd2b38c797fa20e1287329ab71ff090052a1d616e47b7ddb02b1c86971904d452fc25c52bf15d05ef
+  metadata.gz: be27f9d88e195b9165e3cdd81f03e18b3c4acf49596432684857f10b768f2cfde5d11a09087ca3e4b97fd9c36b6c95dc94ba6eeeb67b2191ddb0467eff4e2a44
+  data.tar.gz: 5f6a210cc57bb84cdd29aeb88edd37a3884d9072ec734ee6743f2d2eeec9868eb6c6f1c6280db868b5e0161969ff59a810986b0f11dca7535a82639c9eed2b96

data/lib/ksconnect/api/plugin.rb

@@ -47,39 +47,13 @@ class KSConnect
       def subscribe_to_events
         KSConnect.channel("#{@name}:push") do |message|
           begin
-            msg = JSON.parse(message)
+            json = JSON.parse(message)
+            perform_request(json)
           rescue Exception => e
             logger.error e
             logger.error "Error parsing message as JSON: #{message}"
             next
           end
-
-          if %w(initialize update teardown).include? msg['request_type']
-            perform_request(msg)
-          else
-            begin
-              result = config.on_push.call(msg)
-              update_action(msg["action_uuid"], :done, result) if msg["action_uuid"] && ENV['KSCONNECT_READ_ONLY'].nil?
-            rescue => e
-              update_action(msg["action_uuid"], :failed, "") if msg["action_uuid"] && ENV['KSCONNECT_READ_ONLY'].nil?
-              raise e
-            end
-          end
-        end
-      end
-
-      def update_action(action_id, state, body="")
-        raise "Updating action with empty action_id" if action_id.nil? or action_id.empty?
-        $redis.with do |redis|
-          redis.multi do |redis_transaction|
-            redis_transaction.mapped_hmset "kloudsec_data:#{action_id}", {
-                plugin_name: @name,
-                uuid: action_id,
-                state: state,
-                response: body,
-            }
-            redis_transaction.expire "kloudsec_data:#{action_id}", 300
-          end
         end
       end
 
@@ -104,8 +78,23 @@ class KSConnect
           when 'teardown'
             config.on_teardown.call(request)
             @domains.delete(domain_name)
-          else
-            raise "Invalid request type"
+          else # default to generic `on_push` type
+            begin
+              keys_to_echo = { domain_name: request['domain_name'], website_plugin_id: request['website_plugin_id'], request_id: request['request_id'] }
+              result = config.on_push.call(request)
+              update_action(keys_to_echo.merge!({ state: :done, data: result }))
+            rescue => e
+              update_action(keys_to_echo.merge({ state: :failed }))
+              raise e
+            end
+        end
+      end
+
+      def update_action(result)
+        if ENV['KSCONNECT_READ_ONLY'].nil?
+          $redis.with do |redis|
+            redis.lpush("ks:actions_push", result.to_json)
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ksconnect
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Ivan Poon