Skip to content

Commit

Permalink
update various connectors to use YAML specs (#12230)
Browse files Browse the repository at this point in the history
* salesforce uses spec.yaml

* stripe uses spec.yaml

* revert unintended changes

* bump stripe version

* add yaml files to package_data

* hubspot uses a spec.yaml

* use double quotes in yaml files

* google sheets uses spec.yaml

* exhcange-rates uses spec.yaml

* remove usage of default and enum in spec

* bump hubspot cdk requirement

* auto-bump connector version

* auto-bump connector version

* manually bump versions

Co-authored-by: Octavia Squidington III <octavia-squidington-iii@users.noreply.github.com>
  • Loading branch information
2 people authored and suhomud committed May 23, 2022
1 parent 6d3f9ee commit f920eb5
Show file tree
Hide file tree
Showing 32 changed files with 429 additions and 434 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
- name: Exchange Rates Api
sourceDefinitionId: e2b40e36-aa0e-4bed-b41b-bcea6fa348b1
dockerRepository: airbyte/source-exchange-rates
dockerImageTag: 0.2.5
dockerImageTag: 0.2.6
documentationUrl: https://docs.airbyte.io/integrations/sources/exchangeratesapi
icon: exchangeratesapi.svg
sourceType: api
Expand Down Expand Up @@ -300,7 +300,7 @@
- name: Google Sheets
sourceDefinitionId: 71607ba1-c0ac-4799-8049-7f4b90dd50f7
dockerRepository: airbyte/source-google-sheets
dockerImageTag: 0.2.11
dockerImageTag: 0.2.12
documentationUrl: https://docs.airbyte.io/integrations/sources/google-sheets
icon: google-sheets.svg
sourceType: file
Expand Down Expand Up @@ -341,7 +341,7 @@
- name: HubSpot
sourceDefinitionId: 36c891d9-4bd9-43ac-bad2-10e12756272c
dockerRepository: airbyte/source-hubspot
dockerImageTag: 0.1.52
dockerImageTag: 0.1.53
documentationUrl: https://docs.airbyte.io/integrations/sources/hubspot
icon: hubspot.svg
sourceType: api
Expand Down Expand Up @@ -695,7 +695,7 @@
- name: Salesforce
sourceDefinitionId: b117307c-14b6-41aa-9422-947e34922962
dockerRepository: airbyte/source-salesforce
dockerImageTag: 1.0.3
dockerImageTag: 1.0.4
documentationUrl: https://docs.airbyte.io/integrations/sources/salesforce
icon: salesforce.svg
sourceType: api
Expand Down Expand Up @@ -771,7 +771,7 @@
- name: Stripe
sourceDefinitionId: e094cb9a-26de-4645-8761-65c0c425d1de
dockerRepository: airbyte/source-stripe
dockerImageTag: 0.1.30
dockerImageTag: 0.1.31
documentationUrl: https://docs.airbyte.io/integrations/sources/stripe
icon: stripe.svg
sourceType: api
Expand Down
16 changes: 5 additions & 11 deletions airbyte-config/init/src/main/resources/seed/source_specs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1709,7 +1709,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-exchange-rates:0.2.5"
- dockerImage: "airbyte/source-exchange-rates:0.2.6"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/exchangeratesapi"
connectionSpecification:
Expand Down Expand Up @@ -3142,7 +3142,7 @@
oauthFlowOutputParameters:
- - "access_token"
- - "refresh_token"
- dockerImage: "airbyte/source-google-sheets:0.2.11"
- dockerImage: "airbyte/source-google-sheets:0.2.12"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/google-sheets"
connectionSpecification:
Expand Down Expand Up @@ -3485,7 +3485,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-hubspot:0.1.52"
- dockerImage: "airbyte/source-hubspot:0.1.53"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/hubspot"
connectionSpecification:
Expand Down Expand Up @@ -3523,9 +3523,6 @@
title: "Credentials Title"
description: "Name of the credentials set"
const: "OAuth Credentials"
enum:
- "OAuth Credentials"
default: "OAuth Credentials"
order: 0
client_id:
title: "Client ID"
Expand Down Expand Up @@ -3564,9 +3561,6 @@
title: "Credentials title"
description: "Name of the credentials set"
const: "API Key Credentials"
enum:
- "API Key Credentials"
default: "API Key Credentials"
order: 0
api_key:
title: "API key"
Expand Down Expand Up @@ -7357,7 +7351,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-salesforce:1.0.3"
- dockerImage: "airbyte/source-salesforce:1.0.4"
spec:
documentationUrl: "https://docs.airbyte.com/integrations/sources/salesforce"
connectionSpecification:
Expand Down Expand Up @@ -8279,7 +8273,7 @@
type: "string"
path_in_connector_config:
- "client_secret"
- dockerImage: "airbyte/source-stripe:0.1.30"
- dockerImage: "airbyte/source-stripe:0.1.31"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/stripe"
connectionSpecification:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ RUN pip install .
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.2.5
LABEL io.airbyte.version=0.2.6
LABEL io.airbyte.name=airbyte/source-exchange-rates
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
connector_image: airbyte/source-exchange-rates:dev
tests:
spec:
- spec_path: "source_exchange_rates/spec.json"
- spec_path: "source_exchange_rates/spec.yaml"
connection:
- config_path: "secrets/config.json"
status: "succeed"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
author="Airbyte",
author_email="contact@airbyte.io",
packages=find_packages(),
package_data={"": ["*.json", "schemas/*.json"]},
package_data={"": ["*.json", "*.yaml", "schemas/*.json"]},
install_requires=["airbyte-cdk~=0.1", "pendulum>=2,<3"],
)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
documentationUrl: https://docs.airbyte.io/integrations/sources/exchangeratesapi
connectionSpecification:
$schema: http://json-schema.org/draft-07/schema#
title: exchangeratesapi.io Source Spec
type: object
required:
- start_date
- access_key
additionalProperties: false
properties:
start_date:
type: string
description: Start getting data from that date.
pattern: ^[0-9]{4}-[0-9]{2}-[0-9]{2}$
examples:
- YYYY-MM-DD
access_key:
type: string
description: >-
Your API Access Key. See <a
href="https://exchangeratesapi.io/documentation/">here</a>. The key is
case sensitive.
airbyte_secret: true
base:
type: string
description: >-
ISO reference currency. See <a
href="https://www.ecb.europa.eu/stats/policy_and_exchange_rates/euro_reference_exchange_rates/html/index.en.html">here</a>.
Free plan doesn't support Source Currency Switching, default base
currency is EUR
examples:
- EUR
- USD
ignore_weekends:
type: boolean
description: Ignore weekends? (Exchanges don't run on weekends)
default: true
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ COPY google_sheets_source ./google_sheets_source
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.2.11
LABEL io.airbyte.version=0.2.12
LABEL io.airbyte.name=airbyte/source-google-sheets
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ From the Airbyte repository root, run:

#### Create credentials
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/google-sheets)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_google_sheets/spec.json` file.
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_google_sheets/spec.yaml` file.
Note that the `secrets` directory is gitignored by default, so there is no danger of accidentally checking in sensitive information.
See `sample_files/sample_config.json` for a sample config file.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
connector_image: airbyte/source-google-sheets:dev
tests:
spec:
- spec_path: "google_sheets_source/spec.json"
- spec_path: "google_sheets_source/spec.yaml"
connection:
- config_path: "secrets/config.json"
status: "succeed"
Expand Down

This file was deleted.

Loading

0 comments on commit f920eb5

Please sign in to comment.