Skip to content

NIFI-13666 Applied the S3 changes to 1.x #9190

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

Closed
MikeThomsen wants to merge 1 commit into from
Closed

NIFI-13666 Applied the S3 changes to 1.x #9190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...dle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
s3.copyObject(request);
session.getProvenanceReporter().send(flowFile, getTransitUrl(destinationBucket, destinationKey));
session.transfer(flowFile, REL_SUCCESS);
} catch (final AmazonClientException e) {
} catch (final IllegalArgumentException | AmazonClientException e) {
flowFile = extractExceptionDetails(e, session, flowFile);
getLogger().error("Failed to copy S3 object from Bucket [{}] Key [{}]", sourceBucket, sourceKey, e);
session.transfer(flowFile, REL_FAILURE);
Expand Down
2 changes: 1 addition & 1 deletion ...e/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
final DeleteVersionRequest r = new DeleteVersionRequest(bucket, key, versionId);
s3.deleteVersion(r);
}
} catch (final AmazonServiceException ase) {
} catch (final IllegalArgumentException | AmazonServiceException ase) {
flowFile = extractExceptionDetails(ase, session, flowFile);
getLogger().error("Failed to delete S3 Object for {}; routing to failure", flowFile, ase);
flowFile = session.penalize(flowFile);
Expand Down
2 changes: 1 addition & 1 deletion ...le/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
if (metadata.getVersionId() != null) {
attributes.put("s3.version", metadata.getVersionId());
}
} catch (final IOException | AmazonClientException ioe) {
} catch (final IllegalArgumentException | IOException | AmazonClientException ioe) {
flowFile = extractExceptionDetails(ioe, session, flowFile);
getLogger().error("Failed to retrieve S3 Object for {}; routing to failure", flowFile, ioe);
flowFile = session.penalize(flowFile);
Expand Down
2 changes: 1 addition & 1 deletion ...i-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
}

session.transfer(flowFile, relationship);
} catch (final AmazonClientException e) {
} catch (final IllegalArgumentException | AmazonClientException e) {
getLogger().error("Failed to get S3 Object Metadata from Bucket [{}] Key [{}]", bucket, key, e);
flowFile = extractExceptionDetails(e, session, flowFile);
session.transfer(flowFile, REL_FAILURE);
Expand Down
2 changes: 1 addition & 1 deletion ...ndle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ public void process(final InputStream rawIn) throws IOException {
} catch (IOException e) {
getLogger().info("Error trying to delete key {} from cache", cacheKey, e);
}
} catch (final ProcessException | AmazonClientException pe) {
} catch (final IllegalArgumentException | ProcessException | AmazonClientException pe) {
extractExceptionDetails(pe, session, flowFile);
if (pe.getMessage().contains(S3_PROCESS_UNSCHEDULED_MESSAGE)) {
getLogger().info(pe.getMessage());
Expand Down
2 changes: 1 addition & 1 deletion ...ndle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
r = new SetObjectTaggingRequest(bucket, key, version, new ObjectTagging(tags));
}
s3.setObjectTagging(r);
} catch (final AmazonServiceException ase) {
} catch (final IllegalArgumentException | AmazonServiceException ase) {
flowFile = extractExceptionDetails(ase, session, flowFile);
getLogger().error("Failed to tag S3 Object for {}; routing to failure", flowFile, ase);
flowFile = session.penalize(flowFile);
Expand Down