From 0f413cbc0a4792544d594d290f99a7cf06d90433 Mon Sep 17 00:00:00 2001 From: maxi297 Date: Thu, 26 Jan 2023 09:44:55 -0500 Subject: [PATCH 1/2] Rename remaining lowcode connector manifest files to manifest.yaml --- .../source_delighted/{delighted.yaml => manifest.yaml} | 0 .../connectors/source-delighted/source_delighted/source.py | 2 +- .../source_sendgrid/{sendgrid.yaml => manifest.yaml} | 0 .../source-sentry/source_sentry/{sentry.yaml => manifest.yaml} | 0 .../source-tempo/source_tempo/{tempo.yaml => manifest.yaml} | 0 .../connectors/source-tempo/source_tempo/source.py | 2 +- .../source_zenloop/{zenloop.yaml => manifest.yaml} | 0 .../connectors/source-zenloop/source_zenloop/source.py | 2 +- 8 files changed, 3 insertions(+), 3 deletions(-) rename airbyte-integrations/connectors/source-delighted/source_delighted/{delighted.yaml => manifest.yaml} (100%) rename airbyte-integrations/connectors/source-sendgrid/source_sendgrid/{sendgrid.yaml => manifest.yaml} (100%) rename airbyte-integrations/connectors/source-sentry/source_sentry/{sentry.yaml => manifest.yaml} (100%) rename airbyte-integrations/connectors/source-tempo/source_tempo/{tempo.yaml => manifest.yaml} (100%) rename airbyte-integrations/connectors/source-zenloop/source_zenloop/{zenloop.yaml => manifest.yaml} (100%) diff --git a/airbyte-integrations/connectors/source-delighted/source_delighted/delighted.yaml b/airbyte-integrations/connectors/source-delighted/source_delighted/manifest.yaml similarity index 100% rename from airbyte-integrations/connectors/source-delighted/source_delighted/delighted.yaml rename to airbyte-integrations/connectors/source-delighted/source_delighted/manifest.yaml diff --git a/airbyte-integrations/connectors/source-delighted/source_delighted/source.py b/airbyte-integrations/connectors/source-delighted/source_delighted/source.py index 2f2e7e7de160..0555e0860a89 100644 --- a/airbyte-integrations/connectors/source-delighted/source_delighted/source.py +++ b/airbyte-integrations/connectors/source-delighted/source_delighted/source.py @@ -14,4 +14,4 @@ # Declarative Source class SourceDelighted(YamlDeclarativeSource): def __init__(self): - super().__init__(path_to_yaml="delighted.yaml") + super().__init__(path_to_yaml="manifest.yaml") diff --git a/airbyte-integrations/connectors/source-sendgrid/source_sendgrid/sendgrid.yaml b/airbyte-integrations/connectors/source-sendgrid/source_sendgrid/manifest.yaml similarity index 100% rename from airbyte-integrations/connectors/source-sendgrid/source_sendgrid/sendgrid.yaml rename to airbyte-integrations/connectors/source-sendgrid/source_sendgrid/manifest.yaml diff --git a/airbyte-integrations/connectors/source-sentry/source_sentry/sentry.yaml b/airbyte-integrations/connectors/source-sentry/source_sentry/manifest.yaml similarity index 100% rename from airbyte-integrations/connectors/source-sentry/source_sentry/sentry.yaml rename to airbyte-integrations/connectors/source-sentry/source_sentry/manifest.yaml diff --git a/airbyte-integrations/connectors/source-tempo/source_tempo/tempo.yaml b/airbyte-integrations/connectors/source-tempo/source_tempo/manifest.yaml similarity index 100% rename from airbyte-integrations/connectors/source-tempo/source_tempo/tempo.yaml rename to airbyte-integrations/connectors/source-tempo/source_tempo/manifest.yaml diff --git a/airbyte-integrations/connectors/source-tempo/source_tempo/source.py b/airbyte-integrations/connectors/source-tempo/source_tempo/source.py index 3b744d6ad807..b36c63992ac9 100644 --- a/airbyte-integrations/connectors/source-tempo/source_tempo/source.py +++ b/airbyte-integrations/connectors/source-tempo/source_tempo/source.py @@ -14,4 +14,4 @@ # Declarative Source class SourceTempo(YamlDeclarativeSource): def __init__(self): - super().__init__(path_to_yaml="tempo.yaml") + super().__init__(path_to_yaml="manifest.yaml") diff --git a/airbyte-integrations/connectors/source-zenloop/source_zenloop/zenloop.yaml b/airbyte-integrations/connectors/source-zenloop/source_zenloop/manifest.yaml similarity index 100% rename from airbyte-integrations/connectors/source-zenloop/source_zenloop/zenloop.yaml rename to airbyte-integrations/connectors/source-zenloop/source_zenloop/manifest.yaml diff --git a/airbyte-integrations/connectors/source-zenloop/source_zenloop/source.py b/airbyte-integrations/connectors/source-zenloop/source_zenloop/source.py index d3eeb2cf46c1..240d275c29f8 100644 --- a/airbyte-integrations/connectors/source-zenloop/source_zenloop/source.py +++ b/airbyte-integrations/connectors/source-zenloop/source_zenloop/source.py @@ -14,4 +14,4 @@ # Declarative Source class SourceZenloop(YamlDeclarativeSource): def __init__(self): - super().__init__(path_to_yaml="zenloop.yaml") + super().__init__(path_to_yaml="manifest.yaml") From 3f98487e89cd28b24d8dcad49dbc373480d5e6ec Mon Sep 17 00:00:00 2001 From: maxi297 Date: Thu, 26 Jan 2023 10:19:09 -0500 Subject: [PATCH 2/2] Updating validation of yaml schema as well --- airbyte-cdk/python/bin/validate-yaml-schema.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-cdk/python/bin/validate-yaml-schema.sh b/airbyte-cdk/python/bin/validate-yaml-schema.sh index 8593426b3534..bc3bbf448115 100755 --- a/airbyte-cdk/python/bin/validate-yaml-schema.sh +++ b/airbyte-cdk/python/bin/validate-yaml-schema.sh @@ -8,7 +8,7 @@ CDK_DIR=$ROOT_DIR/airbyte-cdk/python/ for directory in $CONNECTORS_DIR/source-* ; do MANIFEST_DIRECTORY=$(basename $directory | tr - _) SOURCE_NAME=${MANIFEST_DIRECTORY#source_} - if test -f "$directory/source_$SOURCE_NAME/$SOURCE_NAME.yaml"; then + if test -f "$directory/$MANIFEST_DIRECTORY/manifest.yaml"; then cd $directory rm -rf .venv