Merge branch 'master' into new-cdc-abstraction-sql-server

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/0b5c867e-1b12-4d02-ab74-97b2184ff6d7.json

@@ -0,0 +1,7 @@
+{
+  "sourceDefinitionId": "0b5c867e-1b12-4d02-ab74-97b2184ff6d7",
+  "name": "Dixa",
+  "dockerRepository": "airbyte/source-dixa",
+  "dockerImageTag": "0.1.0",
+  "documentationUrl": "https://docs.airbyte.io/integrations/sources/dixa"
+}

airbyte-config/init/src/main/resources/seed/source_definitions.yaml

@@ -368,3 +368,8 @@
   dockerRepository: airbyte/source-paypal-transaction
   dockerImageTag: 0.1.0
   documentationUrl: https://docs.airbyte.io/integrations/sources/paypal-transaction
+- sourceDefinitionId: 0b5c867e-1b12-4d02-ab74-97b2184ff6d7
+  name: Dixa
+  dockerRepository: airbyte/source-dixa
+  dockerImageTag: 0.1.0
+  documentationUrl: https://docs.airbyte.io/integrations/sources/dixa

airbyte-integrations/connectors/source-dixa/source_dixa/source.py

@@ -24,7 +24,7 @@
 
 
 from abc import ABC
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Any, Iterable, List, Mapping, MutableMapping, Optional, Tuple
 
 import requests
@@ -60,7 +60,7 @@ def ms_timestamp_to_datetime(milliseconds: int) -> datetime:
         """
         Converts a millisecond-precision timestamp to a datetime object.
         """
-        return datetime.fromtimestamp(ConversationExport._validate_ms_timestamp(milliseconds) / 1000)
+        return datetime.fromtimestamp(ConversationExport._validate_ms_timestamp(milliseconds) / 1000, tz=timezone.utc)
 
     @staticmethod
     def datetime_to_ms_timestamp(dt: datetime) -> int:

airbyte-integrations/connectors/source-dixa/unit_tests/unit_test.py

@@ -49,13 +49,15 @@ def test_validate_ms_timestamp_with_invalid_input_length():
 
 def test_ms_timestamp_to_datetime():
     assert ConversationExport.ms_timestamp_to_datetime(1625312980123) == datetime(
-        year=2021, month=7, day=3, hour=13, minute=49, second=40, microsecond=123000
+        year=2021, month=7, day=3, hour=11, minute=49, second=40, microsecond=123000, tzinfo=timezone.utc
     )
 
 
 def test_datetime_to_ms_timestamp():
     assert (
-        ConversationExport.datetime_to_ms_timestamp(datetime(year=2021, month=7, day=3, hour=13, minute=49, second=40, microsecond=123000))
+        ConversationExport.datetime_to_ms_timestamp(
+            datetime(year=2021, month=7, day=3, hour=11, minute=49, second=40, microsecond=123000, tzinfo=timezone.utc)
+        )
         == 1625312980123
     )
 

airbyte-server/src/main/java/io/airbyte/server/ServerApp.java

@@ -60,10 +60,14 @@
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseFilter;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -89,13 +93,19 @@ public class ServerApp {
   private final ConfigRepository configRepository;
   private final JobPersistence jobPersistence;
   private final Configs configs;
+  private final Set<ContainerRequestFilter> requestFilters;
+  private final Set<ContainerResponseFilter> responseFilters;
 
   public ServerApp(final ConfigRepository configRepository,
                    final JobPersistence jobPersistence,
-                   final Configs configs) {
+                   final Configs configs,
+                   final Set<ContainerRequestFilter> requestFilters,
+                   final Set<ContainerResponseFilter> responseFilters) {
     this.configRepository = configRepository;
     this.jobPersistence = jobPersistence;
     this.configs = configs;
+    this.requestFilters = requestFilters;
+    this.responseFilters = responseFilters;
   }
 
   public void start() throws Exception {
@@ -123,9 +133,9 @@ public void start() throws Exception {
 
     ResourceConfig rc =
         new ResourceConfig()
-            // todo (cgardens) - the CORs settings are wide open. will need to revisit when we add auth.
-            // cors
-            .register(new CorsFilter())
+            // add filters
+            .registerInstances(requestFilters)
+            .registerInstances(responseFilters)
             // request logging
             .register(new RequestLogger(mdc))
             // api
@@ -183,7 +193,9 @@ private static void setCustomerIdIfNotSet(final ConfigRepository configRepositor
     }
   }
 
-  public static void main(String[] args) throws Exception {
+  public static void runServer(final Set<ContainerRequestFilter> requestFilters,
+                               final Set<ContainerResponseFilter> responseFilters)
+      throws Exception {
     final Configs configs = new EnvConfigs();
 
     MDC.put(LogClientSingleton.WORKSPACE_MDC_KEY, LogClientSingleton.getServerLogsRoot(configs).toString());
@@ -233,13 +245,17 @@ public static void main(String[] args) throws Exception {
 
     if (airbyteDatabaseVersion.isPresent() && AirbyteVersion.isCompatible(airbyteVersion, airbyteDatabaseVersion.get())) {
       LOGGER.info("Starting server...");
-      new ServerApp(configRepository, jobPersistence, configs).start();
+      new ServerApp(configRepository, jobPersistence, configs, requestFilters, responseFilters).start();
     } else {
       LOGGER.info("Start serving version mismatch errors. Automatic migration either failed or didn't run");
       new VersionMismatchServer(airbyteVersion, airbyteDatabaseVersion.get(), PORT).start();
     }
   }
 
+  public static void main(String[] args) throws Exception {
+    runServer(Collections.emptySet(), Set.of(new CorsFilter()));
+  }
+
   /**
    * Ideally when automatic migration runs, we should make sure that we acquire a lock on database and
    * no other operation is allowed