Merge branch 'main' into fix-34780

Author: aemada-aws

.github/workflows/github-merit-badger.yml

@@ -17,4 +17,4 @@ jobs:
           badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
           thresholds: '[0,3,6,13,25,50]'
           badge-type: 'achievement'
-          ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,Y-JayKim,ykethan,astiwana,maharajhaider,aws-cdk-automation,dependabot[bot],mergify[bot],aemada-aws,ozelalisen,abogical,alinko-aws,vishaalmehrishi,alvazjor,kumsmrit,kumvprat,leonmk-aws,matboros,gasolima]'
+          ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,Y-JayKim,ykethan,astiwana,maharajhaider,aws-cdk-automation,dependabot[bot],mergify[bot],aemada-aws,ozelalisen,abogical,alinko-aws,vishaalmehrishi,alvazjor,kumsmrit,kumvprat,leonmk-aws,matboros,gasolima,abidhasan-aws]'

.mergify.yml

@@ -65,7 +65,7 @@ pull_request_rules:
       label:
         add: [contribution/core]
     conditions:
-      - author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|TheRealAmazonKendra|mrgrain|pahud|ashishdhingra|kellertk|moelasmar|paulhcsun|GavinZZ|xazhao|gracelu0|shikha372|QuantumNeuralCoder|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere|jiayiwang7|saiyush|5d|iankhou|SimonCMoore|maharajhaider|Y-JayKim|astiwana|ykethan|aemada-aws|ozelalisen|abogical|alinko-aws|vishaalmehrishi|alvazjor|kumsmrit|kumvprat|leonmk-aws|matboros|gasolima)$
+      - author=@aws/aws-cdk-team
       - -label~="contribution/core"
   - name: automatic merge
     actions:

allowed-breaking-changes.txt

@@ -3,6 +3,11 @@
 # and that won't typecheck if Manifest.load() adds a union arm and now returns A | B | C.
 change-return-type:@aws-cdk/cloud-assembly-schema.Manifest.load
 
+# To deal with the same as the above: adding artifact properties weakens the ArtifactManifest type.
+# This is done on purpose though, and doesn't break a real type contract in practice because the type
+# of the `properties` field is already unreliable for exhaustive checking.
+weakened:aws-cdk-lib.cloud_assembly_schema.ArtifactManifest
+
 # Adding any new context queries will add to the ContextQueryProperties type,
 # which changes the signature of MissingContext.
 weakened:@aws-cdk/cloud-assembly-schema.MissingContext
@@ -190,7 +195,7 @@ removed:aws-cdk-lib.aws_ec2.CfnNetworkInterface.enablePrimaryIpv6
 removed:aws-cdk-lib.aws_ec2.CfnNetworkInterfaceAttachment.attrId
 removed:aws-cdk-lib.aws_ec2.CfnNetworkInterfaceProps.enablePrimaryIpv6
 
-# Changed type from GraphqlApi to IGraphqlApi to support import from a different stack, should not matter. 
+# Changed type from GraphqlApi to IGraphqlApi to support import from a different stack, should not matter.
 weakened:aws-cdk-lib.aws_appsync.SourceApi
 
 # Due to https://github.com/aws/aws-cdk/issues/27259, none of these could have worked

lerna.json

@@ -12,12 +12,10 @@
     "tools/@aws-cdk/cdk-build-tools",
     "tools/@aws-cdk/user-input-gen",
     "tools/@aws-cdk/cdk-release",
-    "tools/@aws-cdk/node-bundle",
     "tools/@aws-cdk/pkglint",
     "tools/@aws-cdk/pkgtools",
     "tools/@aws-cdk/prlint",
     "tools/@aws-cdk/spec2cdk",
-    "tools/@aws-cdk/yarn-cling",
     "tools/@aws-cdk/lazify",
     "tools/@aws-cdk/lambda-integration-test-updater",
     "tools/@aws-cdk/construct-metadata-updater",
@@ -26,4 +24,4 @@
   "rejectCycles": true,
   "version": "0.0.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
-}
+}

package.json

@@ -79,12 +79,10 @@
       "tools/@aws-cdk/cdk-build-tools",
       "tools/@aws-cdk/user-input-gen",
       "tools/@aws-cdk/cdk-release",
-      "tools/@aws-cdk/node-bundle",
       "tools/@aws-cdk/pkglint",
       "tools/@aws-cdk/pkgtools",
       "tools/@aws-cdk/prlint",
       "tools/@aws-cdk/spec2cdk",
-      "tools/@aws-cdk/yarn-cling",
       "tools/@aws-cdk/lazify",
       "tools/@aws-cdk/lambda-integration-test-updater",
       "tools/@aws-cdk/construct-metadata-updater",

packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.assets.json

@@ -142,6 +142,17 @@
          "BackupVaultName"
         ]
        }
+      },
+      {
+       "RuleName": "PlanRule4",
+       "ScheduleExpression": "cron(30 3 15 * ? *)",
+       "ScheduleExpressionTimezone": "Etc/UTC",
+       "TargetBackupVault": {
+        "Fn::GetAtt": [
+         "Vault23237E5B",
+         "BackupVaultName"
+        ]
+       }
       }
      ]
     }