embulk-input-google_analytics 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ab44fb8b7d3108fc5611a58e38640eb2839478b
-  data.tar.gz: c7dbaea282c1703273cffaf02799c5fc2a4a9013
+  metadata.gz: 98cf1ab1dabc69c3b8ee6a48e7054f9ed7a13bfc
+  data.tar.gz: b214635c4b353bde69fc9358aa937c82765b6fe7
 SHA512:
-  metadata.gz: 42e3f0dedf09f963e1e8d016cc673f4c5737a41f2a708e6b5f2245769862c71ba2bd50ca79b622c66a7b896135c18f7568e1db4c059d0ba42de359c02dcae4e8
-  data.tar.gz: 4e9e5f619ae9ddf6acfdd413984533f14d28cfbb2a59f34bf351b37a128e665e411a2f3cc49092cbf3b3841de9b099d85b42cd9b112bc7d7cc5413f6f2d32f67
+  metadata.gz: e24333e7618c3c729a78ae1a9d0fdb1cac380fef1f9b08bd31fb0a7fdc1b1b0ba25d31a2e399b8c33eed283a3d39007d1da2569dffa6f7c02143dafe55337c6a
+  data.tar.gz: bcee119969919b4352761643d18a0c650dd5b5d017abedf1f75a1f980a2e282174d983ea5622dda77b7c7cbc05d0e35db794a0b70f4b5fbed4c2b847c4be0e1c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.19 - 2018-10-03
+* Make it easy to understand error message of Google Analytics connector (https://github.com/treasure-data/embulk-input-google_analytics/pull/39)
+
 ## 0.1.18 - 2018-05-23
 * Suport User Account Authentication [#33](https://github.com/treasure-data/embulk-input-google_analytics/pull/33)
 * Ignore last_record_time if non-incremental task [#34](https://github.com/treasure-data/embulk-input-google_analytics/pull/34)

data/embulk-input-google_analytics.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-google_analytics"
-	spec.version       = "0.1.18"
+	spec.version       = "0.1.19"
   spec.authors       = ["uu59"]
   spec.summary       = "Google Analytics input plugin for Embulk"
   spec.description   = "Loads records from Google Analytics."

data/lib/embulk/input/google_analytics/plugin.rb

@@ -20,6 +20,10 @@ module Embulk
             unless task['client_id'] && task['client_secret'] && task['refresh_token']
               raise ConfigError.new("client_id, client_secret and refresh_token are required when using Oauth authentication")
             end
+          elsif task['auth_method'] == Plugin::AUTH_TYPE_JSON_KEY
+            if !valid_json?(task["json_key_content"])
+              raise ConfigError.new("json_key_content is not a valid JSON object")
+            end
           end
 
           columns_list = Client.new(task).get_columns_list
@@ -106,8 +110,21 @@ module Embulk
           return {}
         end
 
+        def self.valid_json?(json_object)
+          # 'null' string is a valid string for parse function
+          # However in our case, json_content_key could not be 'null' therefore this check is added
+          if json_object == "null"
+              return false
+          end
+          begin
+            JSON.parse(json_object)
+                return true
+          rescue JSON::ParserError => e
+              return false
+          end
+        end
+
         def init
-          # PLT-6753
           if task["start_date"] && !task["end_date"]
             task["end_date"] = "today"
           end

data/test/embulk/input/google_analytics/test_plugin.rb

@@ -107,6 +107,26 @@ module Embulk
               end
             end
 
+            test "invalid json_key_content params for oauth" do
+              conf = valid_config["in"]
+              # Empty json_key_content
+              conf["json_key_content"] = ""
+              message = "json_key_content is not a valid JSON object"
+              assert_raise(Embulk::ConfigError.new(message)) do
+                Plugin.transaction(embulk_config(conf))
+              end
+              # null json_key_content
+              conf["json_key_content"] = "null"
+              assert_raise(Embulk::ConfigError.new(message)) do
+                Plugin.transaction(embulk_config(conf))
+              end
+              # Not a string json_key_content
+              conf["json_key_content"] = nil
+              assert_raise(Embulk::ConfigError.new(message)) do
+                Plugin.transaction(embulk_config(conf))
+              end
+            end
+
             def unknown_auth_method_message
               "Unknown Authentication method ''."
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-google_analytics
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - uu59
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement