[aws-sdk-cpp] Regenerate feature list (#16149)

5 files changed, 571 insertions, 26 deletions

diff --git a/ports/aws-sdk-cpp/CONTROL.in b/ports/aws-sdk-cpp/CONTROL.in
deleted file mode 100644
index 8ddba4b77..000000000
--- a/ports/aws-sdk-cpp/CONTROL.in
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: aws-sdk-cpp

-Version: 1.8.83

-Port-Version: 0

-Description: AWS SDK for C++

-Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream

-Default-Features: dynamodb, s3, kinesis

diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake
index ba9bcb26d..bd46513e4 100644
--- a/ports/aws-sdk-cpp/compute_build_only.cmake
+++ b/ports/aws-sdk-cpp/compute_build_only.cmake
@@ -2,6 +2,9 @@
 if("access-management" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY access-management)
 endif()
+if("accessanalyzer" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY accessanalyzer)
+endif()
 if("acm" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY acm)
 endif()
@@ -11,9 +14,15 @@ endif()
 if("alexaforbusiness" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY alexaforbusiness)
 endif()
+if("amp" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY amp)
+endif()
 if("amplify" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY amplify)
 endif()
+if("amplifybackend" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY amplifybackend)
+endif()
 if("apigateway" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY apigateway)
 endif()
@@ -23,9 +32,21 @@ endif()
 if("apigatewayv2" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY apigatewayv2)
 endif()
+if("appconfig" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY appconfig)
+endif()
+if("appflow" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY appflow)
+endif()
+if("appintegrations" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY appintegrations)
+endif()
 if("application-autoscaling" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY application-autoscaling)
 endif()
+if("application-insights" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY application-insights)
+endif()
 if("appmesh" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY appmesh)
 endif()
@@ -38,6 +59,9 @@ endif()
 if("athena" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY athena)
 endif()
+if("auditmanager" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY auditmanager)
+endif()
 if("autoscaling" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY autoscaling)
 endif()
@@ -56,6 +80,9 @@ endif()
 if("batch" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY batch)
 endif()
+if("braket" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY braket)
+endif()
 if("budgets" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY budgets)
 endif()
@@ -92,6 +119,9 @@ endif()
 if("cloudtrail" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY cloudtrail)
 endif()
+if("codeartifact" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY codeartifact)
+endif()
 if("codebuild" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY codebuild)
 endif()
@@ -101,12 +131,24 @@ endif()
 if("codedeploy" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY codedeploy)
 endif()
+if("codeguru-reviewer" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY codeguru-reviewer)
+endif()
+if("codeguruprofiler" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY codeguruprofiler)
+endif()
 if("codepipeline" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY codepipeline)
 endif()
 if("codestar" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY codestar)
 endif()
+if("codestar-connections" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY codestar-connections)
+endif()
+if("codestar-notifications" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY codestar-notifications)
+endif()
 if("cognito-identity" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY cognito-identity)
 endif()
@@ -122,15 +164,33 @@ endif()
 if("comprehendmedical" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY comprehendmedical)
 endif()
+if("compute-optimizer" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY compute-optimizer)
+endif()
 if("config" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY config)
 endif()
 if("connect" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY connect)
 endif()
+if("connect-contact-lens" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY connect-contact-lens)
+endif()
+if("connectparticipant" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY connectparticipant)
+endif()
 if("cur" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY cur)
 endif()
+if("customer-profiles" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY customer-profiles)
+endif()
+if("databrew" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY databrew)
+endif()
+if("dataexchange" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY dataexchange)
+endif()
 if("datapipeline" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY datapipeline)
 endif()
@@ -140,9 +200,15 @@ endif()
 if("dax" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY dax)
 endif()
+if("detective" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY detective)
+endif()
 if("devicefarm" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY devicefarm)
 endif()
+if("devops-guru" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY devops-guru)
+endif()
 if("directconnect" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY directconnect)
 endif()
@@ -167,18 +233,30 @@ endif()
 if("dynamodbstreams" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY dynamodbstreams)
 endif()
+if("ebs" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY ebs)
+endif()
 if("ec2" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY ec2)
 endif()
+if("ec2-instance-connect" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY ec2-instance-connect)
+endif()
 if("ecr" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY ecr)
 endif()
+if("ecr-public" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY ecr-public)
+endif()
 if("ecs" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY ecs)
 endif()
 if("eks" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY eks)
 endif()
+if("elastic-inference" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY elastic-inference)
+endif()
 if("elasticache" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY elasticache)
 endif()
@@ -203,9 +281,15 @@ endif()
 if("email" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY email)
 endif()
+if("emr-containers" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY emr-containers)
+endif()
 if("es" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY es)
 endif()
+if("eventbridge" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY eventbridge)
+endif()
 if("events" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY events)
 endif()
@@ -215,6 +299,15 @@ endif()
 if("fms" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY fms)
 endif()
+if("forecast" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY forecast)
+endif()
+if("forecastquery" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY forecastquery)
+endif()
+if("frauddetector" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY frauddetector)
+endif()
 if("fsx" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY fsx)
 endif()
@@ -233,18 +326,36 @@ endif()
 if("greengrass" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY greengrass)
 endif()
+if("greengrassv2" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY greengrassv2)
+endif()
+if("groundstation" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY groundstation)
+endif()
 if("guardduty" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY guardduty)
 endif()
 if("health" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY health)
 endif()
+if("healthlake" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY healthlake)
+endif()
+if("honeycode" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY honeycode)
+endif()
 if("iam" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY iam)
 endif()
 if("identity-management" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY identity-management)
 endif()
+if("identitystore" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY identitystore)
+endif()
+if("imagebuilder" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY imagebuilder)
+endif()
 if("importexport" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY importexport)
 endif()
@@ -269,9 +380,39 @@ endif()
 if("iotanalytics" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY iotanalytics)
 endif()
+if("iotdeviceadvisor" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY iotdeviceadvisor)
+endif()
+if("iotevents" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY iotevents)
+endif()
+if("iotevents-data" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY iotevents-data)
+endif()
+if("iotfleethub" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY iotfleethub)
+endif()
+if("iotsecuretunneling" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY iotsecuretunneling)
+endif()
+if("iotsitewise" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY iotsitewise)
+endif()
+if("iotthingsgraph" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY iotthingsgraph)
+endif()
+if("iotwireless" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY iotwireless)
+endif()
+if("ivs" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY ivs)
+endif()
 if("kafka" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY kafka)
 endif()
+if("kendra" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY kendra)
+endif()
 if("kinesis" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY kinesis)
 endif()
@@ -281,6 +422,9 @@ endif()
 if("kinesis-video-media" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY kinesis-video-media)
 endif()
+if("kinesis-video-signaling" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY kinesis-video-signaling)
+endif()
 if("kinesisanalytics" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY kinesisanalytics)
 endif()
@@ -293,6 +437,9 @@ endif()
 if("kms" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY kms)
 endif()
+if("lakeformation" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY lakeformation)
+endif()
 if("lambda" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY lambda)
 endif()
@@ -308,15 +455,30 @@ endif()
 if("lightsail" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY lightsail)
 endif()
+if("location" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY location)
+endif()
 if("logs" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY logs)
 endif()
+if("lookoutvision" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY lookoutvision)
+endif()
 if("machinelearning" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY machinelearning)
 endif()
 if("macie" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY macie)
 endif()
+if("macie2" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY macie2)
+endif()
+if("managedblockchain" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY managedblockchain)
+endif()
+if("marketplace-catalog" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY marketplace-catalog)
+endif()
 if("marketplace-entitlement" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY marketplace-entitlement)
 endif()
@@ -335,6 +497,9 @@ endif()
 if("mediapackage" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY mediapackage)
 endif()
+if("mediapackage-vod" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY mediapackage-vod)
+endif()
 if("mediastore" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY mediastore)
 endif()
@@ -347,6 +512,9 @@ endif()
 if("meteringmarketplace" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY meteringmarketplace)
 endif()
+if("migrationhub-config" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY migrationhub-config)
+endif()
 if("mobile" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY mobile)
 endif()
@@ -362,9 +530,18 @@ endif()
 if("mturk-requester" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY mturk-requester)
 endif()
+if("mwaa" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY mwaa)
+endif()
 if("neptune" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY neptune)
 endif()
+if("network-firewall" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY network-firewall)
+endif()
+if("networkmanager" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY networkmanager)
+endif()
 if("opsworks" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY opsworks)
 endif()
@@ -374,6 +551,18 @@ endif()
 if("organizations" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY organizations)
 endif()
+if("outposts" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY outposts)
+endif()
+if("personalize" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY personalize)
+endif()
+if("personalize-events" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY personalize-events)
+endif()
+if("personalize-runtime" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY personalize-runtime)
+endif()
 if("pi" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY pi)
 endif()
@@ -389,6 +578,12 @@ endif()
 if("pricing" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY pricing)
 endif()
+if("qldb" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY qldb)
+endif()
+if("qldb-session" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY qldb-session)
+endif()
 if("queues" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY queues)
 endif()
@@ -407,6 +602,9 @@ endif()
 if("redshift" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY redshift)
 endif()
+if("redshift-data" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY redshift-data)
+endif()
 if("rekognition" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY rekognition)
 endif()
@@ -437,12 +635,30 @@ endif()
 if("s3control" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY s3control)
 endif()
+if("s3outposts" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY s3outposts)
+endif()
 if("sagemaker" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY sagemaker)
 endif()
+if("sagemaker-a2i-runtime" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY sagemaker-a2i-runtime)
+endif()
+if("sagemaker-edge" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY sagemaker-edge)
+endif()
+if("sagemaker-featurestore-runtime" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY sagemaker-featurestore-runtime)
+endif()
 if("sagemaker-runtime" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY sagemaker-runtime)
 endif()
+if("savingsplans" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY savingsplans)
+endif()
+if("schemas" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY schemas)
+endif()
 if("sdb" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY sdb)
 endif()
@@ -455,12 +671,21 @@ endif()
 if("serverlessrepo" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY serverlessrepo)
 endif()
+if("service-quotas" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY service-quotas)
+endif()
 if("servicecatalog" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY servicecatalog)
 endif()
+if("servicecatalog-appregistry" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY servicecatalog-appregistry)
+endif()
 if("servicediscovery" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY servicediscovery)
 endif()
+if("sesv2" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY sesv2)
+endif()
 if("shield" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY shield)
 endif()
@@ -485,6 +710,15 @@ endif()
 if("ssm" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY ssm)
 endif()
+if("sso" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY sso)
+endif()
+if("sso-admin" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY sso-admin)
+endif()
+if("sso-oidc" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY sso-oidc)
+endif()
 if("states" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY states)
 endif()
@@ -500,12 +734,27 @@ endif()
 if("swf" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY swf)
 endif()
+if("synthetics" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY synthetics)
+endif()
 if("text-to-speech" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY text-to-speech)
 endif()
+if("textract" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY textract)
+endif()
+if("timestream-query" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY timestream-query)
+endif()
+if("timestream-write" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY timestream-write)
+endif()
 if("transcribe" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY transcribe)
 endif()
+if("transcribestreaming" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY transcribestreaming)
+endif()
 if("transfer" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY transfer)
 endif()
@@ -518,12 +767,24 @@ endif()
 if("waf-regional" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY waf-regional)
 endif()
+if("wafv2" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY wafv2)
+endif()
+if("wellarchitected" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY wellarchitected)
+endif()
 if("workdocs" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY workdocs)
 endif()
+if("worklink" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY worklink)
+endif()
 if("workmail" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY workmail)
 endif()
+if("workmailmessageflow" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY workmailmessageflow)
+endif()
 if("workspaces" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY workspaces)
 endif()
diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1
index 8c8b1a342..7933e327e 100644
--- a/ports/aws-sdk-cpp/generateFeatures.ps1
+++ b/ports/aws-sdk-cpp/generateFeatures.ps1
@@ -1,15 +1,18 @@
 [CmdletBinding()]

 param(

     [Parameter(Mandatory=$true)][string]$ExtractedSources,

-    [Parameter(Mandatory=$true)][string]$ControlFileIn,

-    [Parameter(Mandatory=$true)][string]$ControlFile,

-    [Parameter(Mandatory=$true)][string]$CMakeFragmentFile

+    [Parameter(Mandatory=$true)][string]$ManifestIn,

+    [Parameter(Mandatory=$true)][string]$ManifestOut,

+    [Parameter(Mandatory=$true)][string]$CMakeFragmentFile,

+    [Parameter(Mandatory=$false)][string]$vcpkg = "vcpkg"

 )

 

+$ErrorActionPreference = "Stop"

+

 $subfolders = Get-Item $ExtractedSources\aws-cpp-sdk-*

 

-$controltext = gc $ControlFileIn

-$controltext += @("# Automatically generated by generateFeatures.ps1")

+$manifest = Get-Content $ManifestIn | ConvertFrom-Json

+$manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{}

 

 $cmakefragmenttext = @("# Automatically generated by generateFeatures.ps1")

 

@@ -20,32 +23,34 @@ function GetDescription($dir, $modulename)
         $descs = @(Select-String -Path "$dir\CMakeLists.txt" -Pattern "`"C\+\+ SDK for the AWS [^`"]*`"")

         if ($descs.count -eq 1) {

             $desc = $descs[0].Matches.Value -replace "`"",""

-            "Description: $desc"

+            "$desc"

         }

-        else { "Description: C++ SDK for the AWS $modulename service" }

+        else { "C++ SDK for the AWS $modulename service" }

     }

-    else { "Description: C++ SDK for the AWS $modulename service" }

+    else { "C++ SDK for the AWS $modulename service" }

 }

 

-$subfolders | % {

-    $modulename = $_.name -replace "^aws-cpp-sdk-",""

-    if ($modulename -match "-tests`$") { return }

-    if ($modulename -match "-sample`$") { return }

-    if ($modulename -eq "core") { return }

+foreach ($subfolder in $subfolders)

+{

+    $modulename = $subfolder.name -replace "^aws-cpp-sdk-",""

+    if ($modulename -match "-tests`$") { continue }

+    if ($modulename -match "-sample`$") { continue }

+    if ($modulename -eq "core") { continue }

+

+    $lowermodulename = $modulename.ToLower()

 

-    $controltext += @("")

-    $controltext += @("Feature: $modulename")

-    $controltext += @(GetDescription $_ $modulename)

+    $manifest.features.Add("$lowermodulename", @{ description=(GetDescription $subfolder $modulename) })

 

     $cmakefragmenttext += @(

-        "if(`"$modulename`" IN_LIST FEATURES)",

+        "if(`"$lowermodulename`" IN_LIST FEATURES)",

         "  list(APPEND BUILD_ONLY $modulename)",

         "endif()"

     )

 }

 

-Write-Verbose ($controltext -join "`n")

-[IO.File]::WriteAllText($ControlFile, ($controltext -join "`n")+"`n")

+[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 5 -InputObject $manifest))

 

 Write-Verbose ($cmakefragmenttext -join "`n")

 [IO.File]::WriteAllText($CMakeFragmentFile, ($cmakefragmenttext -join "`n") +"`n")

+

+vcpkg format-manifest --feature-flags=-manifests $ManifestOut

diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json
new file mode 100644
index 000000000..d0edaef42
--- /dev/null
+++ b/ports/aws-sdk-cpp/vcpkg.in.json
@@ -0,0 +1,24 @@
+{
+  "name": "aws-sdk-cpp",
+  "version": "1.8.126",
+  "port-version": 7,
+  "description": "AWS SDK for C++",
+  "homepage": "https://github.com/aws/aws-sdk-cpp",
+  "dependencies": [
+    "aws-c-event-stream",
+    {
+      "name": "curl",
+      "platform": "!uwp & !windows"
+    },
+    {
+      "name": "openssl",
+      "platform": "!uwp & !windows"
+    },
+    "zlib"
+  ],
+  "default-features": [
+    "dynamodb",
+    "kinesis",
+    "s3"
+  ]
+}
diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
index f1f9763cf..5aac8ad57 100644
--- a/ports/aws-sdk-cpp/vcpkg.json
+++ b/ports/aws-sdk-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "aws-sdk-cpp",
   "version": "1.8.126",
-  "port-version": 6,
+  "port-version": 7,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "dependencies": [
@@ -25,6 +25,9 @@
     "access-management": {
       "description": "C++ SDK for the AWS access-management service"
     },
+    "accessanalyzer": {
+      "description": "C++ SDK for the AWS accessanalyzer service"
+    },
     "acm": {
       "description": "C++ SDK for the AWS acm service"
     },
@@ -34,9 +37,15 @@
     "alexaforbusiness": {
       "description": "C++ SDK for the AWS alexaforbusiness service"
     },
+    "amp": {
+      "description": "C++ SDK for the AWS amp service"
+    },
     "amplify": {
       "description": "C++ SDK for the AWS amplify service"
     },
+    "amplifybackend": {
+      "description": "C++ SDK for the AWS amplifybackend service"
+    },
     "apigateway": {
       "description": "C++ SDK for the AWS apigateway service"
     },
@@ -46,9 +55,21 @@
     "apigatewayv2": {
       "description": "C++ SDK for the AWS apigatewayv2 service"
     },
+    "appconfig": {
+      "description": "C++ SDK for the AWS appconfig service"
+    },
+    "appflow": {
+      "description": "C++ SDK for the AWS appflow service"
+    },
+    "appintegrations": {
+      "description": "C++ SDK for the AWS appintegrations service"
+    },
     "application-autoscaling": {
       "description": "C++ SDK for the AWS application-autoscaling service"
     },
+    "application-insights": {
+      "description": "C++ SDK for the AWS application-insights service"
+    },
     "appmesh": {
       "description": "C++ SDK for the AWS appmesh service"
     },
@@ -61,6 +82,9 @@
     "athena": {
       "description": "C++ SDK for the AWS athena service"
     },
+    "auditmanager": {
+      "description": "C++ SDK for the AWS auditmanager service"
+    },
     "autoscaling": {
       "description": "C++ SDK for the AWS autoscaling service"
     },
@@ -79,6 +103,9 @@
     "batch": {
       "description": "C++ SDK for the AWS batch service"
     },
+    "braket": {
+      "description": "C++ SDK for the AWS braket service"
+    },
     "budgets": {
       "description": "C++ SDK for the AWS budgets service"
     },
@@ -115,6 +142,9 @@
     "cloudtrail": {
       "description": "C++ SDK for the AWS cloudtrail service"
     },
+    "codeartifact": {
+      "description": "C++ SDK for the AWS codeartifact service"
+    },
     "codebuild": {
       "description": "C++ SDK for the AWS codebuild service"
     },
@@ -124,12 +154,24 @@
     "codedeploy": {
       "description": "C++ SDK for the AWS codedeploy service"
     },
+    "codeguru-reviewer": {
+      "description": "C++ SDK for the AWS codeguru-reviewer service"
+    },
+    "codeguruprofiler": {
+      "description": "C++ SDK for the AWS codeguruprofiler service"
+    },
     "codepipeline": {
       "description": "C++ SDK for the AWS codepipeline service"
     },
     "codestar": {
       "description": "C++ SDK for the AWS codestar service"
     },
+    "codestar-connections": {
+      "description": "C++ SDK for the AWS codestar-connections service"
+    },
+    "codestar-notifications": {
+      "description": "C++ SDK for the AWS codestar-notifications service"
+    },
     "cognito-identity": {
       "description": "C++ SDK for the AWS cognito-identity service"
     },
@@ -145,15 +187,33 @@
     "comprehendmedical": {
       "description": "C++ SDK for the AWS comprehendmedical service"
     },
+    "compute-optimizer": {
+      "description": "C++ SDK for the AWS compute-optimizer service"
+    },
     "config": {
       "description": "C++ SDK for the AWS config service"
     },
     "connect": {
       "description": "C++ SDK for the AWS connect service"
     },
+    "connect-contact-lens": {
+      "description": "C++ SDK for the AWS connect-contact-lens service"
+    },
+    "connectparticipant": {
+      "description": "C++ SDK for the AWS connectparticipant service"
+    },
     "cur": {
       "description": "C++ SDK for the AWS cur service"
     },
+    "customer-profiles": {
+      "description": "C++ SDK for the AWS customer-profiles service"
+    },
+    "databrew": {
+      "description": "C++ SDK for the AWS databrew service"
+    },
+    "dataexchange": {
+      "description": "C++ SDK for the AWS dataexchange service"
+    },
     "datapipeline": {
       "description": "C++ SDK for the AWS datapipeline service"
     },
@@ -163,9 +223,15 @@
     "dax": {
       "description": "C++ SDK for the AWS dax service"
     },
+    "detective": {
+      "description": "C++ SDK for the AWS detective service"
+    },
     "devicefarm": {
       "description": "C++ SDK for the AWS devicefarm service"
     },
+    "devops-guru": {
+      "description": "C++ SDK for the AWS devops-guru service"
+    },
     "directconnect": {
       "description": "C++ SDK for the AWS directconnect service"
     },
@@ -190,18 +256,30 @@
     "dynamodbstreams": {
       "description": "C++ SDK for the AWS dynamodbstreams service"
     },
+    "ebs": {
+      "description": "C++ SDK for the AWS ebs service"
+    },
     "ec2": {
       "description": "C++ SDK for the AWS ec2 service"
     },
+    "ec2-instance-connect": {
+      "description": "C++ SDK for the AWS ec2-instance-connect service"
+    },
     "ecr": {
       "description": "C++ SDK for the AWS ecr service"
     },
+    "ecr-public": {
+      "description": "C++ SDK for the AWS ecr-public service"
+    },
     "ecs": {
       "description": "C++ SDK for the AWS ecs service"
     },
     "eks": {
       "description": "C++ SDK for the AWS eks service"
     },
+    "elastic-inference": {
+      "description": "C++ SDK for the AWS elastic-inference service"
+    },
     "elasticache": {
       "description": "C++ SDK for the AWS elasticache service"
     },
@@ -226,9 +304,15 @@
     "email": {
       "description": "C++ SDK for the AWS email service"
     },
+    "emr-containers": {
+      "description": "C++ SDK for the AWS emr-containers service"
+    },
     "es": {
       "description": "C++ SDK for the AWS es service"
     },
+    "eventbridge": {
+      "description": "C++ SDK for the AWS eventbridge service"
+    },
     "events": {
       "description": "C++ SDK for the AWS events service"
     },
@@ -238,6 +322,15 @@
     "fms": {
       "description": "C++ SDK for the AWS fms service"
     },
+    "forecast": {
+      "description": "C++ SDK for the AWS forecast service"
+    },
+    "forecastquery": {
+      "description": "C++ SDK for the AWS forecastquery service"
+    },
+    "frauddetector": {
+      "description": "C++ SDK for the AWS frauddetector service"
+    },
     "fsx": {
       "description": "C++ SDK for the AWS fsx service"
     },
@@ -256,18 +349,36 @@
     "greengrass": {
       "description": "C++ SDK for the AWS greengrass service"
     },
+    "greengrassv2": {
+      "description": "C++ SDK for the AWS greengrassv2 service"
+    },
+    "groundstation": {
+      "description": "C++ SDK for the AWS groundstation service"
+    },
     "guardduty": {
       "description": "C++ SDK for the AWS guardduty service"
     },
     "health": {
       "description": "C++ SDK for the AWS health service"
     },
+    "healthlake": {
+      "description": "C++ SDK for the AWS healthlake service"
+    },
+    "honeycode": {
+      "description": "C++ SDK for the AWS honeycode service"
+    },
     "iam": {
       "description": "C++ SDK for the AWS iam service"
     },
     "identity-management": {
       "description": "C++ SDK for the AWS identity-management service"
     },
+    "identitystore": {
+      "description": "C++ SDK for the AWS identitystore service"
+    },
+    "imagebuilder": {
+      "description": "C++ SDK for the AWS imagebuilder service"
+    },
     "importexport": {
       "description": "C++ SDK for the AWS importexport service"
     },
@@ -292,9 +403,39 @@
     "iotanalytics": {
       "description": "C++ SDK for the AWS iotanalytics service"
     },
+    "iotdeviceadvisor": {
+      "description": "C++ SDK for the AWS iotdeviceadvisor service"
+    },
+    "iotevents": {
+      "description": "C++ SDK for the AWS iotevents service"
+    },
+    "iotevents-data": {
+      "description": "C++ SDK for the AWS iotevents-data service"
+    },
+    "iotfleethub": {
+      "description": "C++ SDK for the AWS iotfleethub service"
+    },
+    "iotsecuretunneling": {
+      "description": "C++ SDK for the AWS iotsecuretunneling service"
+    },
+    "iotsitewise": {
+      "description": "C++ SDK for the AWS iotsitewise service"
+    },
+    "iotthingsgraph": {
+      "description": "C++ SDK for the AWS iotthingsgraph service"
+    },
+    "iotwireless": {
+      "description": "C++ SDK for the AWS iotwireless service"
+    },
+    "ivs": {
+      "description": "C++ SDK for the AWS ivs service"
+    },
     "kafka": {
       "description": "C++ SDK for the AWS kafka service"
     },
+    "kendra": {
+      "description": "C++ SDK for the AWS kendra service"
+    },
     "kinesis": {
       "description": "C++ SDK for the AWS kinesis service"
     },
@@ -304,6 +445,9 @@
     "kinesis-video-media": {
       "description": "C++ SDK for the AWS kinesis-video-media service"
     },
+    "kinesis-video-signaling": {
+      "description": "C++ SDK for the AWS kinesis-video-signaling service"
+    },
     "kinesisanalytics": {
       "description": "C++ SDK for the AWS kinesisanalytics service"
     },
@@ -316,6 +460,9 @@
     "kms": {
       "description": "C++ SDK for the AWS kms service"
     },
+    "lakeformation": {
+      "description": "C++ SDK for the AWS lakeformation service"
+    },
     "lambda": {
       "description": "C++ SDK for the AWS lambda service"
     },
@@ -331,15 +478,30 @@
     "lightsail": {
       "description": "C++ SDK for the AWS lightsail service"
     },
+    "location": {
+      "description": "C++ SDK for the AWS location service"
+    },
     "logs": {
       "description": "C++ SDK for the AWS logs service"
     },
+    "lookoutvision": {
+      "description": "C++ SDK for the AWS lookoutvision service"
+    },
     "machinelearning": {
       "description": "C++ SDK for the AWS machinelearning service"
     },
     "macie": {
       "description": "C++ SDK for the AWS macie service"
     },
+    "macie2": {
+      "description": "C++ SDK for the AWS macie2 service"
+    },
+    "managedblockchain": {
+      "description": "C++ SDK for the AWS managedblockchain service"
+    },
+    "marketplace-catalog": {
+      "description": "C++ SDK for the AWS marketplace-catalog service"
+    },
     "marketplace-entitlement": {
       "description": "C++ SDK for the AWS marketplace-entitlement service"
     },
@@ -358,6 +520,9 @@
     "mediapackage": {
       "description": "C++ SDK for the AWS mediapackage service"
     },
+    "mediapackage-vod": {
+      "description": "C++ SDK for the AWS mediapackage-vod service"
+    },
     "mediastore": {
       "description": "C++ SDK for the AWS mediastore service"
     },
@@ -370,6 +535,9 @@
     "meteringmarketplace": {
       "description": "C++ SDK for the AWS meteringmarketplace service"
     },
+    "migrationhub-config": {
+      "description": "C++ SDK for the AWS migrationhub-config service"
+    },
     "mobile": {
       "description": "C++ SDK for the AWS mobile service"
     },
@@ -385,9 +553,18 @@
     "mturk-requester": {
       "description": "C++ SDK for the AWS mturk-requester service"
     },
+    "mwaa": {
+      "description": "C++ SDK for the AWS mwaa service"
+    },
     "neptune": {
       "description": "C++ SDK for the AWS neptune service"
     },
+    "network-firewall": {
+      "description": "C++ SDK for the AWS network-firewall service"
+    },
+    "networkmanager": {
+      "description": "C++ SDK for the AWS networkmanager service"
+    },
     "opsworks": {
       "description": "C++ SDK for the AWS opsworks service"
     },
@@ -397,6 +574,18 @@
     "organizations": {
       "description": "C++ SDK for the AWS organizations service"
     },
+    "outposts": {
+      "description": "C++ SDK for the AWS outposts service"
+    },
+    "personalize": {
+      "description": "C++ SDK for the AWS personalize service"
+    },
+    "personalize-events": {
+      "description": "C++ SDK for the AWS personalize-events service"
+    },
+    "personalize-runtime": {
+      "description": "C++ SDK for the AWS personalize-runtime service"
+    },
     "pi": {
       "description": "C++ SDK for the AWS pi service"
     },
@@ -412,6 +601,12 @@
     "pricing": {
       "description": "C++ SDK for the AWS pricing service"
     },
+    "qldb": {
+      "description": "C++ SDK for the AWS qldb service"
+    },
+    "qldb-session": {
+      "description": "C++ SDK for the AWS qldb-session service"
+    },
     "queues": {
       "description": "C++ SDK for the AWS queues service"
     },
@@ -430,6 +625,9 @@
     "redshift": {
       "description": "C++ SDK for the AWS redshift service"
     },
+    "redshift-data": {
+      "description": "C++ SDK for the AWS redshift-data service"
+    },
     "rekognition": {
       "description": "C++ SDK for the AWS rekognition service"
     },
@@ -460,12 +658,30 @@
     "s3control": {
       "description": "C++ SDK for the AWS s3control service"
     },
+    "s3outposts": {
+      "description": "C++ SDK for the AWS s3outposts service"
+    },
     "sagemaker": {
       "description": "C++ SDK for the AWS sagemaker service"
     },
+    "sagemaker-a2i-runtime": {
+      "description": "C++ SDK for the AWS sagemaker-a2i-runtime service"
+    },
+    "sagemaker-edge": {
+      "description": "C++ SDK for the AWS sagemaker-edge service"
+    },
+    "sagemaker-featurestore-runtime": {
+      "description": "C++ SDK for the AWS sagemaker-featurestore-runtime service"
+    },
     "sagemaker-runtime": {
       "description": "C++ SDK for the AWS sagemaker-runtime service"
     },
+    "savingsplans": {
+      "description": "C++ SDK for the AWS savingsplans service"
+    },
+    "schemas": {
+      "description": "C++ SDK for the AWS schemas service"
+    },
     "sdb": {
       "description": "C++ SDK for the AWS sdb service"
     },
@@ -478,12 +694,21 @@
     "serverlessrepo": {
       "description": "C++ SDK for the AWS serverlessrepo service"
     },
+    "service-quotas": {
+      "description": "C++ SDK for the AWS service-quotas service"
+    },
     "servicecatalog": {
       "description": "C++ SDK for the AWS servicecatalog service"
     },
+    "servicecatalog-appregistry": {
+      "description": "C++ SDK for the AWS servicecatalog-appregistry service"
+    },
     "servicediscovery": {
       "description": "C++ SDK for the AWS servicediscovery service"
     },
+    "sesv2": {
+      "description": "C++ SDK for the AWS sesv2 service"
+    },
     "shield": {
       "description": "C++ SDK for the AWS shield service"
     },
@@ -508,6 +733,15 @@
     "ssm": {
       "description": "C++ SDK for the AWS ssm service"
     },
+    "sso": {
+      "description": "C++ SDK for the AWS sso service"
+    },
+    "sso-admin": {
+      "description": "C++ SDK for the AWS sso-admin service"
+    },
+    "sso-oidc": {
+      "description": "C++ SDK for the AWS sso-oidc service"
+    },
     "states": {
       "description": "C++ SDK for the AWS states service"
     },
@@ -523,12 +757,27 @@
     "swf": {
       "description": "C++ SDK for the AWS swf service"
     },
+    "synthetics": {
+      "description": "C++ SDK for the AWS synthetics service"
+    },
     "text-to-speech": {
       "description": "C++ SDK for the AWS text-to-speech service"
     },
+    "textract": {
+      "description": "C++ SDK for the AWS textract service"
+    },
+    "timestream-query": {
+      "description": "C++ SDK for the AWS timestream-query service"
+    },
+    "timestream-write": {
+      "description": "C++ SDK for the AWS timestream-write service"
+    },
     "transcribe": {
       "description": "C++ SDK for the AWS transcribe service"
     },
+    "transcribestreaming": {
+      "description": "C++ SDK for the AWS transcribestreaming service"
+    },
     "transfer": {
       "description": "C++ SDK for the AWS transfer service"
     },
@@ -541,12 +790,24 @@
     "waf-regional": {
       "description": "C++ SDK for the AWS waf-regional service"
     },
+    "wafv2": {
+      "description": "C++ SDK for the AWS wafv2 service"
+    },
+    "wellarchitected": {
+      "description": "C++ SDK for the AWS wellarchitected service"
+    },
     "workdocs": {
       "description": "C++ SDK for the AWS workdocs service"
     },
+    "worklink": {
+      "description": "C++ SDK for the AWS worklink service"
+    },
     "workmail": {
       "description": "C++ SDK for the AWS workmail service"
     },
+    "workmailmessageflow": {
+      "description": "C++ SDK for the AWS workmailmessageflow service"
+    },
     "workspaces": {
       "description": "C++ SDK for the AWS workspaces service"
     },