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.

Sign up for GitHub

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

Jump to bottom

Organise S3 Classes in Amazon Provider #20167

Merged
merged 15 commits into from
Dec 13, 2021
Merged

Organise S3 Classes in Amazon Provider #20167

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5e38647
Task: Organize S3 Classes in Amazon Provider
KennyRich Dec 9, 2021
f7c8704
Task: Organize S3 Classes in Amazon Provider
KennyRich Dec 9, 2021
f4e04c7
Task: Organize S3 Classes in Amazon Provider
KennyRich Dec 9, 2021
9880d8a
Merge remote-tracking branch 'origin/main' into s3
KennyRich Dec 9, 2021
4825edb
Task: Organize S3 Classes in Amazon Provider
KennyRich Dec 9, 2021
538480b
Update tests/deprecated_classes.py
KennyRich Dec 9, 2021
717ef75
Update tests/deprecated_classes.py
KennyRich Dec 9, 2021
719289b
Update tests/deprecated_classes.py
KennyRich Dec 9, 2021
d41f58a
Task: Organize S3 Classes in Amazon Provider
KennyRich Dec 9, 2021
1270cb6
Merge remote-tracking branch 'origin/s3' into s3
KennyRich Dec 9, 2021
a8dcc57
Update airflow/providers/amazon/aws/operators/s3_bucket_tagging.py
KennyRich Dec 10, 2021
07be582
Task: Allow s3 test point to the new class.
KennyRich Dec 12, 2021
a05241e
Task: Allow s3 test point to the new class.
KennyRich Dec 12, 2021
cc128b8
Task: Allow s3 test point to the new class.
KennyRich Dec 12, 2021
8987c34
Task: Fix merge conflicts
KennyRich Dec 13, 2021
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
2 changes: 1 addition & 1 deletion airflow/providers/amazon/aws/example_dags/example_s3_bucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from airflow.decorators import task
from airflow.models.dag import DAG
from airflow.providers.amazon.aws.hooks.s3 import S3Hook
from airflow.providers.amazon.aws.operators.s3_bucket import S3CreateBucketOperator, S3DeleteBucketOperator
from airflow.providers.amazon.aws.operators.s3 import S3CreateBucketOperator, S3DeleteBucketOperator

BUCKET_NAME = os.environ.get('BUCKET_NAME', 'test-airflow-12345')

Expand Down
5 changes: 3 additions & 2 deletions airflow/providers/amazon/aws/example_dags/example_s3_bucket_tagging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
from datetime import datetime

from airflow.models.dag import DAG
from airflow.providers.amazon.aws.operators.s3_bucket import S3CreateBucketOperator, S3DeleteBucketOperator
from airflow.providers.amazon.aws.operators.s3_bucket_tagging import (
from airflow.providers.amazon.aws.operators.s3 import (
S3CreateBucketOperator,
S3DeleteBucketOperator,
S3DeleteBucketTaggingOperator,
S3GetBucketTaggingOperator,
S3PutBucketTaggingOperator,
Expand Down
3 changes: 1 addition & 2 deletions airflow/providers/amazon/aws/example_dags/example_salesforce_to_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
from datetime import datetime

from airflow import DAG
from airflow.providers.amazon.aws.operators.s3_copy_object import S3CopyObjectOperator
from airflow.providers.amazon.aws.operators.s3_delete_objects import S3DeleteObjectsOperator
from airflow.providers.amazon.aws.operators.s3 import S3CopyObjectOperator, S3DeleteObjectsOperator
from airflow.providers.amazon.aws.transfers.salesforce_to_s3 import SalesforceToS3Operator

BASE_PATH = "salesforce/customers"
Expand Down
Loading