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

Improve Authentication Error handling #21087

Merged
merged 179 commits into from
Jan 23, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
179 commits
Select commit Hold shift + click to select a range
2bc0f2c
refactor checks
jbfbell Jan 5, 2023
2de7385
resolve conflicts
jbfbell Jan 6, 2023
f003856
Add Auth Error Checks
jbfbell Jan 12, 2023
8130a40
rebase from master
jbfbell Jan 12, 2023
66a8201
some weird versioning issue
jbfbell Jan 12, 2023
d684daf
🪟🎉 Connector builder: Substream slicer and cartesian slicer (#20861)
Jan 5, 2023
fc66209
🪟🔧 Connector builder: Performance improvements (#20620)
Jan 5, 2023
7beef18
Remove workspace helper from fetchConfigActivity (#21048)
alovew Jan 5, 2023
ca10a01
Publish new version of destination-redshift (#21083)
grishick Jan 5, 2023
6f8e578
Progress Bar Read APIs (#20937)
davinchia Jan 6, 2023
88c3518
Rm temporal version (#21045)
benmoriceau Jan 6, 2023
de1a587
🪟🎉 Connector builder: Available inputs dropdown (#20983)
Jan 6, 2023
3387d09
Fixed appstore docs link (#21098)
Amruta-Ranade Jan 6, 2023
e0fd67b
fill in all default values on switch (#21059)
Jan 6, 2023
fb60113
🐛Source Freshdesk: Fix schema types (#20416)
lazebnyi Jan 6, 2023
4437101
CDK: Add schema inferrer class (#20941)
Jan 6, 2023
9bb61bb
Source Facebook Marketing: Docs update (#21105)
artem1205 Jan 6, 2023
23ef1c1
Source Amazon Ads: fix bug with handling: "Report date is too far in …
grubberr Jan 6, 2023
a7a0a8f
Revert "Progress Bar Read APIs (#20937)" (#21115)
supertopher Jan 6, 2023
10c67fd
Remove unneeded margin top and bottom (#21111)
krishnaglick Jan 6, 2023
15e7e76
feat(Platform): update actor configuration when receiving control mes…
pedroslopez Jan 6, 2023
e6306bc
🐛Source Looker: Fix schema transformation issue (#20182)
lazebnyi Jan 6, 2023
8b6e557
[ISSUE #20322] add datetime_granularity logic to DatetimeStreamSlicer…
maxi297 Jan 6, 2023
4fd4537
Source Slack: update schema; data from openapi spec (#20767)
artem1205 Jan 6, 2023
06788f0
make sure name is rendered in first position (#21101)
Jan 6, 2023
6403184
Source Github: Raise Error if no organizations or repos are available…
artem1205 Jan 6, 2023
c071fc5
Convert the server to micronaut (#19194)
benmoriceau Jan 6, 2023
dd9b783
🪟 🐛 🎨 Fix stream table icon checkboxes and icons (#21108)
edmundito Jan 6, 2023
18ea9ec
Use explicit configuration for Micronaut endpoints (#20759)
jdpgrailsdev Jan 6, 2023
f76ba9b
process config control messages during `check` and `discover` (#20894)
pedroslopez Jan 6, 2023
7c2ff54
🪟🧹 Connector builder: Fast fields performance improvements (#20957)
Jan 6, 2023
98042f0
In Cloud, out of date connectors call always returns 0 (#21126)
krishnaglick Jan 6, 2023
7132633
Move hadoop-lzo to test dependency (#21085)
grishick Jan 6, 2023
320ed3f
Update Connector Builder docs to reflect configuration UI additions (…
lmossman Jan 6, 2023
b7e2948
Revert "Convert the server to micronaut (#19194)" (#21132)
benmoriceau Jan 6, 2023
44ebed3
🐛 Source Google Ads: publish missing `0.2.6` (#21103)
bazarnov Jan 6, 2023
836e2e5
Remerge Progress Bar Read API. (#21124)
davinchia Jan 6, 2023
0fc73d8
Bump Airbyte version from 0.40.26 to 0.40.27 (#21135)
octavia-squidington-iii Jan 6, 2023
8b61e77
add import rule changes for Kotlin code (#21136)
colesnodgrass Jan 6, 2023
0ab8432
Source Okta: OAuth2.0 support - disabled (#20877)
lazebnyi Jan 6, 2023
4f14b79
Remove the quarantine status (#21088)
benmoriceau Jan 6, 2023
972794a
normalization: delete supportsDbt and supportsNormalization from Dest…
alafanechere Jan 7, 2023
c779c49
Allow for custom requesters to be defined in low-code manifests (#21001)
brianjlai Jan 7, 2023
0cc751e
adjust readme (#20945)
Jan 9, 2023
961aae0
🪟🎨 Connector form: Improve logs look and feel (#20951)
Jan 9, 2023
44daeb5
Adjust GitHub flow for FE chapter (#20813)
timroes Jan 9, 2023
ad140b5
Source: Google Analytics 4 (GA4) - improve config validation and SAT …
grubberr Jan 9, 2023
6becd86
Simplify messaging for sync canceled jobs (#20999)
edmundito Jan 9, 2023
43baa05
Remove deprecated getter (#21089)
benmoriceau Jan 9, 2023
98da7ae
Import error broke master (#21165)
krishnaglick Jan 9, 2023
00780e9
allow the cursors and primary keys to be deselected when the sync mod…
mfsiega-airbyte Jan 9, 2023
9a9ca55
Connector builder server: Add inferred schema to read API response (#…
Jan 9, 2023
ecdd732
New destination: databend (community PR #19815) (#20909)
grishick Jan 9, 2023
252333c
Update postgres.md (#21170)
evantahler Jan 9, 2023
5360239
Source Facebook Marketing: Update schema ad_account (#21149)
artem1205 Jan 9, 2023
c83b293
Revert "Revert Convert the server to micronaut" (#21133)
benmoriceau Jan 9, 2023
afb63cc
Amazon Seller Partner: Validate connections without orders data (#20896)
animer3009 Jan 9, 2023
3673aab
Source Harvest: Skip 403 FORBIDDEN for all streams (#21151)
artem1205 Jan 9, 2023
de8a177
test for behavior when a column is removed in an incremental sync (#2…
davinchia Jan 9, 2023
4c60cb5
Source Mailchimp - fix the way request params are built (#20765)
davydov-d Jan 9, 2023
07c4fbf
🐛 🎉 Source Airtable: migrate to the `Metadata API` for dynamic schema…
bazarnov Jan 9, 2023
cd00b48
Extend connection list filtering (#21094)
gosusnp Jan 9, 2023
77f463d
test cleanup (#21178)
mfsiega-airbyte Jan 9, 2023
81947aa
removed error (#20612)
sophia-wiley Jan 10, 2023
a93ac03
Adjust connector icons (#20547)
timroes Jan 10, 2023
fa548e9
Use jest directly as test runner (#21174)
timroes Jan 10, 2023
85c042c
🪟 🎨 Refining BulkEditPanel component (#20474)
YatsukBogdan1 Jan 10, 2023
2b11350
🪟 🔧 Add tests for BulkEditService (#20820)
YatsukBogdan1 Jan 10, 2023
14b618f
Connector builder: E2e tests (#21122)
Jan 10, 2023
edbde3b
🎉 Source Airtable: update `releaseStage` to `beta` (#20935)
bazarnov Jan 10, 2023
d780fe9
🪟 🎉 Disable deselection of cursor field/primary key in the UI (#20844)
josephkmh Jan 10, 2023
c3d842f
🪟 🔧 Update frontend typing of cloud api response (#21086)
josephkmh Jan 10, 2023
b68d130
🪟 🔧 Use CSS Custom Properties for colors (#19344)
josephkmh Jan 10, 2023
7e0b526
ci-connector-ops: change required reviewers logic (#21158)
alafanechere Jan 10, 2023
af5faad
[ISSUE-20322] updating tutorial documentation (#21163)
maxi297 Jan 10, 2023
2ae3d51
Connector builder server: Fix unit tests (#21107)
Jan 10, 2023
c83ffff
Destination connector for teradata vantage (rebased community PR) (#2…
grishick Jan 10, 2023
53557c3
🎉 Updates for edit password field in connector (#20723)
natalyjazzviolin Jan 10, 2023
1a25de2
convert EnvVariableFeatureFlag to an injected dependency (#21171)
colesnodgrass Jan 10, 2023
e42355b
Updated ISO certification date (#21181)
sophia-wiley Jan 10, 2023
6a336fe
Source google ads: add more logs (#20755)
davydov-d Jan 10, 2023
4a2a5eb
🎉 Destination Local CSV: add custom delimiter (#17998)
natalyjazzviolin Jan 10, 2023
de748b8
Source Airtable: fix field names (#21215)
artem1205 Jan 10, 2023
31e1860
Source S3: update block size for json (#21210)
artem1205 Jan 10, 2023
29e2a30
🪟 🧹 Custom connectors in Cloud UI updates (#21034)
teallarson Jan 10, 2023
66a475d
lowcode docs: add link to YAML reference (#21231)
sherifnada Jan 10, 2023
167e528
Update platform-workflow-labels.yml (#21225)
colesnodgrass Jan 10, 2023
18c1776
Update README.md (#21236)
evantahler Jan 11, 2023
a8a10bb
Enforce HTTPS (#21182)
grishick Jan 11, 2023
26a556d
🪟🐛 Connector builder UI: Fix datetime stream slicer (#21161)
Jan 11, 2023
9918386
[ISSUE #19981] testing version bump (#21106)
maxi297 Jan 11, 2023
b911717
[Low-Code CDK] Handle forward references in manifest (#20893)
clnoll Jan 11, 2023
be86bd5
Update form field labels in connection form to match design (#21036)
Jan 11, 2023
4821113
Hide no credits banner for no billing accounts (#21218)
timroes Jan 11, 2023
3437500
Fix auto detect schema change backdrop color CSS (#21246)
edmundito Jan 11, 2023
e15bb43
Source notion: fix schema (#20639)
davydov-d Jan 11, 2023
68f3858
[Connector-builder server] Allow client to specify record limit and e…
clnoll Jan 11, 2023
43e3a24
Upgrade to Micronaut 3.8.0 and related dependencies (#21077)
jdpgrailsdev Jan 11, 2023
0084339
Source Google Analytics Data API: slicer updated, unit tests added (#…
grubberr Jan 11, 2023
94021fa
Bmoric/restore old interface (#21235)
benmoriceau Jan 11, 2023
77b08a4
Switch CI to use npm ci (#21259)
timroes Jan 11, 2023
76585a9
postgres-source-cdc: handle null values for array data types (#21003)
subodh1810 Jan 11, 2023
307c499
🪟 🐛 Fix broken switch UI state - when checked state provided as a "va…
dizel852 Jan 11, 2023
b578675
🪟 🔧 Use experiment for new streams table design (#21230)
edmundito Jan 11, 2023
9df3e0a
Source Snapchat Marketing: fix error response (#21267)
artem1205 Jan 11, 2023
a2bc9e4
[Low-Code CDK] Parse incoming manifest objects into Pydantic models (…
brianjlai Jan 11, 2023
b280df2
[Low Code CDK] Add type annotations and cleanup usage of `visited` se…
clnoll Jan 12, 2023
9c32277
feat: mention user on failed master branch build (#21201)
cuyk Jan 12, 2023
64702d7
🪟 🔧 Fixed passed props to `<CheckBoxControl />` which cause error in …
dizel852 Jan 12, 2023
2de2bb6
Connector builder server: Fail on failing tests (#21198)
Jan 12, 2023
5bdc39c
Source Google Ads: Update docs (#21308)
artem1205 Jan 12, 2023
c97685c
Migrate airbyte-bootloader to Micronaut (#21073)
jdpgrailsdev Jan 12, 2023
45c2f20
🪟 🧹 Reorganize connections pages (#20845)
edmundito Jan 12, 2023
cf876b1
Add bootloader/server to published images for Cloud (#21325)
jdpgrailsdev Jan 12, 2023
9ba1fce
🪟 🚦 E2E: Fix duplicated database object warning (#20926)
dizel852 Jan 12, 2023
6eaec8b
Run Airbyte CI on pull_request (#21266)
Jan 12, 2023
026e857
🎉 Source bigcommerce: add brands and categories streams (#20518)
PhilipCorr Jan 12, 2023
3a4ac04
🎉 New Destination: Weaviate (#20094)
samos123 Jan 12, 2023
a7089da
Make schema field in source-snowflake mean a subset of the specified …
rodireich Jan 12, 2023
a558b8d
Ensure Local Secret Persistence is Initialized (#21329)
jdpgrailsdev Jan 12, 2023
b336d6c
December release notes docs (#21270)
sophia-wiley Jan 12, 2023
7d3d837
Add dependencies to docker-compose (#19321)
gosusnp Jan 12, 2023
f715310
store env-var response (#21327)
colesnodgrass Jan 12, 2023
021b715
Better escape the select query for a case a schema name starts with a…
rodireich Jan 12, 2023
db25e3c
manually bump source definition version (#21349)
rodireich Jan 12, 2023
507a90a
:bug: Source Jira: `check_connection` fails if no projects are define…
philippeboyd Jan 12, 2023
8063c35
airbyte-common-workers: Collect trace message on failed connection_st…
alafanechere Jan 12, 2023
1024e3f
🪟 🎉 Verify auth status on tab focus (#21175)
teallarson Jan 12, 2023
8b943a7
Make documentation_url optional in a declarative connector spec (#21347)
lmossman Jan 12, 2023
a79fe8c
Avoid parsing a message if this message is too big (#21090)
benmoriceau Jan 13, 2023
bcad152
JDBC Destinations: improve error message for conflicting streams (#21…
edgao Jan 13, 2023
1f0c569
Bump Airbyte version from 0.40.27 to 0.40.28 (#21359)
octavia-squidington-iii Jan 13, 2023
4d5ed05
Add records committed to job stats (#21364)
gosusnp Jan 13, 2023
a060797
[Low-Code CDK] Construct declarative components from Pydantic models …
brianjlai Jan 13, 2023
3ac31da
update destination-python generator (#21298)
alafanechere Jan 13, 2023
8b65da1
fixed current_value in usage_triggers stream (#21304)
darynaishchenko Jan 13, 2023
1441218
🪟 🔧 Add stylelint plugin & no-color-variables-in-rgba rule (#21269)
josephkmh Jan 13, 2023
974915e
fix e2e tests (#21380)
Jan 13, 2023
f956265
🪟🎉 Connector builder: Schema inferrer UI (#21154)
Jan 13, 2023
c1f1175
🎉 New Source: Dremio (#19912)
arsenlosenko Jan 13, 2023
f467803
Remove `supportsNormalization` `supportsDbt` from non GA destination …
alafanechere Jan 13, 2023
3396fce
SAT: check `future_state` only for incremental streams. (#21248)
grubberr Jan 13, 2023
c8f0e1c
:tada: Typeform - beta certification (#21145)
midavadim Jan 13, 2023
16c2f2c
Update databend.md (#21179)
hantmac Jan 13, 2023
30d49c0
<Callout /> component (#21273)
teallarson Jan 13, 2023
7900e2c
Update to Micronaut 3.8.1 (#21388)
jdpgrailsdev Jan 13, 2023
43109da
Source Slack: retry timeout error (#21321)
artem1205 Jan 13, 2023
e91dc6c
Source Facebook Marketing: Videos stream remove filtering (#21385)
artem1205 Jan 13, 2023
bced390
Source Klaviyo: enable SAT high strictness (#21374)
arsenlosenko Jan 13, 2023
2196c7a
Source File: enable high strictness level (#21243)
roman-yermilov-gl Jan 13, 2023
e68b907
introduce code coverage report step (#21376)
mfsiega-airbyte Jan 13, 2023
fc1bdc8
added edits (#21346)
sophia-wiley Jan 13, 2023
c3a2e63
🪟 🐛 Fix jest tests to fail build correctly (#21408)
timroes Jan 13, 2023
218b42a
Allow the OSS server only on OSS (#21416)
benmoriceau Jan 13, 2023
2256412
Update create connection page to full width, and fix trivial UI issue…
edmundito Jan 13, 2023
6aa54ac
Improvements to edge cases of CheckStream (#21404)
erohmensing Jan 13, 2023
d174dd0
Add AllowedHosts to Actor Definitions and Config Database (#21363)
evantahler Jan 13, 2023
beae36c
Update on-gcp-compute-engine.md (#21429)
gosusnp Jan 13, 2023
eb07473
refactor checks
jbfbell Jan 5, 2023
3646cda
rebase from master
jbfbell Jan 12, 2023
6f3fcc8
PR Feedback
jbfbell Jan 13, 2023
c9e254f
PR feedback
jbfbell Jan 13, 2023
6783d58
conflicts
jbfbell Jan 14, 2023
18bf629
revert unintended version downgrade
jbfbell Jan 14, 2023
0e4a808
merge conflict resolution
jbfbell Jan 18, 2023
50b38ba
add version updates and changelog
jbfbell Jan 18, 2023
046f3fb
Merge branch 'master' into joseph.bell/20092/config-exception-for-auth
jbfbell Jan 19, 2023
79e0245
auto-bump connector version
octavia-squidington-iii Jan 19, 2023
2f91349
Merge branch 'master' into joseph.bell/20092/config-exception-for-auth
jbfbell Jan 20, 2023
c4d9892
Merge branch 'master' into joseph.bell/20092/config-exception-for-auth
jbfbell Jan 20, 2023
4302b67
Merge branch 'master' into joseph.bell/20092/config-exception-for-auth
jbfbell Jan 20, 2023
5c6f5b4
auto-bump connector version
octavia-squidington-iii Jan 20, 2023
159ca81
formatting
jbfbell Jan 20, 2023
5c70686
Merge branch 'master' into joseph.bell/20092/config-exception-for-auth
jbfbell Jan 20, 2023
680f211
Merge branch 'master' into joseph.bell/20092/config-exception-for-auth
jbfbell Jan 20, 2023
5177665
bump snowflake destination version
jbfbell Jan 20, 2023
9244363
manual version bump for s3
jbfbell Jan 20, 2023
a22e2a3
auto-bump connector version
octavia-squidington-iii Jan 21, 2023
fd1537e
auto-bump connector version
octavia-squidington-iii Jan 21, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ protected BlobStorageOperations() {
public abstract String getBucketObjectPath(String namespace, String streamName, DateTime writeDatetime, String customFormat);

/**
* Create a storage object where to store data in the destination for a @param objectPath
* Ensure that the bucket specified in the config exists
*/
public abstract void createBucketObjectIfNotExists(String objectPath) throws Exception;
public abstract void createBucketIfNotExists() throws Exception;

/**
* Upload the data files into the storage area.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ private static void attemptWriteAndDeleteS3Object(final S3StorageOperations stor
final var bucketPath = s3Config.getBucketPath();

if (!Strings.isNullOrEmpty(bucketPath)) {
storageOperations.createBucketObjectIfNotExists(bucketPath);
storageOperations.createBucketIfNotExists();
}
s3.putObject(s3Bucket, outputTableName, "check-content");
testIAMUserHasListObjectPermission(s3, s3Bucket);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@

import alex.mojaki.s3upload.StreamTransferManager;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.AmazonS3Exception;
import com.amazonaws.services.s3.model.DeleteObjectsRequest;
import com.amazonaws.services.s3.model.DeleteObjectsRequest.KeyVersion;
import com.amazonaws.services.s3.model.ListObjectsRequest;
import com.amazonaws.services.s3.model.ObjectListing;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableMap;
import io.airbyte.commons.exceptions.ConfigErrorException;
import io.airbyte.commons.string.Strings;
import io.airbyte.integrations.destination.NamingConventionTransformer;
import io.airbyte.integrations.destination.record_buffer.SerializableBuffer;
Expand Down Expand Up @@ -95,23 +97,15 @@ public String getBucketObjectPath(final String namespace, final String streamNam

/**
* Create a directory object at the specified location. Creates the bucket if necessary.
*
* @param objectPath The directory to create. Must be a nonempty string.
*/
@Override
public void createBucketObjectIfNotExists(final String objectPath) {
public void createBucketIfNotExists() {
final String bucket = s3Config.getBucketName();
final String folderPath = objectPath.endsWith("/") ? objectPath : objectPath + "/";
if (!doesBucketExist(bucket)) {
LOGGER.info("Bucket {} does not exist; creating...", bucket);
s3Client.createBucket(bucket);
LOGGER.info("Bucket {} has been created.", bucket);
}
if (!s3Client.doesObjectExist(bucket, folderPath)) {
edgao marked this conversation as resolved.
Show resolved Hide resolved
LOGGER.info("Storage Object {}/{} does not exist in bucket; creating...", bucket, objectPath);
s3Client.putObject(bucket, folderPath, "");
LOGGER.info("Storage Object {}/{} has been created in bucket.", bucket, objectPath);
}
}

protected boolean doesBucketExist(final String bucket) {
Expand All @@ -138,7 +132,13 @@ public String uploadRecordsToBucket(final SerializableBuffer recordsData,
exceptionsThrown.add(e);
}
}
throw new RuntimeException(String.format("Exceptions thrown while uploading records into storage: %s", Strings.join(exceptionsThrown, "\n")));
final boolean areAllExceptionsAuthExceptions = exceptionsThrown.stream().filter(e -> e instanceof AmazonS3Exception)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the rationale behind checking that all exceptions are authentication issues?

Similar to BigQueryGcsOperations can this Auth Error Code be a constant so anybody not sure how come 403 can easily understand the value behind the integer?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 on making it a constant

Rationale for checking that all errors are auth errors is that theoretically there could be a transient issue with permissions thats resolved on a retry. All issues being auth issues was the behavior I observed when permissions were not set correctly and it seemed safer to make a judgement call on this being a configuration issue when this occurs since matching any as opposed to all might hide a different issue

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, that makes sense. I would add that in as a comment if you can since I can see someone looking at this code and coming with a different conclusion and just checking if any of the exceptions are Auth and calling it a day

Further more in the BigQueryException class they have a section that goes like

  private static final Set<Error> RETRYABLE_ERRORS =
      ImmutableSet.of(
          new Error(500, null), new Error(502, null), new Error(503, null), new Error(504, null));

Might be worth considering naming the errors as AUTH_ERRORS and placing them into some general utility file like JdbcUtils.java so they don't need to be recreated across each destination connector

grishick marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

@edgao edgao Jan 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if I'm reading this correctly, this currently checks that all AmazonS3Exception are auth errors, but ignores any non-amazon exceptions. E.g. if there's a random IllegalStateException in this list, it would be treated as though it's an auth error

I think it might be better to bundle the filter + map together?

.map(e -> {
  if (e instanceof AmazonS3Exception s3e) {
    // ...
  } else {
    // assume non-amazon exceptions are unrelated to authentication
    return false;
  }
})

(womp, didn't see greg's comment before posting this)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It took me awhile but I think I see what you and @grishick are saying - updating this to ensure that really all of the errors are auth errors

.map(s3e -> ((AmazonS3Exception) s3e).getStatusCode()).allMatch(code -> Integer.valueOf(403).equals(code));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also formatting nit, I'd prefer to have the allMatch on a newline to make this easier to read, i.e.

Suggested change
.map(s3e -> ((AmazonS3Exception) s3e).getStatusCode()).allMatch(code -> Integer.valueOf(403).equals(code));
.map(s3e -> ((AmazonS3Exception) s3e).getStatusCode())
.allMatch(code -> Integer.valueOf(403).equals(code));

(I find it hard to keep track of which parentheses surround which expressions)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 on the multiline styling, I wasn't sure what the preference here was so I let the autoformatter decide

if (areAllExceptionsAuthExceptions) {
throw new ConfigErrorException(exceptionsThrown.get(0).getMessage(), exceptionsThrown.get(0));
} else {
throw new RuntimeException(String.format("Exceptions thrown while uploading records into storage: %s", Strings.join(exceptionsThrown, "\n")));
}
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import com.google.cloud.bigquery.LoadJobConfiguration;
import com.google.cloud.bigquery.Schema;
import com.google.cloud.bigquery.TableId;
import com.google.common.collect.ImmutableList;
import io.airbyte.commons.exceptions.ConfigErrorException;
import io.airbyte.integrations.destination.StandardNameTransformer;
import io.airbyte.integrations.destination.bigquery.uploader.AbstractBigQueryUploader;
import io.airbyte.integrations.destination.gcs.GcsDestinationConfig;
Expand All @@ -31,6 +33,7 @@ public class BigQueryGcsOperations implements BigQueryStagingOperations {

private static final Logger LOGGER = LoggerFactory.getLogger(BigQueryGcsOperations.class);

private static final List<Integer> AUTH_ERROR_CODES = ImmutableList.of(401, 403);
private final BigQuery bigQuery;
private final StandardNameTransformer gcsNameTransformer;
private final GcsDestinationConfig gcsConfig;
Expand Down Expand Up @@ -84,7 +87,15 @@ public String getStagingFullPath(final String datasetId, final String stream) {
public void createSchemaIfNotExists(final String datasetId, final String datasetLocation) {
if (!existingSchemas.contains(datasetId)) {
LOGGER.info("Creating dataset {}", datasetId);
BigQueryUtils.getOrCreateDataset(bigQuery, datasetId, datasetLocation);
try {
BigQueryUtils.getOrCreateDataset(bigQuery, datasetId, datasetLocation);
} catch (BigQueryException bqe) {
Copy link
Contributor

@ryankfu ryankfu Jan 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Super nit: since we're only catching one exception type, it doesn't seem necessary to have an Exception value that differs from the rest of the code

BigQueryException e

That said, it's not blocking. It's mostly to keep consistency across our code base.

Also in the super class of BigQueryException, BaseServiceException there's a method getReason() that might be more useful to return back to the user for how come something caused this exception

if (AUTH_ERROR_CODES.contains(bqe.getCode())) {
throw new ConfigErrorException(bqe.getMessage(), bqe);
} else {
throw bqe;
}
}
existingSchemas.add(datasetId);
}
}
Expand All @@ -99,7 +110,7 @@ public void createTmpTableIfNotExists(final TableId tmpTableId, final Schema tab
public void createStageIfNotExists(final String datasetId, final String stream) {
final String objectPath = getStagingFullPath(datasetId, stream);
LOGGER.info("Creating staging path for stream {} (dataset {}): {}", stream, datasetId, objectPath);
gcsStorageOperations.createBucketObjectIfNotExists(objectPath);
gcsStorageOperations.createBucketIfNotExists();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class BigQueryDestinationTest {
protected static final Path CREDENTIALS_WITH_GCS_STAGING_PATH =
Path.of("secrets/credentials-gcs-staging.json");

protected static final Path[] ALL_PATHS = {CREDENTIALS_WITH_GCS_STAGING_PATH, CREDENTIALS_BAD_PROJECT_PATH, CREDENTIALS_NO_DATASET_CREATION_PATH,
protected static final Path[] ALL_PATHS = {CREDENTIALS_STANDARD_INSERT_PATH, CREDENTIALS_BAD_PROJECT_PATH, CREDENTIALS_NO_DATASET_CREATION_PATH,
edgao marked this conversation as resolved.
Show resolved Hide resolved
CREDENTIALS_NON_BILLABLE_PROJECT_PATH, CREDENTIALS_WITH_GCS_STAGING_PATH};
private static final Logger LOGGER = LoggerFactory.getLogger(BigQueryDestinationTest.class);
private static final String DATASET_NAME_PREFIX = "bq_dest_integration_test";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public String getStagingPath(UUID connectionId, String namespace, String streamN
public void createStageIfNotExists(JdbcDatabase database, String stageName) throws Exception {
final String bucketPath = s3Config.getBucketPath();
final String prefix = bucketPath.isEmpty() ? "" : bucketPath + (bucketPath.endsWith("/") ? "" : "/");
s3StorageOperations.createBucketObjectIfNotExists(prefix + stageName);
s3StorageOperations.createBucketIfNotExists();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public String uploadRecordsToStage(final JdbcDatabase database,

@Override
public void createStageIfNotExists(final JdbcDatabase database, final String stageName) {
s3StorageOperations.createBucketObjectIfNotExists(stageName);
s3StorageOperations.createBucketIfNotExists();
}

@Override
Expand Down
2 changes: 0 additions & 2 deletions docs/integrations/destinations/redshift.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,5 +178,3 @@ Each stream will be output into its own raw table in Redshift. Each table will c
| 0.3.13 | 2021-09-02 | [5745](https://github.com/airbytehq/airbyte/pull/5745) | Disable STATUPDATE flag when using S3 staging to speed up performance |
| 0.3.12 | 2021-07-21 | [3555](https://github.com/airbytehq/airbyte/pull/3555) | Enable partial checkpointing for halfway syncs |
| 0.3.11 | 2021-07-20 | [4874](https://github.com/airbytehq/airbyte/pull/4874) | allow `additionalProperties` in connector spec |

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly not sure how this happened, I have a blank new line at the end of my file and it says its up to date.