chore(release): 1.163.0 #21016
Merged
chore(release): 1.163.0 #21016
Conversation
This file contains 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
…k/lambda-layer-awscli (#20979) Bumps [awscli](https://github.com/aws/aws-cli) from 1.25.17 to 1.25.22. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/aws/aws-cli/blob/develop/CHANGELOG.rst">awscli's changelog</a>.</em></p> <blockquote> <h1>1.25.22</h1> <ul> <li>api-change:<code>dms</code>: Added new features for AWS DMS version 3.4.7 that includes new endpoint settings for S3, OpenSearch, Postgres, SQLServer and Oracle.</li> <li>api-change:<code>rds</code>: Adds support for additional retention periods to Performance Insights.</li> </ul> <h1>1.25.21</h1> <ul> <li>api-change:<code>athena</code>: This feature introduces the API support for Athena's parameterized query and BatchGetPreparedStatement API.</li> <li>api-change:<code>customer-profiles</code>: This release adds the optional MinAllowedConfidenceScoreForMerging parameter to the CreateDomain, UpdateDomain, and GetAutoMergingPreview APIs in Customer Profiles. This parameter is used as a threshold to influence the profile auto-merging step of the Identity Resolution process.</li> <li>api-change:<code>emr</code>: Update emr command to latest version</li> <li>api-change:<code>glue</code>: This release adds tag as an input of CreateDatabase</li> <li>api-change:<code>kendra</code>: Amazon Kendra now provides a data source connector for alfresco</li> <li>api-change:<code>mwaa</code>: Documentation updates for Amazon Managed Workflows for Apache Airflow.</li> <li>api-change:<code>pricing</code>: Documentation update for GetProducts Response.</li> <li>api-change:<code>wellarchitected</code>: Added support for UpdateGlobalSettings API. Added status filter to ListWorkloadShares and ListLensShares.</li> <li>api-change:<code>workmail</code>: This release adds support for managing user availability configurations in Amazon WorkMail.</li> </ul> <h1>1.25.20</h1> <ul> <li>api-change:<code>appstream</code>: Includes support for StreamingExperienceSettings in CreateStack and UpdateStack APIs</li> <li>api-change:<code>elbv2</code>: Update elbv2 command to latest version</li> <li>api-change:<code>emr</code>: Update emr command to latest version</li> <li>api-change:<code>medialive</code>: This release adds support for automatic renewal of MediaLive reservations at the end of each reservation term. Automatic renewal is optional. This release also adds support for labelling accessibility-focused audio and caption tracks in HLS outputs.</li> <li>api-change:<code>redshift-serverless</code>: Add new API operations for Amazon Redshift Serverless, a new way of using Amazon Redshift without needing to manually manage provisioned clusters. The new operations let you interact with Redshift Serverless resources, such as create snapshots, list VPC endpoints, delete resource policies, and more.</li> <li>api-change:<code>sagemaker</code>: This release adds: UpdateFeatureGroup, UpdateFeatureMetadata, DescribeFeatureMetadata APIs; FeatureMetadata type in Search API; LastModifiedTime, LastUpdateStatus, OnlineStoreTotalSizeBytes in DescribeFeatureGroup API.</li> <li>api-change:<code>translate</code>: Added ListLanguages API which can be used to list the languages supported by Translate.</li> </ul> <h1>1.25.19</h1> <ul> <li>api-change:<code>datasync</code>: AWS DataSync now supports Amazon FSx for NetApp ONTAP locations.</li> <li>api-change:<code>ec2</code>: This release adds a new spread placement group to EC2 Placement Groups: host level spread, which spread instances between physical hosts, available to Outpost customers only. CreatePlacementGroup and DescribePlacementGroups APIs were updated with a new parameter: SpreadLevel to support this feature.</li> <li>api-change:<code>finspace-data</code>: Release new API GetExternalDataViewAccessDetails</li> <li>api-change:<code>polly</code>: Add 4 new neural voices - Pedro (es-US), Liam (fr-CA), Daniel (de-DE) and Arthur (en-GB).</li> </ul> <h1>1.25.18</h1> <ul> <li>api-change:<code>iot</code>: This release ease the restriction for the input of tag value to align with AWS standard, now instead of min length 1, we change it to min length 0.</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/aws/aws-cli/commit/c9909c41bb4362b4373f120e832900f5cdba57cc"><code>c9909c4</code></a> Merge branch 'release-1.25.22'</li> <li><a href="https://github.com/aws/aws-cli/commit/e66532a1044cf26db892e686fedf60d8dbedbd94"><code>e66532a</code></a> Bumping version to 1.25.22</li> <li><a href="https://github.com/aws/aws-cli/commit/8d6737340beb5f24c6fde5146ccfda7bc08700f3"><code>8d67373</code></a> Update changelog based on model updates</li> <li><a href="https://github.com/aws/aws-cli/commit/bd2e04cb1c837c051e4d45a2210c0f4fab5e8dad"><code>bd2e04c</code></a> Merge branch 'release-1.25.21'</li> <li><a href="https://github.com/aws/aws-cli/commit/c3eec161713ffd7e01c239bd0761fcf02db183aa"><code>c3eec16</code></a> Merge branch 'release-1.25.21' into develop</li> <li><a href="https://github.com/aws/aws-cli/commit/fd47b901d2fac4330d447c57f9bf2fcded9ec140"><code>fd47b90</code></a> Bumping version to 1.25.21</li> <li><a href="https://github.com/aws/aws-cli/commit/ce14b7b541ccc398c92de7cef87a98be4cebebcf"><code>ce14b7b</code></a> Merge commit '43c7def09a6ce05753a4fd8a54da7ee98128554b' into stage-release-de...</li> <li><a href="https://github.com/aws/aws-cli/commit/9d4cc92174ee1b4d258ea188e70941cdb8a01d86"><code>9d4cc92</code></a> Update changelog based on model updates</li> <li><a href="https://github.com/aws/aws-cli/commit/ef7b4d565370a3eb0a81fac2f520c8baa4e9284c"><code>ef7b4d5</code></a> Merge branch 'release-1.25.20' into develop</li> <li><a href="https://github.com/aws/aws-cli/commit/7f44303eabfc9061f86dc2a2a8d4db9da0bff9ea"><code>7f44303</code></a> Merge branch 'release-1.25.20'</li> <li>Additional commits viewable in <a href="https://github.com/aws/aws-cli/compare/1.25.17...1.25.22">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
This is an automatic backport of pull request #20899 done by [Mergify](https://mergify.com). Cherry-pick of 6b4f92f has failed: ``` On branch mergify/bp/v1-main/pr-20899 Your branch is up to date with 'origin/v1-main'. You are currently cherry-picking commit 6b4f92f. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: packages/@aws-cdk/aws-dynamodb/lib/replica-handler/index.ts modified: packages/@aws-cdk/aws-ecs-patterns/test/ec2/multiple-application-load-balanced-ecs-service.integ.snapshot/aws-ecs-integ.template.json modified: packages/@aws-cdk/aws-ecs-patterns/test/ec2/multiple-application-load-balanced-ecs-service.integ.snapshot/manifest.json modified: packages/@aws-cdk/aws-ecs-patterns/test/ec2/scheduled-ecs-task.lit.integ.snapshot/aws-ecs-integ-ecs.template.json modified: packages/@aws-cdk/aws-ecs/lib/drain-hook/lambda-source/index.py modified: packages/@aws-cdk/aws-ecs/test/ec2/app-mesh-proxy-config.integ.snapshot/aws-ecs-integ.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/bottlerocket.integ.snapshot/aws-ecs-integ-bottlerocket.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/capacity-provider.integ.snapshot/integ-ec2-capacity-provider.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/clb-host-nw.integ.snapshot/aws-ecs-integ.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/cloudmap-container-port.integ.snapshot/aws-ecs-integ.template.json deleted: packages/@aws-cdk/aws-ecs/test/ec2/environment-file.integ.snapshot/asset.8ad7bbf8be94e05d569da95ddb82511dcc959f25054825394cbb86028ccd1b6a.zip deleted: packages/@aws-cdk/aws-ecs/test/ec2/environment-file.integ.snapshot/asset.be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824/__entrypoint__.js deleted: packages/@aws-cdk/aws-ecs/test/ec2/environment-file.integ.snapshot/asset.be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824/index.d.ts deleted: packages/@aws-cdk/aws-ecs/test/ec2/environment-file.integ.snapshot/asset.be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824/index.js deleted: packages/@aws-cdk/aws-ecs/test/ec2/environment-file.integ.snapshot/asset.be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824/index.ts modified: packages/@aws-cdk/aws-ecs/test/ec2/environment-file.integ.snapshot/manifest.json modified: packages/@aws-cdk/aws-ecs/test/ec2/exec-command.integ.snapshot/aws-ecs-integ-exec-command.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/firelens-s3-config.integ.snapshot/aws-ecs-integ.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/graviton-bottlerocket.integ.snapshot/aws-ecs-integ.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/graviton.integ.snapshot/aws-ecs-integ.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/lb-awsvpc-nw.integ.snapshot/aws-ecs-integ.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/lb-bridge-nw.integ.snapshot/aws-ecs-integ-ecs.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/sd-awsvpc-nw.integ.snapshot/aws-ecs-integ-ecs.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/sd-bridge-nw.integ.snapshot/aws-ecs-integ-ecs.template.json modified: packages/@aws-cdk/aws-ecs/test/ec2/spot-drain.integ.snapshot/aws-ecs-integ-spot.template.json modified: packages/@aws-cdk/aws-eks-legacy/lib/cluster-resource/index.py modified: packages/@aws-cdk/aws-eks-legacy/lib/helm-chart/index.py modified: packages/@aws-cdk/aws-eks-legacy/lib/k8s-resource/index.py modified: packages/@aws-cdk/aws-eks/lib/kubectl-handler/apply/__init__.py modified: packages/@aws-cdk/aws-eks/lib/kubectl-handler/get/__init__.py modified: packages/@aws-cdk/aws-eks/lib/kubectl-handler/helm/__init__.py modified: packages/@aws-cdk/aws-eks/lib/kubectl-handler/index.py modified: packages/@aws-cdk/aws-eks/lib/kubectl-handler/patch/__init__.py modified: packages/@aws-cdk/aws-events-targets/lib/aws-api-handler/index.ts modified: packages/@aws-cdk/aws-events-targets/test/ecs/event-ec2-task.lit.integ.snapshot/aws-ecs-integ-ecs.template.json modified: packages/@aws-cdk/aws-logs/lib/log-retention-provider/index.ts modified: packages/@aws-cdk/aws-stepfunctions-tasks/lib/eval-nodejs-handler/index.ts modified: packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs/ec2-run-task.integ.snapshot/aws-sfn-tasks-ecs-ec2-integ.template.json modified: packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs/ec2-task.integ.snapshot/aws-ecs-integ2.template.json modified: packages/@aws-cdk/custom-resources/lib/aws-custom-resource/runtime/index.ts modified: packages/@aws-cdk/custom-resources/lib/provider-framework/runtime/cfn-response.ts modified: packages/@aws-cdk/custom-resources/lib/provider-framework/runtime/framework.ts modified: packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/base.ts modified: packages/@aws-cdk/triggers/lib/lambda/index.ts Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) deleted by us: packages/@aws-cdk/aws-dynamodb/test/global-replicas-provisioned.integ.snapshot/asset.5d88959fad6bed204d22b24bf15826b8c7591c586a60a313e54f1948d9cdf80f/index.js deleted by us: packages/@aws-cdk/aws-ecs-patterns/test/ec2/multiple-application-load-balanced-ecs-service.integ.snapshot/aws-ecs-integ.assets.json both modified: packages/@aws-cdk/aws-ecs-patterns/test/ec2/multiple-application-load-balanced-ecs-service.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs-patterns/test/ec2/scheduled-ecs-task.lit.integ.snapshot/aws-ecs-integ-ecs.assets.json both modified: packages/@aws-cdk/aws-ecs-patterns/test/ec2/scheduled-ecs-task.lit.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/app-mesh-proxy-config.integ.snapshot/aws-ecs-integ.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/app-mesh-proxy-config.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/bottlerocket.integ.snapshot/aws-ecs-integ-bottlerocket.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/bottlerocket.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/capacity-provider.integ.snapshot/integ-ec2-capacity-provider.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/capacity-provider.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/clb-host-nw.integ.snapshot/aws-ecs-integ.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/clb-host-nw.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/cloudmap-container-port.integ.snapshot/aws-ecs-integ.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/cloudmap-container-port.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/environment-file.integ.snapshot/aws-ecs-integ.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/environment-file.integ.snapshot/aws-ecs-integ.template.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/environment-file.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/exec-command.integ.snapshot/aws-ecs-integ-exec-command.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/exec-command.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/firelens-s3-config.integ.snapshot/aws-ecs-integ.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/firelens-s3-config.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/graviton-bottlerocket.integ.snapshot/aws-ecs-integ.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/graviton-bottlerocket.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/graviton.integ.snapshot/aws-ecs-integ.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/graviton.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/lb-awsvpc-nw.integ.snapshot/aws-ecs-integ.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/lb-awsvpc-nw.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/lb-bridge-nw.integ.snapshot/aws-ecs-integ-ecs.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/lb-bridge-nw.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/sd-awsvpc-nw.integ.snapshot/aws-ecs-integ-ecs.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/sd-awsvpc-nw.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/sd-bridge-nw.integ.snapshot/aws-ecs-integ-ecs.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/sd-bridge-nw.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-ecs/test/ec2/spot-drain.integ.snapshot/aws-ecs-integ-spot.assets.json both modified: packages/@aws-cdk/aws-ecs/test/ec2/spot-drain.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-events-targets/test/ecs/event-ec2-task.lit.integ.snapshot/aws-ecs-integ-ecs.assets.json both modified: packages/@aws-cdk/aws-events-targets/test/ecs/event-ec2-task.lit.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs/ec2-run-task.integ.snapshot/aws-sfn-tasks-ecs-ec2-integ.assets.json both modified: packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs/ec2-run-task.integ.snapshot/tree.json deleted by us: packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs/ec2-task.integ.snapshot/aws-ecs-integ2.assets.json both modified: packages/@aws-cdk/aws-stepfunctions-tasks/test/ecs/ec2-task.integ.snapshot/tree.json both modified: packages/aws-cdk/does-not-exist.json ``` To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details>
This is an automatic backport of pull request #20977 done by [Mergify](https://mergify.com). Cherry-pick of d55ad0e has failed: ``` On branch mergify/bp/v1-main/pr-20977 Your branch is up to date with 'origin/v1-main'. You are currently cherry-picking commit d55ad0e. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: packages/@aws-cdk/core/lib/custom-resource-provider/nodejs-entrypoint.ts modified: packages/@aws-cdk/custom-resources/README.md modified: packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/PipelineSecurityStack.template.json deleted: packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/__entrypoint__.js deleted: packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.d.ts deleted: packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.js deleted: packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.ts modified: packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/PipelineStack.assets.json modified: packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/PipelineStack.template.json deleted: packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/__entrypoint__.js deleted: packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.d.ts deleted: packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.js deleted: packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.ts modified: packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/manifest.json modified: packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/tree.json modified: packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/PipelineStack.assets.json modified: packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/PipelineStack.template.json deleted: packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/__entrypoint__.js deleted: packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.d.ts deleted: packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.js deleted: packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.ts modified: packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/manifest.json modified: packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/tree.json modified: packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/VariablePipelineStack.assets.json modified: packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/VariablePipelineStack.template.json deleted: packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/__entrypoint__.js deleted: packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.d.ts deleted: packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.js deleted: packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.ts modified: packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/manifest.json modified: packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/PipelineStack.assets.json modified: packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/PipelineStack.template.json deleted: packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/__entrypoint__.js deleted: packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.d.ts deleted: packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.js deleted: packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/asset.17cb4b37288c269a54418db6e9c7c3763b2d1a82bdc374be4653bd366345eccb/index.ts modified: packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/manifest.json modified: packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/tree.json Unmerged paths: (use "git add <file>..." to mark resolution) both modified: packages/@aws-cdk/custom-resources/lib/provider-framework/runtime/framework.ts both modified: packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/PipelineSecurityStack.assets.json both modified: packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/manifest.json ``` To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details>
This is an automatic backport of pull request #20982 done by [Mergify](https://mergify.com). Cherry-pick of 7f4f150 has failed: ``` On branch mergify/bp/v1-main/pr-20982 Your branch is up to date with 'origin/v1-main'. You are currently cherry-picking commit 7f4f150. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: packages/@aws-cdk/aws-secretsmanager/test/secret.test.ts modified: packages/@aws-cdk/core/lib/custom-resource-provider/custom-resource-provider.ts Unmerged paths: (use "git add <file>..." to mark resolution) both modified: packages/@aws-cdk/aws-secretsmanager/lib/secret.ts ``` To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details>
aws-cdk-automation
added
the
pr/no-squash
|
|
kaizencc
approved these changes
Jul 6, 2022
MrArnoldPalmer
approved these changes
Jul 6, 2022
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
|
Thank you for contributing! Your pull request will be automatically updated and merged without squashing (do not update manually, and be sure to allow changes to be pushed to your fork). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
See CHANGELOG