From b6aef4be7302c4b56385d3e7a1b2e7a69330e2f4 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Thu, 14 Sep 2023 02:20:15 +0300 Subject: [PATCH] [aws-sdk-cpp] Fix and improve the manifest generation script. (#33704) --- ports/aws-sdk-cpp/compute_build_only.cmake | 258 ++++++++++++++++ ports/aws-sdk-cpp/generateFeatures.ps1 | 17 +- ports/aws-sdk-cpp/vcpkg.in.json | 38 +++ ports/aws-sdk-cpp/vcpkg.json | 328 ++++++++++++++++++++- versions/a-/aws-sdk-cpp.json | 5 + versions/baseline.json | 2 +- 6 files changed, 638 insertions(+), 10 deletions(-) create mode 100644 ports/aws-sdk-cpp/vcpkg.in.json diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake index 645075a34e..27b93c24bc 100644 --- a/ports/aws-sdk-cpp/compute_build_only.cmake +++ b/ports/aws-sdk-cpp/compute_build_only.cmake @@ -5,6 +5,9 @@ endif() if("accessanalyzer" IN_LIST FEATURES) list(APPEND BUILD_ONLY accessanalyzer) endif() +if("account" IN_LIST FEATURES) + list(APPEND BUILD_ONLY account) +endif() if("acm" IN_LIST FEATURES) list(APPEND BUILD_ONLY acm) endif() @@ -23,6 +26,9 @@ endif() if("amplifybackend" IN_LIST FEATURES) list(APPEND BUILD_ONLY amplifybackend) endif() +if("amplifyuibuilder" IN_LIST FEATURES) + list(APPEND BUILD_ONLY amplifyuibuilder) +endif() if("apigateway" IN_LIST FEATURES) list(APPEND BUILD_ONLY apigateway) endif() @@ -35,6 +41,12 @@ endif() if("appconfig" IN_LIST FEATURES) list(APPEND BUILD_ONLY appconfig) endif() +if("appconfigdata" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appconfigdata) +endif() +if("appfabric" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appfabric) +endif() if("appflow" IN_LIST FEATURES) list(APPEND BUILD_ONLY appflow) endif() @@ -62,6 +74,9 @@ endif() if("appsync" IN_LIST FEATURES) list(APPEND BUILD_ONLY appsync) endif() +if("arc-zonal-shift" IN_LIST FEATURES) + list(APPEND BUILD_ONLY arc-zonal-shift) +endif() if("athena" IN_LIST FEATURES) list(APPEND BUILD_ONLY athena) endif() @@ -83,9 +98,18 @@ endif() if("backup" IN_LIST FEATURES) list(APPEND BUILD_ONLY backup) endif() +if("backup-gateway" IN_LIST FEATURES) + list(APPEND BUILD_ONLY backup-gateway) +endif() +if("backupstorage" IN_LIST FEATURES) + list(APPEND BUILD_ONLY backupstorage) +endif() if("batch" IN_LIST FEATURES) list(APPEND BUILD_ONLY batch) endif() +if("billingconductor" IN_LIST FEATURES) + list(APPEND BUILD_ONLY billingconductor) +endif() if("braket" IN_LIST FEATURES) list(APPEND BUILD_ONLY braket) endif() @@ -98,9 +122,30 @@ endif() if("chime" IN_LIST FEATURES) list(APPEND BUILD_ONLY chime) endif() +if("chime-sdk-identity" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime-sdk-identity) +endif() +if("chime-sdk-media-pipelines" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime-sdk-media-pipelines) +endif() +if("chime-sdk-meetings" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime-sdk-meetings) +endif() +if("chime-sdk-messaging" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime-sdk-messaging) +endif() +if("chime-sdk-voice" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime-sdk-voice) +endif() +if("cleanrooms" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cleanrooms) +endif() if("cloud9" IN_LIST FEATURES) list(APPEND BUILD_ONLY cloud9) endif() +if("cloudcontrol" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudcontrol) +endif() if("clouddirectory" IN_LIST FEATURES) list(APPEND BUILD_ONLY clouddirectory) endif() @@ -125,12 +170,18 @@ endif() if("cloudtrail" IN_LIST FEATURES) list(APPEND BUILD_ONLY cloudtrail) endif() +if("cloudtrail-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudtrail-data) +endif() if("codeartifact" IN_LIST FEATURES) list(APPEND BUILD_ONLY codeartifact) endif() if("codebuild" IN_LIST FEATURES) list(APPEND BUILD_ONLY codebuild) endif() +if("codecatalyst" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codecatalyst) +endif() if("codecommit" IN_LIST FEATURES) list(APPEND BUILD_ONLY codecommit) endif() @@ -140,6 +191,9 @@ endif() if("codeguru-reviewer" IN_LIST FEATURES) list(APPEND BUILD_ONLY codeguru-reviewer) endif() +if("codeguru-security" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codeguru-security) +endif() if("codeguruprofiler" IN_LIST FEATURES) list(APPEND BUILD_ONLY codeguruprofiler) endif() @@ -182,9 +236,18 @@ endif() if("connect-contact-lens" IN_LIST FEATURES) list(APPEND BUILD_ONLY connect-contact-lens) endif() +if("connectcampaigns" IN_LIST FEATURES) + list(APPEND BUILD_ONLY connectcampaigns) +endif() +if("connectcases" IN_LIST FEATURES) + list(APPEND BUILD_ONLY connectcases) +endif() if("connectparticipant" IN_LIST FEATURES) list(APPEND BUILD_ONLY connectparticipant) endif() +if("controltower" IN_LIST FEATURES) + list(APPEND BUILD_ONLY controltower) +endif() if("cur" IN_LIST FEATURES) list(APPEND BUILD_ONLY cur) endif() @@ -230,6 +293,12 @@ endif() if("docdb" IN_LIST FEATURES) list(APPEND BUILD_ONLY docdb) endif() +if("docdb-elastic" IN_LIST FEATURES) + list(APPEND BUILD_ONLY docdb-elastic) +endif() +if("drs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY drs) +endif() if("ds" IN_LIST FEATURES) list(APPEND BUILD_ONLY ds) endif() @@ -290,6 +359,12 @@ endif() if("emr-containers" IN_LIST FEATURES) list(APPEND BUILD_ONLY emr-containers) endif() +if("emr-serverless" IN_LIST FEATURES) + list(APPEND BUILD_ONLY emr-serverless) +endif() +if("entityresolution" IN_LIST FEATURES) + list(APPEND BUILD_ONLY entityresolution) +endif() if("es" IN_LIST FEATURES) list(APPEND BUILD_ONLY es) endif() @@ -299,6 +374,9 @@ endif() if("events" IN_LIST FEATURES) list(APPEND BUILD_ONLY events) endif() +if("evidently" IN_LIST FEATURES) + list(APPEND BUILD_ONLY evidently) +endif() if("finspace" IN_LIST FEATURES) list(APPEND BUILD_ONLY finspace) endif() @@ -329,6 +407,9 @@ endif() if("gamelift" IN_LIST FEATURES) list(APPEND BUILD_ONLY gamelift) endif() +if("gamesparks" IN_LIST FEATURES) + list(APPEND BUILD_ONLY gamesparks) +endif() if("glacier" IN_LIST FEATURES) list(APPEND BUILD_ONLY glacier) endif() @@ -338,6 +419,9 @@ endif() if("glue" IN_LIST FEATURES) list(APPEND BUILD_ONLY glue) endif() +if("grafana" IN_LIST FEATURES) + list(APPEND BUILD_ONLY grafana) +endif() if("greengrass" IN_LIST FEATURES) list(APPEND BUILD_ONLY greengrass) endif() @@ -377,6 +461,12 @@ endif() if("inspector" IN_LIST FEATURES) list(APPEND BUILD_ONLY inspector) endif() +if("inspector2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY inspector2) +endif() +if("internetmonitor" IN_LIST FEATURES) + list(APPEND BUILD_ONLY internetmonitor) +endif() if("iot" IN_LIST FEATURES) list(APPEND BUILD_ONLY iot) endif() @@ -386,6 +476,9 @@ endif() if("iot-jobs-data" IN_LIST FEATURES) list(APPEND BUILD_ONLY iot-jobs-data) endif() +if("iot-roborunner" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot-roborunner) +endif() if("iot1click-devices" IN_LIST FEATURES) list(APPEND BUILD_ONLY iot1click-devices) endif() @@ -407,6 +500,9 @@ endif() if("iotfleethub" IN_LIST FEATURES) list(APPEND BUILD_ONLY iotfleethub) endif() +if("iotfleetwise" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotfleetwise) +endif() if("iotsecuretunneling" IN_LIST FEATURES) list(APPEND BUILD_ONLY iotsecuretunneling) endif() @@ -416,18 +512,36 @@ endif() if("iotthingsgraph" IN_LIST FEATURES) list(APPEND BUILD_ONLY iotthingsgraph) endif() +if("iottwinmaker" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iottwinmaker) +endif() if("iotwireless" IN_LIST FEATURES) list(APPEND BUILD_ONLY iotwireless) endif() if("ivs" IN_LIST FEATURES) list(APPEND BUILD_ONLY ivs) endif() +if("ivs-realtime" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ivs-realtime) +endif() +if("ivschat" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ivschat) +endif() if("kafka" IN_LIST FEATURES) list(APPEND BUILD_ONLY kafka) endif() +if("kafkaconnect" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kafkaconnect) +endif() if("kendra" IN_LIST FEATURES) list(APPEND BUILD_ONLY kendra) endif() +if("kendra-ranking" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kendra-ranking) +endif() +if("keyspaces" IN_LIST FEATURES) + list(APPEND BUILD_ONLY keyspaces) +endif() if("kinesis" IN_LIST FEATURES) list(APPEND BUILD_ONLY kinesis) endif() @@ -440,6 +554,9 @@ endif() if("kinesis-video-signaling" IN_LIST FEATURES) list(APPEND BUILD_ONLY kinesis-video-signaling) endif() +if("kinesis-video-webrtc-storage" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesis-video-webrtc-storage) +endif() if("kinesisanalytics" IN_LIST FEATURES) list(APPEND BUILD_ONLY kinesisanalytics) endif() @@ -473,6 +590,12 @@ endif() if("license-manager" IN_LIST FEATURES) list(APPEND BUILD_ONLY license-manager) endif() +if("license-manager-linux-subscriptions" IN_LIST FEATURES) + list(APPEND BUILD_ONLY license-manager-linux-subscriptions) +endif() +if("license-manager-user-subscriptions" IN_LIST FEATURES) + list(APPEND BUILD_ONLY license-manager-user-subscriptions) +endif() if("lightsail" IN_LIST FEATURES) list(APPEND BUILD_ONLY lightsail) endif() @@ -491,6 +614,9 @@ endif() if("lookoutvision" IN_LIST FEATURES) list(APPEND BUILD_ONLY lookoutvision) endif() +if("m2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY m2) +endif() if("machinelearning" IN_LIST FEATURES) list(APPEND BUILD_ONLY machinelearning) endif() @@ -503,6 +629,9 @@ endif() if("managedblockchain" IN_LIST FEATURES) list(APPEND BUILD_ONLY managedblockchain) endif() +if("managedblockchain-query" IN_LIST FEATURES) + list(APPEND BUILD_ONLY managedblockchain-query) +endif() if("marketplace-catalog" IN_LIST FEATURES) list(APPEND BUILD_ONLY marketplace-catalog) endif() @@ -527,6 +656,9 @@ endif() if("mediapackage-vod" IN_LIST FEATURES) list(APPEND BUILD_ONLY mediapackage-vod) endif() +if("mediapackagev2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediapackagev2) +endif() if("mediastore" IN_LIST FEATURES) list(APPEND BUILD_ONLY mediastore) endif() @@ -536,15 +668,30 @@ endif() if("mediatailor" IN_LIST FEATURES) list(APPEND BUILD_ONLY mediatailor) endif() +if("medical-imaging" IN_LIST FEATURES) + list(APPEND BUILD_ONLY medical-imaging) +endif() +if("memorydb" IN_LIST FEATURES) + list(APPEND BUILD_ONLY memorydb) +endif() if("meteringmarketplace" IN_LIST FEATURES) list(APPEND BUILD_ONLY meteringmarketplace) endif() if("mgn" IN_LIST FEATURES) list(APPEND BUILD_ONLY mgn) endif() +if("migration-hub-refactor-spaces" IN_LIST FEATURES) + list(APPEND BUILD_ONLY migration-hub-refactor-spaces) +endif() if("migrationhub-config" IN_LIST FEATURES) list(APPEND BUILD_ONLY migrationhub-config) endif() +if("migrationhuborchestrator" IN_LIST FEATURES) + list(APPEND BUILD_ONLY migrationhuborchestrator) +endif() +if("migrationhubstrategy" IN_LIST FEATURES) + list(APPEND BUILD_ONLY migrationhubstrategy) +endif() if("mobile" IN_LIST FEATURES) list(APPEND BUILD_ONLY mobile) endif() @@ -563,6 +710,9 @@ endif() if("neptune" IN_LIST FEATURES) list(APPEND BUILD_ONLY neptune) endif() +if("neptunedata" IN_LIST FEATURES) + list(APPEND BUILD_ONLY neptunedata) +endif() if("network-firewall" IN_LIST FEATURES) list(APPEND BUILD_ONLY network-firewall) endif() @@ -572,6 +722,18 @@ endif() if("nimble" IN_LIST FEATURES) list(APPEND BUILD_ONLY nimble) endif() +if("oam" IN_LIST FEATURES) + list(APPEND BUILD_ONLY oam) +endif() +if("omics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY omics) +endif() +if("opensearch" IN_LIST FEATURES) + list(APPEND BUILD_ONLY opensearch) +endif() +if("opensearchserverless" IN_LIST FEATURES) + list(APPEND BUILD_ONLY opensearchserverless) +endif() if("opsworks" IN_LIST FEATURES) list(APPEND BUILD_ONLY opsworks) endif() @@ -581,9 +743,24 @@ endif() if("organizations" IN_LIST FEATURES) list(APPEND BUILD_ONLY organizations) endif() +if("osis" IN_LIST FEATURES) + list(APPEND BUILD_ONLY osis) +endif() if("outposts" IN_LIST FEATURES) list(APPEND BUILD_ONLY outposts) endif() +if("panorama" IN_LIST FEATURES) + list(APPEND BUILD_ONLY panorama) +endif() +if("payment-cryptography" IN_LIST FEATURES) + list(APPEND BUILD_ONLY payment-cryptography) +endif() +if("payment-cryptography-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY payment-cryptography-data) +endif() +if("pca-connector-ad" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pca-connector-ad) +endif() if("personalize" IN_LIST FEATURES) list(APPEND BUILD_ONLY personalize) endif() @@ -602,12 +779,24 @@ endif() if("pinpoint-email" IN_LIST FEATURES) list(APPEND BUILD_ONLY pinpoint-email) endif() +if("pinpoint-sms-voice-v2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pinpoint-sms-voice-v2) +endif() +if("pipes" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pipes) +endif() if("polly" IN_LIST FEATURES) list(APPEND BUILD_ONLY polly) endif() if("pricing" IN_LIST FEATURES) list(APPEND BUILD_ONLY pricing) endif() +if("privatenetworks" IN_LIST FEATURES) + list(APPEND BUILD_ONLY privatenetworks) +endif() +if("proton" IN_LIST FEATURES) + list(APPEND BUILD_ONLY proton) +endif() if("qldb" IN_LIST FEATURES) list(APPEND BUILD_ONLY qldb) endif() @@ -623,6 +812,9 @@ endif() if("ram" IN_LIST FEATURES) list(APPEND BUILD_ONLY ram) endif() +if("rbin" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rbin) +endif() if("rds" IN_LIST FEATURES) list(APPEND BUILD_ONLY rds) endif() @@ -635,9 +827,18 @@ endif() if("redshift-data" IN_LIST FEATURES) list(APPEND BUILD_ONLY redshift-data) endif() +if("redshift-serverless" IN_LIST FEATURES) + list(APPEND BUILD_ONLY redshift-serverless) +endif() if("rekognition" IN_LIST FEATURES) list(APPEND BUILD_ONLY rekognition) endif() +if("resiliencehub" IN_LIST FEATURES) + list(APPEND BUILD_ONLY resiliencehub) +endif() +if("resource-explorer-2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY resource-explorer-2) +endif() if("resource-groups" IN_LIST FEATURES) list(APPEND BUILD_ONLY resource-groups) endif() @@ -647,15 +848,30 @@ endif() if("robomaker" IN_LIST FEATURES) list(APPEND BUILD_ONLY robomaker) endif() +if("rolesanywhere" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rolesanywhere) +endif() if("route53" IN_LIST FEATURES) list(APPEND BUILD_ONLY route53) endif() +if("route53-recovery-cluster" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53-recovery-cluster) +endif() +if("route53-recovery-control-config" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53-recovery-control-config) +endif() +if("route53-recovery-readiness" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53-recovery-readiness) +endif() if("route53domains" IN_LIST FEATURES) list(APPEND BUILD_ONLY route53domains) endif() if("route53resolver" IN_LIST FEATURES) list(APPEND BUILD_ONLY route53resolver) endif() +if("rum" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rum) +endif() if("s3" IN_LIST FEATURES) list(APPEND BUILD_ONLY s3) endif() @@ -683,12 +899,21 @@ endif() if("sagemaker-featurestore-runtime" IN_LIST FEATURES) list(APPEND BUILD_ONLY sagemaker-featurestore-runtime) endif() +if("sagemaker-geospatial" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sagemaker-geospatial) +endif() +if("sagemaker-metrics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sagemaker-metrics) +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("scheduler" IN_LIST FEATURES) + list(APPEND BUILD_ONLY scheduler) +endif() if("schemas" IN_LIST FEATURES) list(APPEND BUILD_ONLY schemas) endif() @@ -701,6 +926,9 @@ endif() if("securityhub" IN_LIST FEATURES) list(APPEND BUILD_ONLY securityhub) endif() +if("securitylake" IN_LIST FEATURES) + list(APPEND BUILD_ONLY securitylake) +endif() if("serverlessrepo" IN_LIST FEATURES) list(APPEND BUILD_ONLY serverlessrepo) endif() @@ -725,12 +953,18 @@ endif() if("signer" IN_LIST FEATURES) list(APPEND BUILD_ONLY signer) endif() +if("simspaceweaver" IN_LIST FEATURES) + list(APPEND BUILD_ONLY simspaceweaver) +endif() if("sms" IN_LIST FEATURES) list(APPEND BUILD_ONLY sms) endif() if("sms-voice" IN_LIST FEATURES) list(APPEND BUILD_ONLY sms-voice) endif() +if("snow-device-management" IN_LIST FEATURES) + list(APPEND BUILD_ONLY snow-device-management) +endif() if("snowball" IN_LIST FEATURES) list(APPEND BUILD_ONLY snowball) endif() @@ -749,6 +983,9 @@ endif() if("ssm-incidents" IN_LIST FEATURES) list(APPEND BUILD_ONLY ssm-incidents) endif() +if("ssm-sap" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ssm-sap) +endif() if("sso" IN_LIST FEATURES) list(APPEND BUILD_ONLY sso) endif() @@ -770,6 +1007,9 @@ endif() if("support" IN_LIST FEATURES) list(APPEND BUILD_ONLY support) endif() +if("support-app" IN_LIST FEATURES) + list(APPEND BUILD_ONLY support-app) +endif() if("swf" IN_LIST FEATURES) list(APPEND BUILD_ONLY swf) endif() @@ -788,6 +1028,9 @@ endif() if("timestream-write" IN_LIST FEATURES) list(APPEND BUILD_ONLY timestream-write) endif() +if("tnb" IN_LIST FEATURES) + list(APPEND BUILD_ONLY tnb) +endif() if("transcribe" IN_LIST FEATURES) list(APPEND BUILD_ONLY transcribe) endif() @@ -800,6 +1043,15 @@ endif() if("translate" IN_LIST FEATURES) list(APPEND BUILD_ONLY translate) endif() +if("verifiedpermissions" IN_LIST FEATURES) + list(APPEND BUILD_ONLY verifiedpermissions) +endif() +if("voice-id" IN_LIST FEATURES) + list(APPEND BUILD_ONLY voice-id) +endif() +if("vpc-lattice" IN_LIST FEATURES) + list(APPEND BUILD_ONLY vpc-lattice) +endif() if("waf" IN_LIST FEATURES) list(APPEND BUILD_ONLY waf) endif() @@ -812,6 +1064,9 @@ endif() if("wellarchitected" IN_LIST FEATURES) list(APPEND BUILD_ONLY wellarchitected) endif() +if("wisdom" IN_LIST FEATURES) + list(APPEND BUILD_ONLY wisdom) +endif() if("workdocs" IN_LIST FEATURES) list(APPEND BUILD_ONLY workdocs) endif() @@ -827,6 +1082,9 @@ endif() if("workspaces" IN_LIST FEATURES) list(APPEND BUILD_ONLY workspaces) endif() +if("workspaces-web" IN_LIST FEATURES) + list(APPEND BUILD_ONLY workspaces-web) +endif() if("xray" IN_LIST FEATURES) list(APPEND BUILD_ONLY xray) endif() diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1 index 89265ddbd4..22eeb653f8 100644 --- a/ports/aws-sdk-cpp/generateFeatures.ps1 +++ b/ports/aws-sdk-cpp/generateFeatures.ps1 @@ -23,7 +23,7 @@ if (-not (Test-Path $ExtractedSources)) { Write-Host "Using sources directory: $ExtractedSources" -$subfolders = Get-Item $ExtractedSources\aws-cpp-sdk-* +$subfolders = Get-ChildItem -Path "$ExtractedSources\generated\src\aws-cpp-sdk-*", "$ExtractedSources\src\aws-cpp-sdk*" | Sort-Object -Property Name $manifest = Get-Content $ManifestIn | ConvertFrom-Json $manifest | Add-Member ` @@ -47,6 +47,11 @@ function GetDescription($dir, $modulename) else { "C++ SDK for the AWS $modulename service" } } +$featureDependencies = @{} +Select-String -Path "$ExtractedSources\cmake\sdksCommon.cmake" -Pattern "list\(APPEND SDK_DEPENDENCY_LIST `"([\w-]+):([\w-,]+)`"\)" -AllMatches +| ForEach-Object { $_.Matches } +| ForEach-Object { $featureDependencies[$_.Groups[1].Value] = @($_.Groups[2].Value -split "," | Where-Object { $_ -ne "core" }) } + foreach ($subfolder in $subfolders) { $modulename = $subfolder.name -replace "^aws-cpp-sdk-","" @@ -56,7 +61,13 @@ foreach ($subfolder in $subfolders) $lowermodulename = $modulename.ToLower() - $manifest.features.Add("$lowermodulename", @{ description=(GetDescription $subfolder $modulename) }) + $featureObj = @{ description = (GetDescription $subfolder $modulename) } + + if ($featureDependencies.ContainsKey($lowermodulename)) { + $featureObj.dependencies = ,@{ name = "aws-sdk-cpp"; "default-features" = $false; "features" = $featureDependencies[$lowermodulename] } + } + + $manifest.features.Add("$lowermodulename", $featureObj) $cmakefragmenttext += @( "if(`"$lowermodulename`" IN_LIST FEATURES)", @@ -65,7 +76,7 @@ foreach ($subfolder in $subfolders) ) } -[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 5 -InputObject $manifest)) +[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 10 -InputObject $manifest)) Write-Verbose ($cmakefragmenttext -join "`n") [IO.File]::WriteAllText($CMakeFragmentFile, ($cmakefragmenttext -join "`n") +"`n") diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json new file mode 100644 index 0000000000..d306b3f4a3 --- /dev/null +++ b/ports/aws-sdk-cpp/vcpkg.in.json @@ -0,0 +1,38 @@ +{ + "name": "aws-sdk-cpp", + "version": "1.11.155", + "port-version": 1, + "description": "AWS SDK for C++", + "homepage": "https://github.com/aws/aws-sdk-cpp", + "license": "Apache-2.0", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-crt-cpp", + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ], + "platform": "!uwp & !windows" + }, + { + "name": "openssl", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "dynamodb", + "kinesis", + "s3" + ] +} \ No newline at end of file diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 3ebf3104b2..77ff515499 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -2,6 +2,7 @@ "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", "version": "1.11.155", + "port-version": 1, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", @@ -37,11 +38,24 @@ ], "features": { "access-management": { - "description": "C++ SDK for the AWS access-management service" + "description": "C++ SDK for the AWS access-management service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "cognito-identity", + "iam" + ] + } + ] }, "accessanalyzer": { "description": "C++ SDK for the AWS accessanalyzer service" }, + "account": { + "description": "C++ SDK for the AWS account service" + }, "acm": { "description": "C++ SDK for the AWS acm service" }, @@ -60,6 +74,9 @@ "amplifybackend": { "description": "C++ SDK for the AWS amplifybackend service" }, + "amplifyuibuilder": { + "description": "C++ SDK for the AWS amplifyuibuilder service" + }, "apigateway": { "description": "C++ SDK for the AWS apigateway service" }, @@ -72,6 +89,12 @@ "appconfig": { "description": "C++ SDK for the AWS appconfig service" }, + "appconfigdata": { + "description": "C++ SDK for the AWS appconfigdata service" + }, + "appfabric": { + "description": "C++ SDK for the AWS appfabric service" + }, "appflow": { "description": "C++ SDK for the AWS appflow service" }, @@ -99,6 +122,9 @@ "appsync": { "description": "C++ SDK for the AWS appsync service" }, + "arc-zonal-shift": { + "description": "C++ SDK for the AWS arc-zonal-shift service" + }, "athena": { "description": "C++ SDK for the AWS athena service" }, @@ -120,9 +146,18 @@ "backup": { "description": "C++ SDK for the AWS backup service" }, + "backup-gateway": { + "description": "C++ SDK for the AWS backup-gateway service" + }, + "backupstorage": { + "description": "C++ SDK for the AWS backupstorage service" + }, "batch": { "description": "C++ SDK for the AWS batch service" }, + "billingconductor": { + "description": "C++ SDK for the AWS billingconductor service" + }, "braket": { "description": "C++ SDK for the AWS braket service" }, @@ -135,9 +170,30 @@ "chime": { "description": "C++ SDK for the AWS chime service" }, + "chime-sdk-identity": { + "description": "C++ SDK for the AWS chime-sdk-identity service" + }, + "chime-sdk-media-pipelines": { + "description": "C++ SDK for the AWS chime-sdk-media-pipelines service" + }, + "chime-sdk-meetings": { + "description": "C++ SDK for the AWS chime-sdk-meetings service" + }, + "chime-sdk-messaging": { + "description": "C++ SDK for the AWS chime-sdk-messaging service" + }, + "chime-sdk-voice": { + "description": "C++ SDK for the AWS chime-sdk-voice service" + }, + "cleanrooms": { + "description": "C++ SDK for the AWS cleanrooms service" + }, "cloud9": { "description": "C++ SDK for the AWS cloud9 service" }, + "cloudcontrol": { + "description": "C++ SDK for the AWS cloudcontrol service" + }, "clouddirectory": { "description": "C++ SDK for the AWS clouddirectory service" }, @@ -162,12 +218,18 @@ "cloudtrail": { "description": "C++ SDK for the AWS cloudtrail service" }, + "cloudtrail-data": { + "description": "C++ SDK for the AWS cloudtrail-data service" + }, "codeartifact": { "description": "C++ SDK for the AWS codeartifact service" }, "codebuild": { "description": "C++ SDK for the AWS codebuild service" }, + "codecatalyst": { + "description": "C++ SDK for the AWS codecatalyst service" + }, "codecommit": { "description": "C++ SDK for the AWS codecommit service" }, @@ -177,6 +239,9 @@ "codeguru-reviewer": { "description": "C++ SDK for the AWS codeguru-reviewer service" }, + "codeguru-security": { + "description": "C++ SDK for the AWS codeguru-security service" + }, "codeguruprofiler": { "description": "C++ SDK for the AWS codeguruprofiler service" }, @@ -219,9 +284,18 @@ "connect-contact-lens": { "description": "C++ SDK for the AWS connect-contact-lens service" }, + "connectcampaigns": { + "description": "C++ SDK for the AWS connectcampaigns service" + }, + "connectcases": { + "description": "C++ SDK for the AWS connectcases service" + }, "connectparticipant": { "description": "C++ SDK for the AWS connectparticipant service" }, + "controltower": { + "description": "C++ SDK for the AWS controltower service" + }, "cur": { "description": "C++ SDK for the AWS cur service" }, @@ -267,6 +341,12 @@ "docdb": { "description": "C++ SDK for the AWS docdb service" }, + "docdb-elastic": { + "description": "C++ SDK for the AWS docdb-elastic service" + }, + "drs": { + "description": "C++ SDK for the AWS drs service" + }, "ds": { "description": "C++ SDK for the AWS ds service" }, @@ -327,6 +407,12 @@ "emr-containers": { "description": "C++ SDK for the AWS emr-containers service" }, + "emr-serverless": { + "description": "C++ SDK for the AWS emr-serverless service" + }, + "entityresolution": { + "description": "C++ SDK for the AWS entityresolution service" + }, "es": { "description": "C++ SDK for the AWS es service" }, @@ -336,6 +422,9 @@ "events": { "description": "C++ SDK for the AWS events service" }, + "evidently": { + "description": "C++ SDK for the AWS evidently service" + }, "finspace": { "description": "C++ SDK for the AWS finspace service" }, @@ -366,6 +455,9 @@ "gamelift": { "description": "C++ SDK for the AWS gamelift service" }, + "gamesparks": { + "description": "C++ SDK for the AWS gamesparks service" + }, "glacier": { "description": "C++ SDK for the AWS glacier service" }, @@ -375,6 +467,9 @@ "glue": { "description": "C++ SDK for the AWS glue service" }, + "grafana": { + "description": "C++ SDK for the AWS grafana service" + }, "greengrass": { "description": "C++ SDK for the AWS greengrass service" }, @@ -400,7 +495,17 @@ "description": "C++ SDK for the AWS iam service" }, "identity-management": { - "description": "C++ SDK for the AWS identity-management service" + "description": "C++ SDK for the AWS identity-management service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "cognito-identity", + "sts" + ] + } + ] }, "identitystore": { "description": "C++ SDK for the AWS identitystore service" @@ -414,6 +519,12 @@ "inspector": { "description": "C++ SDK for the AWS inspector service" }, + "inspector2": { + "description": "C++ SDK for the AWS inspector2 service" + }, + "internetmonitor": { + "description": "C++ SDK for the AWS internetmonitor service" + }, "iot": { "description": "C++ SDK for the AWS iot service" }, @@ -423,6 +534,9 @@ "iot-jobs-data": { "description": "C++ SDK for the AWS iot-jobs-data service" }, + "iot-roborunner": { + "description": "C++ SDK for the AWS iot-roborunner service" + }, "iot1click-devices": { "description": "C++ SDK for the AWS iot1click-devices service" }, @@ -444,6 +558,9 @@ "iotfleethub": { "description": "C++ SDK for the AWS iotfleethub service" }, + "iotfleetwise": { + "description": "C++ SDK for the AWS iotfleetwise service" + }, "iotsecuretunneling": { "description": "C++ SDK for the AWS iotsecuretunneling service" }, @@ -453,18 +570,36 @@ "iotthingsgraph": { "description": "C++ SDK for the AWS iotthingsgraph service" }, + "iottwinmaker": { + "description": "C++ SDK for the AWS iottwinmaker service" + }, "iotwireless": { "description": "C++ SDK for the AWS iotwireless service" }, "ivs": { "description": "C++ SDK for the AWS ivs service" }, + "ivs-realtime": { + "description": "C++ SDK for the AWS ivs-realtime service" + }, + "ivschat": { + "description": "C++ SDK for the AWS ivschat service" + }, "kafka": { "description": "C++ SDK for the AWS kafka service" }, + "kafkaconnect": { + "description": "C++ SDK for the AWS kafkaconnect service" + }, "kendra": { "description": "C++ SDK for the AWS kendra service" }, + "kendra-ranking": { + "description": "C++ SDK for the AWS kendra-ranking service" + }, + "keyspaces": { + "description": "C++ SDK for the AWS keyspaces service" + }, "kinesis": { "description": "C++ SDK for the AWS kinesis service" }, @@ -477,6 +612,9 @@ "kinesis-video-signaling": { "description": "C++ SDK for the AWS kinesis-video-signaling service" }, + "kinesis-video-webrtc-storage": { + "description": "C++ SDK for the AWS kinesis-video-webrtc-storage service" + }, "kinesisanalytics": { "description": "C++ SDK for the AWS kinesisanalytics service" }, @@ -510,6 +648,12 @@ "license-manager": { "description": "C++ SDK for the AWS license-manager service" }, + "license-manager-linux-subscriptions": { + "description": "C++ SDK for the AWS license-manager-linux-subscriptions service" + }, + "license-manager-user-subscriptions": { + "description": "C++ SDK for the AWS license-manager-user-subscriptions service" + }, "lightsail": { "description": "C++ SDK for the AWS lightsail service" }, @@ -528,6 +672,9 @@ "lookoutvision": { "description": "C++ SDK for the AWS lookoutvision service" }, + "m2": { + "description": "C++ SDK for the AWS m2 service" + }, "machinelearning": { "description": "C++ SDK for the AWS machinelearning service" }, @@ -540,6 +687,9 @@ "managedblockchain": { "description": "C++ SDK for the AWS managedblockchain service" }, + "managedblockchain-query": { + "description": "C++ SDK for the AWS managedblockchain-query service" + }, "marketplace-catalog": { "description": "C++ SDK for the AWS marketplace-catalog service" }, @@ -564,6 +714,9 @@ "mediapackage-vod": { "description": "C++ SDK for the AWS mediapackage-vod service" }, + "mediapackagev2": { + "description": "C++ SDK for the AWS mediapackagev2 service" + }, "mediastore": { "description": "C++ SDK for the AWS mediastore service" }, @@ -573,15 +726,30 @@ "mediatailor": { "description": "C++ SDK for the AWS mediatailor service" }, + "medical-imaging": { + "description": "C++ SDK for the AWS medical-imaging service" + }, + "memorydb": { + "description": "C++ SDK for the AWS memorydb service" + }, "meteringmarketplace": { "description": "C++ SDK for the AWS meteringmarketplace service" }, "mgn": { "description": "C++ SDK for the AWS mgn service" }, + "migration-hub-refactor-spaces": { + "description": "C++ SDK for the AWS migration-hub-refactor-spaces service" + }, "migrationhub-config": { "description": "C++ SDK for the AWS migrationhub-config service" }, + "migrationhuborchestrator": { + "description": "C++ SDK for the AWS migrationhuborchestrator service" + }, + "migrationhubstrategy": { + "description": "C++ SDK for the AWS migrationhubstrategy service" + }, "mobile": { "description": "C++ SDK for the AWS mobile service" }, @@ -600,6 +768,9 @@ "neptune": { "description": "C++ SDK for the AWS neptune service" }, + "neptunedata": { + "description": "C++ SDK for the AWS neptunedata service" + }, "network-firewall": { "description": "C++ SDK for the AWS network-firewall service" }, @@ -609,6 +780,18 @@ "nimble": { "description": "C++ SDK for the AWS nimble service" }, + "oam": { + "description": "C++ SDK for the AWS oam service" + }, + "omics": { + "description": "C++ SDK for the AWS omics service" + }, + "opensearch": { + "description": "C++ SDK for the AWS opensearch service" + }, + "opensearchserverless": { + "description": "C++ SDK for the AWS opensearchserverless service" + }, "opsworks": { "description": "C++ SDK for the AWS opsworks service" }, @@ -618,9 +801,24 @@ "organizations": { "description": "C++ SDK for the AWS organizations service" }, + "osis": { + "description": "C++ SDK for the AWS osis service" + }, "outposts": { "description": "C++ SDK for the AWS outposts service" }, + "panorama": { + "description": "C++ SDK for the AWS panorama service" + }, + "payment-cryptography": { + "description": "C++ SDK for the AWS payment-cryptography service" + }, + "payment-cryptography-data": { + "description": "C++ SDK for the AWS payment-cryptography-data service" + }, + "pca-connector-ad": { + "description": "C++ SDK for the AWS pca-connector-ad service" + }, "personalize": { "description": "C++ SDK for the AWS personalize service" }, @@ -639,12 +837,24 @@ "pinpoint-email": { "description": "C++ SDK for the AWS pinpoint-email service" }, + "pinpoint-sms-voice-v2": { + "description": "C++ SDK for the AWS pinpoint-sms-voice-v2 service" + }, + "pipes": { + "description": "C++ SDK for the AWS pipes service" + }, "polly": { "description": "C++ SDK for the AWS polly service" }, "pricing": { "description": "C++ SDK for the AWS pricing service" }, + "privatenetworks": { + "description": "C++ SDK for the AWS privatenetworks service" + }, + "proton": { + "description": "C++ SDK for the AWS proton service" + }, "qldb": { "description": "C++ SDK for the AWS qldb service" }, @@ -652,7 +862,16 @@ "description": "C++ SDK for the AWS qldb-session service" }, "queues": { - "description": "C++ SDK for the AWS queues service" + "description": "C++ SDK for the AWS queues service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "sqs" + ] + } + ] }, "quicksight": { "description": "C++ SDK for the AWS quicksight service" @@ -660,6 +879,9 @@ "ram": { "description": "C++ SDK for the AWS ram service" }, + "rbin": { + "description": "C++ SDK for the AWS rbin service" + }, "rds": { "description": "C++ SDK for the AWS rds service" }, @@ -672,9 +894,18 @@ "redshift-data": { "description": "C++ SDK for the AWS redshift-data service" }, + "redshift-serverless": { + "description": "C++ SDK for the AWS redshift-serverless service" + }, "rekognition": { "description": "C++ SDK for the AWS rekognition service" }, + "resiliencehub": { + "description": "C++ SDK for the AWS resiliencehub service" + }, + "resource-explorer-2": { + "description": "C++ SDK for the AWS resource-explorer-2 service" + }, "resource-groups": { "description": "C++ SDK for the AWS resource-groups service" }, @@ -684,15 +915,30 @@ "robomaker": { "description": "C++ SDK for the AWS robomaker service" }, + "rolesanywhere": { + "description": "C++ SDK for the AWS rolesanywhere service" + }, "route53": { "description": "C++ SDK for the AWS route53 service" }, + "route53-recovery-cluster": { + "description": "C++ SDK for the AWS route53-recovery-cluster service" + }, + "route53-recovery-control-config": { + "description": "C++ SDK for the AWS route53-recovery-control-config service" + }, + "route53-recovery-readiness": { + "description": "C++ SDK for the AWS route53-recovery-readiness service" + }, "route53domains": { "description": "C++ SDK for the AWS route53domains service" }, "route53resolver": { "description": "C++ SDK for the AWS route53resolver service" }, + "rum": { + "description": "C++ SDK for the AWS rum service" + }, "s3": { "description": "C++ SDK for the AWS s3 service" }, @@ -700,7 +946,17 @@ "description": "C++ SDK for the AWS s3-crt service" }, "s3-encryption": { - "description": "C++ SDK for the AWS s3-encryption service" + "description": "C++ SDK for the AWS s3-encryption service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "kms", + "s3" + ] + } + ] }, "s3control": { "description": "C++ SDK for the AWS s3control service" @@ -720,12 +976,21 @@ "sagemaker-featurestore-runtime": { "description": "C++ SDK for the AWS sagemaker-featurestore-runtime service" }, + "sagemaker-geospatial": { + "description": "C++ SDK for the AWS sagemaker-geospatial service" + }, + "sagemaker-metrics": { + "description": "C++ SDK for the AWS sagemaker-metrics service" + }, "sagemaker-runtime": { "description": "C++ SDK for the AWS sagemaker-runtime service" }, "savingsplans": { "description": "C++ SDK for the AWS savingsplans service" }, + "scheduler": { + "description": "C++ SDK for the AWS scheduler service" + }, "schemas": { "description": "C++ SDK for the AWS schemas service" }, @@ -738,6 +1003,9 @@ "securityhub": { "description": "C++ SDK for the AWS securityhub service" }, + "securitylake": { + "description": "C++ SDK for the AWS securitylake service" + }, "serverlessrepo": { "description": "C++ SDK for the AWS serverlessrepo service" }, @@ -762,12 +1030,18 @@ "signer": { "description": "C++ SDK for the AWS signer service" }, + "simspaceweaver": { + "description": "C++ SDK for the AWS simspaceweaver service" + }, "sms": { "description": "C++ SDK for the AWS sms service" }, "sms-voice": { "description": "C++ SDK for the AWS sms-voice service" }, + "snow-device-management": { + "description": "C++ SDK for the AWS snow-device-management service" + }, "snowball": { "description": "C++ SDK for the AWS snowball service" }, @@ -786,6 +1060,9 @@ "ssm-incidents": { "description": "C++ SDK for the AWS ssm-incidents service" }, + "ssm-sap": { + "description": "C++ SDK for the AWS ssm-sap service" + }, "sso": { "description": "C++ SDK for the AWS sso service" }, @@ -807,6 +1084,9 @@ "support": { "description": "C++ SDK for the AWS support service" }, + "support-app": { + "description": "C++ SDK for the AWS support-app service" + }, "swf": { "description": "C++ SDK for the AWS swf service" }, @@ -814,7 +1094,16 @@ "description": "C++ SDK for the AWS synthetics service" }, "text-to-speech": { - "description": "C++ SDK for the AWS text-to-speech service" + "description": "C++ SDK for the AWS text-to-speech service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "polly" + ] + } + ] }, "textract": { "description": "C++ SDK for the AWS textract service" @@ -825,6 +1114,9 @@ "timestream-write": { "description": "C++ SDK for the AWS timestream-write service" }, + "tnb": { + "description": "C++ SDK for the AWS tnb service" + }, "transcribe": { "description": "C++ SDK for the AWS transcribe service" }, @@ -832,11 +1124,29 @@ "description": "C++ SDK for the AWS transcribestreaming service" }, "transfer": { - "description": "C++ SDK for the AWS transfer service" + "description": "C++ SDK for the AWS transfer service", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "s3" + ] + } + ] }, "translate": { "description": "C++ SDK for the AWS translate service" }, + "verifiedpermissions": { + "description": "C++ SDK for the AWS verifiedpermissions service" + }, + "voice-id": { + "description": "C++ SDK for the AWS voice-id service" + }, + "vpc-lattice": { + "description": "C++ SDK for the AWS vpc-lattice service" + }, "waf": { "description": "C++ SDK for the AWS waf service" }, @@ -849,6 +1159,9 @@ "wellarchitected": { "description": "C++ SDK for the AWS wellarchitected service" }, + "wisdom": { + "description": "C++ SDK for the AWS wisdom service" + }, "workdocs": { "description": "C++ SDK for the AWS workdocs service" }, @@ -864,6 +1177,9 @@ "workspaces": { "description": "C++ SDK for the AWS workspaces service" }, + "workspaces-web": { + "description": "C++ SDK for the AWS workspaces-web service" + }, "xray": { "description": "C++ SDK for the AWS xray service" } diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 109f45b6d5..007e908634 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94f8f9c8774eda639d96a707cf3fda55fc9df034", + "version": "1.11.155", + "port-version": 1 + }, { "git-tree": "f0cc899ce753e066c26bec70fdfb87c84feaf28f", "version": "1.11.155", diff --git a/versions/baseline.json b/versions/baseline.json index def79f9974..ec8ffbcb5c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -398,7 +398,7 @@ }, "aws-sdk-cpp": { "baseline": "1.11.155", - "port-version": 0 + "port-version": 1 }, "azmq": { "baseline": "1.0.3",