Skip to content

Commit

Permalink
Merge branch 'master' into ryermilov/source-zendesk-support-fix-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
lazebnyi committed Feb 10, 2023
2 parents 515807d + cb695fd commit 278d114
Show file tree
Hide file tree
Showing 5,015 changed files with 7,225 additions and 5,736 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1216,7 +1216,7 @@ jobs:
AWS_S3_BUCKET: airbyte-ci-ac-tests-logs
SECRET_STORE_GCP_CREDENTIALS: ${{ secrets.SECRET_STORE_GCP_CREDENTIALS }}
SECRET_STORE_GCP_PROJECT_ID: ${{ secrets.SECRET_STORE_GCP_PROJECT_ID }}
timeout-minutes: 20
timeout-minutes: 40
uses: Wandalen/wretry.action@master
with:
command: CI=true IS_MINIKUBE=true ./tools/bin/acceptance_test_kube_helm.sh
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/run-qa-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup Cloud SDK
uses: google-github-actions/setup-gcloud@v0
with:
service_account_key: ${{ secrets.PROD_SPEC_CACHE_SA_KEY }}
service_account_key: ${{ secrets.QA_ENGINE_AIRBYTE_DATA_PROD_SA }}
export_default_credentials: true
- name: Install Python
uses: actions/setup-python@v4
Expand All @@ -28,5 +28,8 @@ jobs:
run: pip install --quiet -e ./tools/ci_connector_ops
- name: Run QA Engine
env:
QA_ENGINE_AIRBYTE_DATA_PROD_SA: '${{ secrets.QA_ENGINE_AIRBYTE_DATA_PROD_SA }}'
LOGLEVEL: INFO
GITHUB_API_TOKEN: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}
run: run-qa-engine
# TODO: enable PR creation when all the QA checks are implemented:
# run: run-qa-engine --create-prs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.analytics;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.analytics;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.analytics;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.analytics;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.analytics;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.analytics;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.analytics;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.analytics;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.api.client;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.api.client;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.api.client;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader.config;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader.config;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader.config;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
* Copyright (c) 2023 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.bootloader;
Expand Down
2 changes: 1 addition & 1 deletion airbyte-cdk/python/.bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.27.0
current_version = 0.28.0
commit = False

[bumpversion:file:setup.py]
2 changes: 2 additions & 0 deletions airbyte-cdk/python/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@

# TODO: these are tmp files generated by unit tests. They should go to the /tmp directory.
cache_http_stream*.yml
<MagicMock*
cache*.sqlite
3 changes: 3 additions & 0 deletions airbyte-cdk/python/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 0.28.0
Low-Code: improve day_delta macro and MinMaxDatetime component

## 0.27.0
Make HttpAvailabilityStrategy default for HttpStreams

Expand Down
2 changes: 1 addition & 1 deletion airbyte-cdk/python/airbyte_cdk/config_observation.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

from __future__ import ( # Used to evaluate type hints at runtime, a NameError: name 'ConfigObserver' is not defined is thrown otherwise
Expand Down
2 changes: 1 addition & 1 deletion airbyte-cdk/python/airbyte_cdk/connector.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#


Expand Down
2 changes: 1 addition & 1 deletion airbyte-cdk/python/airbyte_cdk/destinations/destination.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

import argparse
Expand Down
2 changes: 1 addition & 1 deletion airbyte-cdk/python/airbyte_cdk/entrypoint.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#


Expand Down
2 changes: 1 addition & 1 deletion airbyte-cdk/python/airbyte_cdk/exception_handler.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

import logging
Expand Down
2 changes: 1 addition & 1 deletion airbyte-cdk/python/airbyte_cdk/logger.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

import json
Expand Down
2 changes: 1 addition & 1 deletion airbyte-cdk/python/airbyte_cdk/models/airbyte_protocol.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

# generated by datamodel-codegen:
Expand Down
2 changes: 1 addition & 1 deletion airbyte-cdk/python/airbyte_cdk/models/well_known_types.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

# generated by datamodel-codegen:
Expand Down
2 changes: 1 addition & 1 deletion airbyte-cdk/python/airbyte_cdk/sources/abstract_source.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

import json
Expand Down
2 changes: 1 addition & 1 deletion airbyte-cdk/python/airbyte_cdk/sources/config.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

from typing import Any, Dict
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

import copy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

from airbyte_cdk.sources.declarative.auth.oauth import DeclarativeOauth2Authenticator
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

from dataclasses import InitVar, dataclass
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

from dataclasses import InitVar, dataclass, field
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

import base64
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

from airbyte_cdk.sources.declarative.checks.check_stream import CheckStream
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

import logging
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

import logging
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

import inspect
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

from airbyte_cdk.sources.declarative.datetime.min_max_datetime import MinMaxDatetime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

import datetime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

import datetime as dt
Expand Down Expand Up @@ -62,11 +62,15 @@ def get_datetime(self, config, **additional_options) -> dt.datetime:
time = self._parser.parse(str(self.datetime.eval(config, **additional_options)), datetime_format, self.timezone)

if self.min_datetime:
min_time = self._parser.parse(str(self.min_datetime.eval(config, **additional_options)), datetime_format, self.timezone)
time = max(time, min_time)
min_time = str(self.min_datetime.eval(config, **additional_options))
if min_time:
min_time = self._parser.parse(min_time, datetime_format, self.timezone)
time = max(time, min_time)
if self.max_datetime:
max_time = self._parser.parse(str(self.max_datetime.eval(config, **additional_options)), datetime_format, self.timezone)
time = min(time, max_time)
max_time = str(self.max_datetime.eval(config, **additional_options))
if max_time:
max_time = self._parser.parse(max_time, datetime_format, self.timezone)
time = min(time, max_time)
return time

@property
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

from abc import abstractmethod
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
#

from dataclasses import InitVar, dataclass, field
Expand Down
Loading

0 comments on commit 278d114

Please sign in to comment.