embulk-output-mailchimp 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 464eeb7f786c9890be8adf21b84dbe1cc6ca442e
-  data.tar.gz: 0b812c416f3900910b9d1772aebdd56307fa737c
+  metadata.gz: 0f302894ddc97cb2d46fcd4017e1c5bfd49d7a47
+  data.tar.gz: 4ca3f4eaa7c1ce19a378e855b5604b49fae962d2
 SHA512:
-  metadata.gz: ec68fb3cb297f16724edf22975801f9b7928319983deb13b925c4670d231f3ab664a4f49ffbab74bf088cf87c2483da6ea5b1838865e4711dee8c5ab32f6c2b9
-  data.tar.gz: 3b310edb9b4a7bc732b17bb17f5ad3f6097c748d73ee3c6a7693190e1f6764987dbeae81daf0db2d3ba426a4ee9325b1a2968944244357fdfa070b7b36229db3
+  metadata.gz: 3451461a7022d3e747aa58a72c6568d51cd9651cc6d177abbfe87540b50aee8d65b8b9950689c48f9570410265f32a27be057218581d485637db6833af1b6cc4
+  data.tar.gz: 40bb5c7e83bb6e33d3fe078b8684bf476edb77cc6c1d673754631806a98bc5fac6d5d2da23d27ca69506f61cc3f39df73ee3e46ae7d51d762c6aced8a79ebaf4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.16 - 2017-08-28
+- Fixed user friendly error message when input invalid api key [#31](https://github.com/treasure-data/embulk-output-mailchimp/pull/31)
+
 ## 0.3.15 - 2017-07-26
 - Add checking exception to retry [#30](https://github.com/treasure-data/embulk-output-mailchimp/pull/30)
 

data/build.gradle

@@ -18,7 +18,7 @@ configurations {
     provided
 }
 
-version = "0.3.15"
+version = "0.3.16"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/output/mailchimp/MailChimpClient.java

@@ -11,6 +11,7 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
+import org.eclipse.jetty.client.HttpResponseException;
 import org.eclipse.jetty.http.HttpMethod;
 import org.embulk.config.ConfigException;
 import org.embulk.output.mailchimp.helper.MailChimpHelper;
@@ -23,6 +24,7 @@ import org.embulk.output.mailchimp.model.MergeField;
 import org.embulk.output.mailchimp.model.MergeFields;
 import org.embulk.output.mailchimp.model.MetaDataResponse;
 import org.embulk.output.mailchimp.model.ReportResponse;
+import org.embulk.spi.DataException;
 import org.embulk.spi.Exec;
 import org.slf4j.Logger;
 
@@ -180,23 +182,33 @@ public class MailChimpClient
 
     private void extractDataCenter(MailChimpOutputPluginDelegate.PluginTask task)
     {
-        try {
-            if (task.getAuthMethod() == OAUTH) {
-                // Extract data center from meta data URL
-                JsonNode response = client.sendRequest("https://login.mailchimp.com/oauth2/metadata", HttpMethod.GET, task);
-                MetaDataResponse metaDataResponse = mapper.treeToValue(response, MetaDataResponse.class);
+        if (task.getAuthMethod() == OAUTH) {
+            // Extract data center from meta data URL
+            JsonNode response = client.sendRequest("https://login.mailchimp.com/oauth2/metadata", HttpMethod.GET, task);
+            MetaDataResponse metaDataResponse;
+            try {
+                metaDataResponse = mapper.treeToValue(response, MetaDataResponse.class);
                 mailchimpEndpoint = MessageFormat.format(mailchimpEndpoint, metaDataResponse.getDc());
             }
-            else if (task.getAuthMethod() == API_KEY && task.getApikey().isPresent()) {
-                // Authenticate and return data center
-                String domain = task.getApikey().get().split("-")[1];
-                String endpoint = MessageFormat.format(mailchimpEndpoint + "/", domain);
+            catch (JsonProcessingException e) {
+                throw new DataException(e);
+            }
+        }
+        else if (task.getAuthMethod() == API_KEY && task.getApikey().isPresent()) {
+            // Authenticate and return data center
+            if (!task.getApikey().get().contains("-")) {
+                throw new ConfigException("API Key format invalid.");
+            }
+
+            String domain = task.getApikey().get().split("-")[1];
+            String endpoint = MessageFormat.format(mailchimpEndpoint + "/", domain);
+            try {
                 client.sendRequest(endpoint, HttpMethod.GET, task);
                 mailchimpEndpoint = MessageFormat.format(mailchimpEndpoint, domain);
             }
-        }
-        catch (Exception e) {
-            throw new ConfigException("Could not get data center", e);
+            catch (HttpResponseException re) {
+                throw new ConfigException("Your API key may be invalid, or you've attempted to access the wrong datacenter.");
+            }
         }
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Thang Nguyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ files:
 - test/override_assert_raise.rb
 - test/run-test.rb
 - classpath/embulk-base-restclient-0.5.3.jar
-- classpath/embulk-output-mailchimp-0.3.15.jar
+- classpath/embulk-output-mailchimp-0.3.16.jar
 - classpath/embulk-util-retryhelper-jetty92-0.5.3.jar
 - classpath/jetty-client-9.2.14.v20151106.jar
 - classpath/jetty-http-9.2.14.v20151106.jar