embulk-input-cloudwatch_logs 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87992b58676fdeaddad2c841f96e3bbd53a44329
-  data.tar.gz: 35deb6b6a8741deb4044e565442827980b93844b
+  metadata.gz: 0c8514b9710d424e207be6f8d9ba1eaba9722756
+  data.tar.gz: e429b3906d0ca115b6d0fa9e827904cd823cf534
 SHA512:
-  metadata.gz: eabd966215d768006705c8921b0cd90982dff5fb93811cde636ba20b98033f466554ec4164687bc282eec7a5902eaa61c9edff18e2548d57b54666b0e68e9739
-  data.tar.gz: 13902ef7a5c355490a25cd653a370c04d927e8f72037680a5b38cfa2e57a538481c4788e7b4d0f197135ff9593a8b3a9ae98a041b37d59a77c3c25c5f1ded2b6
+  metadata.gz: aaa51712b7cbc2255a9988b950e8485e3a9e41c8047edb45972e055e9ed931edc0c15534a9a949ff3a0876971eb9538a7b4513a4627ad92cd44d86e76ed3dabf
+  data.tar.gz: cee8e80247f51920c0e57cdedf668a32936c762b2bd7e0ef59086fb078462f6549bf3032005d72c8b16322556b71f964adecb4c47c8528e0d733a9031f7eeaa6

data/.github/workflows/build.yml

@@ -0,0 +1,25 @@
+name: Build and test
+on:
+  - push
+  - pull_request
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+        - ubuntu-latest
+        # - macOS-latest
+        # - windows-latest
+        gradle_task:
+        - "gem"
+        - "assemble"
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build and test
+      run: ./gradlew ${{ matrix.gradle_task }}

data/.gitignore

@@ -3,6 +3,7 @@
 /tmp/
 .DS_Store
 config.yaml
+*.sh
 *.gemspec
 .gradle/
 /classpath/

data/build.gradle

@@ -4,6 +4,7 @@ plugins {
     id "java"
     id "checkstyle"
 }
+
 import com.github.jrubygradle.JRubyExec
 repositories {
     mavenCentral()
@@ -13,22 +14,25 @@ configurations {
     provided
 }
 
-version = "0.1.0"
+version = "0.1.1"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.9.21"
-    provided "org.embulk:embulk-core:0.9.21"
+    compile  "org.embulk:embulk-core:0.10.1"
+    provided "org.embulk:embulk-core:0.10.1"
+    implementation "com.google.guava:guava:28.2-jre"
     compile group: 'com.amazonaws', name: 'aws-java-sdk-logs', version: '1.11.749'
     compile group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: '1.11.749'
     // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
     testCompile "junit:junit:4.+"
     testCompile "org.mockito:mockito-core:1.+"
-    testCompile "org.embulk:embulk-core:0.9.21:tests"
-    testCompile "org.embulk:embulk-standards:0.9.21"
-    testCompile "org.embulk:embulk-test:0.9.21"
+    testCompile "org.embulk:embulk-core:0.10.1:tests"
+    testCompile "org.embulk:embulk-standards:0.10.1"
+    testCompile "org.embulk:embulk-junit4:0.10.1"
+    testCompile "org.embulk:embulk-deps-buffer:0.10.1"
+    testCompile "org.embulk:embulk-deps-config:0.10.1"
 }
 
 // add tests/javadoc/source jar tasks as artifacts to be released

data/src/main/java/org/embulk/input/cloudwatch_logs/AbstractCloudwatchLogsInputPlugin.java

@@ -1,15 +1,16 @@
 package org.embulk.input.cloudwatch_logs;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Optional;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import com.google.common.base.Optional;
-import com.google.common.annotations.VisibleForTesting;
-
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
+
 import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigException;
 import org.embulk.config.ConfigSource;
@@ -21,25 +22,21 @@ import org.embulk.spi.InputPlugin;
 import org.embulk.spi.PageBuilder;
 import org.embulk.spi.PageOutput;
 import org.embulk.spi.Schema;
-import org.embulk.spi.SchemaConfig;
 import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.type.Types;
-import org.embulk.spi.util.RetryExecutor;
 
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.ClientConfiguration;
-import com.amazonaws.Protocol;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.retry.PredefinedRetryPolicies;
 
-import com.amazonaws.services.logs.AWSLogsClient;
-import com.amazonaws.services.logs.AWSLogsClientBuilder;
 import com.amazonaws.services.logs.AWSLogs;
+import com.amazonaws.services.logs.AWSLogsClientBuilder;
 import com.amazonaws.services.logs.model.DescribeLogStreamsRequest;
 import com.amazonaws.services.logs.model.DescribeLogStreamsResult;
-import com.amazonaws.services.logs.model.LogStream;
 import com.amazonaws.services.logs.model.GetLogEventsRequest;
 import com.amazonaws.services.logs.model.GetLogEventsResult;
+import com.amazonaws.services.logs.model.LogStream;
 import com.amazonaws.services.logs.model.OutputLogEvent;
 
 import org.embulk.input.cloudwatch_logs.aws.AwsCredentials;

data/src/main/java/org/embulk/input/cloudwatch_logs/CloudwatchLogsInputPlugin.java

@@ -1,25 +1,12 @@
 package org.embulk.input.cloudwatch_logs;
 
-import java.util.List;
-
-import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
 import com.amazonaws.services.logs.AWSLogsClientBuilder;
 import com.amazonaws.services.logs.AWSLogs;
 import com.google.common.base.Optional;
 
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
-import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigException;
-import org.embulk.config.ConfigSource;
-import org.embulk.config.Task;
-import org.embulk.config.TaskReport;
-import org.embulk.config.TaskSource;
-import org.embulk.spi.Exec;
-import org.embulk.spi.InputPlugin;
-import org.embulk.spi.PageOutput;
-import org.embulk.spi.Schema;
-import org.embulk.spi.SchemaConfig;
 
 public class CloudwatchLogsInputPlugin
         extends AbstractCloudwatchLogsInputPlugin

data/src/main/java/org/embulk/input/cloudwatch_logs/aws/AwsCredentials.java

@@ -14,8 +14,6 @@ import com.amazonaws.auth.SystemPropertiesCredentialsProvider;
 import com.amazonaws.auth.profile.ProfileCredentialsProvider;
 import com.amazonaws.auth.profile.ProfilesConfigFile;
 import org.embulk.config.ConfigException;
-import org.embulk.spi.Exec;
-import org.slf4j.Logger;
 
 import java.util.Optional;
 

data/src/main/java/org/embulk/input/cloudwatch_logs/utils/DateUtils.java

@@ -0,0 +1,29 @@
+package org.embulk.input.cloudwatch_logs.utils;
+
+import com.google.common.base.Joiner;
+import org.embulk.config.ConfigException;
+import org.joda.time.format.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+public class DateUtils
+{
+    public static Date parseDateStr(final String value, final List<String> supportedDateFormats)
+            throws ConfigException
+    {
+        for (final String format : supportedDateFormats) {
+            try {
+                return DateTimeFormat.forPattern(format).parseDateTime(value).toDate();
+            }
+            catch (final IllegalArgumentException e) {
+                // ignorable exception
+            }
+        }
+        throw new ConfigException("Unsupported DateTime value: '" + value + "', supported formats: [" + Joiner.on(",").join(supportedDateFormats) + "]");
+    }
+
+    private DateUtils()
+    {
+    }
+}

data/src/test/java/org/embulk/input/cloudwatch_logs/TestAwsCredentials.java

@@ -1,52 +1,38 @@
 package org.embulk.input.cloudwatch_logs;
 
-import com.amazonaws.services.logs.AWSLogsClient;
-import com.amazonaws.services.logs.AWSLogsClientBuilder;
 import com.amazonaws.services.logs.AWSLogs;
-import com.amazonaws.services.logs.model.DescribeLogStreamsRequest;
-import com.amazonaws.services.logs.model.DescribeLogStreamsResult;
-import com.amazonaws.services.logs.model.LogStream;
-import com.amazonaws.services.logs.model.GetLogEventsRequest;
-import com.amazonaws.services.logs.model.GetLogEventsResult;
-import com.amazonaws.services.logs.model.OutputLogEvent;
+import com.amazonaws.services.logs.model.InputLogEvent;
 
 import org.embulk.EmbulkTestRuntime;
-import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.TaskReport;
 import org.embulk.config.TaskSource;
 import org.embulk.spi.InputPlugin;
 import org.embulk.spi.PageBuilder;
-import org.embulk.spi.PageOutput;
 import org.embulk.spi.Schema;
 import org.embulk.spi.TestPageBuilderReader.MockPageOutput;
-import org.embulk.spi.util.Pages;
-import org.embulk.test.EmbulkTests;
 import org.embulk.test.TestingEmbulk;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.mockito.Spy;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
-import org.embulk.input.cloudwatch_logs.CloudwatchLogsInputPlugin;
+
+import org.embulk.input.cloudwatch_logs.TestHelpers;
+import org.embulk.input.cloudwatch_logs.TestHelpers.CloudWatchLogsTestUtils;
 
 import static org.embulk.input.cloudwatch_logs.CloudwatchLogsInputPlugin.CloudWatchLogsPluginTask;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assume.assumeNotNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 public class TestAwsCredentials
 {
@@ -63,17 +49,17 @@ public class TestAwsCredentials
     private ConfigSource config;
     private MockPageOutput output = new MockPageOutput();
     private PageBuilder pageBuilder;
+    private String logGroupName;
+    private String logStreamName;
+    private AWSLogs logsClient;
+    private CloudWatchLogsTestUtils testUtils;
 
-    private static String EMBULK_LOGS_TEST_GROUP_NAME;
-    private static String EMBULK_LOGS_TEST_STREAM_NAME;
     private static String EMBULK_LOGS_TEST_REGION;
     private static String EMBULK_LOGS_TEST_ACCESS_KEY_ID;
     private static String EMBULK_LOGS_TEST_SECRET_ACCESS_KEY;
 
     /*
      * This test case requires environment variables:
-     *   EMBULK_LOGS_TEST_GROUP_NAME
-     *   EMBULK_LOGS_TEST_STREAM_NAME
      *   EMBULK_LOGS_TEST_REGION
      *   EMBULK_LOGS_TEST_ACCESS_KEY_ID
      *   EMBULK_LOGS_TEST_SECRET_ACCESS_KEY
@@ -82,32 +68,61 @@ public class TestAwsCredentials
     @BeforeClass
     public static void initializeConstantVariables()
     {
-        EMBULK_LOGS_TEST_GROUP_NAME = System.getenv("EMBULK_LOGS_TEST_GROUP_NAME");
-        EMBULK_LOGS_TEST_STREAM_NAME = System.getenv("EMBULK_LOGS_TEST_STREAM_NAME");
         EMBULK_LOGS_TEST_REGION = System.getenv("EMBULK_LOGS_TEST_REGION");
         EMBULK_LOGS_TEST_ACCESS_KEY_ID = System.getenv("EMBULK_LOGS_TEST_ACCESS_KEY_ID");
         EMBULK_LOGS_TEST_SECRET_ACCESS_KEY = System.getenv("EMBULK_LOGS_TEST_SECRET_ACCESS_KEY");
-        assumeNotNull(EMBULK_LOGS_TEST_GROUP_NAME, EMBULK_LOGS_TEST_STREAM_NAME, EMBULK_LOGS_TEST_REGION, EMBULK_LOGS_TEST_ACCESS_KEY_ID, EMBULK_LOGS_TEST_SECRET_ACCESS_KEY);
+        assumeNotNull(EMBULK_LOGS_TEST_REGION, EMBULK_LOGS_TEST_ACCESS_KEY_ID, EMBULK_LOGS_TEST_SECRET_ACCESS_KEY);
     }
 
     @Before
     public void setUp() throws IOException
     {
+        logGroupName = TestHelpers.getLogGroupName();
+        logStreamName = TestHelpers.getLogStreamName();
+
         if (plugin == null) {
             plugin = Mockito.spy(new CloudwatchLogsInputPlugin());
             config = runtime.getExec().newConfigSource()
                     .set("type", "cloudwatch_logs")
-                    .set("log_group_name", EMBULK_LOGS_TEST_GROUP_NAME)
-                    .set("log_stream_name", EMBULK_LOGS_TEST_STREAM_NAME)
-                    .set("use_log_stream_name_prefix", "true")
+                    .set("log_group_name", logGroupName)
+                    .set("log_stream_name", logStreamName)
                     .set("region", EMBULK_LOGS_TEST_REGION);
             pageBuilder = Mockito.mock(PageBuilder.class);
-        doReturn(pageBuilder).when(plugin).getPageBuilder(Mockito.any(), Mockito.any());
+            doReturn(pageBuilder).when(plugin).getPageBuilder(Mockito.any(), Mockito.any());
+        }
+    }
+
+    @After
+    public void tearDown() throws IOException
+    {
+        if (testUtils != null) {
+            testUtils.clearLogGroup();
         }
     }
 
     private void doTest(ConfigSource config) throws IOException
     {
+        CloudWatchLogsPluginTask task = config.loadConfig(CloudWatchLogsPluginTask.class);
+        CloudwatchLogsInputPlugin plugin = runtime.getInstance(CloudwatchLogsInputPlugin.class);
+        logsClient = plugin.newLogsClient(task);
+        testUtils = new CloudWatchLogsTestUtils(logsClient, logGroupName, logStreamName);
+
+        testUtils.createLogStream();
+
+        List<InputLogEvent> events = new ArrayList<>();
+        Date d = new Date();
+        for (int i = 0; i < 3; i++) {
+            InputLogEvent event = new InputLogEvent();
+            event.setTimestamp(d.getTime());
+            event.setMessage(String.format("CloudWatchLogs from Embulk take %d", i));
+            events.add(event);
+        }
+        testUtils.putLogEvents(events);
+        try {
+            Thread.sleep(10000);
+        } catch (InterruptedException e) {
+        }
+
         plugin.transaction(config, new Control());
         verify(pageBuilder, times(1)).finish();
     }

data/src/test/java/org/embulk/input/cloudwatch_logs/TestCloudwatchLogsInputPlugin.java

@@ -1,52 +1,38 @@
 package org.embulk.input.cloudwatch_logs;
 
-import com.amazonaws.services.logs.AWSLogsClient;
-import com.amazonaws.services.logs.AWSLogsClientBuilder;
 import com.amazonaws.services.logs.AWSLogs;
-import com.amazonaws.services.logs.model.DescribeLogStreamsRequest;
-import com.amazonaws.services.logs.model.DescribeLogStreamsResult;
-import com.amazonaws.services.logs.model.LogStream;
-import com.amazonaws.services.logs.model.GetLogEventsRequest;
-import com.amazonaws.services.logs.model.GetLogEventsResult;
-import com.amazonaws.services.logs.model.OutputLogEvent;
+import com.amazonaws.services.logs.model.InputLogEvent;
 
 import org.embulk.EmbulkTestRuntime;
-import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.TaskReport;
 import org.embulk.config.TaskSource;
 import org.embulk.spi.InputPlugin;
 import org.embulk.spi.PageBuilder;
-import org.embulk.spi.PageOutput;
 import org.embulk.spi.Schema;
 import org.embulk.spi.TestPageBuilderReader.MockPageOutput;
-import org.embulk.spi.util.Pages;
-import org.embulk.test.EmbulkTests;
 import org.embulk.test.TestingEmbulk;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.mockito.Spy;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
-import org.embulk.input.cloudwatch_logs.CloudwatchLogsInputPlugin;
+
+import org.embulk.input.cloudwatch_logs.TestHelpers;
+import org.embulk.input.cloudwatch_logs.TestHelpers.CloudWatchLogsTestUtils;
 
 import static org.embulk.input.cloudwatch_logs.CloudwatchLogsInputPlugin.CloudWatchLogsPluginTask;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assume.assumeNotNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 public class TestCloudwatchLogsInputPlugin
 {
@@ -63,17 +49,17 @@ public class TestCloudwatchLogsInputPlugin
     private ConfigSource config;
     private MockPageOutput output = new MockPageOutput();
     private PageBuilder pageBuilder;
+    private String logGroupName;
+    private String logStreamName;
+    private AWSLogs logsClient;
+    private CloudWatchLogsTestUtils testUtils;
 
-    private static String EMBULK_LOGS_TEST_GROUP_NAME;
-    private static String EMBULK_LOGS_TEST_STREAM_NAME;
     private static String EMBULK_LOGS_TEST_REGION;
     private static String EMBULK_LOGS_TEST_ACCESS_KEY_ID;
     private static String EMBULK_LOGS_TEST_SECRET_ACCESS_KEY;
 
     /*
      * This test case requires environment variables:
-     *   EMBULK_LOGS_TEST_GROUP_NAME
-     *   EMBULK_LOGS_TEST_STREAM_NAME
      *   EMBULK_LOGS_TEST_REGION
      *   EMBULK_LOGS_TEST_ACCESS_KEY_ID
      *   EMBULK_LOGS_TEST_SECRET_ACCESS_KEY
@@ -82,36 +68,63 @@ public class TestCloudwatchLogsInputPlugin
     @BeforeClass
     public static void initializeConstantVariables()
     {
-        EMBULK_LOGS_TEST_GROUP_NAME = System.getenv("EMBULK_LOGS_TEST_GROUP_NAME");
-        EMBULK_LOGS_TEST_STREAM_NAME = System.getenv("EMBULK_LOGS_TEST_STREAM_NAME");
         EMBULK_LOGS_TEST_REGION = System.getenv("EMBULK_LOGS_TEST_REGION");
         EMBULK_LOGS_TEST_ACCESS_KEY_ID = System.getenv("EMBULK_LOGS_TEST_ACCESS_KEY_ID");
         EMBULK_LOGS_TEST_SECRET_ACCESS_KEY = System.getenv("EMBULK_LOGS_TEST_SECRET_ACCESS_KEY");
-        assumeNotNull(EMBULK_LOGS_TEST_GROUP_NAME, EMBULK_LOGS_TEST_STREAM_NAME, EMBULK_LOGS_TEST_REGION, EMBULK_LOGS_TEST_ACCESS_KEY_ID, EMBULK_LOGS_TEST_SECRET_ACCESS_KEY);
+        assumeNotNull(EMBULK_LOGS_TEST_REGION, EMBULK_LOGS_TEST_ACCESS_KEY_ID, EMBULK_LOGS_TEST_SECRET_ACCESS_KEY);
     }
 
     @Before
     public void setUp() throws IOException
     {
+        logGroupName = TestHelpers.getLogGroupName();
+        logStreamName = TestHelpers.getLogStreamName();
+
         if (plugin == null) {
             plugin = Mockito.spy(new CloudwatchLogsInputPlugin());
             config = runtime.getExec().newConfigSource()
                     .set("type", "cloudwatch_logs")
-                    .set("log_group_name", EMBULK_LOGS_TEST_GROUP_NAME)
-                    .set("log_stream_name", EMBULK_LOGS_TEST_STREAM_NAME)
-                    .set("use_log_stream_name_prefix", "true")
+                    .set("log_group_name", logGroupName)
+                    .set("log_stream_name", logStreamName)
                     .set("region", EMBULK_LOGS_TEST_REGION)
                     .set("aws_access_key_id", EMBULK_LOGS_TEST_ACCESS_KEY_ID)
                     .set("aws_secret_access_key", EMBULK_LOGS_TEST_SECRET_ACCESS_KEY);
             pageBuilder = Mockito.mock(PageBuilder.class);
         }
         doReturn(pageBuilder).when(plugin).getPageBuilder(Mockito.any(), Mockito.any());
+        CloudWatchLogsPluginTask task = config.loadConfig(CloudWatchLogsPluginTask.class);
+        CloudwatchLogsInputPlugin plugin = runtime.getInstance(CloudwatchLogsInputPlugin.class);
+        logsClient = plugin.newLogsClient(task);
+        testUtils = new CloudWatchLogsTestUtils(logsClient, logGroupName, logStreamName);
+    }
+
+    @After
+    public void tearDown() throws IOException
+    {
+        testUtils.clearLogGroup();
     }
 
     @Test
     public void test_simple() throws IOException
     {
+        testUtils.createLogStream();
+
+        List<InputLogEvent> events = new ArrayList<>();
+        Date d = new Date();
+        for (int i = 0; i < 3; i++) {
+            InputLogEvent event = new InputLogEvent();
+            event.setTimestamp(d.getTime());
+            event.setMessage(String.format("CloudWatchLogs from Embulk take %d", i));
+            events.add(event);
+        }
+        testUtils.putLogEvents(events);
+        try {
+            Thread.sleep(10000);
+        } catch (InterruptedException e) {
+        }
+
         plugin.transaction(config, new Control());
+        verify(pageBuilder, times(3)).addRecord();
         verify(pageBuilder, times(1)).finish();
     }
 

data/src/test/java/org/embulk/input/cloudwatch_logs/TestHelpers.java

@@ -0,0 +1,78 @@
+package org.embulk.input.cloudwatch_logs;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import com.amazonaws.services.logs.AWSLogs;
+import com.amazonaws.services.logs.model.CreateLogGroupRequest;
+import com.amazonaws.services.logs.model.CreateLogStreamRequest;
+import com.amazonaws.services.logs.model.DeleteLogGroupRequest;
+import com.amazonaws.services.logs.model.InputLogEvent;
+import com.amazonaws.services.logs.model.PutLogEventsRequest;
+import com.amazonaws.services.logs.model.ResourceNotFoundException;
+
+public final class TestHelpers
+{
+    private TestHelpers() {}
+
+    public static String getLogGroupName()
+    {
+        Date d = new Date();
+        return String.format("embulk-input-cloudwatch-test-%d", d.getTime());
+    }
+
+    public static String getLogStreamName()
+    {
+        UUID uuid = UUID.randomUUID();
+        return uuid.toString();
+    }
+
+    static class CloudWatchLogsTestUtils
+    {
+        private final AWSLogs logs;
+        private final String logGroupName;
+        private final String logStreamName;
+
+        public CloudWatchLogsTestUtils(AWSLogs logs, String logGroupName, String logStreamName)
+        {
+            this.logs = logs;
+            this.logGroupName = logGroupName;
+            this.logStreamName = logStreamName;
+        }
+
+        public void clearLogGroup()
+        {
+            DeleteLogGroupRequest request = new DeleteLogGroupRequest();
+            request.setLogGroupName(logGroupName);
+            try {
+                logs.deleteLogGroup(request);
+            } catch (ResourceNotFoundException ex) {
+                // Just ignored.
+            }
+        }
+
+        public void createLogStream()
+        {
+            CreateLogGroupRequest groupRequest = new CreateLogGroupRequest();
+            groupRequest.setLogGroupName(logGroupName);
+            logs.createLogGroup(groupRequest);
+
+            CreateLogStreamRequest streamRequest = new CreateLogStreamRequest();
+            streamRequest.setLogGroupName(logGroupName);
+            streamRequest.setLogStreamName(logStreamName);
+            logs.createLogStream(streamRequest);
+        }
+
+        public void putLogEvents(List<InputLogEvent> events) {
+            PutLogEventsRequest request = new PutLogEventsRequest()
+                    .withLogGroupName(logGroupName)
+                    .withLogStreamName(logStreamName)
+                    .withLogEvents(events);
+            logs.putLogEvents(request);
+        }
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-cloudwatch_logs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
 - LICENSE.txt
 - README.md
@@ -54,7 +55,7 @@ files:
 - classpath/aws-java-sdk-sts-1.11.749.jar
 - classpath/commons-codec-1.11.jar
 - classpath/commons-logging-1.2.jar
-- classpath/embulk-input-cloudwatch_logs-0.1.0.jar
+- classpath/embulk-input-cloudwatch_logs-0.1.1.jar
 - classpath/httpclient-4.5.9.jar
 - classpath/httpcore-4.4.11.jar
 - classpath/ion-java-1.0.2.jar
@@ -73,8 +74,10 @@ files:
 - src/main/java/org/embulk/input/cloudwatch_logs/aws/AwsCredentials.java
 - src/main/java/org/embulk/input/cloudwatch_logs/aws/AwsCredentialsConfig.java
 - src/main/java/org/embulk/input/cloudwatch_logs/aws/AwsCredentialsTask.java
+- src/main/java/org/embulk/input/cloudwatch_logs/utils/DateUtils.java
 - src/test/java/org/embulk/input/cloudwatch_logs/TestAwsCredentials.java
 - src/test/java/org/embulk/input/cloudwatch_logs/TestCloudwatchLogsInputPlugin.java
+- src/test/java/org/embulk/input/cloudwatch_logs/TestHelpers.java
 homepage: https://github.com/cosmo0920/embulk-input-cloudwatch_logs
 licenses:
 - MIT