fix(stepfunctions-tasks): Athena StartQueryExecution includes QueryExecutionContext even when object is empty#16141
Merged
mergify[bot] merged 8 commits intoaws:masterfrom Sep 3, 2021
LukvonStrom:master
Merged
fix(stepfunctions-tasks): Athena StartQueryExecution includes QueryExecutionContext even when object is empty#16141mergify[bot] merged 8 commits intoaws:masterfrom LukvonStrom:master
mergify[bot] merged 8 commits intoaws:masterfrom
LukvonStrom:master
Conversation
|
|
BenChaimberg
previously requested changes
Sep 2, 2021
Contributor
BenChaimberg
left a comment
There was a problem hiding this comment.
Thank you so much for cleaning up our logic! A couple of further modifications to make things sleek
packages/@aws-cdk/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts
Outdated
Show resolved
Hide resolved
packages/@aws-cdk/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts
Outdated
Show resolved
Hide resolved
packages/@aws-cdk/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts
Show resolved
Hide resolved
packages/@aws-cdk/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts
Outdated
Show resolved
Hide resolved
packages/@aws-cdk/aws-stepfunctions-tasks/test/athena/start-query-execution.test.ts
Outdated
Show resolved
Hide resolved
packages/@aws-cdk/aws-stepfunctions-tasks/test/athena/start-query-execution.test.ts
Outdated
Show resolved
Hide resolved
packages/@aws-cdk/aws-stepfunctions-tasks/test/athena/start-query-execution.test.ts
Outdated
Show resolved
Hide resolved
Co-authored-by: Ben Chaimberg <youppi3@gmail.com>
Pull request has been modified.
BenChaimberg
previously requested changes
Sep 3, 2021
Contributor
BenChaimberg
left a comment
There was a problem hiding this comment.
awesome, looks great! just some minor stuff
packages/@aws-cdk/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts
Outdated
Show resolved
Hide resolved
packages/@aws-cdk/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts
Outdated
Show resolved
Hide resolved
packages/@aws-cdk/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts
Outdated
Show resolved
Hide resolved
packages/@aws-cdk/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts
Outdated
Show resolved
Hide resolved
packages/@aws-cdk/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.ts
Outdated
Show resolved
Hide resolved
Pull request has been modified.
BenChaimberg
previously requested changes
Sep 3, 2021
packages/@aws-cdk/aws-stepfunctions-tasks/test/athena/start-query-execution.test.ts
Outdated
Show resolved
Hide resolved
Pull request has been modified.
BenChaimberg
approved these changes
Sep 3, 2021
Contributor
|
Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
Collaborator
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
Contributor
|
Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
TikiTDO
pushed a commit
to TikiTDO/aws-cdk
that referenced
this pull request
Sep 6, 2021
…ecutionContext even when object is empty (aws#16141) fixes: aws#16133 As described in aws#16133, the empty `QueryExecutionContext`, which was included before this fix, leads to an error. To mitigate this, I implemented a check to exclude the `QueryExecutionContext`when both params are empty. This way, it behaves like a truly optional parameter. Additionally I integrated an easier way to merge an OutputLocation if provided. This means less redundancy than the original solution, which returned an object that was only different in one key in each branch. The unittest is based on the default unittest, but a bit "stripped down". It proofs that no empty `QueryExecutionContext` object is present. In my tests, this fixes the ``` { "resourceType": "athena", "resource": "startQueryExecution.sync", "error": "Athena.InvalidRequestException", "cause": "Both queryExecutionContext.catalog and queryExecutionContext.database are null or empty (Service: AmazonAthena; Status Code: 400; Error Code: InvalidRequestException; Request ID: [Censored]; Proxy: null)" } ``` error. This solution turned out to be a bit different than I envisioned in the issue. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
david-doyle-as24
pushed a commit
to david-doyle-as24/aws-cdk
that referenced
this pull request
Sep 7, 2021
…ecutionContext even when object is empty (aws#16141) fixes: aws#16133 As described in aws#16133, the empty `QueryExecutionContext`, which was included before this fix, leads to an error. To mitigate this, I implemented a check to exclude the `QueryExecutionContext`when both params are empty. This way, it behaves like a truly optional parameter. Additionally I integrated an easier way to merge an OutputLocation if provided. This means less redundancy than the original solution, which returned an object that was only different in one key in each branch. The unittest is based on the default unittest, but a bit "stripped down". It proofs that no empty `QueryExecutionContext` object is present. In my tests, this fixes the ``` { "resourceType": "athena", "resource": "startQueryExecution.sync", "error": "Athena.InvalidRequestException", "cause": "Both queryExecutionContext.catalog and queryExecutionContext.database are null or empty (Service: AmazonAthena; Status Code: 400; Error Code: InvalidRequestException; Request ID: [Censored]; Proxy: null)" } ``` error. This solution turned out to be a bit different than I envisioned in the issue. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes: #16133
As described in #16133, the empty
QueryExecutionContext, which was included before this fix, leads to an error.To mitigate this, I implemented a check to exclude the
QueryExecutionContextwhen both params are empty.This way, it behaves like a truly optional parameter.
Additionally I integrated an easier way to merge an OutputLocation if provided.
This means less redundancy than the original solution, which returned an object that was only different in one key in each branch.
The unittest is based on the default unittest, but a bit "stripped down". It proofs that no empty
QueryExecutionContextobject is present.In my tests, this fixes the
error.
This solution turned out to be a bit different than I envisioned in the issue.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license