cyclone_lariat 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e81df0b814b28eff97a38a58e1d3573ef09efc594242da8b9768ed781eb1f989
-  data.tar.gz: ef8441b399c937518506bacc0514a1fbb68cde9c0d92e99d619edf3bfaee9611
+  metadata.gz: db8b83a45f403749ab3ab2503f22e85af53cce8fc3267a63eb31df0246d30683
+  data.tar.gz: 31ed6ee400d6778d90adf90ef997cc577df5564b78238cdc36b8067ff9fcaff9
 SHA512:
-  metadata.gz: 216f064daa35c0eb8599b368364ee116c0184e1ee7bd2ad94e39b06ce324d5f958c21fca460f2b368db34fcca287bb23db34af03c14718a676618213765ca150
-  data.tar.gz: 947a143ea181f60a450dba792091f3a122c88d6929638272292370bbaa8a5fe0270ecf6ad4d3ba01b560660478987dc9388879327100efa8426717be9cf75b9a
+  metadata.gz: f73b11ffa6189231a1ebd71dcb7db455fbc092aaa00e740b4b1092006dd4db38550ddbb94ccc0266dc1bf4f467d481110a92061344fb1a6fa22e92ef48995b4b
+  data.tar.gz: d06087c237bbc3946c7e91772a987edf47b787ccd0f8e1c6e0f341f32fa6c7965b1546dcc7e188967baafaac19dd140ddca0d1cdbafb82ce68ab736d965271ef

data/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.10] - 2022-10-05
+Added
+- Added aws_client_od options
+Changed:
+- Renamed all AWS options with prefix _aws 
+
+## [0.3.9] - 2022-10-05 Depricated
+Added
+- Added configuration options see README.md
+
 ## [0.3.8] - 2022-09-05
 Added
 - Added configuration options see README.md

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cyclone_lariat (0.3.9)
+    cyclone_lariat (0.3.10)
       aws-sdk-sns
       aws-sdk-sqs
       luna_park (~> 0.11)
@@ -13,19 +13,19 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.626.0)
-    aws-sdk-core (3.140.0)
+    aws-partitions (1.641.0)
+    aws-sdk-core (3.158.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-sns (1.54.0)
+    aws-sdk-sns (1.55.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-sqs (1.51.1)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.5.1)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     byebug (11.1.3)
     coderay (1.1.3)

data/README.md

@@ -38,12 +38,13 @@ received at all.
 ```ruby
 # 'config/initializers/cyclone_lariat.rb'
 CycloneLariat.tap do |cl|
-  cl.default_version  = 1 # api version default is 1
-  cl.key              = # aws key
-  cl.secret_key       = # aws secret
-  cl.default_region   = # aws default region
-  cl.publisher        = 'auth' # name of your publishers, usually name of your application 
-  cl.default_instance = APP_INSTANCE # stage, production, test
+  cl.default_version    = 1 # api version default is 1
+  cl.aws_key            = # aws key
+  cl.aws_secret_key     = # aws secret
+  cl.aws_client_id      = # aws client id
+  cl.aws_default_region = # aws default region
+  cl.publisher          = 'auth' # name of your publishers, usually name of your application 
+  cl.default_instance   = APP_INSTANCE # stage, production, test
 end
 ```
 

data/lib/cyclone_lariat/abstract/client.rb

@@ -14,13 +14,14 @@ module CycloneLariat
       dependency(:aws_client_class)      { raise ArgumentError, 'Client class should be defined' }
       dependency(:aws_credentials_class) { Aws::Credentials }
 
-      def initialize(key:, secret_key:, region:, version: nil, publisher: nil, instance: nil)
+      def initialize(key: nil, secret_key: nil, region: nil, version: nil, publisher: nil, instance: nil, client_id: nil)
         @key = key
         @secret_key = secret_key
         @region = region
         @version = version
         @publisher = publisher
         @instance = instance
+        @client_id = client_id
       end
 
       def event(type, data: {}, version: self.version, uuid: SecureRandom.uuid)
@@ -76,15 +77,19 @@ module CycloneLariat
       end
 
       def key
-        @key ||= CycloneLariat.key
+        @key ||= CycloneLariat.aws_key
       end
 
       def secret_key
-        @secret_key ||= CycloneLariat.secret_key
+        @secret_key ||= CycloneLariat.aws_secret_key
       end
 
       def region
-        @region ||= CycloneLariat.default_region
+        @region ||= CycloneLariat.aws_default_region
+      end
+
+      def client_id
+        @client_id ||= CycloneLariat.aws_client_id
       end
 
       private

data/lib/cyclone_lariat/configure.rb

@@ -4,7 +4,8 @@ module CycloneLariat
   class << self
     DEFAULT_VERSION = 1
 
-    attr_accessor :key, :secret_key, :publisher, :default_region, :default_instance
+    attr_accessor :aws_key, :aws_secret_key, :publisher, :aws_default_region, :default_instance,
+                  :aws_client_id
     attr_writer :default_version
 
     def default_version

data/lib/cyclone_lariat/errors.rb

@@ -9,10 +9,6 @@ module CycloneLariat
       message 'Received message is empty'
     end
 
-    class TopicNotFound < LunaPark::Errors::System
-      message { |d| "Could not found topic: `#{d[:expected_topic]}`" }
-    end
-
     class ClientError < LunaPark::Errors::Business
       attr_writer :message, :details
 

data/lib/cyclone_lariat/sns_client.rb

@@ -2,7 +2,6 @@
 
 require 'aws-sdk-sns'
 require_relative 'abstract/client'
-require_relative 'list_topics_store'
 
 module CycloneLariat
   class SnsClient < Abstract::Client
@@ -13,12 +12,9 @@ module CycloneLariat
     SNS_SUFFIX = :fanout
 
     def publish(msg, topic: nil)
-      topic ||= [instance, msg.kind, SNS_SUFFIX, publisher, msg.type].join('-')
-
-      aws_client.publish(
-        topic_arn: topic_arn(topic),
-        message: msg.to_json
-      )
+      topic ||= get_topic(msg.kind, msg.type)
+      arn     = get_arn(topic)
+      aws_client.publish(topic_arn: arn, message: msg.to_json)
     end
 
     def publish_event(type, data: {}, version: self.version, uuid: SecureRandom.uuid, topic: nil)
@@ -31,22 +27,12 @@ module CycloneLariat
 
     private
 
-    def topic_arn(topic_name)
-      topics_store.add_topics(aws_client)
-      topic_arn = topics_store.topic_arn(topic_name)
-
-      if topic_arn.nil?
-        raise Errors::TopicNotFound.new(
-          expected_topic: topic_name,
-          existed_topics: topics_store.list
-        )
-      end
-
-      topic_arn
+    def get_arn(topic)
+      ['arn', 'aws', 'sns', region, client_id, topic].join ':'
     end
 
-    def topics_store
-      ListTopicsStore.instance
+    def get_topic(kind, type)
+      [instance, kind, SNS_SUFFIX, publisher, type].join '-'
     end
   end
 end

data/lib/cyclone_lariat/sqs_client.rb

@@ -34,8 +34,6 @@ module CycloneLariat
 
     def url(topic_name)
       aws_client.get_queue_url(queue_name: topic_name).queue_url
-    rescue Aws::SQS::Errors::NonExistentQueue => _e
-      raise Errors::TopicNotFound.new(expected_topic: topic_name, existed_topics: aws_client.list_queues)
     end
   end
 end

data/lib/cyclone_lariat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CycloneLariat
-  VERSION = '0.3.9'
+  VERSION = '0.3.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyclone_lariat
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Alexander Kudrin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sns
@@ -272,7 +272,6 @@ files:
 - lib/cyclone_lariat/configure.rb
 - lib/cyclone_lariat/errors.rb
 - lib/cyclone_lariat/event.rb
-- lib/cyclone_lariat/list_topics_store.rb
 - lib/cyclone_lariat/messages_mapper.rb
 - lib/cyclone_lariat/messages_repo.rb
 - lib/cyclone_lariat/middleware.rb

data/lib/cyclone_lariat/list_topics_store.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'singleton'
-
-module CycloneLariat
-  class ListTopicsStore
-    include Singleton
-
-    def topic_arn(topic_name)
-      @topics[topic_name.to_sym]
-    end
-
-    def list
-      @topics.keys
-    end
-
-    def add_topics(aws_client)
-      @topics ||= {}
-      @aws_client = aws_client
-      fetch
-    end
-
-    def clear_store!
-      @topics = {}
-    end
-
-    private
-
-    def fetch
-      return unless @topics.empty?
-
-      @next_token = ''
-      topics_from_aws until @next_token.nil?
-    end
-
-    def topics_from_aws
-      result = @aws_client.list_topics(next_token: @next_token)
-      @next_token = result.next_token
-      result.topics.each do |topic|
-        topic_name = topic.topic_arn.split(':').last
-        @topics[topic_name.to_sym] = topic.topic_arn
-      end
-    end
-  end
-end