Merge branch 'main' into comcalvi/batch-submit-job-num-nodes

.github/workflows/request-cli-integ-test.yml

@@ -36,6 +36,12 @@ jobs:
               - packages/aws-cdk-lib/cloud-assembly-schema/test/**
               - packages/@aws-cdk/cloudformation-diff/lib/**
               - packages/@aws-cdk/cloudformation-diff/test/**
+              - packages/@aws-cdk-testing/cli-integ/bin/**
+              - packages/@aws-cdk-testing/cli-integ/entrypoints/**
+              - packages/@aws-cdk-testing/cli-integ/lib/**
+              - packages/@aws-cdk-testing/cli-integ/resources/**
+              - packages/@aws-cdk-testing/cli-integ/test/**
+              - packages/@aws-cdk-testing/cli-integ/tests/**
   submit-to-test-pipeline:
     environment: test-pipeline
     needs: cli-changes

.gitignore

@@ -55,3 +55,6 @@ read*lock
 # VSCode jest plugin
 .test-output
 
+# Nx cache
+.nx/
+

aws-cdk.code-workspace

@@ -27,8 +27,8 @@
         "rootPath": "packages/@aws-cdk/integ-tests-alpha"
       },
       {
-        "name": "sdk-v2-to-v3-adapter",
-        "rootPath": "packages/@aws-cdk/sdk-v2-to-v3-adapter"
+        "name": "aws-custom-resource-sdk-adapter",
+        "rootPath": "packages/@aws-cdk/aws-custom-resource-sdk-adapter"
       }
     ]
   },

package.json

@@ -28,9 +28,9 @@
     "jsii-diff": "1.97.0",
     "jsii-pacmak": "1.97.0",
     "jsii-reflect": "1.97.0",
-    "jsii-rosetta": "~5.4.0",
-    "lerna": "^7.4.2",
-    "nx": "^16.10.0",
+    "jsii-rosetta": "~5.4.2",
+    "lerna": "^8.1.2",
+    "nx": "^18.3.1",
     "patch-package": "^6.5.1",
     "semver": "^7.6.0",
     "standard-version": "^9.5.0",

packages/@aws-cdk-testing/cli-integ/package.json

@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "aws-sdk": "^2.1596.0",
+    "aws-sdk": "^2.1600.0",
     "axios": "^1.6.8",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",

packages/@aws-cdk-testing/framework-integ/package.json

@@ -42,9 +42,9 @@
     "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
     "@aws-cdk/lambda-layer-kubectl-v29": "^2.0.0",
     "aws-cdk-lib": "0.0.0",
-    "aws-sdk": "^2.1596.0",
+    "aws-sdk": "^2.1600.0",
     "aws-sdk-mock": "5.6.0",
-    "cdk8s": "2.68.58",
+    "cdk8s": "2.68.60",
     "cdk8s-plus-27": "2.7.88",
     "constructs": "^10.0.0"
   },

packages/@aws-cdk-testing/framework-integ/test/aws-cognito/test/integ.user-pool-idp.saml.js.snapshot/integ-user-pool-identity-provider-saml-stack.template.json

@@ -34,9 +34,6 @@
   "poolclient2623294C": {
    "Type": "AWS::Cognito::UserPoolClient",
    "Properties": {
-    "UserPoolId": {
-     "Ref": "pool056F3F7E"
-    },
     "AllowedOAuthFlows": [
      "implicit",
      "code"
@@ -54,10 +51,13 @@
     ],
     "SupportedIdentityProviders": [
      {
-      "Ref": "cdk52888317"
+      "Ref": "samlProvider6C4CC492"
      },
      "COGNITO"
-    ]
+    ],
+    "UserPoolId": {
+     "Ref": "pool056F3F7E"
+    }
    }
   },
   "pooldomain430FA744": {
@@ -69,17 +69,93 @@
     }
    }
   },
-  "cdk52888317": {
+  "samlProvider6C4CC492": {
    "Type": "AWS::Cognito::UserPoolIdentityProvider",
    "Properties": {
-    "ProviderName": "cdk",
+    "ProviderDetails": {
+     "IDPSignout": false,
+     "MetadataURL": "https://fujifish.github.io/samling/public/metadata.xml",
+     "EncryptedResponses": true,
+     "RequestSigningAlgorithm": "rsa-sha256"
+    },
+    "ProviderName": "provider",
     "ProviderType": "SAML",
     "UserPoolId": {
      "Ref": "pool056F3F7E"
+    }
+   }
+  },
+  "poolForIdpInitiatedSaml8B7CB492": {
+   "Type": "AWS::Cognito::UserPool",
+   "Properties": {
+    "AccountRecoverySetting": {
+     "RecoveryMechanisms": [
+      {
+       "Name": "verified_phone_number",
+       "Priority": 1
+      },
+      {
+       "Name": "verified_email",
+       "Priority": 2
+      }
+     ]
     },
+    "AdminCreateUserConfig": {
+     "AllowAdminCreateUserOnly": true
+    },
+    "EmailVerificationMessage": "The verification code to your new account is {####}",
+    "EmailVerificationSubject": "Verify your new account",
+    "SmsVerificationMessage": "The verification code to your new account is {####}",
+    "VerificationMessageTemplate": {
+     "DefaultEmailOption": "CONFIRM_WITH_CODE",
+     "EmailMessage": "The verification code to your new account is {####}",
+     "EmailSubject": "Verify your new account",
+     "SmsMessage": "The verification code to your new account is {####}"
+    }
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
+  "poolForIdpInitiatedSamlidpInitiatedClientACB7B7B4": {
+   "Type": "AWS::Cognito::UserPoolClient",
+   "Properties": {
+    "AllowedOAuthFlows": [
+     "implicit",
+     "code"
+    ],
+    "AllowedOAuthFlowsUserPoolClient": true,
+    "AllowedOAuthScopes": [
+     "profile",
+     "phone",
+     "email",
+     "openid",
+     "aws.cognito.signin.user.admin"
+    ],
+    "CallbackURLs": [
+     "https://example.com"
+    ],
+    "SupportedIdentityProviders": [
+     {
+      "Ref": "samlProviderIdpInitiatedA5C8CB58"
+     }
+    ],
+    "UserPoolId": {
+     "Ref": "poolForIdpInitiatedSaml8B7CB492"
+    }
+   }
+  },
+  "samlProviderIdpInitiatedA5C8CB58": {
+   "Type": "AWS::Cognito::UserPoolIdentityProvider",
+   "Properties": {
     "ProviderDetails": {
      "IDPSignout": false,
-     "MetadataURL": "https://fujifish.github.io/samling/public/metadata.xml"
+     "MetadataURL": "https://fujifish.github.io/samling/public/metadata.xml",
+     "IDPInit": true
+    },
+    "ProviderName": "IdPInitiatedProvider",
+    "ProviderType": "SAML",
+    "UserPoolId": {
+     "Ref": "poolForIdpInitiatedSaml8B7CB492"
     }
    }
   }