diff --git a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/AWSClientConfigDefaultsProvider.swift b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/AWSClientConfigDefaultsProvider.swift index 88ac4604d1c..61e36402692 100644 --- a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/AWSClientConfigDefaultsProvider.swift +++ b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/AWSClientConfigDefaultsProvider.swift @@ -179,4 +179,22 @@ public class AWSClientConfigDefaultsProvider: ClientConfigDefaultsProvider { ) } } + + public static func disableS3ExpressSessionAuth( + _ disableS3ExpressSessionAuth: Bool? = nil + ) throws -> Bool { + let fileBasedConfig = try CRTFileBasedConfiguration.make() + return FieldResolver( + configValue: disableS3ExpressSessionAuth, + envVarName: "AWS_S3_DISABLE_EXPRESS_SESSION_AUTH", + configFieldName: "s3_disable_express_session_auth", + fileBasedConfig: fileBasedConfig, + profileName: nil, converter: { value in + switch value { + case "true": return true + case "false": return false + default: return nil + } + }).value ?? false + } } diff --git a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Endpoints/EndpointResolverMiddleware.swift b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Endpoints/EndpointResolverMiddleware.swift index 1576037cab0..cc3a095c6ad 100644 --- a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Endpoints/EndpointResolverMiddleware.swift +++ b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Endpoints/EndpointResolverMiddleware.swift @@ -55,7 +55,7 @@ extension AWSEndpointResolverMiddleware: ApplyEndpoint { let authScheme = try authSchemeResolver.resolve(authSchemes: schemes) signingAlgorithm = authScheme.name switch authScheme { - case .sigV4(let param): + case .sigV4(let param), .sigV4S3Express(let param): signingName = param.signingName signingRegion = param.signingRegion case .sigV4A(let param): diff --git a/Sources/Core/AWSSDKCommon/Sources/AWSSDKCommon/FileBasedConfiguration/CRTFileBasedConfiguration.swift b/Sources/Core/AWSSDKCommon/Sources/AWSSDKCommon/FileBasedConfiguration/CRTFileBasedConfiguration.swift index bd69254ab5d..4ed5fea43dc 100644 --- a/Sources/Core/AWSSDKCommon/Sources/AWSSDKCommon/FileBasedConfiguration/CRTFileBasedConfiguration.swift +++ b/Sources/Core/AWSSDKCommon/Sources/AWSSDKCommon/FileBasedConfiguration/CRTFileBasedConfiguration.swift @@ -46,13 +46,17 @@ extension CRTFileBasedConfiguration: FileBasedConfiguration { configFilePath: String? = nil, credentialsFilePath: String? = nil ) async throws -> CRTFileBasedConfiguration { - let task = Task { - try CRTFileBasedConfiguration.make( - configFilePath: configFilePath, - credentialsFilePath: credentialsFilePath - ) + try await withCheckedThrowingContinuation { continuation in + do { + let fileBasedConfig = try CRTFileBasedConfiguration.make( + configFilePath: configFilePath, + credentialsFilePath: credentialsFilePath + ) + continuation.resume(returning: fileBasedConfig) + } catch { + continuation.resume(throwing: error) + } } - return try await task.value } public func section( diff --git a/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md b/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md index 61e73d86d42..65b17b991bf 100644 --- a/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md +++ b/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md @@ -77,809 +77,5 @@ This SDK is open-source. Code is available on Github [here](https://github.com/ ## Service Documentation -[AWSACM](../../../../../swift/api/awsacm/latest) - -[AWSACMPCA](../../../../../swift/api/awsacmpca/latest) - -[AWSAPIGateway](../../../../../swift/api/awsapigateway/latest) - -[AWSARCZonalShift](../../../../../swift/api/awsarczonalshift/latest) - -[AWSAccessAnalyzer](../../../../../swift/api/awsaccessanalyzer/latest) - -[AWSAccount](../../../../../swift/api/awsaccount/latest) - -[AWSAmp](../../../../../swift/api/awsamp/latest) - -[AWSAmplify](../../../../../swift/api/awsamplify/latest) - -[AWSAmplifyBackend](../../../../../swift/api/awsamplifybackend/latest) - -[AWSAmplifyUIBuilder](../../../../../swift/api/awsamplifyuibuilder/latest) - -[AWSApiGatewayManagementApi](../../../../../swift/api/awsapigatewaymanagementapi/latest) - -[AWSApiGatewayV2](../../../../../swift/api/awsapigatewayv2/latest) - -[AWSAppConfig](../../../../../swift/api/awsappconfig/latest) - -[AWSAppConfigData](../../../../../swift/api/awsappconfigdata/latest) - -[AWSAppFabric](../../../../../swift/api/awsappfabric/latest) - -[AWSAppIntegrations](../../../../../swift/api/awsappintegrations/latest) - -[AWSAppMesh](../../../../../swift/api/awsappmesh/latest) - -[AWSAppRunner](../../../../../swift/api/awsapprunner/latest) - -[AWSAppStream](../../../../../swift/api/awsappstream/latest) - -[AWSAppSync](../../../../../swift/api/awsappsync/latest) - -[AWSAppTest](../../../../../swift/api/awsapptest/latest) - -[AWSAppflow](../../../../../swift/api/awsappflow/latest) - -[AWSApplicationAutoScaling](../../../../../swift/api/awsapplicationautoscaling/latest) - -[AWSApplicationCostProfiler](../../../../../swift/api/awsapplicationcostprofiler/latest) - -[AWSApplicationDiscoveryService](../../../../../swift/api/awsapplicationdiscoveryservice/latest) - -[AWSApplicationInsights](../../../../../swift/api/awsapplicationinsights/latest) - -[AWSApplicationSignals](../../../../../swift/api/awsapplicationsignals/latest) - -[AWSArtifact](../../../../../swift/api/awsartifact/latest) - -[AWSAthena](../../../../../swift/api/awsathena/latest) - -[AWSAuditManager](../../../../../swift/api/awsauditmanager/latest) - -[AWSAutoScaling](../../../../../swift/api/awsautoscaling/latest) - -[AWSAutoScalingPlans](../../../../../swift/api/awsautoscalingplans/latest) - -[AWSB2bi](../../../../../swift/api/awsb2bi/latest) - -[AWSBCMDataExports](../../../../../swift/api/awsbcmdataexports/latest) - -[AWSBCMPricingCalculator](../../../../../swift/api/awsbcmpricingcalculator/latest) - -[AWSBackup](../../../../../swift/api/awsbackup/latest) - -[AWSBackupGateway](../../../../../swift/api/awsbackupgateway/latest) - -[AWSBackupSearch](../../../../../swift/api/awsbackupsearch/latest) - -[AWSBatch](../../../../../swift/api/awsbatch/latest) - -[AWSBedrock](../../../../../swift/api/awsbedrock/latest) - -[AWSBedrockAgent](../../../../../swift/api/awsbedrockagent/latest) - -[AWSBedrockAgentRuntime](../../../../../swift/api/awsbedrockagentruntime/latest) - -[AWSBedrockDataAutomation](../../../../../swift/api/awsbedrockdataautomation/latest) - -[AWSBedrockDataAutomationRuntime](../../../../../swift/api/awsbedrockdataautomationruntime/latest) - -[AWSBedrockRuntime](../../../../../swift/api/awsbedrockruntime/latest) - -[AWSBilling](../../../../../swift/api/awsbilling/latest) - -[AWSBillingconductor](../../../../../swift/api/awsbillingconductor/latest) - -[AWSBraket](../../../../../swift/api/awsbraket/latest) - -[AWSBudgets](../../../../../swift/api/awsbudgets/latest) - -[AWSChatbot](../../../../../swift/api/awschatbot/latest) - -[AWSChime](../../../../../swift/api/awschime/latest) - -[AWSChimeSDKIdentity](../../../../../swift/api/awschimesdkidentity/latest) - -[AWSChimeSDKMediaPipelines](../../../../../swift/api/awschimesdkmediapipelines/latest) - -[AWSChimeSDKMeetings](../../../../../swift/api/awschimesdkmeetings/latest) - -[AWSChimeSDKMessaging](../../../../../swift/api/awschimesdkmessaging/latest) - -[AWSChimeSDKVoice](../../../../../swift/api/awschimesdkvoice/latest) - -[AWSCleanRooms](../../../../../swift/api/awscleanrooms/latest) - -[AWSCleanRoomsML](../../../../../swift/api/awscleanroomsml/latest) - -[AWSCloud9](../../../../../swift/api/awscloud9/latest) - -[AWSCloudControl](../../../../../swift/api/awscloudcontrol/latest) - -[AWSCloudDirectory](../../../../../swift/api/awsclouddirectory/latest) - -[AWSCloudFormation](../../../../../swift/api/awscloudformation/latest) - -[AWSCloudFront](../../../../../swift/api/awscloudfront/latest) - -[AWSCloudFrontKeyValueStore](../../../../../swift/api/awscloudfrontkeyvaluestore/latest) - -[AWSCloudHSM](../../../../../swift/api/awscloudhsm/latest) - -[AWSCloudHSMV2](../../../../../swift/api/awscloudhsmv2/latest) - -[AWSCloudSearch](../../../../../swift/api/awscloudsearch/latest) - -[AWSCloudSearchDomain](../../../../../swift/api/awscloudsearchdomain/latest) - -[AWSCloudTrail](../../../../../swift/api/awscloudtrail/latest) - -[AWSCloudTrailData](../../../../../swift/api/awscloudtraildata/latest) - -[AWSCloudWatch](../../../../../swift/api/awscloudwatch/latest) - -[AWSCloudWatchEvents](../../../../../swift/api/awscloudwatchevents/latest) - -[AWSCloudWatchLogs](../../../../../swift/api/awscloudwatchlogs/latest) - -[AWSCodeBuild](../../../../../swift/api/awscodebuild/latest) - -[AWSCodeCatalyst](../../../../../swift/api/awscodecatalyst/latest) - -[AWSCodeCommit](../../../../../swift/api/awscodecommit/latest) - -[AWSCodeConnections](../../../../../swift/api/awscodeconnections/latest) - -[AWSCodeDeploy](../../../../../swift/api/awscodedeploy/latest) - -[AWSCodeGuruProfiler](../../../../../swift/api/awscodeguruprofiler/latest) - -[AWSCodeGuruReviewer](../../../../../swift/api/awscodegurureviewer/latest) - -[AWSCodeGuruSecurity](../../../../../swift/api/awscodegurusecurity/latest) - -[AWSCodePipeline](../../../../../swift/api/awscodepipeline/latest) - -[AWSCodeStarconnections](../../../../../swift/api/awscodestarconnections/latest) - -[AWSCodeartifact](../../../../../swift/api/awscodeartifact/latest) - -[AWSCodestarnotifications](../../../../../swift/api/awscodestarnotifications/latest) - -[AWSCognitoIdentity](../../../../../swift/api/awscognitoidentity/latest) - -[AWSCognitoIdentityProvider](../../../../../swift/api/awscognitoidentityprovider/latest) - -[AWSCognitoSync](../../../../../swift/api/awscognitosync/latest) - -[AWSComprehend](../../../../../swift/api/awscomprehend/latest) - -[AWSComprehendMedical](../../../../../swift/api/awscomprehendmedical/latest) - -[AWSComputeOptimizer](../../../../../swift/api/awscomputeoptimizer/latest) - -[AWSConfigService](../../../../../swift/api/awsconfigservice/latest) - -[AWSConnect](../../../../../swift/api/awsconnect/latest) - -[AWSConnectCampaigns](../../../../../swift/api/awsconnectcampaigns/latest) - -[AWSConnectCampaignsV2](../../../../../swift/api/awsconnectcampaignsv2/latest) - -[AWSConnectCases](../../../../../swift/api/awsconnectcases/latest) - -[AWSConnectContactLens](../../../../../swift/api/awsconnectcontactlens/latest) - -[AWSConnectParticipant](../../../../../swift/api/awsconnectparticipant/latest) - -[AWSControlCatalog](../../../../../swift/api/awscontrolcatalog/latest) - -[AWSControlTower](../../../../../swift/api/awscontroltower/latest) - -[AWSCostExplorer](../../../../../swift/api/awscostexplorer/latest) - -[AWSCostOptimizationHub](../../../../../swift/api/awscostoptimizationhub/latest) - -[AWSCostandUsageReportService](../../../../../swift/api/awscostandusagereportservice/latest) - -[AWSCustomerProfiles](../../../../../swift/api/awscustomerprofiles/latest) - -[AWSDAX](../../../../../swift/api/awsdax/latest) - -[AWSDLM](../../../../../swift/api/awsdlm/latest) - -[AWSDSQL](../../../../../swift/api/awsdsql/latest) - -[AWSDataBrew](../../../../../swift/api/awsdatabrew/latest) - -[AWSDataExchange](../../../../../swift/api/awsdataexchange/latest) - -[AWSDataPipeline](../../../../../swift/api/awsdatapipeline/latest) - -[AWSDataSync](../../../../../swift/api/awsdatasync/latest) - -[AWSDataZone](../../../../../swift/api/awsdatazone/latest) - -[AWSDatabaseMigrationService](../../../../../swift/api/awsdatabasemigrationservice/latest) - -[AWSDeadline](../../../../../swift/api/awsdeadline/latest) - -[AWSDetective](../../../../../swift/api/awsdetective/latest) - -[AWSDevOpsGuru](../../../../../swift/api/awsdevopsguru/latest) - -[AWSDeviceFarm](../../../../../swift/api/awsdevicefarm/latest) - -[AWSDirectConnect](../../../../../swift/api/awsdirectconnect/latest) - -[AWSDirectoryService](../../../../../swift/api/awsdirectoryservice/latest) - -[AWSDirectoryServiceData](../../../../../swift/api/awsdirectoryservicedata/latest) - -[AWSDocDB](../../../../../swift/api/awsdocdb/latest) - -[AWSDocDBElastic](../../../../../swift/api/awsdocdbelastic/latest) - -[AWSDrs](../../../../../swift/api/awsdrs/latest) - -[AWSDynamoDB](../../../../../swift/api/awsdynamodb/latest) - -[AWSDynamoDBStreams](../../../../../swift/api/awsdynamodbstreams/latest) - -[AWSEBS](../../../../../swift/api/awsebs/latest) - -[AWSEC2](../../../../../swift/api/awsec2/latest) - -[AWSEC2InstanceConnect](../../../../../swift/api/awsec2instanceconnect/latest) - -[AWSECR](../../../../../swift/api/awsecr/latest) - -[AWSECRPUBLIC](../../../../../swift/api/awsecrpublic/latest) - -[AWSECS](../../../../../swift/api/awsecs/latest) - -[AWSEFS](../../../../../swift/api/awsefs/latest) - -[AWSEKS](../../../../../swift/api/awseks/latest) - -[AWSEKSAuth](../../../../../swift/api/awseksauth/latest) - -[AWSEMR](../../../../../swift/api/awsemr/latest) - -[AWSEMRServerless](../../../../../swift/api/awsemrserverless/latest) - -[AWSEMRcontainers](../../../../../swift/api/awsemrcontainers/latest) - -[AWSElastiCache](../../../../../swift/api/awselasticache/latest) - -[AWSElasticBeanstalk](../../../../../swift/api/awselasticbeanstalk/latest) - -[AWSElasticLoadBalancing](../../../../../swift/api/awselasticloadbalancing/latest) - -[AWSElasticLoadBalancingv2](../../../../../swift/api/awselasticloadbalancingv2/latest) - -[AWSElasticTranscoder](../../../../../swift/api/awselastictranscoder/latest) - -[AWSElasticsearchService](../../../../../swift/api/awselasticsearchservice/latest) - -[AWSEntityResolution](../../../../../swift/api/awsentityresolution/latest) - -[AWSEventBridge](../../../../../swift/api/awseventbridge/latest) - -[AWSEvidently](../../../../../swift/api/awsevidently/latest) - -[AWSFMS](../../../../../swift/api/awsfms/latest) - -[AWSFSx](../../../../../swift/api/awsfsx/latest) - -[AWSFinspace](../../../../../swift/api/awsfinspace/latest) - -[AWSFinspacedata](../../../../../swift/api/awsfinspacedata/latest) - -[AWSFirehose](../../../../../swift/api/awsfirehose/latest) - -[AWSFis](../../../../../swift/api/awsfis/latest) - -[AWSForecast](../../../../../swift/api/awsforecast/latest) - -[AWSForecastquery](../../../../../swift/api/awsforecastquery/latest) - -[AWSFraudDetector](../../../../../swift/api/awsfrauddetector/latest) - -[AWSFreeTier](../../../../../swift/api/awsfreetier/latest) - -[AWSGameLift](../../../../../swift/api/awsgamelift/latest) - -[AWSGameLiftStreams](../../../../../swift/api/awsgameliftstreams/latest) - -[AWSGeoMaps](../../../../../swift/api/awsgeomaps/latest) - -[AWSGeoPlaces](../../../../../swift/api/awsgeoplaces/latest) - -[AWSGeoRoutes](../../../../../swift/api/awsgeoroutes/latest) - -[AWSGlacier](../../../../../swift/api/awsglacier/latest) - -[AWSGlobalAccelerator](../../../../../swift/api/awsglobalaccelerator/latest) - -[AWSGlue](../../../../../swift/api/awsglue/latest) - -[AWSGrafana](../../../../../swift/api/awsgrafana/latest) - -[AWSGreengrass](../../../../../swift/api/awsgreengrass/latest) - -[AWSGreengrassV2](../../../../../swift/api/awsgreengrassv2/latest) - -[AWSGroundStation](../../../../../swift/api/awsgroundstation/latest) - -[AWSGuardDuty](../../../../../swift/api/awsguardduty/latest) - -[AWSHealth](../../../../../swift/api/awshealth/latest) - -[AWSHealthLake](../../../../../swift/api/awshealthlake/latest) - -[AWSIAM](../../../../../swift/api/awsiam/latest) - -[AWSIVSRealTime](../../../../../swift/api/awsivsrealtime/latest) - -[AWSIdentitystore](../../../../../swift/api/awsidentitystore/latest) - -[AWSImagebuilder](../../../../../swift/api/awsimagebuilder/latest) - -[AWSInspector](../../../../../swift/api/awsinspector/latest) - -[AWSInspector2](../../../../../swift/api/awsinspector2/latest) - -[AWSInspectorScan](../../../../../swift/api/awsinspectorscan/latest) - -[AWSInternetMonitor](../../../../../swift/api/awsinternetmonitor/latest) - -[AWSInvoicing](../../../../../swift/api/awsinvoicing/latest) - -[AWSIoT](../../../../../swift/api/awsiot/latest) - -[AWSIoTAnalytics](../../../../../swift/api/awsiotanalytics/latest) - -[AWSIoTDataPlane](../../../../../swift/api/awsiotdataplane/latest) - -[AWSIoTEvents](../../../../../swift/api/awsiotevents/latest) - -[AWSIoTEventsData](../../../../../swift/api/awsioteventsdata/latest) - -[AWSIoTFleetHub](../../../../../swift/api/awsiotfleethub/latest) - -[AWSIoTFleetWise](../../../../../swift/api/awsiotfleetwise/latest) - -[AWSIoTJobsDataPlane](../../../../../swift/api/awsiotjobsdataplane/latest) - -[AWSIoTManagedIntegrations](../../../../../swift/api/awsiotmanagedintegrations/latest) - -[AWSIoTSecureTunneling](../../../../../swift/api/awsiotsecuretunneling/latest) - -[AWSIoTSiteWise](../../../../../swift/api/awsiotsitewise/latest) - -[AWSIoTThingsGraph](../../../../../swift/api/awsiotthingsgraph/latest) - -[AWSIoTTwinMaker](../../../../../swift/api/awsiottwinmaker/latest) - -[AWSIoTWireless](../../../../../swift/api/awsiotwireless/latest) - -[AWSIotDeviceAdvisor](../../../../../swift/api/awsiotdeviceadvisor/latest) - -[AWSIvs](../../../../../swift/api/awsivs/latest) - -[AWSIvschat](../../../../../swift/api/awsivschat/latest) - -[AWSKMS](../../../../../swift/api/awskms/latest) - -[AWSKafka](../../../../../swift/api/awskafka/latest) - -[AWSKafkaConnect](../../../../../swift/api/awskafkaconnect/latest) - -[AWSKendra](../../../../../swift/api/awskendra/latest) - -[AWSKendraRanking](../../../../../swift/api/awskendraranking/latest) - -[AWSKeyspaces](../../../../../swift/api/awskeyspaces/latest) - -[AWSKinesis](../../../../../swift/api/awskinesis/latest) - -[AWSKinesisAnalytics](../../../../../swift/api/awskinesisanalytics/latest) - -[AWSKinesisAnalyticsV2](../../../../../swift/api/awskinesisanalyticsv2/latest) - -[AWSKinesisVideo](../../../../../swift/api/awskinesisvideo/latest) - -[AWSKinesisVideoArchivedMedia](../../../../../swift/api/awskinesisvideoarchivedmedia/latest) - -[AWSKinesisVideoMedia](../../../../../swift/api/awskinesisvideomedia/latest) - -[AWSKinesisVideoSignaling](../../../../../swift/api/awskinesisvideosignaling/latest) - -[AWSKinesisVideoWebRTCStorage](../../../../../swift/api/awskinesisvideowebrtcstorage/latest) - -[AWSLakeFormation](../../../../../swift/api/awslakeformation/latest) - -[AWSLambda](../../../../../swift/api/awslambda/latest) - -[AWSLaunchWizard](../../../../../swift/api/awslaunchwizard/latest) - -[AWSLexModelBuildingService](../../../../../swift/api/awslexmodelbuildingservice/latest) - -[AWSLexModelsV2](../../../../../swift/api/awslexmodelsv2/latest) - -[AWSLexRuntimeService](../../../../../swift/api/awslexruntimeservice/latest) - -[AWSLexRuntimeV2](../../../../../swift/api/awslexruntimev2/latest) - -[AWSLicenseManager](../../../../../swift/api/awslicensemanager/latest) - -[AWSLicenseManagerLinuxSubscriptions](../../../../../swift/api/awslicensemanagerlinuxsubscriptions/latest) - -[AWSLicenseManagerUserSubscriptions](../../../../../swift/api/awslicensemanagerusersubscriptions/latest) - -[AWSLightsail](../../../../../swift/api/awslightsail/latest) - -[AWSLocation](../../../../../swift/api/awslocation/latest) - -[AWSLookoutEquipment](../../../../../swift/api/awslookoutequipment/latest) - -[AWSLookoutMetrics](../../../../../swift/api/awslookoutmetrics/latest) - -[AWSLookoutVision](../../../../../swift/api/awslookoutvision/latest) - -[AWSM2](../../../../../swift/api/awsm2/latest) - -[AWSMTurk](../../../../../swift/api/awsmturk/latest) - -[AWSMWAA](../../../../../swift/api/awsmwaa/latest) - -[AWSMachineLearning](../../../../../swift/api/awsmachinelearning/latest) - -[AWSMacie2](../../../../../swift/api/awsmacie2/latest) - -[AWSMailManager](../../../../../swift/api/awsmailmanager/latest) - -[AWSManagedBlockchain](../../../../../swift/api/awsmanagedblockchain/latest) - -[AWSManagedBlockchainQuery](../../../../../swift/api/awsmanagedblockchainquery/latest) - -[AWSMarketplaceAgreement](../../../../../swift/api/awsmarketplaceagreement/latest) - -[AWSMarketplaceCatalog](../../../../../swift/api/awsmarketplacecatalog/latest) - -[AWSMarketplaceCommerceAnalytics](../../../../../swift/api/awsmarketplacecommerceanalytics/latest) - -[AWSMarketplaceDeployment](../../../../../swift/api/awsmarketplacedeployment/latest) - -[AWSMarketplaceEntitlementService](../../../../../swift/api/awsmarketplaceentitlementservice/latest) - -[AWSMarketplaceMetering](../../../../../swift/api/awsmarketplacemetering/latest) - -[AWSMarketplaceReporting](../../../../../swift/api/awsmarketplacereporting/latest) - -[AWSMediaConnect](../../../../../swift/api/awsmediaconnect/latest) - -[AWSMediaConvert](../../../../../swift/api/awsmediaconvert/latest) - -[AWSMediaLive](../../../../../swift/api/awsmedialive/latest) - -[AWSMediaPackage](../../../../../swift/api/awsmediapackage/latest) - -[AWSMediaPackageV2](../../../../../swift/api/awsmediapackagev2/latest) - -[AWSMediaPackageVod](../../../../../swift/api/awsmediapackagevod/latest) - -[AWSMediaStore](../../../../../swift/api/awsmediastore/latest) - -[AWSMediaStoreData](../../../../../swift/api/awsmediastoredata/latest) - -[AWSMediaTailor](../../../../../swift/api/awsmediatailor/latest) - -[AWSMedicalImaging](../../../../../swift/api/awsmedicalimaging/latest) - -[AWSMemoryDB](../../../../../swift/api/awsmemorydb/latest) - -[AWSMgn](../../../../../swift/api/awsmgn/latest) - -[AWSMigrationHub](../../../../../swift/api/awsmigrationhub/latest) - -[AWSMigrationHubConfig](../../../../../swift/api/awsmigrationhubconfig/latest) - -[AWSMigrationHubOrchestrator](../../../../../swift/api/awsmigrationhuborchestrator/latest) - -[AWSMigrationHubRefactorSpaces](../../../../../swift/api/awsmigrationhubrefactorspaces/latest) - -[AWSMigrationHubStrategy](../../../../../swift/api/awsmigrationhubstrategy/latest) - -[AWSMq](../../../../../swift/api/awsmq/latest) - -[AWSNeptune](../../../../../swift/api/awsneptune/latest) - -[AWSNeptuneGraph](../../../../../swift/api/awsneptunegraph/latest) - -[AWSNeptunedata](../../../../../swift/api/awsneptunedata/latest) - -[AWSNetworkFirewall](../../../../../swift/api/awsnetworkfirewall/latest) - -[AWSNetworkFlowMonitor](../../../../../swift/api/awsnetworkflowmonitor/latest) - -[AWSNetworkManager](../../../../../swift/api/awsnetworkmanager/latest) - -[AWSNetworkMonitor](../../../../../swift/api/awsnetworkmonitor/latest) - -[AWSNotifications](../../../../../swift/api/awsnotifications/latest) - -[AWSNotificationsContacts](../../../../../swift/api/awsnotificationscontacts/latest) - -[AWSOAM](../../../../../swift/api/awsoam/latest) - -[AWSOSIS](../../../../../swift/api/awsosis/latest) - -[AWSObservabilityAdmin](../../../../../swift/api/awsobservabilityadmin/latest) - -[AWSOmics](../../../../../swift/api/awsomics/latest) - -[AWSOpenSearch](../../../../../swift/api/awsopensearch/latest) - -[AWSOpenSearchServerless](../../../../../swift/api/awsopensearchserverless/latest) - -[AWSOpsWorks](../../../../../swift/api/awsopsworks/latest) - -[AWSOpsWorksCM](../../../../../swift/api/awsopsworkscm/latest) - -[AWSOrganizations](../../../../../swift/api/awsorganizations/latest) - -[AWSOutposts](../../../../../swift/api/awsoutposts/latest) - -[AWSPCS](../../../../../swift/api/awspcs/latest) - -[AWSPI](../../../../../swift/api/awspi/latest) - -[AWSPanorama](../../../../../swift/api/awspanorama/latest) - -[AWSPartnerCentralSelling](../../../../../swift/api/awspartnercentralselling/latest) - -[AWSPaymentCryptography](../../../../../swift/api/awspaymentcryptography/latest) - -[AWSPaymentCryptographyData](../../../../../swift/api/awspaymentcryptographydata/latest) - -[AWSPcaConnectorAd](../../../../../swift/api/awspcaconnectorad/latest) - -[AWSPcaConnectorScep](../../../../../swift/api/awspcaconnectorscep/latest) - -[AWSPersonalize](../../../../../swift/api/awspersonalize/latest) - -[AWSPersonalizeEvents](../../../../../swift/api/awspersonalizeevents/latest) - -[AWSPersonalizeRuntime](../../../../../swift/api/awspersonalizeruntime/latest) - -[AWSPinpoint](../../../../../swift/api/awspinpoint/latest) - -[AWSPinpointEmail](../../../../../swift/api/awspinpointemail/latest) - -[AWSPinpointSMSVoice](../../../../../swift/api/awspinpointsmsvoice/latest) - -[AWSPinpointSMSVoiceV2](../../../../../swift/api/awspinpointsmsvoicev2/latest) - -[AWSPipes](../../../../../swift/api/awspipes/latest) - -[AWSPolly](../../../../../swift/api/awspolly/latest) - -[AWSPricing](../../../../../swift/api/awspricing/latest) - -[AWSPrivateNetworks](../../../../../swift/api/awsprivatenetworks/latest) - -[AWSProton](../../../../../swift/api/awsproton/latest) - -[AWSQApps](../../../../../swift/api/awsqapps/latest) - -[AWSQBusiness](../../../../../swift/api/awsqbusiness/latest) - -[AWSQConnect](../../../../../swift/api/awsqconnect/latest) - -[AWSQLDB](../../../../../swift/api/awsqldb/latest) - -[AWSQLDBSession](../../../../../swift/api/awsqldbsession/latest) - -[AWSQuickSight](../../../../../swift/api/awsquicksight/latest) - -[AWSRAM](../../../../../swift/api/awsram/latest) - -[AWSRDS](../../../../../swift/api/awsrds/latest) - -[AWSRDSData](../../../../../swift/api/awsrdsdata/latest) - -[AWSRUM](../../../../../swift/api/awsrum/latest) - -[AWSRbin](../../../../../swift/api/awsrbin/latest) - -[AWSRedshift](../../../../../swift/api/awsredshift/latest) - -[AWSRedshiftData](../../../../../swift/api/awsredshiftdata/latest) - -[AWSRedshiftServerless](../../../../../swift/api/awsredshiftserverless/latest) - -[AWSRekognition](../../../../../swift/api/awsrekognition/latest) - -[AWSRepostspace](../../../../../swift/api/awsrepostspace/latest) - -[AWSResiliencehub](../../../../../swift/api/awsresiliencehub/latest) - -[AWSResourceExplorer2](../../../../../swift/api/awsresourceexplorer2/latest) - -[AWSResourceGroups](../../../../../swift/api/awsresourcegroups/latest) - -[AWSResourceGroupsTaggingAPI](../../../../../swift/api/awsresourcegroupstaggingapi/latest) - -[AWSRoboMaker](../../../../../swift/api/awsrobomaker/latest) - -[AWSRolesAnywhere](../../../../../swift/api/awsrolesanywhere/latest) - -[AWSRoute53](../../../../../swift/api/awsroute53/latest) - -[AWSRoute53Domains](../../../../../swift/api/awsroute53domains/latest) - -[AWSRoute53Profiles](../../../../../swift/api/awsroute53profiles/latest) - -[AWSRoute53RecoveryCluster](../../../../../swift/api/awsroute53recoverycluster/latest) - -[AWSRoute53RecoveryControlConfig](../../../../../swift/api/awsroute53recoverycontrolconfig/latest) - -[AWSRoute53RecoveryReadiness](../../../../../swift/api/awsroute53recoveryreadiness/latest) - -[AWSRoute53Resolver](../../../../../swift/api/awsroute53resolver/latest) - [AWSS3](../../../../../swift/api/awss3/latest) -[AWSS3Control](../../../../../swift/api/awss3control/latest) - -[AWSS3Outposts](../../../../../swift/api/awss3outposts/latest) - -[AWSS3Tables](../../../../../swift/api/awss3tables/latest) - -[AWSSES](../../../../../swift/api/awsses/latest) - -[AWSSESv2](../../../../../swift/api/awssesv2/latest) - -[AWSSFN](../../../../../swift/api/awssfn/latest) - -[AWSSMS](../../../../../swift/api/awssms/latest) - -[AWSSNS](../../../../../swift/api/awssns/latest) - -[AWSSQS](../../../../../swift/api/awssqs/latest) - -[AWSSSM](../../../../../swift/api/awsssm/latest) - -[AWSSSMContacts](../../../../../swift/api/awsssmcontacts/latest) - -[AWSSSMIncidents](../../../../../swift/api/awsssmincidents/latest) - -[AWSSSMQuickSetup](../../../../../swift/api/awsssmquicksetup/latest) - -[AWSSSO](../../../../../swift/api/awssso/latest) - -[AWSSSOAdmin](../../../../../swift/api/awsssoadmin/latest) - -[AWSSSOOIDC](../../../../../swift/api/awsssooidc/latest) - -[AWSSTS](../../../../../swift/api/awssts/latest) - -[AWSSWF](../../../../../swift/api/awsswf/latest) - -[AWSSageMaker](../../../../../swift/api/awssagemaker/latest) - -[AWSSageMakerA2IRuntime](../../../../../swift/api/awssagemakera2iruntime/latest) - -[AWSSageMakerFeatureStoreRuntime](../../../../../swift/api/awssagemakerfeaturestoreruntime/latest) - -[AWSSageMakerGeospatial](../../../../../swift/api/awssagemakergeospatial/latest) - -[AWSSageMakerMetrics](../../../../../swift/api/awssagemakermetrics/latest) - -[AWSSageMakerRuntime](../../../../../swift/api/awssagemakerruntime/latest) - -[AWSSagemakerEdge](../../../../../swift/api/awssagemakeredge/latest) - -[AWSSavingsplans](../../../../../swift/api/awssavingsplans/latest) - -[AWSScheduler](../../../../../swift/api/awsscheduler/latest) - -[AWSSchemas](../../../../../swift/api/awsschemas/latest) - -[AWSSecretsManager](../../../../../swift/api/awssecretsmanager/latest) - -[AWSSecurityHub](../../../../../swift/api/awssecurityhub/latest) - -[AWSSecurityIR](../../../../../swift/api/awssecurityir/latest) - -[AWSSecurityLake](../../../../../swift/api/awssecuritylake/latest) - -[AWSServerlessApplicationRepository](../../../../../swift/api/awsserverlessapplicationrepository/latest) - -[AWSServiceCatalog](../../../../../swift/api/awsservicecatalog/latest) - -[AWSServiceCatalogAppRegistry](../../../../../swift/api/awsservicecatalogappregistry/latest) - -[AWSServiceDiscovery](../../../../../swift/api/awsservicediscovery/latest) - -[AWSServiceQuotas](../../../../../swift/api/awsservicequotas/latest) - -[AWSShield](../../../../../swift/api/awsshield/latest) - -[AWSSigner](../../../../../swift/api/awssigner/latest) - -[AWSSimSpaceWeaver](../../../../../swift/api/awssimspaceweaver/latest) - -[AWSSnowDeviceManagement](../../../../../swift/api/awssnowdevicemanagement/latest) - -[AWSSnowball](../../../../../swift/api/awssnowball/latest) - -[AWSSocialMessaging](../../../../../swift/api/awssocialmessaging/latest) - -[AWSSsmSap](../../../../../swift/api/awsssmsap/latest) - -[AWSStorageGateway](../../../../../swift/api/awsstoragegateway/latest) - -[AWSSupplyChain](../../../../../swift/api/awssupplychain/latest) - -[AWSSupport](../../../../../swift/api/awssupport/latest) - -[AWSSupportApp](../../../../../swift/api/awssupportapp/latest) - -[AWSSynthetics](../../../../../swift/api/awssynthetics/latest) - -[AWSTaxSettings](../../../../../swift/api/awstaxsettings/latest) - -[AWSTextract](../../../../../swift/api/awstextract/latest) - -[AWSTimestreamInfluxDB](../../../../../swift/api/awstimestreaminfluxdb/latest) - -[AWSTimestreamQuery](../../../../../swift/api/awstimestreamquery/latest) - -[AWSTimestreamWrite](../../../../../swift/api/awstimestreamwrite/latest) - -[AWSTnb](../../../../../swift/api/awstnb/latest) - -[AWSTranscribe](../../../../../swift/api/awstranscribe/latest) - -[AWSTranscribeStreaming](../../../../../swift/api/awstranscribestreaming/latest) - -[AWSTransfer](../../../../../swift/api/awstransfer/latest) - -[AWSTranslate](../../../../../swift/api/awstranslate/latest) - -[AWSTrustedAdvisor](../../../../../swift/api/awstrustedadvisor/latest) - -[AWSVPCLattice](../../../../../swift/api/awsvpclattice/latest) - -[AWSVerifiedPermissions](../../../../../swift/api/awsverifiedpermissions/latest) - -[AWSVoiceID](../../../../../swift/api/awsvoiceid/latest) - -[AWSWAF](../../../../../swift/api/awswaf/latest) - -[AWSWAFRegional](../../../../../swift/api/awswafregional/latest) - -[AWSWAFV2](../../../../../swift/api/awswafv2/latest) - -[AWSWellArchitected](../../../../../swift/api/awswellarchitected/latest) - -[AWSWisdom](../../../../../swift/api/awswisdom/latest) - -[AWSWorkDocs](../../../../../swift/api/awsworkdocs/latest) - -[AWSWorkMail](../../../../../swift/api/awsworkmail/latest) - -[AWSWorkMailMessageFlow](../../../../../swift/api/awsworkmailmessageflow/latest) - -[AWSWorkSpaces](../../../../../swift/api/awsworkspaces/latest) - -[AWSWorkSpacesThinClient](../../../../../swift/api/awsworkspacesthinclient/latest) - -[AWSWorkSpacesWeb](../../../../../swift/api/awsworkspacesweb/latest) - -[AWSXRay](../../../../../swift/api/awsxray/latest) - diff --git a/Sources/Core/AWSSDKHTTPAuth/Sources/AWSSDKHTTPAuth/AWSSigV4Signer.swift b/Sources/Core/AWSSDKHTTPAuth/Sources/AWSSDKHTTPAuth/AWSSigV4Signer.swift index 635c96d1f0b..610b88c594e 100644 --- a/Sources/Core/AWSSDKHTTPAuth/Sources/AWSSDKHTTPAuth/AWSSigV4Signer.swift +++ b/Sources/Core/AWSSDKHTTPAuth/Sources/AWSSDKHTTPAuth/AWSSigV4Signer.swift @@ -5,6 +5,7 @@ // SPDX-License-Identifier: Apache-2.0 // +import struct AWSSDKIdentity.S3ExpressIdentity import class AwsCommonRuntimeKit.HTTPRequestBase import class AwsCommonRuntimeKit.Signer import class SmithyHTTPAPI.HTTPRequest @@ -49,7 +50,7 @@ public class AWSSigV4Signer: SmithyHTTPAuthAPI.Signer { ) } - guard let identity = identity as? AWSCredentialIdentity else { + guard let identity = identity.asAWSCredentialIdentity else { throw Smithy.ClientError.authError( "Identity passed to the AWSSigV4Signer must be of type Credentials." ) @@ -274,3 +275,18 @@ extension SigningConfig { } } } + +private extension Identity { + + var asAWSCredentialIdentity: AWSCredentialIdentity? { + (self as? AWSCredentialIdentity) ?? + (self as? S3ExpressIdentity)?.awsCredentialIdentity + } +} + +private extension S3ExpressIdentity { + + var awsCredentialIdentity: AWSCredentialIdentity { + .init(accessKey: accessKeyID, secret: secretAccessKey, expiration: expiration, sessionToken: sessionToken) + } +} diff --git a/Sources/Core/AWSSDKHTTPAuth/Sources/AWSSDKHTTPAuth/SigV4S3ExpressAuthScheme.swift b/Sources/Core/AWSSDKHTTPAuth/Sources/AWSSDKHTTPAuth/SigV4S3ExpressAuthScheme.swift new file mode 100644 index 00000000000..b213d04744e --- /dev/null +++ b/Sources/Core/AWSSDKHTTPAuth/Sources/AWSSDKHTTPAuth/SigV4S3ExpressAuthScheme.swift @@ -0,0 +1,95 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +import class Smithy.Context +import enum SmithyHTTPAuthAPI.AWSSignedBodyHeader +import enum SmithyHTTPAuthAPI.SigningPropertyKeys +import protocol SmithyHTTPAuthAPI.AuthScheme +import protocol SmithyHTTPAuthAPI.Signer +import struct Smithy.Attributes + +public struct SigV4S3ExpressAuthScheme: AuthScheme { + public let schemeID: String = "aws.auth#sigv4-s3express" + public let signer: Signer = AWSSigV4Signer() + public let requestUnsignedBody: Bool + + public init() { + self.requestUnsignedBody = false + } + + public init(requestUnsignedBody: Bool) { + self.requestUnsignedBody = requestUnsignedBody + } + + public func customizeSigningProperties(signingProperties: Attributes, context: Context) throws -> Attributes { + var updatedSigningProperties = signingProperties + + // Set signing algorithm flag + updatedSigningProperties.set(key: SigningPropertyKeys.signingAlgorithm, value: .sigv4s3express) + + // Set bidirectional streaming flag + updatedSigningProperties.set( + key: SigningPropertyKeys.bidirectionalStreaming, + value: context.isBidirectionalStreamingEnabled + ) + + // Set signing name and signing region flags + updatedSigningProperties.set(key: SigningPropertyKeys.signingName, value: context.signingName) + updatedSigningProperties.set( + key: SigningPropertyKeys.signingRegion, + value: signingProperties.get(key: SigningPropertyKeys.signingRegion) ?? context.signingRegion + ) + + // Set expiration flag + // + // Expiration is only used for presigning (presign request flow or presign URL flow). + updatedSigningProperties.set(key: SigningPropertyKeys.expiration, value: context.expiration) + + // Set signature type flag + // + // AWSSignatureType.requestQueryParams is only used for presign URL flow. + // Out of the AWSSignatureType enum cases, only two are used. .requestHeaders and .requestQueryParams. + // .requestHeaders is the deafult signing used for AWS operations. + let isPresignURLFlow = context.getFlowType() == .PRESIGN_URL + updatedSigningProperties.set( + key: SigningPropertyKeys.signatureType, + value: isPresignURLFlow ? .requestQueryParams : .requestHeaders + ) + + // Set unsignedBody to true IFF operation had unsigned payload trait. + let unsignedBody = context.hasUnsignedPayloadTrait() + updatedSigningProperties.set(key: SigningPropertyKeys.unsignedBody, value: unsignedBody) + + // Set default values. + updatedSigningProperties.set(key: SigningPropertyKeys.signedBodyHeader, value: AWSSignedBodyHeader.none) + updatedSigningProperties.set(key: SigningPropertyKeys.useDoubleURIEncode, value: true) + updatedSigningProperties.set(key: SigningPropertyKeys.shouldNormalizeURIPath, value: true) + updatedSigningProperties.set(key: SigningPropertyKeys.omitSessionToken, value: false) + + // Copy checksum from middleware context to signing properties + updatedSigningProperties.set(key: SigningPropertyKeys.checksum, value: context.checksumString) + + // Copy chunked streaming eligiblity from middleware context to signing properties + updatedSigningProperties.set( + key: SigningPropertyKeys.isChunkedEligibleStream, + value: context.isChunkedEligibleStream + ) + + // Optionally toggle unsigned body + if self.requestUnsignedBody { + updatedSigningProperties.set(key: SigningPropertyKeys.requestUnsignedBody, value: true) + } + + // Set service-specific signing properties if needed. + try CustomSigningPropertiesSetter().setServiceSpecificSigningProperties( + signingProperties: &updatedSigningProperties, + context: context + ) + + return updatedSigningProperties + } +} diff --git a/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/AWSIdentityPropertyKeys.swift b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/AWSIdentityPropertyKeys.swift new file mode 100644 index 00000000000..5a6ffc3ae16 --- /dev/null +++ b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/AWSIdentityPropertyKeys.swift @@ -0,0 +1,29 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +import struct Smithy.AttributeKey + +public enum AWSIdentityPropertyKeys { + + /// The S3 bucket associated with the credentials to be resolved. + /// + /// Used only in conjunction with the `awsv4-s3express` auth scheme, which generates bucket-specific credentials + /// for use with the S3 Express service. + public static let bucket = AttributeKey(name: "AWSIdentityBucket") + + /// The region to be used for client creation. + /// + /// Used only in conjunction with the `awsv4-s3express` auth scheme, which generates bucket-specific credentials + /// for use with the S3 Express service. + public static let region = AttributeKey(name: "AWSIdentityRegion") + + /// The S3 service client to be used in credential resolution. + /// + /// Used only in conjunction with the `awsv4-s3express` auth scheme, which generates bucket-specific credentials + /// for use with the S3 Express service. + public static let s3ExpressClient = AttributeKey(name: "AWSIdentityS3Client") +} diff --git a/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/Context+S3ExpressIdentity.swift b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/Context+S3ExpressIdentity.swift new file mode 100644 index 00000000000..be9a260d6c7 --- /dev/null +++ b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/Context+S3ExpressIdentity.swift @@ -0,0 +1,23 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +import class Smithy.Context +import struct Smithy.AttributeKey +import struct SmithyIdentity.AWSCredentialIdentity + +public extension Context { + + /// The AWS account ID associated with the selected auth scheme. + /// + /// Will be `nil` if an auth scheme has not yet been selected, an AWS credential identity was not resolved, or the identity did not resolve with an AWS account ID. + var s3ExpressIdentity: S3ExpressIdentity? { + get { get(key: s3ExpressIdentityKey) } + set { set(key: s3ExpressIdentityKey, value: newValue) } + } +} + +private let s3ExpressIdentityKey: AttributeKey = .init(name: "S3ExpressIdentity") diff --git a/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/DefaultS3ExpressIdentityResolver.swift b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/DefaultS3ExpressIdentityResolver.swift new file mode 100644 index 00000000000..494927eba41 --- /dev/null +++ b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/DefaultS3ExpressIdentityResolver.swift @@ -0,0 +1,22 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +import enum ClientRuntime.IdentityPropertyKeys +import struct Smithy.Attributes +import struct Foundation.Date + +public class DefaultS3ExpressIdentityResolver: S3ExpressIdentityResolver { + + public init() {} + + public func getIdentity(identityProperties: Attributes?) async throws -> S3ExpressIdentity { + guard let bucket = identityProperties?.get(key: AWSIdentityPropertyKeys.bucket) else { fatalError() } + guard let clientConfig = identityProperties?.get(key: IdentityPropertyKeys.clientConfig) else { fatalError() } + guard let client = identityProperties?.get(key: AWSIdentityPropertyKeys.s3ExpressClient) else { fatalError() } + return try await client.createSession(clientConfig: clientConfig, bucket: bucket) + } +} diff --git a/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/S3ExpressCreateSessionClient.swift b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/S3ExpressCreateSessionClient.swift new file mode 100644 index 00000000000..d3bcb6c4b10 --- /dev/null +++ b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/S3ExpressCreateSessionClient.swift @@ -0,0 +1,15 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +import protocol ClientRuntime.DefaultClientConfiguration + +public protocol S3ExpressCreateSessionClient { + func createSession( + clientConfig: DefaultClientConfiguration, + bucket: String + ) async throws -> S3ExpressIdentity +} diff --git a/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/S3ExpressIdentity.swift b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/S3ExpressIdentity.swift new file mode 100644 index 00000000000..d77aad25ca6 --- /dev/null +++ b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/S3ExpressIdentity.swift @@ -0,0 +1,23 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +import protocol SmithyIdentityAPI.Identity +import struct Foundation.Date + +public struct S3ExpressIdentity: Identity { + public var accessKeyID: String + public var secretAccessKey: String + public var sessionToken: String + public var expiration: Date? + + public init(accessKeyID: String, secretAccessKey: String, sessionToken: String, expiration: Date?) { + self.accessKeyID = accessKeyID + self.secretAccessKey = secretAccessKey + self.sessionToken = sessionToken + self.expiration = expiration + } +} diff --git a/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/S3ExpressIdentityResolver.swift b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/S3ExpressIdentityResolver.swift new file mode 100644 index 00000000000..492fe02e6f4 --- /dev/null +++ b/Sources/Core/AWSSDKIdentity/Sources/AWSSDKIdentity/S3Express/S3ExpressIdentityResolver.swift @@ -0,0 +1,11 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +import struct Smithy.Attributes +import protocol SmithyIdentityAPI.IdentityResolver + +public protocol S3ExpressIdentityResolver: IdentityResolver where IdentityT == S3ExpressIdentity {} diff --git a/Sources/Services/AWSS3/Package.swift.txt b/Sources/Services/AWSS3/Package.swift.txt index 6847e3d18fe..c8a42b43bd3 100644 --- a/Sources/Services/AWSS3/Package.swift.txt +++ b/Sources/Services/AWSS3/Package.swift.txt @@ -23,6 +23,10 @@ let package = Package( id: "aws-sdk-swift.AWSSDKHTTPAuth", exact: "0.0.1" ), + .package( + id: "aws-sdk-swift.AWSSDKIdentity", + exact: "0.0.1" + ), .package( url: "https://github.com/smithy-lang/smithy-swift", exact: "0.0.1" @@ -44,6 +48,10 @@ let package = Package( name: "AWSSDKHTTPAuth", package: "aws-sdk-swift.AWSSDKHTTPAuth" ), + .product( + name: "AWSSDKIdentity", + package: "aws-sdk-swift.AWSSDKIdentity" + ), .product( name: "ClientRuntime", package: "smithy-swift" diff --git a/Sources/Services/AWSS3/Sources/AWSS3/AuthSchemeResolver.swift b/Sources/Services/AWSS3/Sources/AWSS3/AuthSchemeResolver.swift index 4185def1317..ff72eae558c 100644 --- a/Sources/Services/AWSS3/Sources/AWSS3/AuthSchemeResolver.swift +++ b/Sources/Services/AWSS3/Sources/AWSS3/AuthSchemeResolver.swift @@ -8,6 +8,7 @@ // Code generated by smithy-swift-codegen. DO NOT EDIT! import class Smithy.Context +import enum AWSSDKIdentity.AWSIdentityPropertyKeys import enum ClientRuntime.EndpointsAuthScheme import enum Smithy.ClientError import enum SmithyHTTPAuthAPI.SigningPropertyKeys @@ -118,6 +119,13 @@ public struct DefaultS3AuthSchemeResolver: S3AuthSchemeResolver { sigV4Option.signingProperties.set(key: SmithyHTTPAuthAPI.SigningPropertyKeys.signingName, value: param.signingName) sigV4Option.signingProperties.set(key: SmithyHTTPAuthAPI.SigningPropertyKeys.signingRegion, value: param.signingRegionSet?[0]) validAuthOptions.append(sigV4Option) + case .sigV4S3Express(let param): + var authOption = SmithyHTTPAuthAPI.AuthOption(schemeID: "aws.auth#sigv4-s3express") + authOption.signingProperties.set(key: SmithyHTTPAuthAPI.SigningPropertyKeys.signingName, value: param.signingName) + authOption.signingProperties.set(key: SmithyHTTPAuthAPI.SigningPropertyKeys.signingRegion, value: param.signingRegion) + authOption.identityProperties.set(key: AWSSDKIdentity.AWSIdentityPropertyKeys.bucket, value: serviceParams.bucket) + authOption.identityProperties.set(key: AWSSDKIdentity.AWSIdentityPropertyKeys.s3ExpressClient, value: S3ExpressCreateSessionClient()) + validAuthOptions.append(authOption) default: throw Smithy.ClientError.authError("Unknown auth scheme name: \(scheme.name)") } diff --git a/Sources/Services/AWSS3/Sources/AWSS3/Models.swift b/Sources/Services/AWSS3/Sources/AWSS3/Models.swift index a30ae8cc821..0a0db8e0af3 100644 --- a/Sources/Services/AWSS3/Sources/AWSS3/Models.swift +++ b/Sources/Services/AWSS3/Sources/AWSS3/Models.swift @@ -22507,6 +22507,7 @@ extension GetObjectInput { throw Smithy.ClientError.unknownError("No HTTP client configured for presigned request") } let context = Smithy.ContextBuilder() + .withClientConfig(value: config) .withMethod(value: .get) .withServiceName(value: serviceName) .withOperation(value: "getObject") @@ -22522,6 +22523,7 @@ extension GetObjectInput { .withExpiration(value: expiration) .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4") .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4a") + .withIdentityResolver(value: config.s3ExpressIdentityResolver, schemeID: "aws.auth#sigv4-s3express") .withRegion(value: config.region) .withRequestChecksumCalculation(value: config.requestChecksumCalculation) .withResponseChecksumValidation(value: config.responseChecksumValidation) @@ -22656,6 +22658,7 @@ extension PutObjectInput { throw Smithy.ClientError.unknownError("No HTTP client configured for presigned request") } let context = Smithy.ContextBuilder() + .withClientConfig(value: config) .withMethod(value: .put) .withServiceName(value: serviceName) .withOperation(value: "putObject") @@ -22671,6 +22674,7 @@ extension PutObjectInput { .withExpiration(value: expiration) .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4") .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4a") + .withIdentityResolver(value: config.s3ExpressIdentityResolver, schemeID: "aws.auth#sigv4-s3express") .withRegion(value: config.region) .withRequestChecksumCalculation(value: config.requestChecksumCalculation) .withResponseChecksumValidation(value: config.responseChecksumValidation) @@ -22746,6 +22750,7 @@ extension UploadPartInput { throw Smithy.ClientError.unknownError("No HTTP client configured for presigned request") } let context = Smithy.ContextBuilder() + .withClientConfig(value: config) .withMethod(value: .put) .withServiceName(value: serviceName) .withOperation(value: "uploadPart") @@ -22761,6 +22766,7 @@ extension UploadPartInput { .withExpiration(value: expiration) .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4") .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4a") + .withIdentityResolver(value: config.s3ExpressIdentityResolver, schemeID: "aws.auth#sigv4-s3express") .withRegion(value: config.region) .withRequestChecksumCalculation(value: config.requestChecksumCalculation) .withResponseChecksumValidation(value: config.responseChecksumValidation) @@ -22815,6 +22821,7 @@ extension GetObjectInput { throw Smithy.ClientError.unknownError("No HTTP client configured for presigned request") } let context = Smithy.ContextBuilder() + .withClientConfig(value: config) .withMethod(value: .get) .withServiceName(value: serviceName) .withOperation(value: "getObject") @@ -22830,6 +22837,7 @@ extension GetObjectInput { .withExpiration(value: expiration) .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4") .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4a") + .withIdentityResolver(value: config.s3ExpressIdentityResolver, schemeID: "aws.auth#sigv4-s3express") .withRegion(value: config.region) .withRequestChecksumCalculation(value: config.requestChecksumCalculation) .withResponseChecksumValidation(value: config.responseChecksumValidation) @@ -22887,6 +22895,7 @@ extension PutObjectInput { throw Smithy.ClientError.unknownError("No HTTP client configured for presigned request") } let context = Smithy.ContextBuilder() + .withClientConfig(value: config) .withMethod(value: .put) .withServiceName(value: serviceName) .withOperation(value: "putObject") @@ -22902,6 +22911,7 @@ extension PutObjectInput { .withExpiration(value: expiration) .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4") .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4a") + .withIdentityResolver(value: config.s3ExpressIdentityResolver, schemeID: "aws.auth#sigv4-s3express") .withRegion(value: config.region) .withRequestChecksumCalculation(value: config.requestChecksumCalculation) .withResponseChecksumValidation(value: config.responseChecksumValidation) @@ -22963,6 +22973,7 @@ extension UploadPartInput { throw Smithy.ClientError.unknownError("No HTTP client configured for presigned request") } let context = Smithy.ContextBuilder() + .withClientConfig(value: config) .withMethod(value: .put) .withServiceName(value: serviceName) .withOperation(value: "uploadPart") @@ -22978,6 +22989,7 @@ extension UploadPartInput { .withExpiration(value: expiration) .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4") .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4a") + .withIdentityResolver(value: config.s3ExpressIdentityResolver, schemeID: "aws.auth#sigv4-s3express") .withRegion(value: config.region) .withRequestChecksumCalculation(value: config.requestChecksumCalculation) .withResponseChecksumValidation(value: config.responseChecksumValidation) diff --git a/Sources/Services/AWSS3/Sources/AWSS3/Plugins.swift b/Sources/Services/AWSS3/Sources/AWSS3/Plugins.swift index 4298d28036c..d4b6680c383 100644 --- a/Sources/Services/AWSS3/Sources/AWSS3/Plugins.swift +++ b/Sources/Services/AWSS3/Sources/AWSS3/Plugins.swift @@ -15,6 +15,7 @@ import protocol SmithyIdentity.AWSCredentialIdentityResolver import protocol SmithyIdentity.BearerTokenIdentityResolver import struct AWSSDKHTTPAuth.SigV4AAuthScheme import struct AWSSDKHTTPAuth.SigV4AuthScheme +import struct AWSSDKHTTPAuth.SigV4S3ExpressAuthScheme import struct SmithyIdentity.BearerTokenIdentity import struct SmithyIdentity.StaticBearerTokenIdentityResolver import typealias SmithyHTTPAuthAPI.AuthSchemes @@ -44,7 +45,7 @@ public class DefaultAWSAuthSchemePlugin: ClientRuntime.Plugin { public func configureClient(clientConfiguration: ClientRuntime.ClientConfiguration) throws { if let config = clientConfiguration as? S3Client.S3ClientConfiguration { config.authSchemeResolver = DefaultS3AuthSchemeResolver() - config.authSchemes = [AWSSDKHTTPAuth.SigV4AuthScheme(), AWSSDKHTTPAuth.SigV4AAuthScheme()] + config.authSchemes = [AWSSDKHTTPAuth.SigV4AuthScheme(), AWSSDKHTTPAuth.SigV4AAuthScheme(), AWSSDKHTTPAuth.SigV4S3ExpressAuthScheme()] config.awsCredentialIdentityResolver = try AWSClientRuntime.AWSClientConfigDefaultsProvider.awsCredentialIdentityResolver() config.bearerTokenIdentityResolver = SmithyIdentity.StaticBearerTokenIdentityResolver(token: SmithyIdentity.BearerTokenIdentity(token: "")) } diff --git a/Sources/Services/AWSS3/Sources/AWSS3/S3Client+S3Express.swift b/Sources/Services/AWSS3/Sources/AWSS3/S3Client+S3Express.swift new file mode 100644 index 00000000000..588f9dcc6b1 --- /dev/null +++ b/Sources/Services/AWSS3/Sources/AWSS3/S3Client+S3Express.swift @@ -0,0 +1,30 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +// Code generated by smithy-swift-codegen. DO NOT EDIT! + +import protocol AWSSDKIdentity.S3ExpressCreateSessionClient +import protocol ClientRuntime.DefaultClientConfiguration +import struct AWSSDKIdentity.S3ExpressIdentity + + +public struct S3ExpressCreateSessionClient: AWSSDKIdentity.S3ExpressCreateSessionClient { + + public func createSession(clientConfig: ClientRuntime.DefaultClientConfiguration, bucket: Swift.String) async throws -> AWSSDKIdentity.S3ExpressIdentity { + guard let config = clientConfig as? S3Client.Config else { fatalError() } + let client = S3Client(config: config) + let input = CreateSessionInput(bucket: bucket) + let output = try await client.createSession(input: input) + guard let creds = output.credentials, let accessKeyID = creds.accessKeyId, let secretAccessKey = creds.secretAccessKey, let sessionToken = creds.sessionToken else { fatalError() } + return AWSSDKIdentity.S3ExpressIdentity( + accessKeyID: accessKeyID, + secretAccessKey: secretAccessKey, + sessionToken: sessionToken, + expiration: output.credentials?.expiration + ) + } +} diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSAuthUtils.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSAuthUtils.kt index 18080fe80eb..8d1a1a78cca 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSAuthUtils.kt +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSAuthUtils.kt @@ -5,6 +5,7 @@ package software.amazon.smithy.aws.swift.codegen +import software.amazon.smithy.aws.swift.codegen.customization.s3.isS3 import software.amazon.smithy.aws.swift.codegen.swiftmodules.AWSSDKHTTPAuthTypes import software.amazon.smithy.aws.traits.auth.SigV4ATrait import software.amazon.smithy.aws.traits.auth.SigV4Trait @@ -86,7 +87,9 @@ open class AWSAuthUtils( if (effectiveAuthSchemes.contains(SigV4ATrait.ID) || servicesUsingSigV4A.contains(sdkId)) { updatedAuthSchemeList += writer.format("\$N()", AWSSDKHTTPAuthTypes.SigV4AAuthScheme) } - + if (ctx.service.isS3) { + updatedAuthSchemeList += writer.format("\$N()", AWSSDKHTTPAuthTypes.SigV4S3ExpressAuthScheme) + } return updatedAuthSchemeList } } diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPProtocolCustomizations.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPProtocolCustomizations.kt index 7804b9d674e..6393fbf6c51 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPProtocolCustomizations.kt +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPProtocolCustomizations.kt @@ -6,6 +6,7 @@ package software.amazon.smithy.aws.swift.codegen import software.amazon.smithy.aws.swift.codegen.customization.RulesBasedAuthSchemeResolverGenerator +import software.amazon.smithy.aws.swift.codegen.customization.s3.isS3 import software.amazon.smithy.aws.swift.codegen.swiftmodules.AWSClientRuntimeTypes import software.amazon.smithy.aws.swift.codegen.swiftmodules.AWSSDKEventStreamsAuthTypes import software.amazon.smithy.codegen.core.Symbol @@ -36,6 +37,9 @@ abstract class AWSHTTPProtocolCustomizations : DefaultHTTPProtocolCustomizations } writer.write(" .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: \$S)", "aws.auth#sigv4") writer.write(" .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: \$S)", "aws.auth#sigv4a") + if (ctx.service.isS3) { + writer.write(" .withIdentityResolver(value: config.s3ExpressIdentityResolver, schemeID: \$S)", "aws.auth#sigv4-s3express") + } writer.write(" .withRegion(value: config.region)") writer.write(" .withRequestChecksumCalculation(value: config.requestChecksumCalculation)") writer.write(" .withResponseChecksumValidation(value: config.responseChecksumValidation)") diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolServiceClient.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolServiceClient.kt index d073900ddc7..a2dca01846d 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolServiceClient.kt +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolServiceClient.kt @@ -119,6 +119,19 @@ class AWSHttpProtocolServiceClient( true, ) } + "disableS3ExpressSessionAuth" -> { + ConfigProperty( + "disableS3ExpressSessionAuth", + SwiftTypes.Bool.toOptional(), + { writer -> + writer.format( + "\$N.disableS3ExpressSessionAuth()", + AWSClientRuntimeTypes.Core.AWSClientConfigDefaultsProvider, + ) + }, + true, + ) + } else -> property } } diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/RulesBasedAuthSchemeResolverGenerator.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/RulesBasedAuthSchemeResolverGenerator.kt index 423ff2cd292..059e1d6fc32 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/RulesBasedAuthSchemeResolverGenerator.kt +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/RulesBasedAuthSchemeResolverGenerator.kt @@ -1,5 +1,7 @@ package software.amazon.smithy.aws.swift.codegen.customization +import software.amazon.smithy.aws.swift.codegen.customization.s3.isS3 +import software.amazon.smithy.aws.swift.codegen.swiftmodules.AWSSDKIdentityTypes import software.amazon.smithy.aws.traits.auth.SigV4ATrait import software.amazon.smithy.aws.traits.auth.SigV4Trait import software.amazon.smithy.rulesengine.language.EndpointRuleSet @@ -125,6 +127,34 @@ class RulesBasedAuthSchemeResolverGenerator { ) write("validAuthOptions.append(sigV4Option)") dedent() + // sigv4-s3express case + if (ctx.service.isS3) { + write("case .sigV4S3Express(let param):") + indent() + write( + "var authOption = \$N(schemeID: \$S)", + SmithyHTTPAuthAPITypes.AuthOption, + "aws.auth#sigv4-s3express", + ) + write( + "authOption.signingProperties.set(key: \$N.signingName, value: param.signingName)", + SmithyHTTPAuthAPITypes.SigningPropertyKeys, + ) + write( + "authOption.signingProperties.set(key: \$N.signingRegion, value: param.signingRegion)", + SmithyHTTPAuthAPITypes.SigningPropertyKeys, + ) + write( + "authOption.identityProperties.set(key: \$N.bucket, value: serviceParams.bucket)", + AWSSDKIdentityTypes.AWSIdentityPropertyKeys, + ) + write( + "authOption.identityProperties.set(key: \$N.s3ExpressClient, value: S3ExpressCreateSessionClient())", + AWSSDKIdentityTypes.AWSIdentityPropertyKeys, + ) + write("validAuthOptions.append(authOption)") + dedent() + } // Default case: throw error if returned auth scheme is neither SigV4 nor SigV4A write("default:") indent() diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/s3/S3ExpressIntegration.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/s3/S3ExpressIntegration.kt new file mode 100644 index 00000000000..1201864a14a --- /dev/null +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/s3/S3ExpressIntegration.kt @@ -0,0 +1,76 @@ +package software.amazon.smithy.aws.swift.codegen.customization.s3 + +import software.amazon.smithy.aws.swift.codegen.swiftmodules.AWSSDKIdentityTypes +import software.amazon.smithy.codegen.core.Symbol +import software.amazon.smithy.model.Model +import software.amazon.smithy.model.shapes.ServiceShape +import software.amazon.smithy.swift.codegen.SwiftDelegator +import software.amazon.smithy.swift.codegen.SwiftSettings +import software.amazon.smithy.swift.codegen.config.ClientConfiguration +import software.amazon.smithy.swift.codegen.config.ConfigProperty +import software.amazon.smithy.swift.codegen.config.DefaultProvider +import software.amazon.smithy.swift.codegen.core.SwiftCodegenContext +import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator +import software.amazon.smithy.swift.codegen.integration.SwiftIntegration +import software.amazon.smithy.swift.codegen.model.expectShape +import software.amazon.smithy.swift.codegen.model.toGeneric +import software.amazon.smithy.swift.codegen.swiftmodules.ClientRuntimeTypes +import software.amazon.smithy.swift.codegen.swiftmodules.SwiftTypes + +class S3ExpressIntegration : SwiftIntegration { + override fun enabledForService( + model: Model, + settings: SwiftSettings, + ): Boolean = model.expectShape(settings.service).isS3 + + override fun writeAdditionalFiles( + ctx: SwiftCodegenContext, + protocolGenerationContext: ProtocolGenerator.GenerationContext, + delegator: SwiftDelegator, + ) { + delegator.useFileWriter("Sources/AWSS3/S3Client+S3Express.swift") { writer -> + writer.write("") + writer.openBlock("public struct S3ExpressCreateSessionClient: \$N {", "}", AWSSDKIdentityTypes.S3ExpressCreateSessionClient) { + writer.write("") + writer.openBlock( + "public func createSession(clientConfig: \$N, bucket: \$N) async throws -> \$N {", + "}", + ClientRuntimeTypes.Core.DefaultClientConfiguration, + SwiftTypes.String, + AWSSDKIdentityTypes.S3ExpressIdentity, + ) { + writer.write("guard let config = clientConfig as? S3Client.Config else { fatalError() }") + writer.write("let client = S3Client(config: config)") + writer.write("let input = CreateSessionInput(bucket: bucket)") + writer.write("let output = try await client.createSession(input: input)") + writer.write( + "guard let creds = output.credentials, let accessKeyID = creds.accessKeyId, let secretAccessKey = creds.secretAccessKey, let sessionToken = creds.sessionToken else { fatalError() }", + ) + writer.openBlock("return \$N(", ")", AWSSDKIdentityTypes.S3ExpressIdentity) { + writer.write("accessKeyID: accessKeyID,") + writer.write("secretAccessKey: secretAccessKey,") + writer.write("sessionToken: sessionToken,") + writer.write("expiration: output.credentials?.expiration") + } + } + } + } + } + + override fun clientConfigurations(ctx: ProtocolGenerator.GenerationContext): List = + super.clientConfigurations(ctx) + listOf(S3ExpressClientConfiguration()) +} + +class S3ExpressClientConfiguration : ClientConfiguration { + override val swiftProtocolName: Symbol? + get() = null + + override fun getProperties(ctx: ProtocolGenerator.GenerationContext): Set = + setOf( + ConfigProperty( + "s3ExpressIdentityResolver", + AWSSDKIdentityTypes.S3ExpressIdentityResolver.toGeneric(), + DefaultProvider({ it.format("\$N()", AWSSDKIdentityTypes.DefaultS3ExpressIdentityResolver) }, false, false), + ), + ) +} diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/swiftmodules/AWSSDKHTTPAuthTypes.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/swiftmodules/AWSSDKHTTPAuthTypes.kt index cd84ada25c4..ac9cd8a650f 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/swiftmodules/AWSSDKHTTPAuthTypes.kt +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/swiftmodules/AWSSDKHTTPAuthTypes.kt @@ -8,6 +8,7 @@ import software.amazon.smithy.swift.codegen.swiftmodules.SwiftSymbol object AWSSDKHTTPAuthTypes { val SigV4AuthScheme = runtimeSymbol("SigV4AuthScheme", SwiftDeclaration.STRUCT) val SigV4AAuthScheme = runtimeSymbol("SigV4AAuthScheme", SwiftDeclaration.STRUCT) + val SigV4S3ExpressAuthScheme = runtimeSymbol("SigV4S3ExpressAuthScheme", SwiftDeclaration.STRUCT) } private fun runtimeSymbol( diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/swiftmodules/AWSSDKIdentityTypes.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/swiftmodules/AWSSDKIdentityTypes.kt index 7e132acec20..e80e85f9fcf 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/swiftmodules/AWSSDKIdentityTypes.kt +++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/swiftmodules/AWSSDKIdentityTypes.kt @@ -7,6 +7,11 @@ import software.amazon.smithy.swift.codegen.swiftmodules.SwiftSymbol object AWSSDKIdentityTypes { val DefaultBearerTokenIdentityResolverChain = runtimeSymbol("DefaultBearerTokenIdentityResolverChain", SwiftDeclaration.STRUCT) + val DefaultS3ExpressIdentityResolver = runtimeSymbol("DefaultS3ExpressIdentityResolver", SwiftDeclaration.CLASS) + val S3ExpressIdentity = runtimeSymbol("S3ExpressIdentity", SwiftDeclaration.STRUCT) + val S3ExpressIdentityResolver = runtimeSymbol("S3ExpressIdentityResolver", SwiftDeclaration.PROTOCOL) + val S3ExpressCreateSessionClient = runtimeSymbol("S3ExpressCreateSessionClient", SwiftDeclaration.PROTOCOL) + val AWSIdentityPropertyKeys = runtimeSymbol("AWSIdentityPropertyKeys", SwiftDeclaration.ENUM) } private fun runtimeSymbol( diff --git a/codegen/smithy-aws-swift-codegen/src/main/resources/META-INF/services/software.amazon.smithy.swift.codegen.integration.SwiftIntegration b/codegen/smithy-aws-swift-codegen/src/main/resources/META-INF/services/software.amazon.smithy.swift.codegen.integration.SwiftIntegration index d67a2d456e1..70d1ad0080d 100644 --- a/codegen/smithy-aws-swift-codegen/src/main/resources/META-INF/services/software.amazon.smithy.swift.codegen.integration.SwiftIntegration +++ b/codegen/smithy-aws-swift-codegen/src/main/resources/META-INF/services/software.amazon.smithy.swift.codegen.integration.SwiftIntegration @@ -2,6 +2,7 @@ software.amazon.smithy.aws.swift.codegen.AddProtocols software.amazon.smithy.aws.swift.codegen.customization.s3.S3ErrorIntegration software.amazon.smithy.aws.swift.codegen.customization.s3.S3ErrorWith200StatusIntegration software.amazon.smithy.aws.swift.codegen.customization.s3.S3Expires +software.amazon.smithy.aws.swift.codegen.customization.s3.S3ExpressIntegration software.amazon.smithy.aws.swift.codegen.customization.s3.TruncatablePaginationIntegration software.amazon.smithy.aws.swift.codegen.customization.route53.Route53TrimHostedZone software.amazon.smithy.aws.swift.codegen.customization.route53.Route53InvalidBatchErrorIntegration @@ -28,4 +29,4 @@ software.amazon.smithy.aws.swift.codegen.swiftintegrations.RegistryConfigIntegra software.amazon.smithy.aws.swift.codegen.swiftintegrations.AmzSdkRetryHeadersIntegration software.amazon.smithy.swift.codegen.protocols.rpcv2cbor.CborValidateResponseHeaderIntegration software.amazon.smithy.aws.swift.codegen.customization.rds.AuthTokenGeneratorIntegration -software.amazon.smithy.aws.swift.codegen.customization.dsql.AuthTokenGeneratorIntegration +software.amazon.smithy.aws.swift.codegen.customization.dsql.AuthTokenGeneratorIntegration \ No newline at end of file diff --git a/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/PresignerGeneratorTests.kt b/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/PresignerGeneratorTests.kt index 3bfcc66f360..bfe334b8fe3 100644 --- a/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/PresignerGeneratorTests.kt +++ b/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/PresignerGeneratorTests.kt @@ -21,6 +21,7 @@ extension GetFooInput { throw Smithy.ClientError.unknownError("No HTTP client configured for presigned request") } let context = Smithy.ContextBuilder() + .withClientConfig(value: config) .withMethod(value: .get) .withServiceName(value: serviceName) .withOperation(value: "getFoo") @@ -95,6 +96,7 @@ extension PostFooInput { throw Smithy.ClientError.unknownError("No HTTP client configured for presigned request") } let context = Smithy.ContextBuilder() + .withClientConfig(value: config) .withMethod(value: .post) .withServiceName(value: serviceName) .withOperation(value: "postFoo") @@ -172,6 +174,7 @@ extension PutFooInput { throw Smithy.ClientError.unknownError("No HTTP client configured for presigned request") } let context = Smithy.ContextBuilder() + .withClientConfig(value: config) .withMethod(value: .put) .withServiceName(value: serviceName) .withOperation(value: "putFoo") @@ -249,6 +252,7 @@ extension PutObjectInput { throw Smithy.ClientError.unknownError("No HTTP client configured for presigned request") } let context = Smithy.ContextBuilder() + .withClientConfig(value: config) .withMethod(value: .put) .withServiceName(value: serviceName) .withOperation(value: "putObject") @@ -264,6 +268,7 @@ extension PutObjectInput { .withExpiration(value: expiration) .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4") .withIdentityResolver(value: config.awsCredentialIdentityResolver, schemeID: "aws.auth#sigv4a") + .withIdentityResolver(value: config.s3ExpressIdentityResolver, schemeID: "aws.auth#sigv4-s3express") .withRegion(value: config.region) .withRequestChecksumCalculation(value: config.requestChecksumCalculation) .withResponseChecksumValidation(value: config.responseChecksumValidation) diff --git a/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/customizations/RulesBasedAuthSchemeResolverGeneratorTests.kt b/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/customizations/RulesBasedAuthSchemeResolverGeneratorTests.kt index bd0dd8280a1..acbf53a8b09 100644 --- a/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/customizations/RulesBasedAuthSchemeResolverGeneratorTests.kt +++ b/codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/customizations/RulesBasedAuthSchemeResolverGeneratorTests.kt @@ -118,6 +118,13 @@ public struct DefaultS3AuthSchemeResolver: S3AuthSchemeResolver { sigV4Option.signingProperties.set(key: SmithyHTTPAuthAPI.SigningPropertyKeys.signingName, value: param.signingName) sigV4Option.signingProperties.set(key: SmithyHTTPAuthAPI.SigningPropertyKeys.signingRegion, value: param.signingRegionSet?[0]) validAuthOptions.append(sigV4Option) + case .sigV4S3Express(let param): + var authOption = SmithyHTTPAuthAPI.AuthOption(schemeID: "aws.auth#sigv4-s3express") + authOption.signingProperties.set(key: SmithyHTTPAuthAPI.SigningPropertyKeys.signingName, value: param.signingName) + authOption.signingProperties.set(key: SmithyHTTPAuthAPI.SigningPropertyKeys.signingRegion, value: param.signingRegion) + authOption.identityProperties.set(key: AWSSDKIdentity.AWSIdentityPropertyKeys.bucket, value: serviceParams.bucket) + authOption.identityProperties.set(key: AWSSDKIdentity.AWSIdentityPropertyKeys.s3ExpressClient, value: S3ExpressCreateSessionClient()) + validAuthOptions.append(authOption) default: throw Smithy.ClientError.authError("Unknown auth scheme name: \(scheme.name)") }