embulk-input-zendesk 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a2dc7f31c8524872638398698c54696dd1ae72
-  data.tar.gz: 408233498ae7989a63dae5afd92ea84dadddd359
+  metadata.gz: ad43cfba07a05a5677083290abad4876dfaa652a
+  data.tar.gz: 90dbefa73c45d26e7a499e8c5b1f6618af4512f5
 SHA512:
-  metadata.gz: c8ec39ad37f463cc25e7ec6903cf885ae2cb54a199badc696575fb90a79f2bfb1b412e03896b0546a7d27f5bbedd355092a44c83aea0578cc7c88a2f0a00ab19
-  data.tar.gz: e3123aeb68dc367b08dcaacb9aa62d07af2821afe098d189e7e7e58a6005f80e7373a9fd6fcf626e993f9316068c599d216c6a201f2e0e2d544454bc097d2623
+  metadata.gz: 1bcbdc100b762d7bfa73cddc605d34b64040dcb218e37f31e03b0342dbf4594cbfe5f970d861997dbb85a6b734911fa291db526bbc50a6a933f424ae4924a6ac
+  data.tar.gz: ceef0158dc916745848727ccc3dd58bd8f63d38647475b3f4a0fee75aa95a690b690ba030d99a08fecdd3d14a0a6fa5fa0e2cf2a34ef109d45aba597dd48cdf5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.1 - 2019-04-09
+* [fixed] Fix checking 404 by status code when fetching related objects #52 [#52](https://github.com/treasure-data/embulk-input-zendesk/pull/52)
+
 ## 0.3.0 - 2019-04-08
 * [enhancement] Convert embulk-input-zendesk to Java #50 [#50](https://github.com/treasure-data/embulk-input-zendesk/pull/50)
 

data/build.gradle

@@ -15,7 +15,7 @@ configurations {
     provided
 }
 
-version = "0.3.0"
+version = "0.3.1"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

data/src/main/java/org/embulk/input/zendesk/ZendeskInputPlugin.java

@@ -8,6 +8,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 
+import org.apache.http.HttpStatus;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigDiff;
@@ -19,6 +20,7 @@ import org.embulk.config.TaskSource;
 import org.embulk.exec.GuessExecutor;
 import org.embulk.input.zendesk.models.AuthenticationMethod;
 import org.embulk.input.zendesk.models.Target;
+import org.embulk.input.zendesk.models.ZendeskException;
 import org.embulk.input.zendesk.services.ZendeskSupportAPIService;
 import org.embulk.input.zendesk.utils.ZendeskConstants;
 import org.embulk.input.zendesk.utils.ZendeskDateUtils;
@@ -434,11 +436,12 @@ public class ZendeskInputPlugin implements InputPlugin
             }
             catch (final ConfigException e) {
                 // Sometimes we get 404 when having invalid endpoint, so ignore when we get 404 InvalidEndpoint
-                if (!e.getMessage().contains(ZendeskConstants.Misc.INVALID_END_POINT_RESPONSE)) {
+                if (!(e.getCause() instanceof ZendeskException && ((ZendeskException) e.getCause()).getStatusCode() == HttpStatus.SC_NOT_FOUND)) {
                     throw e;
                 }
             }
         });
+
         ZendeskUtils.addRecord(jsonNode, schema, pageBuilder);
     }
 

data/src/main/java/org/embulk/input/zendesk/clients/ZendeskRestClient.java

@@ -117,7 +117,8 @@ public class ZendeskRestClient
         }
         catch (RetryExecutor.RetryGiveupException | InterruptedException e) {
             if (e instanceof RetryExecutor.RetryGiveupException && e.getCause() != null && e.getCause() instanceof ZendeskException) {
-                throw new ConfigException(e.getCause().getMessage());
+                throw new ConfigException("Status: '" + ((ZendeskException) (e.getCause())).getStatusCode() + "', error message: '" + e.getCause().getMessage() + "'",
+                                          e.getCause());
             }
             throw new ConfigException(e);
         }
@@ -177,7 +178,7 @@ public class ZendeskRestClient
                 //That means "No records from start_time". We can recognize it same as 200.
                 return false;
             }
-            throw new ConfigException("Status: '" + status + "', error message '" + message + "'");
+            throw new ConfigException("Status: '" + status + "', error message: '" + message + "'");
         }
 
         if (status == ZendeskConstants.HttpStatus.TOO_MANY_REQUEST || status == HttpStatus.SC_INTERNAL_SERVER_ERROR

data/src/main/java/org/embulk/input/zendesk/utils/ZendeskConstants.java

@@ -39,10 +39,8 @@ public class ZendeskConstants
         public static final String ISO_TIMESTAMP_FORMAT = "yyyy-MM-dd'T'HH:mm:ssXXX";
         public static final String ISO_INSTANT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
         public static final String TOO_RECENT_START_TIME = "Too recent start_time.";
-        public static final String INVALID_END_POINT_RESPONSE = "\"error\":\"InvalidEndpoint\"";
         public static final int RECORDS_SIZE_PER_PAGE = 100;
         public static final int MAXIMUM_RECORDS_INCREMENTAL = 1000;
-        public static final int TOO_MANY_REQUEST = 429;
 
         // 1 MB
         public static final int GUESS_BUFFER_SIZE = 1024 * 1024;

data/src/test/java/org/embulk/input/zendesk/clients/TestZendeskRestClient.java

@@ -90,7 +90,7 @@ public class TestZendeskRestClient
     @Test
     public void doGetRetryFail429WithoutRetryAfter()
     {
-        String expectedMessage = "Number of allowed incremental export API requests per minute exceeded";
+        String expectedMessage = "Status: '429', error message: 'Number of allowed incremental export API requests per minute exceeded'";
         int expectedRetryTime = 3;
         testExceptionMessageForDoGet("doGet429", expectedMessage, expectedRetryTime);
     }
@@ -98,7 +98,7 @@ public class TestZendeskRestClient
     @Test
     public void doGetRetryFail429WithRetryAfter()
     {
-        String expectedMessage = "Number of allowed incremental export API requests per minute exceeded";
+        String expectedMessage = "Status: '429', error message: 'Number of allowed incremental export API requests per minute exceeded'";
         int expectedRetryTime = 3;
 
         when(response.containsHeader("x-rate-limit")).thenReturn(true);
@@ -123,7 +123,7 @@ public class TestZendeskRestClient
     @Test
     public void doGetRetry422FailBecauseNotContainTooRecentStartTime()
     {
-        String expectedMessage = "Status: '422', error message 'dummy text'";
+        String expectedMessage = "Status: '422', error message: 'dummy text'";
         int expectedRetryTime = 1;
         testExceptionMessageForDoGet("doGet422NotContainTooRecentStartTime", expectedMessage, expectedRetryTime);
     }
@@ -131,7 +131,7 @@ public class TestZendeskRestClient
     @Test
     public void doGetNotRetry422BecauseContainTooRecentStartTime()
     {
-        String expectedMessage = "Status: '422', error message 'dummy text'";
+        String expectedMessage = "Status: '422', error message: 'dummy text'";
         int expectedRetryTime = 1;
         testExceptionMessageForDoGet("doGet422ContainTooRecentStartTime", expectedMessage, expectedRetryTime);
     }
@@ -158,7 +158,7 @@ public class TestZendeskRestClient
     public void doGetRetry404()
     {
         setup("doGet404");
-        String expectedMessage = "dummy text";
+        String expectedMessage = "Status: '404', error message: 'dummy text'";
         int expectedRetryTime = 1;
         try {
             zendeskRestClient.doGet("any", task, false);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-zendesk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - hieu.duong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ files:
 - src/test/resources/data/util.json
 - src/test/resources/data/util_page.json
 - classpath/commons-logging-1.2.jar
-- classpath/embulk-input-zendesk-0.3.0.jar
+- classpath/embulk-input-zendesk-0.3.1.jar
 - classpath/httpcore-4.4.10.jar
 - classpath/httpclient-4.5.6.jar
 - classpath/commons-codec-1.10.jar