From f76483c0f8e81cb0d0526a5782695927cea47a10 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Thu, 17 Oct 2024 10:30:37 -0500 Subject: [PATCH] Adapt to new paths --- .../AWSSDKSwiftCLI/Resources/Package.Base.txt | 30 +- Package.swift | 804 +++++++++--------- .../Documentation.docc/AWSSDKForSwift.md | 12 +- 3 files changed, 423 insertions(+), 423 deletions(-) diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt index dd7afe70594..d2c88ff899c 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt @@ -63,7 +63,7 @@ private var runtimeProducts: [Product] { } private func productForService(_ service: String) -> Product { - .library(name: service, targets: [service]) + .library(name: service, targets: [String(service.trimmingPrefix("aws-sdk-swift."))]) } // MARK: Dependencies @@ -105,7 +105,7 @@ private var runtimeTargets: [Target] { .awsSDKHTTPAuth, .awsSDKIdentity ], - path: "Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime", + path: "Sources/Core/aws-sdk-swift.AWSClientRuntime/Sources/AWSClientRuntime", resources: [ .process("Resources"), ] @@ -113,27 +113,27 @@ private var runtimeTargets: [Target] { .target( name: "AWSSDKCommon", dependencies: [.crt], - path: "Sources/Core/AWSSDKCommon/Sources" + path: "Sources/Core/aws-sdk-swift.AWSSDKCommon/Sources" ), .target( name: "AWSSDKEventStreamsAuth", dependencies: [.smithyEventStreamsAPI, .smithyEventStreamsAuthAPI, .smithyEventStreams, .crt, .clientRuntime, "AWSSDKHTTPAuth"], - path: "Sources/Core/AWSSDKEventStreamsAuth/Sources" + path: "Sources/Core/aws-sdk-swift.AWSSDKEventStreamsAuth/Sources" ), .target( name: "AWSSDKHTTPAuth", dependencies: [.crt, .smithy, .clientRuntime, .smithyHTTPAuth, "AWSSDKIdentity", "AWSSDKChecksums"], - path: "Sources/Core/AWSSDKHTTPAuth/Sources" + path: "Sources/Core/aws-sdk-swift.AWSSDKHTTPAuth/Sources" ), .target( name: "AWSSDKIdentity", dependencies: [.crt, .smithy, .clientRuntime, .smithyIdentity, .smithyIdentityAPI, .smithyHTTPAPI, .awsSDKCommon], - path: "Sources/Core/AWSSDKIdentity/Sources" + path: "Sources/Core/aws-sdk-swift.AWSSDKIdentity/Sources" ), .target( name: "AWSSDKChecksums", dependencies: [.crt, .smithy, .clientRuntime, .smithyChecksumsAPI, .smithyChecksums, .smithyHTTPAPI], - path: "Sources/Core/AWSSDKChecksums/Sources" + path: "Sources/Core/aws-sdk-swift.AWSSDKChecksums/Sources" ) ] } @@ -144,23 +144,23 @@ private var runtimeTestTargets: [Target] { .testTarget( name: "AWSClientRuntimeTests", dependencies: [.awsClientRuntime, .clientRuntime, .smithyTestUtils, .awsSDKCommon], - path: "Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests", + path: "Sources/Core/aws-sdk-swift.AWSClientRuntime/Tests/AWSClientRuntimeTests", resources: [.process("Resources")] ), .testTarget( name: "AWSSDKEventStreamsAuthTests", dependencies: ["AWSClientRuntime", "AWSSDKEventStreamsAuth", .smithyStreams, .smithyTestUtils], - path: "Sources/Core/AWSSDKEventStreamsAuth/Tests/AWSSDKEventStreamsAuthTests" + path: "Sources/Core/aws-sdk-swift.AWSSDKEventStreamsAuth/Tests/AWSSDKEventStreamsAuthTests" ), .testTarget( name: "AWSSDKHTTPAuthTests", dependencies: ["AWSSDKHTTPAuth", "AWSClientRuntime", "AWSSDKEventStreamsAuth", .crt, .clientRuntime, .smithyTestUtils], - path: "Sources/Core/AWSSDKHTTPAuth/Tests/AWSSDKHTTPAuthTests" + path: "Sources/Core/aws-sdk-swift.AWSSDKHTTPAuth/Tests/AWSSDKHTTPAuthTests" ), .testTarget( name: "AWSSDKIdentityTests", dependencies: [.smithy, .smithyIdentity, "AWSSDKIdentity", .awsClientRuntime], - path: "Sources/Core/AWSSDKIdentity/Tests/AWSSDKIdentityTests", + path: "Sources/Core/aws-sdk-swift.AWSSDKIdentity/Tests/AWSSDKIdentityTests", resources: [.process("Resources")] ), ] @@ -168,7 +168,7 @@ private var runtimeTestTargets: [Target] { private func target(_ service: String) -> Target { .target( - name: service, + name: String(service.trimmingPrefix("aws-sdk-swift.")), dependencies: [ .clientRuntime, .awsClientRuntime, @@ -189,16 +189,16 @@ private func target(_ service: String) -> Target { .awsSDKEventStreamsAuth, .awsSDKChecksums, ], - path: "Sources/Services/\(service)/Sources/\(service)", + path: "Sources/Services/\(service)/Sources/\(service.trimmingPrefix("aws-sdk-swift."))", resources: [.process("Resources")] ) } private func unitTestTarget(_ service: String) -> Target { - let testName = "\(service)Tests" + let testName = "\(service)Tests".trimmingPrefix("aws-sdk-swift.") return .testTarget( name: "\(testName)", - dependencies: [.clientRuntime, .awsClientRuntime, .byName(name: service), .smithyTestUtils], + dependencies: [.clientRuntime, .awsClientRuntime, .byName(name: String(service.trimmingPrefix("aws-sdk-swift."))), .smithyTestUtils], path: "Sources/Services/\(service)/Tests/\(testName)" ) } diff --git a/Package.swift b/Package.swift index 28bfc86ddb5..b151d8f5163 100644 --- a/Package.swift +++ b/Package.swift @@ -21,393 +21,393 @@ let crtVersion: Version = "0.36.0" let excludeRuntimeUnitTests = false let serviceTargets: [String] = [ - "AWSACM", - "AWSACMPCA", - "AWSAPIGateway", - "AWSARCZonalShift", - "AWSAccessAnalyzer", - "AWSAccount", - "AWSAmp", - "AWSAmplify", - "AWSAmplifyBackend", - "AWSAmplifyUIBuilder", - "AWSApiGatewayManagementApi", - "AWSApiGatewayV2", - "AWSAppConfig", - "AWSAppConfigData", - "AWSAppFabric", - "AWSAppIntegrations", - "AWSAppMesh", - "AWSAppRunner", - "AWSAppStream", - "AWSAppSync", - "AWSAppTest", - "AWSAppflow", - "AWSApplicationAutoScaling", - "AWSApplicationCostProfiler", - "AWSApplicationDiscoveryService", - "AWSApplicationInsights", - "AWSApplicationSignals", - "AWSArtifact", - "AWSAthena", - "AWSAuditManager", - "AWSAutoScaling", - "AWSAutoScalingPlans", - "AWSB2bi", - "AWSBCMDataExports", - "AWSBackup", - "AWSBackupGateway", - "AWSBatch", - "AWSBedrock", - "AWSBedrockAgent", - "AWSBedrockAgentRuntime", - "AWSBedrockRuntime", - "AWSBillingconductor", - "AWSBraket", - "AWSBudgets", - "AWSChatbot", - "AWSChime", - "AWSChimeSDKIdentity", - "AWSChimeSDKMediaPipelines", - "AWSChimeSDKMeetings", - "AWSChimeSDKMessaging", - "AWSChimeSDKVoice", - "AWSCleanRooms", - "AWSCleanRoomsML", - "AWSCloud9", - "AWSCloudControl", - "AWSCloudDirectory", - "AWSCloudFormation", - "AWSCloudFront", - "AWSCloudFrontKeyValueStore", - "AWSCloudHSM", - "AWSCloudHSMV2", - "AWSCloudSearch", - "AWSCloudSearchDomain", - "AWSCloudTrail", - "AWSCloudTrailData", - "AWSCloudWatch", - "AWSCloudWatchEvents", - "AWSCloudWatchLogs", - "AWSCodeBuild", - "AWSCodeCatalyst", - "AWSCodeCommit", - "AWSCodeConnections", - "AWSCodeDeploy", - "AWSCodeGuruProfiler", - "AWSCodeGuruReviewer", - "AWSCodeGuruSecurity", - "AWSCodePipeline", - "AWSCodeStarconnections", - "AWSCodeartifact", - "AWSCodestarnotifications", - "AWSCognitoIdentity", - "AWSCognitoIdentityProvider", - "AWSCognitoSync", - "AWSComprehend", - "AWSComprehendMedical", - "AWSComputeOptimizer", - "AWSConfigService", - "AWSConnect", - "AWSConnectCampaigns", - "AWSConnectCases", - "AWSConnectContactLens", - "AWSConnectParticipant", - "AWSControlCatalog", - "AWSControlTower", - "AWSCostExplorer", - "AWSCostOptimizationHub", - "AWSCostandUsageReportService", - "AWSCustomerProfiles", - "AWSDAX", - "AWSDLM", - "AWSDataBrew", - "AWSDataExchange", - "AWSDataPipeline", - "AWSDataSync", - "AWSDataZone", - "AWSDatabaseMigrationService", - "AWSDeadline", - "AWSDetective", - "AWSDevOpsGuru", - "AWSDeviceFarm", - "AWSDirectConnect", - "AWSDirectoryService", - "AWSDirectoryServiceData", - "AWSDocDB", - "AWSDocDBElastic", - "AWSDrs", - "AWSDynamoDB", - "AWSDynamoDBStreams", - "AWSEBS", - "AWSEC2", - "AWSEC2InstanceConnect", - "AWSECR", - "AWSECRPUBLIC", - "AWSECS", - "AWSEFS", - "AWSEKS", - "AWSEKSAuth", - "AWSEMR", - "AWSEMRServerless", - "AWSEMRcontainers", - "AWSElastiCache", - "AWSElasticBeanstalk", - "AWSElasticInference", - "AWSElasticLoadBalancing", - "AWSElasticLoadBalancingv2", - "AWSElasticTranscoder", - "AWSElasticsearchService", - "AWSEntityResolution", - "AWSEventBridge", - "AWSEvidently", - "AWSFMS", - "AWSFSx", - "AWSFinspace", - "AWSFinspacedata", - "AWSFirehose", - "AWSFis", - "AWSForecast", - "AWSForecastquery", - "AWSFraudDetector", - "AWSFreeTier", - "AWSGameLift", - "AWSGlacier", - "AWSGlobalAccelerator", - "AWSGlue", - "AWSGrafana", - "AWSGreengrass", - "AWSGreengrassV2", - "AWSGroundStation", - "AWSGuardDuty", - "AWSHealth", - "AWSHealthLake", - "AWSIAM", - "AWSIVSRealTime", - "AWSIdentitystore", - "AWSImagebuilder", - "AWSInspector", - "AWSInspector2", - "AWSInspectorScan", - "AWSInternetMonitor", - "AWSIoT", - "AWSIoT1ClickDevicesService", - "AWSIoT1ClickProjects", - "AWSIoTAnalytics", - "AWSIoTDataPlane", - "AWSIoTEvents", - "AWSIoTEventsData", - "AWSIoTFleetHub", - "AWSIoTFleetWise", - "AWSIoTJobsDataPlane", - "AWSIoTSecureTunneling", - "AWSIoTSiteWise", - "AWSIoTThingsGraph", - "AWSIoTTwinMaker", - "AWSIoTWireless", - "AWSIotDeviceAdvisor", - "AWSIvs", - "AWSIvschat", - "AWSKMS", - "AWSKafka", - "AWSKafkaConnect", - "AWSKendra", - "AWSKendraRanking", - "AWSKeyspaces", - "AWSKinesis", - "AWSKinesisAnalytics", - "AWSKinesisAnalyticsV2", - "AWSKinesisVideo", - "AWSKinesisVideoArchivedMedia", - "AWSKinesisVideoMedia", - "AWSKinesisVideoSignaling", - "AWSKinesisVideoWebRTCStorage", - "AWSLakeFormation", - "AWSLambda", - "AWSLaunchWizard", - "AWSLexModelBuildingService", - "AWSLexModelsV2", - "AWSLexRuntimeService", - "AWSLexRuntimeV2", - "AWSLicenseManager", - "AWSLicenseManagerLinuxSubscriptions", - "AWSLicenseManagerUserSubscriptions", - "AWSLightsail", - "AWSLocation", - "AWSLookoutEquipment", - "AWSLookoutMetrics", - "AWSLookoutVision", - "AWSM2", - "AWSMTurk", - "AWSMWAA", - "AWSMachineLearning", - "AWSMacie2", - "AWSMailManager", - "AWSManagedBlockchain", - "AWSManagedBlockchainQuery", - "AWSMarketplaceAgreement", - "AWSMarketplaceCatalog", - "AWSMarketplaceCommerceAnalytics", - "AWSMarketplaceDeployment", - "AWSMarketplaceEntitlementService", - "AWSMarketplaceMetering", - "AWSMarketplaceReporting", - "AWSMediaConnect", - "AWSMediaConvert", - "AWSMediaLive", - "AWSMediaPackage", - "AWSMediaPackageV2", - "AWSMediaPackageVod", - "AWSMediaStore", - "AWSMediaStoreData", - "AWSMediaTailor", - "AWSMedicalImaging", - "AWSMemoryDB", - "AWSMgn", - "AWSMigrationHub", - "AWSMigrationHubConfig", - "AWSMigrationHubOrchestrator", - "AWSMigrationHubRefactorSpaces", - "AWSMigrationHubStrategy", - "AWSMq", - "AWSNeptune", - "AWSNeptuneGraph", - "AWSNeptunedata", - "AWSNetworkFirewall", - "AWSNetworkManager", - "AWSNetworkMonitor", - "AWSNimble", - "AWSOAM", - "AWSOSIS", - "AWSOmics", - "AWSOpenSearch", - "AWSOpenSearchServerless", - "AWSOpsWorks", - "AWSOpsWorksCM", - "AWSOrganizations", - "AWSOutposts", - "AWSPCS", - "AWSPI", - "AWSPanorama", - "AWSPaymentCryptography", - "AWSPaymentCryptographyData", - "AWSPcaConnectorAd", - "AWSPcaConnectorScep", - "AWSPersonalize", - "AWSPersonalizeEvents", - "AWSPersonalizeRuntime", - "AWSPinpoint", - "AWSPinpointEmail", - "AWSPinpointSMSVoice", - "AWSPinpointSMSVoiceV2", - "AWSPipes", - "AWSPolly", - "AWSPricing", - "AWSPrivateNetworks", - "AWSProton", - "AWSQApps", - "AWSQBusiness", - "AWSQConnect", - "AWSQLDB", - "AWSQLDBSession", - "AWSQuickSight", - "AWSRAM", - "AWSRDS", - "AWSRDSData", - "AWSRUM", - "AWSRbin", - "AWSRedshift", - "AWSRedshiftData", - "AWSRedshiftServerless", - "AWSRekognition", - "AWSRepostspace", - "AWSResiliencehub", - "AWSResourceExplorer2", - "AWSResourceGroups", - "AWSResourceGroupsTaggingAPI", - "AWSRoboMaker", - "AWSRolesAnywhere", - "AWSRoute53", - "AWSRoute53Domains", - "AWSRoute53Profiles", - "AWSRoute53RecoveryCluster", - "AWSRoute53RecoveryControlConfig", - "AWSRoute53RecoveryReadiness", - "AWSRoute53Resolver", - "AWSS3", - "AWSS3Control", - "AWSS3Outposts", - "AWSSES", - "AWSSESv2", - "AWSSFN", - "AWSSMS", - "AWSSNS", - "AWSSQS", - "AWSSSM", - "AWSSSMContacts", - "AWSSSMIncidents", - "AWSSSMQuickSetup", - "AWSSSO", - "AWSSSOAdmin", - "AWSSSOOIDC", - "AWSSTS", - "AWSSWF", - "AWSSageMaker", - "AWSSageMakerA2IRuntime", - "AWSSageMakerFeatureStoreRuntime", - "AWSSageMakerGeospatial", - "AWSSageMakerMetrics", - "AWSSageMakerRuntime", - "AWSSagemakerEdge", - "AWSSavingsplans", - "AWSScheduler", - "AWSSchemas", - "AWSSecretsManager", - "AWSSecurityHub", - "AWSSecurityLake", - "AWSServerlessApplicationRepository", - "AWSServiceCatalog", - "AWSServiceCatalogAppRegistry", - "AWSServiceDiscovery", - "AWSServiceQuotas", - "AWSShield", - "AWSSigner", - "AWSSimSpaceWeaver", - "AWSSnowDeviceManagement", - "AWSSnowball", - "AWSSocialMessaging", - "AWSSsmSap", - "AWSStorageGateway", - "AWSSupplyChain", - "AWSSupport", - "AWSSupportApp", - "AWSSynthetics", - "AWSTaxSettings", - "AWSTextract", - "AWSTimestreamInfluxDB", - "AWSTimestreamQuery", - "AWSTimestreamWrite", - "AWSTnb", - "AWSTranscribe", - "AWSTranscribeStreaming", - "AWSTransfer", - "AWSTranslate", - "AWSTrustedAdvisor", - "AWSVPCLattice", - "AWSVerifiedPermissions", - "AWSVoiceID", - "AWSWAF", - "AWSWAFRegional", - "AWSWAFV2", - "AWSWellArchitected", - "AWSWisdom", - "AWSWorkDocs", - "AWSWorkMail", - "AWSWorkMailMessageFlow", - "AWSWorkSpaces", - "AWSWorkSpacesThinClient", - "AWSWorkSpacesWeb", - "AWSXRay", + "aws-sdk-swift.AWSACM", + "aws-sdk-swift.AWSACMPCA", + "aws-sdk-swift.AWSAPIGateway", + "aws-sdk-swift.AWSARCZonalShift", + "aws-sdk-swift.AWSAccessAnalyzer", + "aws-sdk-swift.AWSAccount", + "aws-sdk-swift.AWSAmp", + "aws-sdk-swift.AWSAmplify", + "aws-sdk-swift.AWSAmplifyBackend", + "aws-sdk-swift.AWSAmplifyUIBuilder", + "aws-sdk-swift.AWSApiGatewayManagementApi", + "aws-sdk-swift.AWSApiGatewayV2", + "aws-sdk-swift.AWSAppConfig", + "aws-sdk-swift.AWSAppConfigData", + "aws-sdk-swift.AWSAppFabric", + "aws-sdk-swift.AWSAppIntegrations", + "aws-sdk-swift.AWSAppMesh", + "aws-sdk-swift.AWSAppRunner", + "aws-sdk-swift.AWSAppStream", + "aws-sdk-swift.AWSAppSync", + "aws-sdk-swift.AWSAppTest", + "aws-sdk-swift.AWSAppflow", + "aws-sdk-swift.AWSApplicationAutoScaling", + "aws-sdk-swift.AWSApplicationCostProfiler", + "aws-sdk-swift.AWSApplicationDiscoveryService", + "aws-sdk-swift.AWSApplicationInsights", + "aws-sdk-swift.AWSApplicationSignals", + "aws-sdk-swift.AWSArtifact", + "aws-sdk-swift.AWSAthena", + "aws-sdk-swift.AWSAuditManager", + "aws-sdk-swift.AWSAutoScaling", + "aws-sdk-swift.AWSAutoScalingPlans", + "aws-sdk-swift.AWSB2bi", + "aws-sdk-swift.AWSBCMDataExports", + "aws-sdk-swift.AWSBackup", + "aws-sdk-swift.AWSBackupGateway", + "aws-sdk-swift.AWSBatch", + "aws-sdk-swift.AWSBedrock", + "aws-sdk-swift.AWSBedrockAgent", + "aws-sdk-swift.AWSBedrockAgentRuntime", + "aws-sdk-swift.AWSBedrockRuntime", + "aws-sdk-swift.AWSBillingconductor", + "aws-sdk-swift.AWSBraket", + "aws-sdk-swift.AWSBudgets", + "aws-sdk-swift.AWSChatbot", + "aws-sdk-swift.AWSChime", + "aws-sdk-swift.AWSChimeSDKIdentity", + "aws-sdk-swift.AWSChimeSDKMediaPipelines", + "aws-sdk-swift.AWSChimeSDKMeetings", + "aws-sdk-swift.AWSChimeSDKMessaging", + "aws-sdk-swift.AWSChimeSDKVoice", + "aws-sdk-swift.AWSCleanRooms", + "aws-sdk-swift.AWSCleanRoomsML", + "aws-sdk-swift.AWSCloud9", + "aws-sdk-swift.AWSCloudControl", + "aws-sdk-swift.AWSCloudDirectory", + "aws-sdk-swift.AWSCloudFormation", + "aws-sdk-swift.AWSCloudFront", + "aws-sdk-swift.AWSCloudFrontKeyValueStore", + "aws-sdk-swift.AWSCloudHSM", + "aws-sdk-swift.AWSCloudHSMV2", + "aws-sdk-swift.AWSCloudSearch", + "aws-sdk-swift.AWSCloudSearchDomain", + "aws-sdk-swift.AWSCloudTrail", + "aws-sdk-swift.AWSCloudTrailData", + "aws-sdk-swift.AWSCloudWatch", + "aws-sdk-swift.AWSCloudWatchEvents", + "aws-sdk-swift.AWSCloudWatchLogs", + "aws-sdk-swift.AWSCodeBuild", + "aws-sdk-swift.AWSCodeCatalyst", + "aws-sdk-swift.AWSCodeCommit", + "aws-sdk-swift.AWSCodeConnections", + "aws-sdk-swift.AWSCodeDeploy", + "aws-sdk-swift.AWSCodeGuruProfiler", + "aws-sdk-swift.AWSCodeGuruReviewer", + "aws-sdk-swift.AWSCodeGuruSecurity", + "aws-sdk-swift.AWSCodePipeline", + "aws-sdk-swift.AWSCodeStarconnections", + "aws-sdk-swift.AWSCodeartifact", + "aws-sdk-swift.AWSCodestarnotifications", + "aws-sdk-swift.AWSCognitoIdentity", + "aws-sdk-swift.AWSCognitoIdentityProvider", + "aws-sdk-swift.AWSCognitoSync", + "aws-sdk-swift.AWSComprehend", + "aws-sdk-swift.AWSComprehendMedical", + "aws-sdk-swift.AWSComputeOptimizer", + "aws-sdk-swift.AWSConfigService", + "aws-sdk-swift.AWSConnect", + "aws-sdk-swift.AWSConnectCampaigns", + "aws-sdk-swift.AWSConnectCases", + "aws-sdk-swift.AWSConnectContactLens", + "aws-sdk-swift.AWSConnectParticipant", + "aws-sdk-swift.AWSControlCatalog", + "aws-sdk-swift.AWSControlTower", + "aws-sdk-swift.AWSCostExplorer", + "aws-sdk-swift.AWSCostOptimizationHub", + "aws-sdk-swift.AWSCostandUsageReportService", + "aws-sdk-swift.AWSCustomerProfiles", + "aws-sdk-swift.AWSDAX", + "aws-sdk-swift.AWSDLM", + "aws-sdk-swift.AWSDataBrew", + "aws-sdk-swift.AWSDataExchange", + "aws-sdk-swift.AWSDataPipeline", + "aws-sdk-swift.AWSDataSync", + "aws-sdk-swift.AWSDataZone", + "aws-sdk-swift.AWSDatabaseMigrationService", + "aws-sdk-swift.AWSDeadline", + "aws-sdk-swift.AWSDetective", + "aws-sdk-swift.AWSDevOpsGuru", + "aws-sdk-swift.AWSDeviceFarm", + "aws-sdk-swift.AWSDirectConnect", + "aws-sdk-swift.AWSDirectoryService", + "aws-sdk-swift.AWSDirectoryServiceData", + "aws-sdk-swift.AWSDocDB", + "aws-sdk-swift.AWSDocDBElastic", + "aws-sdk-swift.AWSDrs", + "aws-sdk-swift.AWSDynamoDB", + "aws-sdk-swift.AWSDynamoDBStreams", + "aws-sdk-swift.AWSEBS", + "aws-sdk-swift.AWSEC2", + "aws-sdk-swift.AWSEC2InstanceConnect", + "aws-sdk-swift.AWSECR", + "aws-sdk-swift.AWSECRPUBLIC", + "aws-sdk-swift.AWSECS", + "aws-sdk-swift.AWSEFS", + "aws-sdk-swift.AWSEKS", + "aws-sdk-swift.AWSEKSAuth", + "aws-sdk-swift.AWSEMR", + "aws-sdk-swift.AWSEMRServerless", + "aws-sdk-swift.AWSEMRcontainers", + "aws-sdk-swift.AWSElastiCache", + "aws-sdk-swift.AWSElasticBeanstalk", + "aws-sdk-swift.AWSElasticInference", + "aws-sdk-swift.AWSElasticLoadBalancing", + "aws-sdk-swift.AWSElasticLoadBalancingv2", + "aws-sdk-swift.AWSElasticTranscoder", + "aws-sdk-swift.AWSElasticsearchService", + "aws-sdk-swift.AWSEntityResolution", + "aws-sdk-swift.AWSEventBridge", + "aws-sdk-swift.AWSEvidently", + "aws-sdk-swift.AWSFMS", + "aws-sdk-swift.AWSFSx", + "aws-sdk-swift.AWSFinspace", + "aws-sdk-swift.AWSFinspacedata", + "aws-sdk-swift.AWSFirehose", + "aws-sdk-swift.AWSFis", + "aws-sdk-swift.AWSForecast", + "aws-sdk-swift.AWSForecastquery", + "aws-sdk-swift.AWSFraudDetector", + "aws-sdk-swift.AWSFreeTier", + "aws-sdk-swift.AWSGameLift", + "aws-sdk-swift.AWSGlacier", + "aws-sdk-swift.AWSGlobalAccelerator", + "aws-sdk-swift.AWSGlue", + "aws-sdk-swift.AWSGrafana", + "aws-sdk-swift.AWSGreengrass", + "aws-sdk-swift.AWSGreengrassV2", + "aws-sdk-swift.AWSGroundStation", + "aws-sdk-swift.AWSGuardDuty", + "aws-sdk-swift.AWSHealth", + "aws-sdk-swift.AWSHealthLake", + "aws-sdk-swift.AWSIAM", + "aws-sdk-swift.AWSIVSRealTime", + "aws-sdk-swift.AWSIdentitystore", + "aws-sdk-swift.AWSImagebuilder", + "aws-sdk-swift.AWSInspector", + "aws-sdk-swift.AWSInspector2", + "aws-sdk-swift.AWSInspectorScan", + "aws-sdk-swift.AWSInternetMonitor", + "aws-sdk-swift.AWSIoT", + "aws-sdk-swift.AWSIoT1ClickDevicesService", + "aws-sdk-swift.AWSIoT1ClickProjects", + "aws-sdk-swift.AWSIoTAnalytics", + "aws-sdk-swift.AWSIoTDataPlane", + "aws-sdk-swift.AWSIoTEvents", + "aws-sdk-swift.AWSIoTEventsData", + "aws-sdk-swift.AWSIoTFleetHub", + "aws-sdk-swift.AWSIoTFleetWise", + "aws-sdk-swift.AWSIoTJobsDataPlane", + "aws-sdk-swift.AWSIoTSecureTunneling", + "aws-sdk-swift.AWSIoTSiteWise", + "aws-sdk-swift.AWSIoTThingsGraph", + "aws-sdk-swift.AWSIoTTwinMaker", + "aws-sdk-swift.AWSIoTWireless", + "aws-sdk-swift.AWSIotDeviceAdvisor", + "aws-sdk-swift.AWSIvs", + "aws-sdk-swift.AWSIvschat", + "aws-sdk-swift.AWSKMS", + "aws-sdk-swift.AWSKafka", + "aws-sdk-swift.AWSKafkaConnect", + "aws-sdk-swift.AWSKendra", + "aws-sdk-swift.AWSKendraRanking", + "aws-sdk-swift.AWSKeyspaces", + "aws-sdk-swift.AWSKinesis", + "aws-sdk-swift.AWSKinesisAnalytics", + "aws-sdk-swift.AWSKinesisAnalyticsV2", + "aws-sdk-swift.AWSKinesisVideo", + "aws-sdk-swift.AWSKinesisVideoArchivedMedia", + "aws-sdk-swift.AWSKinesisVideoMedia", + "aws-sdk-swift.AWSKinesisVideoSignaling", + "aws-sdk-swift.AWSKinesisVideoWebRTCStorage", + "aws-sdk-swift.AWSLakeFormation", + "aws-sdk-swift.AWSLambda", + "aws-sdk-swift.AWSLaunchWizard", + "aws-sdk-swift.AWSLexModelBuildingService", + "aws-sdk-swift.AWSLexModelsV2", + "aws-sdk-swift.AWSLexRuntimeService", + "aws-sdk-swift.AWSLexRuntimeV2", + "aws-sdk-swift.AWSLicenseManager", + "aws-sdk-swift.AWSLicenseManagerLinuxSubscriptions", + "aws-sdk-swift.AWSLicenseManagerUserSubscriptions", + "aws-sdk-swift.AWSLightsail", + "aws-sdk-swift.AWSLocation", + "aws-sdk-swift.AWSLookoutEquipment", + "aws-sdk-swift.AWSLookoutMetrics", + "aws-sdk-swift.AWSLookoutVision", + "aws-sdk-swift.AWSM2", + "aws-sdk-swift.AWSMTurk", + "aws-sdk-swift.AWSMWAA", + "aws-sdk-swift.AWSMachineLearning", + "aws-sdk-swift.AWSMacie2", + "aws-sdk-swift.AWSMailManager", + "aws-sdk-swift.AWSManagedBlockchain", + "aws-sdk-swift.AWSManagedBlockchainQuery", + "aws-sdk-swift.AWSMarketplaceAgreement", + "aws-sdk-swift.AWSMarketplaceCatalog", + "aws-sdk-swift.AWSMarketplaceCommerceAnalytics", + "aws-sdk-swift.AWSMarketplaceDeployment", + "aws-sdk-swift.AWSMarketplaceEntitlementService", + "aws-sdk-swift.AWSMarketplaceMetering", + "aws-sdk-swift.AWSMarketplaceReporting", + "aws-sdk-swift.AWSMediaConnect", + "aws-sdk-swift.AWSMediaConvert", + "aws-sdk-swift.AWSMediaLive", + "aws-sdk-swift.AWSMediaPackage", + "aws-sdk-swift.AWSMediaPackageV2", + "aws-sdk-swift.AWSMediaPackageVod", + "aws-sdk-swift.AWSMediaStore", + "aws-sdk-swift.AWSMediaStoreData", + "aws-sdk-swift.AWSMediaTailor", + "aws-sdk-swift.AWSMedicalImaging", + "aws-sdk-swift.AWSMemoryDB", + "aws-sdk-swift.AWSMgn", + "aws-sdk-swift.AWSMigrationHub", + "aws-sdk-swift.AWSMigrationHubConfig", + "aws-sdk-swift.AWSMigrationHubOrchestrator", + "aws-sdk-swift.AWSMigrationHubRefactorSpaces", + "aws-sdk-swift.AWSMigrationHubStrategy", + "aws-sdk-swift.AWSMq", + "aws-sdk-swift.AWSNeptune", + "aws-sdk-swift.AWSNeptuneGraph", + "aws-sdk-swift.AWSNeptunedata", + "aws-sdk-swift.AWSNetworkFirewall", + "aws-sdk-swift.AWSNetworkManager", + "aws-sdk-swift.AWSNetworkMonitor", + "aws-sdk-swift.AWSNimble", + "aws-sdk-swift.AWSOAM", + "aws-sdk-swift.AWSOSIS", + "aws-sdk-swift.AWSOmics", + "aws-sdk-swift.AWSOpenSearch", + "aws-sdk-swift.AWSOpenSearchServerless", + "aws-sdk-swift.AWSOpsWorks", + "aws-sdk-swift.AWSOpsWorksCM", + "aws-sdk-swift.AWSOrganizations", + "aws-sdk-swift.AWSOutposts", + "aws-sdk-swift.AWSPCS", + "aws-sdk-swift.AWSPI", + "aws-sdk-swift.AWSPanorama", + "aws-sdk-swift.AWSPaymentCryptography", + "aws-sdk-swift.AWSPaymentCryptographyData", + "aws-sdk-swift.AWSPcaConnectorAd", + "aws-sdk-swift.AWSPcaConnectorScep", + "aws-sdk-swift.AWSPersonalize", + "aws-sdk-swift.AWSPersonalizeEvents", + "aws-sdk-swift.AWSPersonalizeRuntime", + "aws-sdk-swift.AWSPinpoint", + "aws-sdk-swift.AWSPinpointEmail", + "aws-sdk-swift.AWSPinpointSMSVoice", + "aws-sdk-swift.AWSPinpointSMSVoiceV2", + "aws-sdk-swift.AWSPipes", + "aws-sdk-swift.AWSPolly", + "aws-sdk-swift.AWSPricing", + "aws-sdk-swift.AWSPrivateNetworks", + "aws-sdk-swift.AWSProton", + "aws-sdk-swift.AWSQApps", + "aws-sdk-swift.AWSQBusiness", + "aws-sdk-swift.AWSQConnect", + "aws-sdk-swift.AWSQLDB", + "aws-sdk-swift.AWSQLDBSession", + "aws-sdk-swift.AWSQuickSight", + "aws-sdk-swift.AWSRAM", + "aws-sdk-swift.AWSRDS", + "aws-sdk-swift.AWSRDSData", + "aws-sdk-swift.AWSRUM", + "aws-sdk-swift.AWSRbin", + "aws-sdk-swift.AWSRedshift", + "aws-sdk-swift.AWSRedshiftData", + "aws-sdk-swift.AWSRedshiftServerless", + "aws-sdk-swift.AWSRekognition", + "aws-sdk-swift.AWSRepostspace", + "aws-sdk-swift.AWSResiliencehub", + "aws-sdk-swift.AWSResourceExplorer2", + "aws-sdk-swift.AWSResourceGroups", + "aws-sdk-swift.AWSResourceGroupsTaggingAPI", + "aws-sdk-swift.AWSRoboMaker", + "aws-sdk-swift.AWSRolesAnywhere", + "aws-sdk-swift.AWSRoute53", + "aws-sdk-swift.AWSRoute53Domains", + "aws-sdk-swift.AWSRoute53Profiles", + "aws-sdk-swift.AWSRoute53RecoveryCluster", + "aws-sdk-swift.AWSRoute53RecoveryControlConfig", + "aws-sdk-swift.AWSRoute53RecoveryReadiness", + "aws-sdk-swift.AWSRoute53Resolver", + "aws-sdk-swift.AWSS3", + "aws-sdk-swift.AWSS3Control", + "aws-sdk-swift.AWSS3Outposts", + "aws-sdk-swift.AWSSES", + "aws-sdk-swift.AWSSESv2", + "aws-sdk-swift.AWSSFN", + "aws-sdk-swift.AWSSMS", + "aws-sdk-swift.AWSSNS", + "aws-sdk-swift.AWSSQS", + "aws-sdk-swift.AWSSSM", + "aws-sdk-swift.AWSSSMContacts", + "aws-sdk-swift.AWSSSMIncidents", + "aws-sdk-swift.AWSSSMQuickSetup", + "aws-sdk-swift.AWSSSO", + "aws-sdk-swift.AWSSSOAdmin", + "aws-sdk-swift.AWSSSOOIDC", + "aws-sdk-swift.AWSSTS", + "aws-sdk-swift.AWSSWF", + "aws-sdk-swift.AWSSageMaker", + "aws-sdk-swift.AWSSageMakerA2IRuntime", + "aws-sdk-swift.AWSSageMakerFeatureStoreRuntime", + "aws-sdk-swift.AWSSageMakerGeospatial", + "aws-sdk-swift.AWSSageMakerMetrics", + "aws-sdk-swift.AWSSageMakerRuntime", + "aws-sdk-swift.AWSSagemakerEdge", + "aws-sdk-swift.AWSSavingsplans", + "aws-sdk-swift.AWSScheduler", + "aws-sdk-swift.AWSSchemas", + "aws-sdk-swift.AWSSecretsManager", + "aws-sdk-swift.AWSSecurityHub", + "aws-sdk-swift.AWSSecurityLake", + "aws-sdk-swift.AWSServerlessApplicationRepository", + "aws-sdk-swift.AWSServiceCatalog", + "aws-sdk-swift.AWSServiceCatalogAppRegistry", + "aws-sdk-swift.AWSServiceDiscovery", + "aws-sdk-swift.AWSServiceQuotas", + "aws-sdk-swift.AWSShield", + "aws-sdk-swift.AWSSigner", + "aws-sdk-swift.AWSSimSpaceWeaver", + "aws-sdk-swift.AWSSnowDeviceManagement", + "aws-sdk-swift.AWSSnowball", + "aws-sdk-swift.AWSSocialMessaging", + "aws-sdk-swift.AWSSsmSap", + "aws-sdk-swift.AWSStorageGateway", + "aws-sdk-swift.AWSSupplyChain", + "aws-sdk-swift.AWSSupport", + "aws-sdk-swift.AWSSupportApp", + "aws-sdk-swift.AWSSynthetics", + "aws-sdk-swift.AWSTaxSettings", + "aws-sdk-swift.AWSTextract", + "aws-sdk-swift.AWSTimestreamInfluxDB", + "aws-sdk-swift.AWSTimestreamQuery", + "aws-sdk-swift.AWSTimestreamWrite", + "aws-sdk-swift.AWSTnb", + "aws-sdk-swift.AWSTranscribe", + "aws-sdk-swift.AWSTranscribeStreaming", + "aws-sdk-swift.AWSTransfer", + "aws-sdk-swift.AWSTranslate", + "aws-sdk-swift.AWSTrustedAdvisor", + "aws-sdk-swift.AWSVPCLattice", + "aws-sdk-swift.AWSVerifiedPermissions", + "aws-sdk-swift.AWSVoiceID", + "aws-sdk-swift.AWSWAF", + "aws-sdk-swift.AWSWAFRegional", + "aws-sdk-swift.AWSWAFV2", + "aws-sdk-swift.AWSWellArchitected", + "aws-sdk-swift.AWSWisdom", + "aws-sdk-swift.AWSWorkDocs", + "aws-sdk-swift.AWSWorkMail", + "aws-sdk-swift.AWSWorkMailMessageFlow", + "aws-sdk-swift.AWSWorkSpaces", + "aws-sdk-swift.AWSWorkSpacesThinClient", + "aws-sdk-swift.AWSWorkSpacesWeb", + "aws-sdk-swift.AWSXRay", ] // MARK: - Static Content @@ -475,7 +475,7 @@ private var runtimeProducts: [Product] { } private func productForService(_ service: String) -> Product { - .library(name: service, targets: [service]) + .library(name: service, targets: [String(service.trimmingPrefix("aws-sdk-swift."))]) } // MARK: Dependencies @@ -517,7 +517,7 @@ private var runtimeTargets: [Target] { .awsSDKHTTPAuth, .awsSDKIdentity ], - path: "Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime", + path: "Sources/Core/aws-sdk-swift.AWSClientRuntime/Sources/AWSClientRuntime", resources: [ .process("Resources"), ] @@ -525,27 +525,27 @@ private var runtimeTargets: [Target] { .target( name: "AWSSDKCommon", dependencies: [.crt], - path: "Sources/Core/AWSSDKCommon/Sources" + path: "Sources/Core/aws-sdk-swift.AWSSDKCommon/Sources" ), .target( name: "AWSSDKEventStreamsAuth", dependencies: [.smithyEventStreamsAPI, .smithyEventStreamsAuthAPI, .smithyEventStreams, .crt, .clientRuntime, "AWSSDKHTTPAuth"], - path: "Sources/Core/AWSSDKEventStreamsAuth/Sources" + path: "Sources/Core/aws-sdk-swift.AWSSDKEventStreamsAuth/Sources" ), .target( name: "AWSSDKHTTPAuth", dependencies: [.crt, .smithy, .clientRuntime, .smithyHTTPAuth, "AWSSDKIdentity", "AWSSDKChecksums"], - path: "Sources/Core/AWSSDKHTTPAuth/Sources" + path: "Sources/Core/aws-sdk-swift.AWSSDKHTTPAuth/Sources" ), .target( name: "AWSSDKIdentity", dependencies: [.crt, .smithy, .clientRuntime, .smithyIdentity, .smithyIdentityAPI, .smithyHTTPAPI, .awsSDKCommon], - path: "Sources/Core/AWSSDKIdentity/Sources" + path: "Sources/Core/aws-sdk-swift.AWSSDKIdentity/Sources" ), .target( name: "AWSSDKChecksums", dependencies: [.crt, .smithy, .clientRuntime, .smithyChecksumsAPI, .smithyChecksums, .smithyHTTPAPI], - path: "Sources/Core/AWSSDKChecksums/Sources" + path: "Sources/Core/aws-sdk-swift.AWSSDKChecksums/Sources" ) ] } @@ -556,23 +556,23 @@ private var runtimeTestTargets: [Target] { .testTarget( name: "AWSClientRuntimeTests", dependencies: [.awsClientRuntime, .clientRuntime, .smithyTestUtils, .awsSDKCommon], - path: "Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests", + path: "Sources/Core/aws-sdk-swift.AWSClientRuntime/Tests/AWSClientRuntimeTests", resources: [.process("Resources")] ), .testTarget( name: "AWSSDKEventStreamsAuthTests", dependencies: ["AWSClientRuntime", "AWSSDKEventStreamsAuth", .smithyStreams, .smithyTestUtils], - path: "Sources/Core/AWSSDKEventStreamsAuth/Tests/AWSSDKEventStreamsAuthTests" + path: "Sources/Core/aws-sdk-swift.AWSSDKEventStreamsAuth/Tests/AWSSDKEventStreamsAuthTests" ), .testTarget( name: "AWSSDKHTTPAuthTests", dependencies: ["AWSSDKHTTPAuth", "AWSClientRuntime", "AWSSDKEventStreamsAuth", .crt, .clientRuntime, .smithyTestUtils], - path: "Sources/Core/AWSSDKHTTPAuth/Tests/AWSSDKHTTPAuthTests" + path: "Sources/Core/aws-sdk-swift.AWSSDKHTTPAuth/Tests/AWSSDKHTTPAuthTests" ), .testTarget( name: "AWSSDKIdentityTests", dependencies: [.smithy, .smithyIdentity, "AWSSDKIdentity", .awsClientRuntime], - path: "Sources/Core/AWSSDKIdentity/Tests/AWSSDKIdentityTests", + path: "Sources/Core/aws-sdk-swift.AWSSDKIdentity/Tests/AWSSDKIdentityTests", resources: [.process("Resources")] ), ] @@ -580,7 +580,7 @@ private var runtimeTestTargets: [Target] { private func target(_ service: String) -> Target { .target( - name: service, + name: String(service.trimmingPrefix("aws-sdk-swift.")), dependencies: [ .clientRuntime, .awsClientRuntime, @@ -601,16 +601,16 @@ private func target(_ service: String) -> Target { .awsSDKEventStreamsAuth, .awsSDKChecksums, ], - path: "Sources/Services/\(service)/Sources/\(service)", + path: "Sources/Services/\(service)/Sources/\(service.trimmingPrefix("aws-sdk-swift."))", resources: [.process("Resources")] ) } private func unitTestTarget(_ service: String) -> Target { - let testName = "\(service)Tests" + let testName = "\(service)Tests".trimmingPrefix("aws-sdk-swift.") return .testTarget( name: "\(testName)", - dependencies: [.clientRuntime, .awsClientRuntime, .byName(name: service), .smithyTestUtils], + dependencies: [.clientRuntime, .awsClientRuntime, .byName(name: String(service.trimmingPrefix("aws-sdk-swift."))), .smithyTestUtils], path: "Sources/Services/\(service)/Tests/\(testName)" ) } diff --git a/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md b/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md index 34f2b35a440..d2ab00b7a6c 100644 --- a/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md +++ b/Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md @@ -60,17 +60,17 @@ This SDK is open-source. Code is available on Github [here](https://github.com/ ## AWS Runtime Module Documentation -[AWSClientRuntime](../../../../../swift/api/awsclientruntime/latest) +[aws-sdk-swift.AWSClientRuntime](../../../../../swift/api/aws-sdk-swift.awsclientruntime/latest) -[AWSSDKChecksums](../../../../../swift/api/awssdkchecksums/latest) +[aws-sdk-swift.AWSSDKChecksums](../../../../../swift/api/aws-sdk-swift.awssdkchecksums/latest) -[AWSSDKCommon](../../../../../swift/api/awssdkcommon/latest) +[aws-sdk-swift.AWSSDKCommon](../../../../../swift/api/aws-sdk-swift.awssdkcommon/latest) -[AWSSDKEventStreamsAuth](../../../../../swift/api/awssdkeventstreamsauth/latest) +[aws-sdk-swift.AWSSDKEventStreamsAuth](../../../../../swift/api/aws-sdk-swift.awssdkeventstreamsauth/latest) -[AWSSDKHTTPAuth](../../../../../swift/api/awssdkhttpauth/latest) +[aws-sdk-swift.AWSSDKHTTPAuth](../../../../../swift/api/aws-sdk-swift.awssdkhttpauth/latest) -[AWSSDKIdentity](../../../../../swift/api/awssdkidentity/latest) +[aws-sdk-swift.AWSSDKIdentity](../../../../../swift/api/aws-sdk-swift.awssdkidentity/latest) ## Service Documentation