logstash-input-google_pubsub 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5bc9362c985c9940b9b4ae677adf15afe2fa6ea86bd85a83beafcd0a5092d42
-  data.tar.gz: 3f8279cf6a25d045d2776a2325fc90fd3edb81dfae312dc04efa82880e013e90
+  metadata.gz: 4ea1a0318dd5de34de0264fc29bb1f2ce61f8c36fd0ff017b833c613edfc359a
+  data.tar.gz: 2b322370bd6696df496c7b7a0c0cdca6917d0c801bd90ddb0613e7cefa65b828
 SHA512:
-  metadata.gz: 4822ec58447e1c8e2d33f8ffb5f9e5d2766aeadf87d411107b588f304249f6069a419cc15703f5f4838f8c746133b2ea977c344d2ae3e3d9aa206a70b32e4de7
-  data.tar.gz: b3e81b01e38863bbefe468c4cff5234745e049a5468a1f9b4d5b5e1eac1ee6c024688aa24347ecf6aedd9655051bf6091f78b064659baed4afde176f8943f3a5
+  metadata.gz: e3ed78f97f2b0618985001312a07ecfc199d5be12259013f52306d92bfddcdd59c7f1eef32558dcbb4d4970d1dfa0f5bef0c185a890adb0398a476a602641223
+  data.tar.gz: 7526c023eed7006014865bc6f343bd6fdbf00cfb684af33d599636745d0004bd8d7beb85bd640bb3c43940939a54e0009dfd7b0ca2755e807355e60e3b88e71e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.1
+ - Fixed dependency conflicts with logstash-output-google_pubsub by using the same client library [logstash-output-google_pubsub#7](https://github.com/logstash-plugins/logstash-output-google_pubsub/issues/7)
+
+
 ## 1.2.0
  - Change to Java client
  - Add `create_subscription` setting. Fixes [#9](https://github.com/logstash-plugins/logstash-input-google_pubsub/issues/9)

data/lib/logstash-input-google_pubsub_jars.rb

@@ -1,52 +1,41 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('com.google.api.grpc', 'proto-google-iam-v1', '0.1.24')
-require_jar('io.netty', 'netty-buffer', '4.1.16.Final')
-require_jar('org.threeten', 'threetenbp', '1.3.3')
-require_jar('com.google.errorprone', 'error_prone_annotations', '2.0.19')
-require_jar('com.google.api.grpc', 'grpc-google-cloud-pubsub-v1', '0.1.24')
-require_jar('io.netty', 'netty-codec-http', '4.1.16.Final')
-require_jar('io.grpc', 'grpc-protobuf-lite', '1.7.0')
-require_jar('io.netty', 'netty-common', '4.1.16.Final')
-require_jar('com.google.auto.value', 'auto-value', '1.2')
-require_jar('com.google.protobuf', 'protobuf-java-util', '3.4.0')
-require_jar('com.google.http-client', 'google-http-client-jackson2', '1.23.0')
+require_jar('com.google.cloud', 'google-cloud-pubsub', '1.37.1')
 require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.1.3')
+require_jar('com.google.api', 'api-common', '1.6.0')
+require_jar('com.google.api', 'gax', '1.29.0')
+require_jar('com.google.api', 'gax-grpc', '1.29.0')
+require_jar('com.google.api.grpc', 'grpc-google-cloud-pubsub-v1', '1.19.1')
+require_jar('com.google.api.grpc', 'proto-google-cloud-pubsub-v1', '1.19.1')
+require_jar('com.google.api.grpc', 'proto-google-common-protos', '1.12.0')
+require_jar('com.google.api.grpc', 'proto-google-iam-v1', '0.12.0')
+require_jar('com.google.auth', 'google-auth-library-credentials', '0.9.1')
+require_jar('com.google.auth', 'google-auth-library-oauth2-http', '0.9.1')
+require_jar('com.google.auto.value', 'auto-value', '1.4')
+require_jar('com.google.cloud', 'google-cloud-core', '1.37.1')
+require_jar('com.google.cloud', 'google-cloud-core-grpc', '1.37.1')
 require_jar('com.google.code.findbugs', 'jsr305', '3.0.2')
-require_jar('joda-time', 'joda-time', '2.9.2')
-require_jar('io.netty', 'netty-handler', '4.1.16.Final')
+require_jar('com.google.code.gson', 'gson', '2.7')
+require_jar('com.google.errorprone', 'error_prone_annotations', '2.2.0')
+require_jar('com.google.guava', 'guava', '20.0')
 require_jar('com.google.http-client', 'google-http-client', '1.23.0')
+require_jar('com.google.http-client', 'google-http-client-jackson2', '1.19.0')
+require_jar('com.google.protobuf', 'protobuf-java', '3.6.0')
+require_jar('com.google.protobuf', 'protobuf-java-util', '3.6.0')
+require_jar('com.google.protobuf', 'protobuf-lite', '3.0.1')
+require_jar('commons-codec', 'commons-codec', '1.3')
 require_jar('commons-logging', 'commons-logging', '1.1.1')
-require_jar('org.json', 'json', '20160810')
-require_jar('com.google.cloud', 'google-cloud-core', '1.10.0')
-require_jar('io.netty', 'netty-codec-http2', '4.1.16.Final')
-require_jar('com.google.guava', 'guava', '20.0')
-require_jar('com.google.cloud', 'google-cloud-core-grpc', '1.10.0')
-require_jar('com.google.protobuf', 'protobuf-java', '3.5.1')
-require_jar('com.google.api', 'gax', '1.14.0')
+require_jar('io.grpc', 'grpc-auth', '1.13.1')
+require_jar('io.grpc', 'grpc-context', '1.13.1')
+require_jar('io.grpc', 'grpc-core', '1.13.1')
+require_jar('io.grpc', 'grpc-netty-shaded', '1.13.1')
+require_jar('io.grpc', 'grpc-protobuf', '1.13.1')
+require_jar('io.grpc', 'grpc-protobuf-lite', '1.13.1')
+require_jar('io.grpc', 'grpc-stub', '1.13.1')
+require_jar('io.opencensus', 'opencensus-api', '0.12.3')
+require_jar('io.opencensus', 'opencensus-contrib-grpc-metrics', '0.12.3')
+require_jar('joda-time', 'joda-time', '2.9.2')
 require_jar('org.apache.httpcomponents', 'httpclient', '4.0.1')
-require_jar('com.google.api', 'gax-grpc', '1.14.0')
-require_jar('com.google.auth', 'google-auth-library-credentials', '0.9.0')
-require_jar('com.google.api', 'api-common', '1.2.0')
-require_jar('com.google.api.grpc', 'proto-google-common-protos', '1.0.0')
-require_jar('io.grpc', 'grpc-auth', '1.7.0')
-require_jar('io.grpc', 'grpc-core', '1.7.0')
-require_jar('io.netty', 'netty-codec-socks', '4.1.16.Final')
-require_jar('io.grpc', 'grpc-protobuf', '1.7.0')
-require_jar('io.grpc', 'grpc-context', '1.7.0')
-require_jar('io.netty', 'netty-transport', '4.1.16.Final')
-require_jar('commons-codec', 'commons-codec', '1.3')
-require_jar('com.google.instrumentation', 'instrumentation-api', '0.4.3')
-require_jar('io.netty', 'netty-handler-proxy', '4.1.16.Final')
-require_jar('io.netty', 'netty-resolver', '4.1.16.Final')
-require_jar('io.netty', 'netty-tcnative-boringssl-static', '2.0.6.Final')
-require_jar('com.google.code.gson', 'gson', '2.7')
-require_jar('io.grpc', 'grpc-netty', '1.7.0')
-require_jar('io.opencensus', 'opencensus-api', '0.6.0')
 require_jar('org.apache.httpcomponents', 'httpcore', '4.0.1')
-require_jar('io.netty', 'netty-codec', '4.1.16.Final')
-require_jar('io.grpc', 'grpc-stub', '1.7.0')
-require_jar('com.google.cloud', 'google-cloud-pubsub', '0.28.0-beta')
-require_jar('com.google.api.grpc', 'proto-google-cloud-pubsub-v1', '0.1.24')
-require_jar('com.google.auth', 'google-auth-library-oauth2-http', '0.9.0')
+require_jar('org.threeten', 'threetenbp', '1.3.3')

data/lib/logstash/inputs/google_pubsub.rb

@@ -226,8 +226,8 @@ class LogStash::Inputs::GooglePubSub < LogStash::Inputs::Base
         ServiceAccountCredentials.fromStream(java.io.FileInputStream.new(@json_key_file))
       )
     end
-    @topic_name = TopicName.create(@project_id, @topic)
-    @subscription_name = SubscriptionName.create(@project_id, @subscription)
+    @topic_name = ProjectTopicName.of(@project_id, @topic)
+    @subscription_name = ProjectSubscriptionName.of(@project_id, @subscription)
   end
 
   def stop

data/logstash-input-google_pubsub.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-google_pubsub'
-  s.version         = '1.2.0'
+  s.version         = '1.2.1'
   s.licenses = ['Apache-2.0']
   s.summary = "Consume events from a Google Cloud PubSub service"
   s.description = "This gem is a Logstash input plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-google_pubsub
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Eric Johnson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -107,53 +107,42 @@ files:
 - logstash-input-google_pubsub.gemspec
 - spec/inputs/google_pubsub_spec.rb
 - vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.1.3/jackson-core-2.1.3.jar
-- vendor/jar-dependencies/com/google/api/api-common/1.2.0/api-common-1.2.0.jar
-- vendor/jar-dependencies/com/google/api/gax-grpc/1.14.0/gax-grpc-1.14.0.jar
-- vendor/jar-dependencies/com/google/api/gax/1.14.0/gax-1.14.0.jar
-- vendor/jar-dependencies/com/google/api/grpc/grpc-google-cloud-pubsub-v1/0.1.24/grpc-google-cloud-pubsub-v1-0.1.24.jar
-- vendor/jar-dependencies/com/google/api/grpc/proto-google-cloud-pubsub-v1/0.1.24/proto-google-cloud-pubsub-v1-0.1.24.jar
-- vendor/jar-dependencies/com/google/api/grpc/proto-google-common-protos/1.0.0/proto-google-common-protos-1.0.0.jar
-- vendor/jar-dependencies/com/google/api/grpc/proto-google-iam-v1/0.1.24/proto-google-iam-v1-0.1.24.jar
-- vendor/jar-dependencies/com/google/auth/google-auth-library-credentials/0.9.0/google-auth-library-credentials-0.9.0.jar
-- vendor/jar-dependencies/com/google/auth/google-auth-library-oauth2-http/0.9.0/google-auth-library-oauth2-http-0.9.0.jar
-- vendor/jar-dependencies/com/google/auto/value/auto-value/1.2/auto-value-1.2.jar
-- vendor/jar-dependencies/com/google/cloud/google-cloud-core-grpc/1.10.0/google-cloud-core-grpc-1.10.0.jar
-- vendor/jar-dependencies/com/google/cloud/google-cloud-core/1.10.0/google-cloud-core-1.10.0.jar
-- vendor/jar-dependencies/com/google/cloud/google-cloud-pubsub/0.28.0-beta/google-cloud-pubsub-0.28.0-beta.jar
+- vendor/jar-dependencies/com/google/api/api-common/1.6.0/api-common-1.6.0.jar
+- vendor/jar-dependencies/com/google/api/gax-grpc/1.29.0/gax-grpc-1.29.0.jar
+- vendor/jar-dependencies/com/google/api/gax/1.29.0/gax-1.29.0.jar
+- vendor/jar-dependencies/com/google/api/grpc/grpc-google-cloud-pubsub-v1/1.19.1/grpc-google-cloud-pubsub-v1-1.19.1.jar
+- vendor/jar-dependencies/com/google/api/grpc/proto-google-cloud-pubsub-v1/1.19.1/proto-google-cloud-pubsub-v1-1.19.1.jar
+- vendor/jar-dependencies/com/google/api/grpc/proto-google-common-protos/1.12.0/proto-google-common-protos-1.12.0.jar
+- vendor/jar-dependencies/com/google/api/grpc/proto-google-iam-v1/0.12.0/proto-google-iam-v1-0.12.0.jar
+- vendor/jar-dependencies/com/google/auth/google-auth-library-credentials/0.9.1/google-auth-library-credentials-0.9.1.jar
+- vendor/jar-dependencies/com/google/auth/google-auth-library-oauth2-http/0.9.1/google-auth-library-oauth2-http-0.9.1.jar
+- vendor/jar-dependencies/com/google/auto/value/auto-value/1.4/auto-value-1.4.jar
+- vendor/jar-dependencies/com/google/cloud/google-cloud-core-grpc/1.37.1/google-cloud-core-grpc-1.37.1.jar
+- vendor/jar-dependencies/com/google/cloud/google-cloud-core/1.37.1/google-cloud-core-1.37.1.jar
+- vendor/jar-dependencies/com/google/cloud/google-cloud-pubsub/1.37.1/google-cloud-pubsub-1.37.1.jar
 - vendor/jar-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
 - vendor/jar-dependencies/com/google/code/gson/gson/2.7/gson-2.7.jar
-- vendor/jar-dependencies/com/google/errorprone/error_prone_annotations/2.0.19/error_prone_annotations-2.0.19.jar
+- vendor/jar-dependencies/com/google/errorprone/error_prone_annotations/2.2.0/error_prone_annotations-2.2.0.jar
 - vendor/jar-dependencies/com/google/guava/guava/20.0/guava-20.0.jar
-- vendor/jar-dependencies/com/google/http-client/google-http-client-jackson2/1.23.0/google-http-client-jackson2-1.23.0.jar
+- vendor/jar-dependencies/com/google/http-client/google-http-client-jackson2/1.19.0/google-http-client-jackson2-1.19.0.jar
 - vendor/jar-dependencies/com/google/http-client/google-http-client/1.23.0/google-http-client-1.23.0.jar
-- vendor/jar-dependencies/com/google/instrumentation/instrumentation-api/0.4.3/instrumentation-api-0.4.3.jar
-- vendor/jar-dependencies/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.jar
-- vendor/jar-dependencies/com/google/protobuf/protobuf-java/3.5.1/protobuf-java-3.5.1.jar
+- vendor/jar-dependencies/com/google/protobuf/protobuf-java-util/3.6.0/protobuf-java-util-3.6.0.jar
+- vendor/jar-dependencies/com/google/protobuf/protobuf-java/3.6.0/protobuf-java-3.6.0.jar
+- vendor/jar-dependencies/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1.jar
 - vendor/jar-dependencies/commons-codec/commons-codec/1.3/commons-codec-1.3.jar
 - vendor/jar-dependencies/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar
-- vendor/jar-dependencies/io/grpc/grpc-auth/1.7.0/grpc-auth-1.7.0.jar
-- vendor/jar-dependencies/io/grpc/grpc-context/1.7.0/grpc-context-1.7.0.jar
-- vendor/jar-dependencies/io/grpc/grpc-core/1.7.0/grpc-core-1.7.0.jar
-- vendor/jar-dependencies/io/grpc/grpc-netty/1.7.0/grpc-netty-1.7.0.jar
-- vendor/jar-dependencies/io/grpc/grpc-protobuf-lite/1.7.0/grpc-protobuf-lite-1.7.0.jar
-- vendor/jar-dependencies/io/grpc/grpc-protobuf/1.7.0/grpc-protobuf-1.7.0.jar
-- vendor/jar-dependencies/io/grpc/grpc-stub/1.7.0/grpc-stub-1.7.0.jar
-- vendor/jar-dependencies/io/netty/netty-buffer/4.1.16.Final/netty-buffer-4.1.16.Final.jar
-- vendor/jar-dependencies/io/netty/netty-codec-http/4.1.16.Final/netty-codec-http-4.1.16.Final.jar
-- vendor/jar-dependencies/io/netty/netty-codec-http2/4.1.16.Final/netty-codec-http2-4.1.16.Final.jar
-- vendor/jar-dependencies/io/netty/netty-codec-socks/4.1.16.Final/netty-codec-socks-4.1.16.Final.jar
-- vendor/jar-dependencies/io/netty/netty-codec/4.1.16.Final/netty-codec-4.1.16.Final.jar
-- vendor/jar-dependencies/io/netty/netty-common/4.1.16.Final/netty-common-4.1.16.Final.jar
-- vendor/jar-dependencies/io/netty/netty-handler-proxy/4.1.16.Final/netty-handler-proxy-4.1.16.Final.jar
-- vendor/jar-dependencies/io/netty/netty-handler/4.1.16.Final/netty-handler-4.1.16.Final.jar
-- vendor/jar-dependencies/io/netty/netty-resolver/4.1.16.Final/netty-resolver-4.1.16.Final.jar
-- vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.6.Final/netty-tcnative-boringssl-static-2.0.6.Final.jar
-- vendor/jar-dependencies/io/netty/netty-transport/4.1.16.Final/netty-transport-4.1.16.Final.jar
-- vendor/jar-dependencies/io/opencensus/opencensus-api/0.6.0/opencensus-api-0.6.0.jar
+- vendor/jar-dependencies/io/grpc/grpc-auth/1.13.1/grpc-auth-1.13.1.jar
+- vendor/jar-dependencies/io/grpc/grpc-context/1.13.1/grpc-context-1.13.1.jar
+- vendor/jar-dependencies/io/grpc/grpc-core/1.13.1/grpc-core-1.13.1.jar
+- vendor/jar-dependencies/io/grpc/grpc-netty-shaded/1.13.1/grpc-netty-shaded-1.13.1.jar
+- vendor/jar-dependencies/io/grpc/grpc-protobuf-lite/1.13.1/grpc-protobuf-lite-1.13.1.jar
+- vendor/jar-dependencies/io/grpc/grpc-protobuf/1.13.1/grpc-protobuf-1.13.1.jar
+- vendor/jar-dependencies/io/grpc/grpc-stub/1.13.1/grpc-stub-1.13.1.jar
+- vendor/jar-dependencies/io/opencensus/opencensus-api/0.12.3/opencensus-api-0.12.3.jar
+- vendor/jar-dependencies/io/opencensus/opencensus-contrib-grpc-metrics/0.12.3/opencensus-contrib-grpc-metrics-0.12.3.jar
 - vendor/jar-dependencies/joda-time/joda-time/2.9.2/joda-time-2.9.2.jar
 - vendor/jar-dependencies/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar
 - vendor/jar-dependencies/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar
-- vendor/jar-dependencies/org/json/json/20160810/json-20160810.jar
 - vendor/jar-dependencies/org/threeten/threetenbp/1.3.3/threetenbp-1.3.3.jar
 homepage: https://cloud.google.com/pubsub/overview
 licenses: