madhawk57-log 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d7fdf6ac2be4c621f0613a76493a71b88bdd9092b95c795deae03c5949af03d
-  data.tar.gz: e2a47f2e095f8fce7951e24e587eec377b8c67bdcfe7b09012086df5b22e36fb
+  metadata.gz: 8cd9b60a60ba7fbb87c62070412d279201b52b211f8a3870dffaee347ee7f0b4
+  data.tar.gz: d4564ac42c84e4a41888ac175624942c2e7b8477ee59e6633b0445ecd35e94cd
 SHA512:
-  metadata.gz: '083f1878c3f1516f8c34f7fe03cc7b8b8f3e635a30f8b99f498087a225ec20173c153a399e29fd597a4997616654926d71fe3a0a63c7f41ac23c423e11430a14'
-  data.tar.gz: a79597240a520f7d0a4de464f6be18dfc95ad530e289cf5466480edddf96fb7f805cb91dd399a8d430a41021888f93cc1ea60c87c81e3ea4b42f140af429ce53
+  metadata.gz: 0745d1e22a1c418ef0912ff6224efab0f7b529e01ee9e07a2eacbed2aedf94057d9239e5c05d0e4f4197fb1572659249816fc006af768be118ad7080c10d35b1
+  data.tar.gz: ae5d3514c9ab871d1456731efc696b33a15ccf7092776280db685a3e5029990e4b22c9ba6bc522e0feae8e260cefcb7ec0d1bcedde959b73724654aa217cea58

data/fluent-plugin-kafka.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.name = "madhawk57-log"
   gem.require_paths = ["lib"]
-  gem.version = '0.1.1'
+  gem.version = '0.1.6'
   gem.required_ruby_version = ">= 2.1.0"
 
   gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]

data/lib/fluent/plugin/kafka_plugin_util.rb

@@ -78,10 +78,11 @@ module Fluent
         }
       end
 
-      def self.fetch(log)
-        if log != nil
-          log.info "fetching secret with name #{@secretName} in project with id: #{@projectId} and version: #{@version}"
-        end
+      def fetch
+        puts "using following to fetch from GSM"
+        puts "project id: #{@projectId}"
+        puts "secret name: #{@secretName}"
+        puts "version: #{@version}"
 
         client = Google::Cloud::SecretManager.secret_manager_service
 
@@ -92,7 +93,7 @@ module Fluent
         )
 
         res = client.access_secret_version name: req
-        s = res.split("\n")
+        s = res.payload.data.split("\n")
 
         if s.length < 1
           raise Fluent::ConfigError, "GSM response too short"
@@ -100,7 +101,8 @@ module Fluent
 
         @username = s[0]
         @password = s[1]
-        @scram_mechanism = "PLAIN"
+
+        s
       end
     end
   end

data/lib/fluent/plugin/out_kafka.rb

@@ -106,9 +106,8 @@ DESC
     end
     begin
       if @seed_brokers.length > 0
-        g = Fluent::KafkaPluginUtil::GsmSettings
         if @secretName != nil && @projectId != nil
-          g.fetch(log)
+          fetch
         end
         if @scram_mechanism != nil && @username != nil && @password != nil
           @kafka = Kafka.new(seed_brokers: @seed_brokers, client_id: @client_id, ssl_ca_cert: read_ssl_file(@ssl_ca_cert),

data/lib/fluent/plugin/out_kafka2.rb

@@ -94,9 +94,8 @@ requires activesupport gem - records will be generated under fluent_kafka_stats.
     def refresh_client(raise_error = true)
       begin
         logger = @get_kafka_client_log ? log : nil
-        g = Fluent::KafkaPluginUtil::GsmSettings
         if @secretName != nil && @projectId != nil
-          g.fetch(logger)
+          fetch
         end
         if @scram_mechanism != nil && @username != nil && @password != nil
           @kafka = Kafka.new(seed_brokers: @seed_brokers, client_id: @client_id, logger: logger, connect_timeout: @connect_timeout, socket_timeout: @socket_timeout, ssl_ca_cert: read_ssl_file(@ssl_ca_cert),

data/lib/fluent/plugin/out_kafka_buffered.rb

@@ -130,9 +130,8 @@ DESC
     begin
       if @seed_brokers.length > 0
         logger = @get_kafka_client_log ? log : nil
-        g = Fluent::KafkaPluginUtil::GsmSettings
         if @secretName != nil && @projectId != nil
-          g.fetch(logger)
+          fetch
         end
         if @scram_mechanism != nil && @username != nil && @password != nil
           @kafka = Kafka.new(seed_brokers: @seed_brokers, client_id: @client_id, logger: logger, ssl_ca_cert: read_ssl_file(@ssl_ca_cert),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madhawk57-log
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Martin Falk