aws-sdk-s3control 1.104.0 → 1.105.0

data/lib/aws-sdk-s3control/client_api.rb

@@ -98,6 +98,7 @@ module Aws::S3Control
     DeleteAccessPointPolicyForObjectLambdaRequest = Shapes::StructureShape.new(name: 'DeleteAccessPointPolicyForObjectLambdaRequest')
     DeleteAccessPointPolicyRequest = Shapes::StructureShape.new(name: 'DeleteAccessPointPolicyRequest')
     DeleteAccessPointRequest = Shapes::StructureShape.new(name: 'DeleteAccessPointRequest')
+    DeleteAccessPointScopeRequest = Shapes::StructureShape.new(name: 'DeleteAccessPointScopeRequest')
     DeleteBucketLifecycleConfigurationRequest = Shapes::StructureShape.new(name: 'DeleteBucketLifecycleConfigurationRequest')
     DeleteBucketPolicyRequest = Shapes::StructureShape.new(name: 'DeleteBucketPolicyRequest')
     DeleteBucketReplicationRequest = Shapes::StructureShape.new(name: 'DeleteBucketReplicationRequest')
@@ -161,6 +162,8 @@ module Aws::S3Control
     GetAccessPointPolicyStatusResult = Shapes::StructureShape.new(name: 'GetAccessPointPolicyStatusResult')
     GetAccessPointRequest = Shapes::StructureShape.new(name: 'GetAccessPointRequest')
     GetAccessPointResult = Shapes::StructureShape.new(name: 'GetAccessPointResult')
+    GetAccessPointScopeRequest = Shapes::StructureShape.new(name: 'GetAccessPointScopeRequest')
+    GetAccessPointScopeResult = Shapes::StructureShape.new(name: 'GetAccessPointScopeResult')
     GetBucketLifecycleConfigurationRequest = Shapes::StructureShape.new(name: 'GetBucketLifecycleConfigurationRequest')
     GetBucketLifecycleConfigurationResult = Shapes::StructureShape.new(name: 'GetBucketLifecycleConfigurationResult')
     GetBucketPolicyRequest = Shapes::StructureShape.new(name: 'GetBucketPolicyRequest')
@@ -264,6 +267,8 @@ module Aws::S3Control
     ListAccessGrantsLocationsResult = Shapes::StructureShape.new(name: 'ListAccessGrantsLocationsResult')
     ListAccessGrantsRequest = Shapes::StructureShape.new(name: 'ListAccessGrantsRequest')
     ListAccessGrantsResult = Shapes::StructureShape.new(name: 'ListAccessGrantsResult')
+    ListAccessPointsForDirectoryBucketsRequest = Shapes::StructureShape.new(name: 'ListAccessPointsForDirectoryBucketsRequest')
+    ListAccessPointsForDirectoryBucketsResult = Shapes::StructureShape.new(name: 'ListAccessPointsForDirectoryBucketsResult')
     ListAccessPointsForObjectLambdaRequest = Shapes::StructureShape.new(name: 'ListAccessPointsForObjectLambdaRequest')
     ListAccessPointsForObjectLambdaResult = Shapes::StructureShape.new(name: 'ListAccessPointsForObjectLambdaResult')
     ListAccessPointsRequest = Shapes::StructureShape.new(name: 'ListAccessPointsRequest')
@@ -360,6 +365,7 @@ module Aws::S3Control
     Prefix = Shapes::StringShape.new(name: 'Prefix')
     PrefixLevel = Shapes::StructureShape.new(name: 'PrefixLevel')
     PrefixLevelStorageMetrics = Shapes::StructureShape.new(name: 'PrefixLevelStorageMetrics')
+    PrefixesList = Shapes::ListShape.new(name: 'PrefixesList')
     Priority = Shapes::IntegerShape.new(name: 'Priority')
     Privilege = Shapes::StringShape.new(name: 'Privilege')
     ProposedMultiRegionAccessPointPolicy = Shapes::StructureShape.new(name: 'ProposedMultiRegionAccessPointPolicy')
@@ -370,6 +376,7 @@ module Aws::S3Control
     PutAccessPointConfigurationForObjectLambdaRequest = Shapes::StructureShape.new(name: 'PutAccessPointConfigurationForObjectLambdaRequest')
     PutAccessPointPolicyForObjectLambdaRequest = Shapes::StructureShape.new(name: 'PutAccessPointPolicyForObjectLambdaRequest')
     PutAccessPointPolicyRequest = Shapes::StructureShape.new(name: 'PutAccessPointPolicyRequest')
+    PutAccessPointScopeRequest = Shapes::StructureShape.new(name: 'PutAccessPointScopeRequest')
     PutBucketLifecycleConfigurationRequest = Shapes::StructureShape.new(name: 'PutBucketLifecycleConfigurationRequest')
     PutBucketPolicyRequest = Shapes::StructureShape.new(name: 'PutBucketPolicyRequest')
     PutBucketReplicationRequest = Shapes::StructureShape.new(name: 'PutBucketReplicationRequest')
@@ -463,6 +470,9 @@ module Aws::S3Control
     SSEKMSKeyId = Shapes::StringShape.new(name: 'SSEKMSKeyId')
     SSES3 = Shapes::StructureShape.new(name: 'SSES3', locationName: "SSE-S3")
     SSES3Encryption = Shapes::StructureShape.new(name: 'SSES3Encryption', locationName: "SSE-S3")
+    Scope = Shapes::StructureShape.new(name: 'Scope')
+    ScopePermission = Shapes::StringShape.new(name: 'ScopePermission')
+    ScopePermissionList = Shapes::ListShape.new(name: 'ScopePermissionList')
     SecretAccessKey = Shapes::StringShape.new(name: 'SecretAccessKey')
     SelectionCriteria = Shapes::StructureShape.new(name: 'SelectionCriteria')
     SessionToken = Shapes::StringShape.new(name: 'SessionToken')
@@ -679,11 +689,12 @@ module Aws::S3Control
     CreateAccessPointForObjectLambdaResult.struct_class = Types::CreateAccessPointForObjectLambdaResult
 
     CreateAccessPointRequest.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-account-id", metadata: {"contextParam"=>{"name"=>"AccountId"}}))
-    CreateAccessPointRequest.add_member(:name, Shapes::ShapeRef.new(shape: AccessPointName, required: true, location: "uri", location_name: "name"))
+    CreateAccessPointRequest.add_member(:name, Shapes::ShapeRef.new(shape: AccessPointName, required: true, location: "uri", location_name: "name", metadata: {"contextParam"=>{"name"=>"AccessPointName"}}))
     CreateAccessPointRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     CreateAccessPointRequest.add_member(:vpc_configuration, Shapes::ShapeRef.new(shape: VpcConfiguration, location_name: "VpcConfiguration"))
     CreateAccessPointRequest.add_member(:public_access_block_configuration, Shapes::ShapeRef.new(shape: PublicAccessBlockConfiguration, location_name: "PublicAccessBlockConfiguration"))
     CreateAccessPointRequest.add_member(:bucket_account_id, Shapes::ShapeRef.new(shape: AccountId, location_name: "BucketAccountId"))
+    CreateAccessPointRequest.add_member(:scope, Shapes::ShapeRef.new(shape: Scope, location_name: "Scope"))
     CreateAccessPointRequest.struct_class = Types::CreateAccessPointRequest
 
     CreateAccessPointResult.add_member(:access_point_arn, Shapes::ShapeRef.new(shape: S3AccessPointArn, location_name: "AccessPointArn"))
@@ -781,6 +792,10 @@ module Aws::S3Control
     DeleteAccessPointRequest.add_member(:name, Shapes::ShapeRef.new(shape: AccessPointName, required: true, location: "uri", location_name: "name", metadata: {"contextParam"=>{"name"=>"AccessPointName"}}))
     DeleteAccessPointRequest.struct_class = Types::DeleteAccessPointRequest
 
+    DeleteAccessPointScopeRequest.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, required: true, location: "header", location_name: "x-amz-account-id", metadata: {"contextParam"=>{"name"=>"AccountId"}, "hostLabel"=>true, "hostLabelName"=>"AccountId"}))
+    DeleteAccessPointScopeRequest.add_member(:name, Shapes::ShapeRef.new(shape: AccessPointName, required: true, location: "uri", location_name: "name", metadata: {"contextParam"=>{"name"=>"AccessPointName"}}))
+    DeleteAccessPointScopeRequest.struct_class = Types::DeleteAccessPointScopeRequest
+
     DeleteBucketLifecycleConfigurationRequest.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-account-id", metadata: {"contextParam"=>{"name"=>"AccountId"}}))
     DeleteBucketLifecycleConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "name", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketLifecycleConfigurationRequest.struct_class = Types::DeleteBucketLifecycleConfigurationRequest
@@ -1001,6 +1016,13 @@ module Aws::S3Control
     GetAccessPointResult.add_member(:bucket_account_id, Shapes::ShapeRef.new(shape: AccountId, location_name: "BucketAccountId"))
     GetAccessPointResult.struct_class = Types::GetAccessPointResult
 
+    GetAccessPointScopeRequest.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, required: true, location: "header", location_name: "x-amz-account-id", metadata: {"contextParam"=>{"name"=>"AccountId"}, "hostLabel"=>true, "hostLabelName"=>"AccountId"}))
+    GetAccessPointScopeRequest.add_member(:name, Shapes::ShapeRef.new(shape: AccessPointName, required: true, location: "uri", location_name: "name", metadata: {"contextParam"=>{"name"=>"AccessPointName"}}))
+    GetAccessPointScopeRequest.struct_class = Types::GetAccessPointScopeRequest
+
+    GetAccessPointScopeResult.add_member(:scope, Shapes::ShapeRef.new(shape: Scope, location_name: "Scope"))
+    GetAccessPointScopeResult.struct_class = Types::GetAccessPointScopeResult
+
     GetBucketLifecycleConfigurationRequest.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-account-id", metadata: {"contextParam"=>{"name"=>"AccountId"}}))
     GetBucketLifecycleConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "name", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketLifecycleConfigurationRequest.struct_class = Types::GetBucketLifecycleConfigurationRequest
@@ -1352,6 +1374,16 @@ module Aws::S3Control
     ListAccessGrantsResult.add_member(:access_grants_list, Shapes::ShapeRef.new(shape: AccessGrantsList, location_name: "AccessGrantsList"))
     ListAccessGrantsResult.struct_class = Types::ListAccessGrantsResult
 
+    ListAccessPointsForDirectoryBucketsRequest.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, required: true, location: "header", location_name: "x-amz-account-id", metadata: {"contextParam"=>{"name"=>"AccountId"}, "hostLabel"=>true, "hostLabelName"=>"AccountId"}))
+    ListAccessPointsForDirectoryBucketsRequest.add_member(:directory_bucket, Shapes::ShapeRef.new(shape: BucketName, location: "querystring", location_name: "directoryBucket"))
+    ListAccessPointsForDirectoryBucketsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NonEmptyMaxLength1024String, location: "querystring", location_name: "nextToken"))
+    ListAccessPointsForDirectoryBucketsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location: "querystring", location_name: "maxResults"))
+    ListAccessPointsForDirectoryBucketsRequest.struct_class = Types::ListAccessPointsForDirectoryBucketsRequest
+
+    ListAccessPointsForDirectoryBucketsResult.add_member(:access_point_list, Shapes::ShapeRef.new(shape: AccessPointList, location_name: "AccessPointList"))
+    ListAccessPointsForDirectoryBucketsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NonEmptyMaxLength1024String, location_name: "NextToken"))
+    ListAccessPointsForDirectoryBucketsResult.struct_class = Types::ListAccessPointsForDirectoryBucketsResult
+
     ListAccessPointsForObjectLambdaRequest.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-account-id", metadata: {"contextParam"=>{"name"=>"AccountId"}}))
     ListAccessPointsForObjectLambdaRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NonEmptyMaxLength1024String, location: "querystring", location_name: "nextToken"))
     ListAccessPointsForObjectLambdaRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location: "querystring", location_name: "maxResults"))
@@ -1557,6 +1589,8 @@ module Aws::S3Control
     PrefixLevelStorageMetrics.add_member(:selection_criteria, Shapes::ShapeRef.new(shape: SelectionCriteria, location_name: "SelectionCriteria"))
     PrefixLevelStorageMetrics.struct_class = Types::PrefixLevelStorageMetrics
 
+    PrefixesList.member = Shapes::ShapeRef.new(shape: Prefix, location_name: "Prefix")
+
     ProposedMultiRegionAccessPointPolicy.add_member(:policy, Shapes::ShapeRef.new(shape: Policy, location_name: "Policy"))
     ProposedMultiRegionAccessPointPolicy.struct_class = Types::ProposedMultiRegionAccessPointPolicy
 
@@ -1591,6 +1625,11 @@ module Aws::S3Control
     PutAccessPointPolicyRequest.add_member(:policy, Shapes::ShapeRef.new(shape: Policy, required: true, location_name: "Policy"))
     PutAccessPointPolicyRequest.struct_class = Types::PutAccessPointPolicyRequest
 
+    PutAccessPointScopeRequest.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, required: true, location: "header", location_name: "x-amz-account-id", metadata: {"contextParam"=>{"name"=>"AccountId"}, "hostLabel"=>true, "hostLabelName"=>"AccountId"}))
+    PutAccessPointScopeRequest.add_member(:name, Shapes::ShapeRef.new(shape: AccessPointName, required: true, location: "uri", location_name: "name", metadata: {"contextParam"=>{"name"=>"AccessPointName"}}))
+    PutAccessPointScopeRequest.add_member(:scope, Shapes::ShapeRef.new(shape: Scope, required: true, location_name: "Scope"))
+    PutAccessPointScopeRequest.struct_class = Types::PutAccessPointScopeRequest
+
     PutBucketLifecycleConfigurationRequest.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-account-id", metadata: {"contextParam"=>{"name"=>"AccountId"}}))
     PutBucketLifecycleConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "name", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketLifecycleConfigurationRequest.add_member(:lifecycle_configuration, Shapes::ShapeRef.new(shape: LifecycleConfiguration, location_name: "LifecycleConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://awss3control.amazonaws.com/doc/2018-08-20/"}}))
@@ -1858,6 +1897,12 @@ module Aws::S3Control
 
     SSES3Encryption.struct_class = Types::SSES3Encryption
 
+    Scope.add_member(:prefixes, Shapes::ShapeRef.new(shape: PrefixesList, location_name: "Prefixes"))
+    Scope.add_member(:permissions, Shapes::ShapeRef.new(shape: ScopePermissionList, location_name: "Permissions"))
+    Scope.struct_class = Types::Scope
+
+    ScopePermissionList.member = Shapes::ShapeRef.new(shape: ScopePermission, location_name: "Permission")
+
     SelectionCriteria.add_member(:delimiter, Shapes::ShapeRef.new(shape: StorageLensPrefixLevelDelimiter, location_name: "Delimiter"))
     SelectionCriteria.add_member(:max_depth, Shapes::ShapeRef.new(shape: StorageLensPrefixLevelMaxDepth, location_name: "MaxDepth"))
     SelectionCriteria.add_member(:min_storage_bytes_percentage, Shapes::ShapeRef.new(shape: MinStorageBytesPercentage, location_name: "MinStorageBytesPercentage"))
@@ -2292,6 +2337,14 @@ module Aws::S3Control
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
 
+      api.add_operation(:delete_access_point_scope, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteAccessPointScope"
+        o.http_method = "DELETE"
+        o.http_request_uri = "/v20180820/accesspoint/{name}/scope"
+        o.input = Shapes::ShapeRef.new(shape: DeleteAccessPointScopeRequest)
+        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+      end)
+
       api.add_operation(:delete_bucket, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucket"
         o.http_method = "DELETE"
@@ -2572,6 +2625,14 @@ module Aws::S3Control
         o.output = Shapes::ShapeRef.new(shape: GetAccessPointPolicyStatusForObjectLambdaResult)
       end)
 
+      api.add_operation(:get_access_point_scope, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetAccessPointScope"
+        o.http_method = "GET"
+        o.http_request_uri = "/v20180820/accesspoint/{name}/scope"
+        o.input = Shapes::ShapeRef.new(shape: GetAccessPointScopeRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetAccessPointScopeResult)
+      end)
+
       api.add_operation(:get_bucket, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucket"
         o.http_method = "GET"
@@ -2808,6 +2869,20 @@ module Aws::S3Control
         )
       end)
 
+      api.add_operation(:list_access_points_for_directory_buckets, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ListAccessPointsForDirectoryBuckets"
+        o.http_method = "GET"
+        o.http_request_uri = "/v20180820/accesspointfordirectory"
+        o.input = Shapes::ShapeRef.new(shape: ListAccessPointsForDirectoryBucketsRequest)
+        o.output = Shapes::ShapeRef.new(shape: ListAccessPointsForDirectoryBucketsResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:list_access_points_for_object_lambda, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListAccessPointsForObjectLambda"
         o.http_method = "GET"
@@ -2994,6 +3069,19 @@ module Aws::S3Control
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
 
+      api.add_operation(:put_access_point_scope, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "PutAccessPointScope"
+        o.http_method = "PUT"
+        o.http_request_uri = "/v20180820/accesspoint/{name}/scope"
+        o.input = Shapes::ShapeRef.new(shape: PutAccessPointScopeRequest,
+          location_name: "PutAccessPointScopeRequest",
+          metadata: {
+            "xmlNamespace" => {"uri"=>"http://awss3control.amazonaws.com/doc/2018-08-20/"}
+          }
+        )
+        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+      end)
+
       api.add_operation(:put_bucket_lifecycle_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketLifecycleConfiguration"
         o.http_method = "PUT"

data/lib/aws-sdk-s3control/endpoint_parameters.rb

@@ -60,6 +60,11 @@ module Aws::S3Control
   #
   #   @return [Boolean]
   #
+  # @!attribute use_s3_express_control_endpoint
+  #   Internal parameter to indicate whether S3Express operation should use control plane, (ex. ListDirectoryAccessPoints)
+  #
+  #   @return [Boolean]
+  #
   EndpointParameters = Struct.new(
     :region,
     :use_fips,
@@ -71,6 +76,7 @@ module Aws::S3Control
     :bucket,
     :access_point_name,
     :use_arn_region,
+    :use_s3_express_control_endpoint,
   ) do
     include Aws::Structure
 
@@ -87,6 +93,7 @@ module Aws::S3Control
         'Bucket' => :bucket,
         'AccessPointName' => :access_point_name,
         'UseArnRegion' => :use_arn_region,
+        'UseS3ExpressControlEndpoint' => :use_s3_express_control_endpoint,
       }.freeze
     end
 
@@ -103,6 +110,7 @@ module Aws::S3Control
       self[:bucket] = options[:bucket]
       self[:access_point_name] = options[:access_point_name]
       self[:use_arn_region] = options[:use_arn_region]
+      self[:use_s3_express_control_endpoint] = options[:use_s3_express_control_endpoint]
     end
 
     def self.create(config, options={})

data/lib/aws-sdk-s3control/endpoint_provider.rb

@@ -11,22 +11,11 @@ module Aws::S3Control
   class EndpointProvider
     def resolve_endpoint(parameters)
       if Aws::Endpoints::Matchers.set?(parameters.region)
-        if Aws::Endpoints::Matchers.string_equals?(parameters.region, "snow") && Aws::Endpoints::Matchers.set?(parameters.endpoint) && (url = Aws::Endpoints::Matchers.parse_url(parameters.endpoint))
-          if (partition_result = Aws::Endpoints::Matchers.aws_partition(parameters.region))
-            if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_dual_stack, true)
-              raise ArgumentError, "S3 Snow does not support DualStack"
-            end
-            if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true)
-              raise ArgumentError, "S3 Snow does not support FIPS"
-            end
-            return Aws::Endpoints::Endpoint.new(url: "#{url['scheme']}://#{url['authority']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3", "signingRegion"=>"#{parameters.region}"}]})
-          end
+        if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true) && (partition_result = Aws::Endpoints::Matchers.aws_partition(parameters.region)) && Aws::Endpoints::Matchers.string_equals?(Aws::Endpoints::Matchers.attr(partition_result, "name"), "aws-cn")
+          raise ArgumentError, "Partition does not support FIPS"
         end
         if Aws::Endpoints::Matchers.set?(parameters.outpost_id)
           if (partition_result = Aws::Endpoints::Matchers.aws_partition(parameters.region))
-            if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true) && Aws::Endpoints::Matchers.string_equals?(Aws::Endpoints::Matchers.attr(partition_result, "name"), "aws-cn")
-              raise ArgumentError, "Partition does not support FIPS"
-            end
             if Aws::Endpoints::Matchers.set?(parameters.requires_account_id) && Aws::Endpoints::Matchers.boolean_equals?(parameters.requires_account_id, true) && Aws::Endpoints::Matchers.not(Aws::Endpoints::Matchers.set?(parameters.account_id))
               raise ArgumentError, "AccountId is required but not set"
             end
@@ -57,6 +46,63 @@ module Aws::S3Control
             raise ArgumentError, "Invalid region: region was not a valid DNS name."
           end
         end
+        if Aws::Endpoints::Matchers.set?(parameters.access_point_name) && (access_point_suffix = Aws::Endpoints::Matchers.substring(parameters.access_point_name, 0, 7, true)) && Aws::Endpoints::Matchers.string_equals?(access_point_suffix, "--xa-s3")
+          if (partition_result = Aws::Endpoints::Matchers.aws_partition(parameters.region))
+            if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_dual_stack, true)
+              raise ArgumentError, "S3Express does not support Dual-stack."
+            end
+            if (s3express_availability_zone_id = Aws::Endpoints::Matchers.substring(parameters.access_point_name, 7, 15, true)) && (s3express_availability_zone_delim = Aws::Endpoints::Matchers.substring(parameters.access_point_name, 15, 17, true)) && Aws::Endpoints::Matchers.string_equals?(s3express_availability_zone_delim, "--")
+              if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true)
+                return Aws::Endpoints::Endpoint.new(url: "https://s3express-control-fips.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+              end
+              return Aws::Endpoints::Endpoint.new(url: "https://s3express-control.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+            end
+            if (s3express_availability_zone_id = Aws::Endpoints::Matchers.substring(parameters.access_point_name, 7, 16, true)) && (s3express_availability_zone_delim = Aws::Endpoints::Matchers.substring(parameters.access_point_name, 16, 18, true)) && Aws::Endpoints::Matchers.string_equals?(s3express_availability_zone_delim, "--")
+              if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true)
+                return Aws::Endpoints::Endpoint.new(url: "https://s3express-control-fips.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+              end
+              return Aws::Endpoints::Endpoint.new(url: "https://s3express-control.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+            end
+            if (s3express_availability_zone_id = Aws::Endpoints::Matchers.substring(parameters.access_point_name, 7, 20, true)) && (s3express_availability_zone_delim = Aws::Endpoints::Matchers.substring(parameters.access_point_name, 20, 22, true)) && Aws::Endpoints::Matchers.string_equals?(s3express_availability_zone_delim, "--")
+              if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true)
+                return Aws::Endpoints::Endpoint.new(url: "https://s3express-control-fips.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+              end
+              return Aws::Endpoints::Endpoint.new(url: "https://s3express-control.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+            end
+            if (s3express_availability_zone_id = Aws::Endpoints::Matchers.substring(parameters.access_point_name, 7, 21, true)) && (s3express_availability_zone_delim = Aws::Endpoints::Matchers.substring(parameters.access_point_name, 21, 23, true)) && Aws::Endpoints::Matchers.string_equals?(s3express_availability_zone_delim, "--")
+              if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true)
+                return Aws::Endpoints::Endpoint.new(url: "https://s3express-control-fips.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+              end
+              return Aws::Endpoints::Endpoint.new(url: "https://s3express-control.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+            end
+            if (s3express_availability_zone_id = Aws::Endpoints::Matchers.substring(parameters.access_point_name, 7, 27, true)) && (s3express_availability_zone_delim = Aws::Endpoints::Matchers.substring(parameters.access_point_name, 27, 29, true)) && Aws::Endpoints::Matchers.string_equals?(s3express_availability_zone_delim, "--")
+              if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true)
+                return Aws::Endpoints::Endpoint.new(url: "https://s3express-control-fips.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+              end
+              return Aws::Endpoints::Endpoint.new(url: "https://s3express-control.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+            end
+            raise ArgumentError, "Unrecognized S3Express Access Point name format."
+          end
+        end
+        if Aws::Endpoints::Matchers.set?(parameters.use_s3_express_control_endpoint) && Aws::Endpoints::Matchers.boolean_equals?(parameters.use_s3_express_control_endpoint, true)
+          if (partition_result = Aws::Endpoints::Matchers.aws_partition(parameters.region))
+            if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true)
+              return Aws::Endpoints::Endpoint.new(url: "https://s3express-control-fips.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+            end
+            return Aws::Endpoints::Endpoint.new(url: "https://s3express-control.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3express", "signingRegion"=>"#{parameters.region}"}]})
+          end
+        end
+        if Aws::Endpoints::Matchers.string_equals?(parameters.region, "snow") && Aws::Endpoints::Matchers.set?(parameters.endpoint) && (url = Aws::Endpoints::Matchers.parse_url(parameters.endpoint))
+          if (partition_result = Aws::Endpoints::Matchers.aws_partition(parameters.region))
+            if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_dual_stack, true)
+              raise ArgumentError, "S3 Snow does not support DualStack"
+            end
+            if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true)
+              raise ArgumentError, "S3 Snow does not support FIPS"
+            end
+            return Aws::Endpoints::Endpoint.new(url: "#{url['scheme']}://#{url['authority']}", headers: {}, properties: {"authSchemes"=>[{"disableDoubleEncoding"=>true, "name"=>"sigv4", "signingName"=>"s3", "signingRegion"=>"#{parameters.region}"}]})
+          end
+        end
         if Aws::Endpoints::Matchers.set?(parameters.access_point_name) && (access_point_arn = Aws::Endpoints::Matchers.aws_parse_arn(parameters.access_point_name))
           if (arn_type = Aws::Endpoints::Matchers.attr(access_point_arn, "resourceId[0]")) && Aws::Endpoints::Matchers.not(Aws::Endpoints::Matchers.string_equals?(arn_type, ""))
             if Aws::Endpoints::Matchers.string_equals?(Aws::Endpoints::Matchers.attr(access_point_arn, "service"), "s3-outposts")
@@ -179,9 +225,6 @@ module Aws::S3Control
         end
         if (partition_result = Aws::Endpoints::Matchers.aws_partition(parameters.region))
           if Aws::Endpoints::Matchers.valid_host_label?(parameters.region, true)
-            if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true) && Aws::Endpoints::Matchers.string_equals?(Aws::Endpoints::Matchers.attr(partition_result, "name"), "aws-cn")
-              raise ArgumentError, "Partition does not support FIPS"
-            end
             if Aws::Endpoints::Matchers.set?(parameters.requires_account_id) && Aws::Endpoints::Matchers.boolean_equals?(parameters.requires_account_id, true) && Aws::Endpoints::Matchers.not(Aws::Endpoints::Matchers.set?(parameters.account_id))
               raise ArgumentError, "AccountId is required but not set"
             end

data/lib/aws-sdk-s3control/endpoints.rb

@@ -64,6 +64,7 @@ module Aws::S3Control
           account_id: context.params[:account_id],
           requires_account_id: true,
           bucket: context.params[:bucket],
+          access_point_name: context.params[:name],
         )
       end
     end
@@ -213,6 +214,19 @@ module Aws::S3Control
       end
     end
 
+    class DeleteAccessPointScope
+      def self.build(context)
+        Aws::S3Control::EndpointParameters.create(
+          context.config,
+          use_dual_stack: context[:use_dualstack_endpoint],
+          account_id: context.params[:account_id],
+          requires_account_id: true,
+          access_point_name: context.params[:name],
+          use_s3_express_control_endpoint: true,
+        )
+      end
+    end
+
     class DeleteBucket
       def self.build(context)
         Aws::S3Control::EndpointParameters.create(
@@ -507,6 +521,19 @@ module Aws::S3Control
       end
     end
 
+    class GetAccessPointScope
+      def self.build(context)
+        Aws::S3Control::EndpointParameters.create(
+          context.config,
+          use_dual_stack: context[:use_dualstack_endpoint],
+          account_id: context.params[:account_id],
+          requires_account_id: true,
+          access_point_name: context.params[:name],
+          use_s3_express_control_endpoint: true,
+        )
+      end
+    end
+
     class GetBucket
       def self.build(context)
         Aws::S3Control::EndpointParameters.create(
@@ -734,6 +761,18 @@ module Aws::S3Control
       end
     end
 
+    class ListAccessPointsForDirectoryBuckets
+      def self.build(context)
+        Aws::S3Control::EndpointParameters.create(
+          context.config,
+          use_dual_stack: context[:use_dualstack_endpoint],
+          account_id: context.params[:account_id],
+          requires_account_id: true,
+          use_s3_express_control_endpoint: true,
+        )
+      end
+    end
+
     class ListAccessPointsForObjectLambda
       def self.build(context)
         Aws::S3Control::EndpointParameters.create(
@@ -868,6 +907,19 @@ module Aws::S3Control
       end
     end
 
+    class PutAccessPointScope
+      def self.build(context)
+        Aws::S3Control::EndpointParameters.create(
+          context.config,
+          use_dual_stack: context[:use_dualstack_endpoint],
+          account_id: context.params[:account_id],
+          requires_account_id: true,
+          access_point_name: context.params[:name],
+          use_s3_express_control_endpoint: true,
+        )
+      end
+    end
+
     class PutBucketLifecycleConfiguration
       def self.build(context)
         Aws::S3Control::EndpointParameters.create(
@@ -1099,6 +1151,8 @@ module Aws::S3Control
         DeleteAccessPointPolicy.build(context)
       when :delete_access_point_policy_for_object_lambda
         DeleteAccessPointPolicyForObjectLambda.build(context)
+      when :delete_access_point_scope
+        DeleteAccessPointScope.build(context)
       when :delete_bucket
         DeleteBucket.build(context)
       when :delete_bucket_lifecycle_configuration
@@ -1151,6 +1205,8 @@ module Aws::S3Control
         GetAccessPointPolicyStatus.build(context)
       when :get_access_point_policy_status_for_object_lambda
         GetAccessPointPolicyStatusForObjectLambda.build(context)
+      when :get_access_point_scope
+        GetAccessPointScope.build(context)
       when :get_bucket
         GetBucket.build(context)
       when :get_bucket_lifecycle_configuration
@@ -1191,6 +1247,8 @@ module Aws::S3Control
         ListAccessGrantsLocations.build(context)
       when :list_access_points
         ListAccessPoints.build(context)
+      when :list_access_points_for_directory_buckets
+        ListAccessPointsForDirectoryBuckets.build(context)
       when :list_access_points_for_object_lambda
         ListAccessPointsForObjectLambda.build(context)
       when :list_caller_access_grants
@@ -1215,6 +1273,8 @@ module Aws::S3Control
         PutAccessPointPolicy.build(context)
       when :put_access_point_policy_for_object_lambda
         PutAccessPointPolicyForObjectLambda.build(context)
+      when :put_access_point_scope
+        PutAccessPointScope.build(context)
       when :put_bucket_lifecycle_configuration
         PutBucketLifecycleConfiguration.build(context)
       when :put_bucket_policy