Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨Source Amazon SQS: Migrate Python CDK to Low code #41064

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
89f0f1b
migrate amazon sqs to low code
btkcodedev Jul 9, 2024
d994690
update docs
btkcodedev Jul 9, 2024
d4c4f1b
chore: format
btkcodedev Jul 9, 2024
78253c2
update date, docs
btkcodedev Jul 9, 2024
51effa5
Merge branch 'master' into btkcodedev/amzsqstolowcode
btkcodedev Jul 12, 2024
a6635d0
Merge branch 'master' into btkcodedev/amzsqstolowcode
btkcodedev Jul 20, 2024
60174be
Merge branch 'master' into btkcodedev/amzsqstolowcode
ChristoGrab Jul 24, 2024
7db44e9
Merge branch 'master' into btkcodedev/amzsqstolowcode
natikgadzhi Oct 14, 2024
e199ca4
Merge branch 'master' into btkcodedev/amzsqstolowcode
btkcodedev Dec 3, 2024
8a2998f
update authentication with aws sign
btkcodedev Dec 5, 2024
78c6a2d
chore: auto-fix lint and format issues
octavia-squidington-iii Dec 5, 2024
c2aeb29
Merge branch 'master' into btkcodedev/amzsqstolowcode
btkcodedev Dec 5, 2024
bf8bc93
update the signature method and calling headers
btkcodedev Dec 6, 2024
fce3a76
update pagination flow to body
btkcodedev Dec 6, 2024
4cc7766
update docs
btkcodedev Dec 6, 2024
5e0ede9
update version and poetry lock
btkcodedev Dec 6, 2024
a1e3518
set record_selector to messages
btkcodedev Dec 6, 2024
ee6e4af
Merge branch 'master' into btkcodedev/amzsqstolowcode
btkcodedev Dec 6, 2024
c1c0383
Merge branch 'btkcodedev/amzsqstolowcode' of https://github.com/airby…
btkcodedev Dec 6, 2024
2518269
chore: auto-fix lint and format issues
octavia-squidington-iii Dec 6, 2024
5bad8f5
update releases tag and migration documentation
btkcodedev Dec 6, 2024
641fe7c
Merge branch 'btkcodedev/amzsqstolowcode' of https://github.com/airby…
btkcodedev Dec 6, 2024
f31ebc8
chore: auto-fix lint and format issues
octavia-squidington-iii Dec 9, 2024
d55d709
fix qa, update ab dependency
btkcodedev Dec 9, 2024
4f301dd
Merge branch 'btkcodedev/amzsqstolowcode' of https://github.com/airby…
btkcodedev Dec 9, 2024
9ed1613
update date
btkcodedev Dec 9, 2024
f23812a
update configured catalog and manifest
btkcodedev Dec 9, 2024
7dbe815
chore: auto-fix lint and format issues
octavia-squidington-iii Dec 9, 2024
ef09c5c
adapt build version
btkcodedev Dec 9, 2024
461959a
Merge branch 'btkcodedev/amzsqstolowcode' of https://github.com/airby…
btkcodedev Dec 9, 2024
8233a43
update types
btkcodedev Dec 12, 2024
659ae61
Merge branch 'master' into btkcodedev/amzsqstolowcode
DanyloGL Dec 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

38 changes: 0 additions & 38 deletions airbyte-integrations/connectors/source-amazon-sqs/Dockerfile

This file was deleted.

97 changes: 42 additions & 55 deletions airbyte-integrations/connectors/source-amazon-sqs/README.md
Original file line number Diff line number Diff line change
@@ -1,116 +1,103 @@
# Amazon Sqs Source

This is the repository for the Amazon Sqs source connector, written in Python.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/amazon-sqs).
This is the repository for the Amazon Sqs configuration based source connector.
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.com/integrations/sources/amazon-sqs).

## Local development

### Prerequisites

**To iterate on this connector, make sure to complete this prerequisites section.**
* Python (`^3.9`)
* Poetry (`^1.7`) - installation instructions [here](https://python-poetry.org/docs/#installation)

#### Minimum Python version required `= 3.7.0`

#### Build & Activate Virtual Environment and install dependencies

From this connector directory, create a virtual environment:
### Installing the connector

From this connector directory, run:
```bash
poetry install --with dev
```
python -m venv .venv
```

This will generate a virtualenv for this module in `.venv/`. Make sure this venv is active in your
development environment of choice. To activate it from the terminal, run:

```
source .venv/bin/activate
pip install -r requirements.txt
```

If you are in an IDE, follow your IDE's instructions to activate the virtualenv.

Note that while we are installing dependencies from `requirements.txt`, you should only edit `setup.py` for your dependencies. `requirements.txt` is
used for editable installs (`pip install -e`) to pull in Python dependencies from the monorepo and will call `setup.py`.
If this is mumbo jumbo to you, don't worry about it, just put your deps in `setup.py` but install using `pip install -r requirements.txt` and everything
should work as you expect.

#### Create credentials
### Create credentials

**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/amazon-sqs)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_amazon_sqs/spec.json` file.
Note that the `secrets` directory is gitignored by default, so there is no danger of accidentally checking in sensitive information.
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/amazon-sqs)
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `src/source_amazon_sqs/spec.yaml` file.
Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.
See `integration_tests/sample_config.json` for a sample config file.

**If you are an Airbyte core member**, copy the credentials in Lastpass under the secret name `source amazon-sqs test creds`
and place them into `secrets/config.json`.

### Locally running the connector

```
python main.py spec
python main.py check --config secrets/config.json
python main.py discover --config secrets/config.json
python main.py read --config secrets/config.json --catalog integration_tests/configured_catalog.json
poetry run source-amazon-sqs spec
poetry run source-amazon-sqs check --config secrets/config.json
poetry run source-amazon-sqs discover --config secrets/config.json
poetry run source-amazon-sqs read --config secrets/config.json --catalog integration_tests/configured_catalog.json
```

### Locally running the connector docker image
### Running tests

#### Build
To run tests locally, from the connector directory run:

```
poetry run pytest tests
```

**Via [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md) (recommended):**
### Building the docker image

1. Install [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md)
2. Run the following command to build the docker image:
```bash
airbyte-ci connectors --name=source-amazon-sqs build
```

An image will be built with the tag `airbyte/source-amazon-sqs:dev`.
An image will be available on your host with the tag `airbyte/source-amazon-sqs:dev`.

**Via `docker build`:**

```bash
docker build -t airbyte/source-amazon-sqs:dev .
```

#### Run
### Running as a docker container

Then run any of the connector commands as follows:

```
docker run --rm airbyte/source-amazon-sqs:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-amazon-sqs:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-amazon-sqs:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-amazon-sqs:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
```

## Testing
### Running our CI test suite

You can run our full test suite locally using [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md):

```bash
airbyte-ci connectors --name=source-amazon-sqs test
```

### Customizing acceptance Tests

Customize `acceptance-test-config.yml` file to configure tests. See [Connector Acceptance Tests](https://docs.airbyte.com/connector-development/testing-connectors/connector-acceptance-tests-reference) for more information.
Customize `acceptance-test-config.yml` file to configure acceptance tests. See [Connector Acceptance Tests](https://docs.airbyte.com/connector-development/testing-connectors/connector-acceptance-tests-reference) for more information.
If your connector requires to create or destroy resources for use during acceptance tests create fixtures for it and place them inside integration_tests/acceptance.py.

## Dependency Management
### Dependency Management

All of your dependencies should go in `setup.py`, NOT `requirements.txt`. The requirements file is only used to connect internal Airbyte dependencies in the monorepo for local development.
We split dependencies between two groups, dependencies that are:
All of your dependencies should be managed via Poetry.
To add a new dependency, run:
```bash
poetry add <package-name>
```

- required for your connector to work need to go to `MAIN_REQUIREMENTS` list.
- required for the testing need to go to `TEST_REQUIREMENTS` list
Please commit the changes to `pyproject.toml` and `poetry.lock` files.

### Publishing a new version of the connector
## Publishing a new version of the connector

You've checked out the repo, implemented a million dollar feature, and you're ready to share your changes with the world. Now what?

1. Make sure your changes are passing our test suite: `airbyte-ci connectors --name=source-amazon-sqs test`
2. Bump the connector version in `metadata.yaml`: increment the `dockerImageTag` value. Please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors).
2. Bump the connector version (please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors)):
- bump the `dockerImageTag` value in in `metadata.yaml`
- bump the `version` value in `pyproject.toml`
3. Make sure the `metadata.yaml` content is up to date.
4. Make the connector documentation and its changelog is up to date (`docs/integrations/sources/amazon-sqs.md`).
4. Make sure the connector documentation and its changelog is up to date (`docs/integrations/sources/amazon-sqs.md`).
5. Create a Pull Request: use [our PR naming conventions](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#pull-request-title-convention).
6. Pat yourself on the back for being an awesome contributor.
7. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.
8. Once your PR is merged, the new version of the connector will be automatically published to Docker Hub and our connector registry.
3 changes: 3 additions & 0 deletions airbyte-integrations/connectors/source-amazon-sqs/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#
# Copyright (c) 2024 Airbyte, Inc., all rights reserved.
#
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
connector_image: airbyte/source-amazon-sqs:dev
tests:
spec:
- spec_path: "source_amazon_sqs/spec.json"
- spec_path: "source_amazon_sqs/spec.yaml"
connection:
- config_path: "secrets/config.json"
status: "succeed"
Expand Down
32 changes: 0 additions & 32 deletions airbyte-integrations/connectors/source-amazon-sqs/bootstrap.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#
# Copyright (c) 2021 Airbyte, Inc., all rights reserved.
# Copyright (c) 2024 Airbyte, Inc., all rights reserved.
#
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ab-airbyte-testing": {
"QueueMessages": {
"todo-field-name": "todo-abnormal-value"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
# Copyright (c) 2024 Airbyte, Inc., all rights reserved.
#


Expand All @@ -11,6 +11,6 @@
@pytest.fixture(scope="session", autouse=True)
def connector_setup():
"""This fixture is a placeholder for external resources that acceptance test might require."""
# TODO: setup test dependencies
# TODO: setup test dependencies if needed. otherwise remove the TODO comments
yield
# TODO: clean up test dependencies
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"streams": [
{
"name": "Airbyte",
"name": "QueueMessages",
"supported_sync_modes": ["full_refresh"],
"source_defined_cursor": false,
"json_schema": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
{
"streams": [
{
"sync_mode": "full_refresh",
"destination_sync_mode": "append",
"stream": {
"name": "Airbyte",
"supported_sync_modes": ["full_refresh"],
"source_defined_cursor": false,
"name": "QueueMessages",
"json_schema": {
"$schema": "https://json-schema.org/draft-07/schema#",
"type": "object",
"properties": {
"id": {
"type": "string"
},
"body": {
"type": "string"
},
"attributes": {
"type": ["null", "object"]
}
}
}
}
"properties": {}
},
"supported_sync_modes": ["full_refresh"],
"supported_destination_sync_modes": ["overwrite", "append_dedup"]
},
"sync_mode": "full_refresh",
"destination_sync_mode": "overwrite"
}
]
}

This file was deleted.

2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-amazon-sqs/main.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
# Copyright (c) 2024 Airbyte, Inc., all rights reserved.
#

from source_amazon_sqs.run import run
Expand Down
24 changes: 21 additions & 3 deletions airbyte-integrations/connectors/source-amazon-sqs/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,34 @@ data:
ab_internal:
ql: 200
sl: 100
allowedHosts:
hosts:
- "sqs.*.amazonaws.com"
connectorBuildOptions:
# Please update to the latest version of the connector base image.
# https://hub.docker.com/r/airbyte/python-connector-base
# Please use the full address with sha256 hash to guarantee build reproducibility.
baseImage: docker.io/airbyte/python-connector-base:3.0.0@sha256:1a0845ff2b30eafa793c6eee4e8f4283c2e52e1bbd44eed6cb9e9abd5d34d844
connectorSubtype: api
connectorType: source
definitionId: 983fd355-6bf3-4709-91b5-37afa391eeb6
dockerImageTag: 0.1.1
dockerImageTag: 1.0.0
dockerRepository: airbyte/source-amazon-sqs
documentationUrl: https://docs.airbyte.com/integrations/sources/amazon-sqs
githubIssueLabel: source-amazon-sqs
icon: awssqs.svg
icon: amazon-sqs.svg
license: MIT
name: Amazon SQS
releaseDate: 2021-10-27
releases:
breakingChanges:
1.0.0:
upgradeDeadline: "2024-12-30"
message: "The verison migrates the Amazon SQS connector to the low-code
framework for greater maintainability. !! Important: The management_events
stream changed it's EventTime field from integer to float. The `start_date`
parameter is now optional and the connector now takes current date as default
start date "
remoteRegistries:
pypi:
enabled: true
Expand All @@ -25,7 +43,7 @@ data:
supportLevel: community
tags:
- language:python
- cdk:python
- cdk:low-code
connectorTestSuitesOptions:
- suite: liveTests
testConnections:
Expand Down
Loading
Loading