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

Merge V3 into V4 #3556

Merged
merged 319 commits into from
Nov 25, 2024
Merged

Merge V3 into V4 #3556

merged 319 commits into from
Nov 25, 2024

Conversation

dscpinheiro
Copy link
Contributor

@dscpinheiro dscpinheiro commented Nov 21, 2024

Description

Merges V3 into V4 (as of last Friday - 11/15) since dry-runs in V4 are currently broken: In addition to some service changes (Elastic Transcoder being discontinued), there are some tests that are failing in the HEAD of the v4-development branch (see inline comments for more details).

These are the relevant commits:

  • Merge commit: 3ff1cd9
  • Update to generated files: c44be2c
  • Manual changes to tests / merge conflicts: 5aee938

Testing

Dry-run: DRY_RUN-7c729c82-ad66-47f3-a65d-7e2a8eada339

Checklist

  • My code follows the code style of this project
  • I have read the README document
  • I have added tests to cover my changes
  • All new and existing tests passed

License

  • I confirm that this pull request can be released under the Apache 2 license

…ing a suite of APIs that enable sending WhatsApp messages to end users.
…ide construct in the describe-target-health API response to include information about the override status applied to a target.
…nsfer status of their files to meet their monitoring needs as well as orchestrate post transfer actions.
… failed stages and skipping stage for failed entry conditions.
… Specifically adding CreateInstance, DeleteInstance, GetInstance, ListInstances, and UpdateInstance APIs.
…rsions-PutLifecycleConfigurationRequestMarshaller

fix: #3500 Add missing NewerNoncurrentVersions to PutLifecycleConfigurationRequestMarshall
* fix: fix #3497. make internalsdkutils trim compatible
…ibeIntegrations and ModifyIntegration APIs to create and manage Amazon Redshift Zero-ETL Integrations.
… a new stream by streaming up with the priority parameter appended to the stream key.
…ows senders to control the time within which their emails are attempted for delivery.
…nabling customers to easily assess the resilience of applications defined in myApplications. The new Resiliency widget provides visibility into application resilience and actionable recommendations for improvement.
…ntroduces new APIs for co-selling opportunity management and related functions. Key features include notifications, a dynamic sandbox for testing, and streamlined validations.
…ropagating attributes, to associate a thing to a connection, and to enable Online Certificate Status Protocol (OCSP) stapling for TLS X.509 server certificates through private endpoints.
…nd block suspicious DNS traffic based on anomalies detected in the queries, such as DNS tunneling and Domain Generation Algorithms (DGAs).
…ic phone numbers. Use message feedback to monitor if a customer interacts with your message.
…r term with one of the following payment options: All Upfront, Partial Upfront, and No Upfront.
@dscpinheiro dscpinheiro added the v4 label Nov 21, 2024
@@ -95,7 +95,7 @@ public void TestDocumentPutGet()

[TestMethod]
[TestCategory("DynamoDBv2")]
public static void TestDocumentJsonConversions()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@normj These tests weren't running. It looks like the methods cannot be static, this was the message on our build system:

[MSTest][Discovery][AWSSDK.IntegrationTests.NetFramework.dll] UTA007: Method TestDocumentBinaryDecoding defined in class AWSSDK_DotNet.IntegrationTests.Tests.DynamoDB.DynamoDBTests does not have correct signature. Test method marked with the [TestMethod] attribute must be non-static, public, return-type as void and should not take any parameter. Example: public void Test.Class1.Test(). Additionally, if you are using async-await in test method then return-type must be Task. Example: public async Task Test.Class1.Test2()

I also had to fix the sample JSON used as it was complaining about trailing commas.

@@ -203,6 +203,7 @@ public async Task TestMockingTableClient_TransactWriteAsync()
public void TestMockingTableClient_LoadTable_Throws()
{
var mockClient = new Mock<IAmazonDynamoDB>();
mockClient.Setup(x => x.Config).Returns(new AmazonDynamoDBConfig());
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This test was failing even before the merge (i.e. on the HEAD of v4-development). The issue was Table.LoadTable (which is tested below) now tries to apply our observability wrapper but the config object on our mock client was null (so we'd get a NPE instead of invalid operation).

@@ -15,7 +15,6 @@

using Amazon.DynamoDBv2.DocumentModel;
using Amazon.Runtime.Telemetry.Tracing;
using Amazon.Runtime.Telemetry.Tracing;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

For all DynamoDB changes here: Looks like some lines were added twice during the merge commit. I removed them and confirmed the contents of the sdk/src/Services/DynamoDBv2/Custom folder match what we had in v4-development before.

@dscpinheiro dscpinheiro marked this pull request as ready for review November 21, 2024 14:12
@boblodgett boblodgett self-requested a review November 21, 2024 18:30
@dscpinheiro dscpinheiro merged commit 82c7d34 into v4-development Nov 25, 2024
1 check passed
@dscpinheiro dscpinheiro deleted the v4-development-merge branch November 25, 2024 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.