From e2f7ca0795804a6cefa36ffb369aeedb50fa3f5f Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:36:31 -0400 Subject: [PATCH 1/2] feat(Storage): Adding StorageBucket --- .../Request/StorageDownloadDataRequest.swift | 23 +++++-- .../Request/StorageDownloadFileRequest.swift | 24 +++++-- .../Request/StorageGetURLRequest.swift | 27 ++++++-- .../Request/StorageListRequest.swift | 23 +++++-- .../Request/StorageRemoveRequest.swift | 13 +++- .../Request/StorageUploadDataRequest.swift | 29 +++++--- .../Request/StorageUploadFileRequest.swift | 29 +++++--- .../Categories/Storage/StorageBucket.swift | 66 +++++++++++++++++++ 8 files changed, 189 insertions(+), 45 deletions(-) create mode 100644 Amplify/Categories/Storage/StorageBucket.swift diff --git a/Amplify/Categories/Storage/Operation/Request/StorageDownloadDataRequest.swift b/Amplify/Categories/Storage/Operation/Request/StorageDownloadDataRequest.swift index 1a8ed260b9..7879f87846 100644 --- a/Amplify/Categories/Storage/Operation/Request/StorageDownloadDataRequest.swift +++ b/Amplify/Categories/Storage/Operation/Request/StorageDownloadDataRequest.swift @@ -64,6 +64,11 @@ public extension StorageDownloadDataRequest { @available(*, deprecated, message: "Use `path` in Storage API instead of `Options`") public let targetIdentityId: String? + /// A Storage Bucket that contains the object to download. Defaults to `nil`, in which case the default one will be used. + /// + /// - Tag: StorageDownloadDataRequest.bucket + public let bucket: (any StorageBucket)? + /// Extra plugin specific options, only used in special circumstances when the existing options do not provide /// a way to utilize the underlying storage system's functionality. See plugin documentation for expected /// key/values @@ -90,20 +95,28 @@ public extension StorageDownloadDataRequest { /// /// - Tag: StorageDownloadDataRequestOptions.init - @available(*, deprecated, message: "Use init(pluginOptions)") - public init(accessLevel: StorageAccessLevel = .guest, - targetIdentityId: String? = nil, - pluginOptions: Any? = nil) { + @available(*, deprecated, message: "Use init(bucket:pluginOptions)") + public init( + accessLevel: StorageAccessLevel = .guest, + targetIdentityId: String? = nil, + bucket: (any StorageBucket)? = nil, + pluginOptions: Any? = nil + ) { self.accessLevel = accessLevel self.targetIdentityId = targetIdentityId + self.bucket = bucket self.pluginOptions = pluginOptions } /// /// - Tag: StorageDownloadDataRequestOptions.init - public init(pluginOptions: Any? = nil) { + public init( + bucket: (any StorageBucket)? = nil, + pluginOptions: Any? = nil + ) { self.accessLevel = .guest self.targetIdentityId = nil + self.bucket = bucket self.pluginOptions = pluginOptions } } diff --git a/Amplify/Categories/Storage/Operation/Request/StorageDownloadFileRequest.swift b/Amplify/Categories/Storage/Operation/Request/StorageDownloadFileRequest.swift index 7ec34c222f..7ac9cc65f6 100644 --- a/Amplify/Categories/Storage/Operation/Request/StorageDownloadFileRequest.swift +++ b/Amplify/Categories/Storage/Operation/Request/StorageDownloadFileRequest.swift @@ -71,6 +71,11 @@ public extension StorageDownloadFileRequest { @available(*, deprecated, message: "Use `path` in Storage API instead of `Options`") public let targetIdentityId: String? + /// A Storage Bucket that contains the object to download. Defaults to `nil`, in which case the default one will be used. + /// + /// - Tag: StorageDownloadDataRequest.bucket + public let bucket: (any StorageBucket)? + /// Extra plugin specific options, only used in special circumstances when the existing options do not provide /// a way to utilize the underlying storage system's functionality. See plugin documentation for expected /// key/values @@ -79,20 +84,27 @@ public extension StorageDownloadFileRequest { public let pluginOptions: Any? /// - Tag: StorageDownloadFileRequestOptions.init - @available(*, deprecated, message: "Use init(pluginOptions)") - public init(accessLevel: StorageAccessLevel = .guest, - targetIdentityId: String? = nil, - pluginOptions: Any? = nil) { + @available(*, deprecated, message: "Use init(bucket:pluginOptions)") + public init( + accessLevel: StorageAccessLevel = .guest, + targetIdentityId: String? = nil, + bucket: (any StorageBucket)? = nil, + pluginOptions: Any? = nil + ) { self.accessLevel = accessLevel self.targetIdentityId = targetIdentityId + self.bucket = bucket self.pluginOptions = pluginOptions } /// - Tag: StorageDownloadFileRequestOptions.init - @available(*, deprecated, message: "Use init(pluginOptions)") - public init(pluginOptions: Any? = nil) { + public init( + bucket: (any StorageBucket)? = nil, + pluginOptions: Any? = nil + ) { self.accessLevel = .guest self.targetIdentityId = nil + self.bucket = bucket self.pluginOptions = pluginOptions } } diff --git a/Amplify/Categories/Storage/Operation/Request/StorageGetURLRequest.swift b/Amplify/Categories/Storage/Operation/Request/StorageGetURLRequest.swift index e8ffd22c00..bdc6731762 100644 --- a/Amplify/Categories/Storage/Operation/Request/StorageGetURLRequest.swift +++ b/Amplify/Categories/Storage/Operation/Request/StorageGetURLRequest.swift @@ -73,6 +73,11 @@ public extension StorageGetURLRequest { /// - Tag: StorageGetURLRequest.Options.expires public let expires: Int + /// A Storage Bucket that contains the object. Defaults to `nil`, in which case the default one will be used. + /// + /// - Tag: StorageDownloadDataRequest.bucket + public let bucket: (any StorageBucket)? + /// Extra plugin specific options, only used in special circumstances when the existing options do /// not provide a way to utilize the underlying storage system's functionality. See plugin /// documentation or @@ -83,21 +88,29 @@ public extension StorageGetURLRequest { public let pluginOptions: Any? /// - Tag: StorageGetURLRequest.Options.init - @available(*, deprecated, message: "Use init(expires:pluginOptions)") - public init(accessLevel: StorageAccessLevel = .guest, - targetIdentityId: String? = nil, - expires: Int = Options.defaultExpireInSeconds, - pluginOptions: Any? = nil) { + @available(*, deprecated, message: "Use init(expires:bucket:pluginOptions)") + public init( + accessLevel: StorageAccessLevel = .guest, + targetIdentityId: String? = nil, + expires: Int = Options.defaultExpireInSeconds, + bucket: (any StorageBucket)? = nil, + pluginOptions: Any? = nil + ) { self.accessLevel = accessLevel self.targetIdentityId = targetIdentityId self.expires = expires + self.bucket = bucket self.pluginOptions = pluginOptions } /// - Tag: StorageGetURLRequest.Options.init - public init(expires: Int = Options.defaultExpireInSeconds, - pluginOptions: Any? = nil) { + public init( + expires: Int = Options.defaultExpireInSeconds, + bucket: (any StorageBucket)? = nil, + pluginOptions: Any? = nil + ) { self.expires = expires + self.bucket = bucket self.pluginOptions = pluginOptions self.accessLevel = .guest self.targetIdentityId = nil diff --git a/Amplify/Categories/Storage/Operation/Request/StorageListRequest.swift b/Amplify/Categories/Storage/Operation/Request/StorageListRequest.swift index 71119f71f8..506fad2b8d 100644 --- a/Amplify/Categories/Storage/Operation/Request/StorageListRequest.swift +++ b/Amplify/Categories/Storage/Operation/Request/StorageListRequest.swift @@ -78,6 +78,11 @@ public extension StorageListRequest { /// - Tag: StorageListRequestOptions.pageSize public let pageSize: UInt + /// A Storage Bucket that contains the objects to list. Defaults to `nil`, in which case the default one will be used. + /// + /// - Tag: StorageDownloadDataRequest.bucket + public let bucket: (any StorageBucket)? + /// Opaque string indicating the page offset at which to resume a listing. This is usually a copy of /// the value from [StorageListResult.nextToken](x-source-tag://StorageListResult.nextToken). /// @@ -96,18 +101,22 @@ public extension StorageListRequest { public let pluginOptions: Any? /// - Tag: StorageListRequestOptions.init - public init(accessLevel: StorageAccessLevel = .guest, - targetIdentityId: String? = nil, - path: String? = nil, - subpathStrategy: SubpathStrategy = .include, - pageSize: UInt = 1000, - nextToken: String? = nil, - pluginOptions: Any? = nil) { + public init( + accessLevel: StorageAccessLevel = .guest, + targetIdentityId: String? = nil, + path: String? = nil, + subpathStrategy: SubpathStrategy = .include, + pageSize: UInt = 1000, + bucket: (any StorageBucket)? = nil, + nextToken: String? = nil, + pluginOptions: Any? = nil + ) { self.accessLevel = accessLevel self.targetIdentityId = targetIdentityId self.path = path self.subpathStrategy = subpathStrategy self.pageSize = pageSize + self.bucket = bucket self.nextToken = nextToken self.pluginOptions = pluginOptions } diff --git a/Amplify/Categories/Storage/Operation/Request/StorageRemoveRequest.swift b/Amplify/Categories/Storage/Operation/Request/StorageRemoveRequest.swift index 31ae1de4f3..26d083a583 100644 --- a/Amplify/Categories/Storage/Operation/Request/StorageRemoveRequest.swift +++ b/Amplify/Categories/Storage/Operation/Request/StorageRemoveRequest.swift @@ -56,6 +56,11 @@ public extension StorageRemoveRequest { @available(*, deprecated, message: "Use `path` in Storage API instead of `Options`") public let accessLevel: StorageAccessLevel + /// A Storage Bucket that contains the object to remove. Defaults to `nil`, in which case the default one will be used. + /// + /// - Tag: StorageDownloadDataRequest.bucket + public let bucket: (any StorageBucket)? + /// Extra plugin specific options, only used in special circumstances when the existing options do not provide /// a way to utilize the underlying storage system's functionality. See plugin documentation for expected /// key/values @@ -64,9 +69,13 @@ public extension StorageRemoveRequest { public let pluginOptions: Any? /// - Tag: StorageRemoveRequestOptions.init - public init(accessLevel: StorageAccessLevel = .guest, - pluginOptions: Any? = nil) { + public init( + accessLevel: StorageAccessLevel = .guest, + bucket: (any StorageBucket)? = nil, + pluginOptions: Any? = nil + ) { self.accessLevel = accessLevel + self.bucket = bucket self.pluginOptions = pluginOptions } } diff --git a/Amplify/Categories/Storage/Operation/Request/StorageUploadDataRequest.swift b/Amplify/Categories/Storage/Operation/Request/StorageUploadDataRequest.swift index 572b160bf8..8a3e043346 100644 --- a/Amplify/Categories/Storage/Operation/Request/StorageUploadDataRequest.swift +++ b/Amplify/Categories/Storage/Operation/Request/StorageUploadDataRequest.swift @@ -75,6 +75,11 @@ public extension StorageUploadDataRequest { /// - Tag: StorageUploadDataRequestOptions.metadata public let metadata: [String: String]? + /// A specific Storage Bucket to upload the data. Defaults to `nil`, in which case the default one will be used. + /// + /// - Tag: StorageDownloadDataRequest.bucket + public let bucket: (any StorageBucket)? + /// The standard MIME type describing the format of the object to store /// /// - Tag: StorageUploadDataRequestOptions.contentType @@ -88,28 +93,34 @@ public extension StorageUploadDataRequest { public let pluginOptions: Any? /// - Tag: StorageUploadDataRequestOptions.init - @available(*, deprecated, message: "Use init(metadata:contentType:options)") - public init(accessLevel: StorageAccessLevel = .guest, - targetIdentityId: String? = nil, - metadata: [String: String]? = nil, - contentType: String? = nil, - pluginOptions: Any? = nil + @available(*, deprecated, message: "Use init(metadata:bucket:contentType:options)") + public init( + accessLevel: StorageAccessLevel = .guest, + targetIdentityId: String? = nil, + metadata: [String: String]? = nil, + bucket: (any StorageBucket)? = nil, + contentType: String? = nil, + pluginOptions: Any? = nil ) { self.accessLevel = accessLevel self.targetIdentityId = targetIdentityId self.metadata = metadata + self.bucket = bucket self.contentType = contentType self.pluginOptions = pluginOptions } /// - Tag: StorageUploadDataRequestOptions.init - public init(metadata: [String: String]? = nil, - contentType: String? = nil, - pluginOptions: Any? = nil + public init( + metadata: [String: String]? = nil, + bucket: (any StorageBucket)? = nil, + contentType: String? = nil, + pluginOptions: Any? = nil ) { self.accessLevel = .guest self.targetIdentityId = nil self.metadata = metadata + self.bucket = bucket self.contentType = contentType self.pluginOptions = pluginOptions } diff --git a/Amplify/Categories/Storage/Operation/Request/StorageUploadFileRequest.swift b/Amplify/Categories/Storage/Operation/Request/StorageUploadFileRequest.swift index 23c8d159f6..fd430476e4 100644 --- a/Amplify/Categories/Storage/Operation/Request/StorageUploadFileRequest.swift +++ b/Amplify/Categories/Storage/Operation/Request/StorageUploadFileRequest.swift @@ -72,6 +72,11 @@ public extension StorageUploadFileRequest { /// - Tag: StorageUploadFileRequestOptions.metadata public let metadata: [String: String]? + /// A specific Storage Bucket to upload the file. Defaults to `nil`, in which case the default one will be used. + /// + /// - Tag: StorageUploadFileRequestOptions.bucket + public let bucket: (any StorageBucket)? + /// The standard MIME type describing the format of the object to store /// /// - Tag: StorageUploadFileRequestOptions.contentType @@ -85,28 +90,34 @@ public extension StorageUploadFileRequest { public let pluginOptions: Any? /// - Tag: StorageUploadFileRequestOptions.init - @available(*, deprecated, message: "Use init(metadata:contentType:pluginOptions)") - public init(accessLevel: StorageAccessLevel = .guest, - targetIdentityId: String? = nil, - metadata: [String: String]? = nil, - contentType: String? = nil, - pluginOptions: Any? = nil + @available(*, deprecated, message: "Use init(metadata:bucket:contentType:pluginOptions)") + public init( + accessLevel: StorageAccessLevel = .guest, + targetIdentityId: String? = nil, + metadata: [String: String]? = nil, + bucket: (any StorageBucket)? = nil, + contentType: String? = nil, + pluginOptions: Any? = nil ) { self.accessLevel = accessLevel self.targetIdentityId = targetIdentityId self.metadata = metadata + self.bucket = bucket self.contentType = contentType self.pluginOptions = pluginOptions } /// - Tag: StorageUploadFileRequestOptions.init - public init(metadata: [String: String]? = nil, - contentType: String? = nil, - pluginOptions: Any? = nil + public init( + metadata: [String: String]? = nil, + bucket: (any StorageBucket)? = nil, + contentType: String? = nil, + pluginOptions: Any? = nil ) { self.accessLevel = .guest self.targetIdentityId = nil self.metadata = metadata + self.bucket = bucket self.contentType = contentType self.pluginOptions = pluginOptions } diff --git a/Amplify/Categories/Storage/StorageBucket.swift b/Amplify/Categories/Storage/StorageBucket.swift new file mode 100644 index 0000000000..d037e23655 --- /dev/null +++ b/Amplify/Categories/Storage/StorageBucket.swift @@ -0,0 +1,66 @@ +// +// Copyright Amazon.com Inc. or its affiliates. +// All Rights Reserved. +// +// SPDX-License-Identifier: Apache-2.0 +// + +import Foundation + +/// Protocol that represents a Storage bucket. +/// +/// - Tag: StorageBucket +public protocol StorageBucket { } + +/// Represents information about a Storage bucket +/// +/// - Tag: BucketInfo +public struct BucketInfo: Hashable { + + /// The name of the bucket + /// - Tag: BucketInfo.bucketName + public let bucketName: String + + /// The region of the bucket + /// - Tag: BucketInfo.region + public let region: String + + public init(bucketName: String, region: String) { + self.bucketName = bucketName + self.region = region + } +} + +public extension StorageBucket where Self == OutputsStorageBucket { + + /// References a `StorageBucket` in the AmplifyOutputs file using the given name. + /// + /// - Parameter name: The name of the bucket + static func fromOutputs(name: String) -> Self { + return OutputsStorageBucket(name: name) + } +} + +public extension StorageBucket where Self == ResolvedStorageBucket { + /// References a `StorageBucket` using the data from the given `BucketInfo`. + /// + /// - Parameter bucketInfo: A `BucketInfo` instance + static func fromBucketInfo(_ bucketInfo: BucketInfo) -> Self { + return ResolvedStorageBucket(bucketInfo: bucketInfo) + } +} + + +/// Conforms to `StorageBucket`. Represents a Storage Bucket defined by a name in the AmplifyOutputs file. +/// +/// - Tag: OutputsStorageBucket +public struct OutputsStorageBucket: StorageBucket { + public let name: String +} + +/// Conforms to `StorageBucket`. Represents a Storage Bucket defined by a name and a region defined in `BucketInfo`. +/// +/// - Tag: ResolvedStorageBucket +public struct ResolvedStorageBucket: StorageBucket { + public let bucketInfo: BucketInfo +} From 98f6c99e81fb7b47f7c6dd08af376f515268d4af Mon Sep 17 00:00:00 2001 From: aws-amplify-ops Date: Tue, 13 Aug 2024 15:40:57 +0000 Subject: [PATCH 2/2] Update API dumps for new version --- api-dump/AWSDataStorePlugin.json | 2 +- api-dump/AWSPluginsCore.json | 2 +- api-dump/Amplify.json | 1340 ++++++++++++++++++++++++- api-dump/CoreMLPredictionsPlugin.json | 2 +- 4 files changed, 1302 insertions(+), 44 deletions(-) diff --git a/api-dump/AWSDataStorePlugin.json b/api-dump/AWSDataStorePlugin.json index 47c0e792de..4065e4f66b 100644 --- a/api-dump/AWSDataStorePlugin.json +++ b/api-dump/AWSDataStorePlugin.json @@ -8205,7 +8205,7 @@ "-module", "AWSDataStorePlugin", "-o", - "\/var\/folders\/hn\/5bx1f4_d4ds5vhwhkxc7vdcr0000gn\/T\/tmp.nAGRifhwH6\/AWSDataStorePlugin.json", + "\/var\/folders\/m_\/cksx93ys47x4621g0zbw_m4m0000gn\/T\/tmp.xrcnJX8DBh\/AWSDataStorePlugin.json", "-I", ".build\/debug", "-sdk-version", diff --git a/api-dump/AWSPluginsCore.json b/api-dump/AWSPluginsCore.json index 19b8e2fb57..502beff81b 100644 --- a/api-dump/AWSPluginsCore.json +++ b/api-dump/AWSPluginsCore.json @@ -24273,7 +24273,7 @@ "-module", "AWSPluginsCore", "-o", - "\/var\/folders\/hn\/5bx1f4_d4ds5vhwhkxc7vdcr0000gn\/T\/tmp.nAGRifhwH6\/AWSPluginsCore.json", + "\/var\/folders\/m_\/cksx93ys47x4621g0zbw_m4m0000gn\/T\/tmp.xrcnJX8DBh\/AWSPluginsCore.json", "-I", ".build\/debug", "-sdk-version", diff --git a/api-dump/Amplify.json b/api-dump/Amplify.json index 1bb4d36d2c..88d1949ba0 100644 --- a/api-dump/Amplify.json +++ b/api-dump/Amplify.json @@ -138551,6 +138551,84 @@ } ] }, + { + "kind": "Var", + "name": "bucket", + "printedName": "bucket", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Var", + "usr": "s:7Amplify26StorageDownloadDataRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "mangledName": "$s7Amplify26StorageDownloadDataRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "moduleName": "Amplify", + "declAttributes": [ + "HasStorage" + ], + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify26StorageDownloadDataRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "mangledName": "$s7Amplify26StorageDownloadDataRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "moduleName": "Amplify", + "implicit": true, + "declAttributes": [ + "Transparent" + ], + "accessorKind": "get" + } + ] + }, { "kind": "Var", "name": "pluginOptions", @@ -138614,7 +138692,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(accessLevel:targetIdentityId:pluginOptions:)", + "printedName": "init(accessLevel:targetIdentityId:bucket:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -138644,6 +138722,29 @@ "hasDefaultArg": true, "usr": "s:Sq" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -138660,8 +138761,8 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify26StorageDownloadDataRequestV7OptionsV11accessLevel16targetIdentityId06pluginF0AeA0b6AccessH0O_SSSgypSgtcfc", - "mangledName": "$s7Amplify26StorageDownloadDataRequestV7OptionsV11accessLevel16targetIdentityId06pluginF0AeA0b6AccessH0O_SSSgypSgtcfc", + "usr": "s:7Amplify26StorageDownloadDataRequestV7OptionsV11accessLevel16targetIdentityId6bucket06pluginF0AeA0b6AccessH0O_SSSgAA0B6Bucket_pSgypSgtcfc", + "mangledName": "$s7Amplify26StorageDownloadDataRequestV7OptionsV11accessLevel16targetIdentityId6bucket06pluginF0AeA0b6AccessH0O_SSSgAA0B6Bucket_pSgypSgtcfc", "moduleName": "Amplify", "deprecated": true, "declAttributes": [ @@ -138672,7 +138773,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(pluginOptions:)", + "printedName": "init(bucket:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -138680,6 +138781,29 @@ "printedName": "Amplify.StorageDownloadDataRequest.Options", "usr": "s:7Amplify26StorageDownloadDataRequestV7OptionsV" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -138696,8 +138820,8 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify26StorageDownloadDataRequestV7OptionsV06pluginF0AEypSg_tcfc", - "mangledName": "$s7Amplify26StorageDownloadDataRequestV7OptionsV06pluginF0AEypSg_tcfc", + "usr": "s:7Amplify26StorageDownloadDataRequestV7OptionsV6bucket06pluginF0AeA0B6Bucket_pSg_ypSgtcfc", + "mangledName": "$s7Amplify26StorageDownloadDataRequestV7OptionsV6bucket06pluginF0AeA0B6Bucket_pSg_ypSgtcfc", "moduleName": "Amplify", "init_kind": "Designated" } @@ -139154,6 +139278,84 @@ } ] }, + { + "kind": "Var", + "name": "bucket", + "printedName": "bucket", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Var", + "usr": "s:7Amplify26StorageDownloadFileRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "mangledName": "$s7Amplify26StorageDownloadFileRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "moduleName": "Amplify", + "declAttributes": [ + "HasStorage" + ], + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify26StorageDownloadFileRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "mangledName": "$s7Amplify26StorageDownloadFileRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "moduleName": "Amplify", + "implicit": true, + "declAttributes": [ + "Transparent" + ], + "accessorKind": "get" + } + ] + }, { "kind": "Var", "name": "pluginOptions", @@ -139217,7 +139419,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(accessLevel:targetIdentityId:pluginOptions:)", + "printedName": "init(accessLevel:targetIdentityId:bucket:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -139247,6 +139449,29 @@ "hasDefaultArg": true, "usr": "s:Sq" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -139263,8 +139488,8 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify26StorageDownloadFileRequestV7OptionsV11accessLevel16targetIdentityId06pluginF0AeA0b6AccessH0O_SSSgypSgtcfc", - "mangledName": "$s7Amplify26StorageDownloadFileRequestV7OptionsV11accessLevel16targetIdentityId06pluginF0AeA0b6AccessH0O_SSSgypSgtcfc", + "usr": "s:7Amplify26StorageDownloadFileRequestV7OptionsV11accessLevel16targetIdentityId6bucket06pluginF0AeA0b6AccessH0O_SSSgAA0B6Bucket_pSgypSgtcfc", + "mangledName": "$s7Amplify26StorageDownloadFileRequestV7OptionsV11accessLevel16targetIdentityId6bucket06pluginF0AeA0b6AccessH0O_SSSgAA0B6Bucket_pSgypSgtcfc", "moduleName": "Amplify", "deprecated": true, "declAttributes": [ @@ -139275,7 +139500,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(pluginOptions:)", + "printedName": "init(bucket:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -139283,6 +139508,29 @@ "printedName": "Amplify.StorageDownloadFileRequest.Options", "usr": "s:7Amplify26StorageDownloadFileRequestV7OptionsV" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -139299,13 +139547,9 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify26StorageDownloadFileRequestV7OptionsV06pluginF0AEypSg_tcfc", - "mangledName": "$s7Amplify26StorageDownloadFileRequestV7OptionsV06pluginF0AEypSg_tcfc", + "usr": "s:7Amplify26StorageDownloadFileRequestV7OptionsV6bucket06pluginF0AeA0B6Bucket_pSg_ypSgtcfc", + "mangledName": "$s7Amplify26StorageDownloadFileRequestV7OptionsV6bucket06pluginF0AeA0B6Bucket_pSg_ypSgtcfc", "moduleName": "Amplify", - "deprecated": true, - "declAttributes": [ - "Available" - ], "init_kind": "Designated" } ], @@ -139798,6 +140042,84 @@ } ] }, + { + "kind": "Var", + "name": "bucket", + "printedName": "bucket", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Var", + "usr": "s:7Amplify20StorageGetURLRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "mangledName": "$s7Amplify20StorageGetURLRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "moduleName": "Amplify", + "declAttributes": [ + "HasStorage" + ], + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify20StorageGetURLRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "mangledName": "$s7Amplify20StorageGetURLRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "moduleName": "Amplify", + "implicit": true, + "declAttributes": [ + "Transparent" + ], + "accessorKind": "get" + } + ] + }, { "kind": "Var", "name": "pluginOptions", @@ -139861,7 +140183,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(accessLevel:targetIdentityId:expires:pluginOptions:)", + "printedName": "init(accessLevel:targetIdentityId:expires:bucket:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -139898,6 +140220,29 @@ "hasDefaultArg": true, "usr": "s:Si" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -139914,8 +140259,8 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify20StorageGetURLRequestV7OptionsV11accessLevel16targetIdentityId7expires06pluginE0AeA0b6AccessG0O_SSSgSiypSgtcfc", - "mangledName": "$s7Amplify20StorageGetURLRequestV7OptionsV11accessLevel16targetIdentityId7expires06pluginE0AeA0b6AccessG0O_SSSgSiypSgtcfc", + "usr": "s:7Amplify20StorageGetURLRequestV7OptionsV11accessLevel16targetIdentityId7expires6bucket06pluginE0AeA0b6AccessG0O_SSSgSiAA0B6Bucket_pSgypSgtcfc", + "mangledName": "$s7Amplify20StorageGetURLRequestV7OptionsV11accessLevel16targetIdentityId7expires6bucket06pluginE0AeA0b6AccessG0O_SSSgSiAA0B6Bucket_pSgypSgtcfc", "moduleName": "Amplify", "deprecated": true, "declAttributes": [ @@ -139926,7 +140271,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(expires:pluginOptions:)", + "printedName": "init(expires:bucket:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -139941,6 +140286,29 @@ "hasDefaultArg": true, "usr": "s:Si" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -139957,8 +140325,8 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify20StorageGetURLRequestV7OptionsV7expires06pluginE0AESi_ypSgtcfc", - "mangledName": "$s7Amplify20StorageGetURLRequestV7OptionsV7expires06pluginE0AESi_ypSgtcfc", + "usr": "s:7Amplify20StorageGetURLRequestV7OptionsV7expires6bucket06pluginE0AESi_AA0B6Bucket_pSgypSgtcfc", + "mangledName": "$s7Amplify20StorageGetURLRequestV7OptionsV7expires6bucket06pluginE0AESi_AA0B6Bucket_pSgypSgtcfc", "moduleName": "Amplify", "init_kind": "Designated" } @@ -140459,6 +140827,84 @@ } ] }, + { + "kind": "Var", + "name": "bucket", + "printedName": "bucket", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Var", + "usr": "s:7Amplify18StorageListRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "mangledName": "$s7Amplify18StorageListRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "moduleName": "Amplify", + "declAttributes": [ + "HasStorage" + ], + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify18StorageListRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "mangledName": "$s7Amplify18StorageListRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "moduleName": "Amplify", + "implicit": true, + "declAttributes": [ + "Transparent" + ], + "accessorKind": "get" + } + ] + }, { "kind": "Var", "name": "nextToken", @@ -140584,7 +141030,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(accessLevel:targetIdentityId:path:subpathStrategy:pageSize:nextToken:pluginOptions:)", + "printedName": "init(accessLevel:targetIdentityId:path:subpathStrategy:pageSize:bucket:nextToken:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -140643,6 +141089,29 @@ "hasDefaultArg": true, "usr": "s:Su" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -140674,8 +141143,8 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify18StorageListRequestV7OptionsV11accessLevel16targetIdentityId4path15subpathStrategy8pageSize9nextToken06pluginE0AeA0b6AccessG0O_SSSgAoE07SubpathM0OSuAOypSgtcfc", - "mangledName": "$s7Amplify18StorageListRequestV7OptionsV11accessLevel16targetIdentityId4path15subpathStrategy8pageSize9nextToken06pluginE0AeA0b6AccessG0O_SSSgAoE07SubpathM0OSuAOypSgtcfc", + "usr": "s:7Amplify18StorageListRequestV7OptionsV11accessLevel16targetIdentityId4path15subpathStrategy8pageSize6bucket9nextToken06pluginE0AeA0b6AccessG0O_SSSgApE07SubpathM0OSuAA0B6Bucket_pSgAPypSgtcfc", + "mangledName": "$s7Amplify18StorageListRequestV7OptionsV11accessLevel16targetIdentityId4path15subpathStrategy8pageSize6bucket9nextToken06pluginE0AeA0b6AccessG0O_SSSgApE07SubpathM0OSuAA0B6Bucket_pSgAPypSgtcfc", "moduleName": "Amplify", "init_kind": "Designated" }, @@ -141170,6 +141639,84 @@ } ] }, + { + "kind": "Var", + "name": "bucket", + "printedName": "bucket", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Var", + "usr": "s:7Amplify20StorageRemoveRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "mangledName": "$s7Amplify20StorageRemoveRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "moduleName": "Amplify", + "declAttributes": [ + "HasStorage" + ], + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify20StorageRemoveRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "mangledName": "$s7Amplify20StorageRemoveRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "moduleName": "Amplify", + "implicit": true, + "declAttributes": [ + "Transparent" + ], + "accessorKind": "get" + } + ] + }, { "kind": "Var", "name": "pluginOptions", @@ -141233,7 +141780,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(accessLevel:pluginOptions:)", + "printedName": "init(accessLevel:bucket:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -141248,6 +141795,29 @@ "hasDefaultArg": true, "usr": "s:7Amplify18StorageAccessLevelO" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -141264,8 +141834,8 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify20StorageRemoveRequestV7OptionsV11accessLevel06pluginE0AeA0b6AccessG0O_ypSgtcfc", - "mangledName": "$s7Amplify20StorageRemoveRequestV7OptionsV11accessLevel06pluginE0AeA0b6AccessG0O_ypSgtcfc", + "usr": "s:7Amplify20StorageRemoveRequestV7OptionsV11accessLevel6bucket06pluginE0AeA0b6AccessG0O_AA0B6Bucket_pSgypSgtcfc", + "mangledName": "$s7Amplify20StorageRemoveRequestV7OptionsV11accessLevel6bucket06pluginE0AeA0b6AccessG0O_AA0B6Bucket_pSgypSgtcfc", "moduleName": "Amplify", "init_kind": "Designated" } @@ -141812,6 +142382,84 @@ } ] }, + { + "kind": "Var", + "name": "bucket", + "printedName": "bucket", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Var", + "usr": "s:7Amplify24StorageUploadDataRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "mangledName": "$s7Amplify24StorageUploadDataRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "moduleName": "Amplify", + "declAttributes": [ + "HasStorage" + ], + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify24StorageUploadDataRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "mangledName": "$s7Amplify24StorageUploadDataRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "moduleName": "Amplify", + "implicit": true, + "declAttributes": [ + "Transparent" + ], + "accessorKind": "get" + } + ] + }, { "kind": "Var", "name": "contentType", @@ -141937,7 +142585,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(accessLevel:targetIdentityId:metadata:contentType:pluginOptions:)", + "printedName": "init(accessLevel:targetIdentityId:metadata:bucket:contentType:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -141996,6 +142644,29 @@ "hasDefaultArg": true, "usr": "s:Sq" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -142027,8 +142698,8 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify24StorageUploadDataRequestV7OptionsV11accessLevel16targetIdentityId8metadata11contentType06pluginF0AeA0b6AccessH0O_SSSgSDyS2SGSgAMypSgtcfc", - "mangledName": "$s7Amplify24StorageUploadDataRequestV7OptionsV11accessLevel16targetIdentityId8metadata11contentType06pluginF0AeA0b6AccessH0O_SSSgSDyS2SGSgAMypSgtcfc", + "usr": "s:7Amplify24StorageUploadDataRequestV7OptionsV11accessLevel16targetIdentityId8metadata6bucket11contentType06pluginF0AeA0b6AccessH0O_SSSgSDyS2SGSgAA0B6Bucket_pSgANypSgtcfc", + "mangledName": "$s7Amplify24StorageUploadDataRequestV7OptionsV11accessLevel16targetIdentityId8metadata6bucket11contentType06pluginF0AeA0b6AccessH0O_SSSgSDyS2SGSgAA0B6Bucket_pSgANypSgtcfc", "moduleName": "Amplify", "deprecated": true, "declAttributes": [ @@ -142039,7 +142710,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(metadata:contentType:pluginOptions:)", + "printedName": "init(metadata:bucket:contentType:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -142076,6 +142747,29 @@ "hasDefaultArg": true, "usr": "s:Sq" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -142107,8 +142801,8 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify24StorageUploadDataRequestV7OptionsV8metadata11contentType06pluginF0AESDyS2SGSg_SSSgypSgtcfc", - "mangledName": "$s7Amplify24StorageUploadDataRequestV7OptionsV8metadata11contentType06pluginF0AESDyS2SGSg_SSSgypSgtcfc", + "usr": "s:7Amplify24StorageUploadDataRequestV7OptionsV8metadata6bucket11contentType06pluginF0AESDyS2SGSg_AA0B6Bucket_pSgSSSgypSgtcfc", + "mangledName": "$s7Amplify24StorageUploadDataRequestV7OptionsV8metadata6bucket11contentType06pluginF0AESDyS2SGSg_AA0B6Bucket_pSgSSSgypSgtcfc", "moduleName": "Amplify", "init_kind": "Designated" } @@ -142655,6 +143349,84 @@ } ] }, + { + "kind": "Var", + "name": "bucket", + "printedName": "bucket", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Var", + "usr": "s:7Amplify24StorageUploadFileRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "mangledName": "$s7Amplify24StorageUploadFileRequestV7OptionsV6bucketAA0B6Bucket_pSgvp", + "moduleName": "Amplify", + "declAttributes": [ + "HasStorage" + ], + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:Sq" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify24StorageUploadFileRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "mangledName": "$s7Amplify24StorageUploadFileRequestV7OptionsV6bucketAA0B6Bucket_pSgvg", + "moduleName": "Amplify", + "implicit": true, + "declAttributes": [ + "Transparent" + ], + "accessorKind": "get" + } + ] + }, { "kind": "Var", "name": "contentType", @@ -142780,7 +143552,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(accessLevel:targetIdentityId:metadata:contentType:pluginOptions:)", + "printedName": "init(accessLevel:targetIdentityId:metadata:bucket:contentType:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -142839,6 +143611,29 @@ "hasDefaultArg": true, "usr": "s:Sq" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -142870,8 +143665,8 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify24StorageUploadFileRequestV7OptionsV11accessLevel16targetIdentityId8metadata11contentType06pluginF0AeA0b6AccessH0O_SSSgSDyS2SGSgAMypSgtcfc", - "mangledName": "$s7Amplify24StorageUploadFileRequestV7OptionsV11accessLevel16targetIdentityId8metadata11contentType06pluginF0AeA0b6AccessH0O_SSSgSDyS2SGSgAMypSgtcfc", + "usr": "s:7Amplify24StorageUploadFileRequestV7OptionsV11accessLevel16targetIdentityId8metadata6bucket11contentType06pluginF0AeA0b6AccessH0O_SSSgSDyS2SGSgAA0B6Bucket_pSgANypSgtcfc", + "mangledName": "$s7Amplify24StorageUploadFileRequestV7OptionsV11accessLevel16targetIdentityId8metadata6bucket11contentType06pluginF0AeA0b6AccessH0O_SSSgSDyS2SGSgAA0B6Bucket_pSgANypSgtcfc", "moduleName": "Amplify", "deprecated": true, "declAttributes": [ @@ -142882,7 +143677,7 @@ { "kind": "Constructor", "name": "init", - "printedName": "init(metadata:contentType:pluginOptions:)", + "printedName": "init(metadata:bucket:contentType:pluginOptions:)", "children": [ { "kind": "TypeNominal", @@ -142919,6 +143714,29 @@ "hasDefaultArg": true, "usr": "s:Sq" }, + { + "kind": "TypeNominal", + "name": "Optional", + "printedName": "(any Amplify.StorageBucket)?", + "children": [ + { + "kind": "TypeNominal", + "name": "Paren", + "printedName": "(any Amplify.StorageBucket)", + "children": [ + { + "kind": "TypeNominal", + "name": "StorageBucket", + "printedName": "any Amplify.StorageBucket", + "usr": "s:7Amplify13StorageBucketP" + } + ], + "usr": "s:7Amplify13StorageBucketP" + } + ], + "hasDefaultArg": true, + "usr": "s:Sq" + }, { "kind": "TypeNominal", "name": "Optional", @@ -142950,8 +143768,8 @@ } ], "declKind": "Constructor", - "usr": "s:7Amplify24StorageUploadFileRequestV7OptionsV8metadata11contentType06pluginF0AESDyS2SGSg_SSSgypSgtcfc", - "mangledName": "$s7Amplify24StorageUploadFileRequestV7OptionsV8metadata11contentType06pluginF0AESDyS2SGSg_SSSgypSgtcfc", + "usr": "s:7Amplify24StorageUploadFileRequestV7OptionsV8metadata6bucket11contentType06pluginF0AESDyS2SGSg_AA0B6Bucket_pSgSSSgypSgtcfc", + "mangledName": "$s7Amplify24StorageUploadFileRequestV7OptionsV8metadata6bucket11contentType06pluginF0AESDyS2SGSg_AA0B6Bucket_pSgSSSgypSgtcfc", "moduleName": "Amplify", "init_kind": "Designated" } @@ -144416,6 +145234,446 @@ } ] }, + { + "kind": "TypeDecl", + "name": "StorageBucket", + "printedName": "StorageBucket", + "children": [ + { + "kind": "Function", + "name": "fromOutputs", + "printedName": "fromOutputs(name:)", + "children": [ + { + "kind": "TypeNominal", + "name": "GenericTypeParam", + "printedName": "Self" + }, + { + "kind": "TypeNominal", + "name": "String", + "printedName": "Swift.String", + "usr": "s:SS" + } + ], + "declKind": "Func", + "usr": "s:7Amplify13StorageBucketPA2A07OutputsbC0VRszrlE04fromD04nameAESS_tFZ", + "mangledName": "$s7Amplify13StorageBucketPA2A07OutputsbC0VRszrlE04fromD04nameAESS_tFZ", + "moduleName": "Amplify", + "genericSig": "", + "static": true, + "isFromExtension": true, + "funcSelfKind": "NonMutating" + }, + { + "kind": "Function", + "name": "fromBucketInfo", + "printedName": "fromBucketInfo(_:)", + "children": [ + { + "kind": "TypeNominal", + "name": "GenericTypeParam", + "printedName": "Self" + }, + { + "kind": "TypeNominal", + "name": "BucketInfo", + "printedName": "Amplify.BucketInfo", + "usr": "s:7Amplify10BucketInfoV" + } + ], + "declKind": "Func", + "usr": "s:7Amplify13StorageBucketPA2A08ResolvedbC0VRszrlE04fromC4InfoyAeA0cF0VFZ", + "mangledName": "$s7Amplify13StorageBucketPA2A08ResolvedbC0VRszrlE04fromC4InfoyAeA0cF0VFZ", + "moduleName": "Amplify", + "genericSig": "", + "static": true, + "isFromExtension": true, + "funcSelfKind": "NonMutating" + } + ], + "declKind": "Protocol", + "usr": "s:7Amplify13StorageBucketP", + "mangledName": "$s7Amplify13StorageBucketP", + "moduleName": "Amplify" + }, + { + "kind": "TypeDecl", + "name": "BucketInfo", + "printedName": "BucketInfo", + "children": [ + { + "kind": "Var", + "name": "bucketName", + "printedName": "bucketName", + "children": [ + { + "kind": "TypeNominal", + "name": "String", + "printedName": "Swift.String", + "usr": "s:SS" + } + ], + "declKind": "Var", + "usr": "s:7Amplify10BucketInfoV10bucketNameSSvp", + "mangledName": "$s7Amplify10BucketInfoV10bucketNameSSvp", + "moduleName": "Amplify", + "declAttributes": [ + "HasStorage" + ], + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "String", + "printedName": "Swift.String", + "usr": "s:SS" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify10BucketInfoV10bucketNameSSvg", + "mangledName": "$s7Amplify10BucketInfoV10bucketNameSSvg", + "moduleName": "Amplify", + "implicit": true, + "declAttributes": [ + "Transparent" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "region", + "printedName": "region", + "children": [ + { + "kind": "TypeNominal", + "name": "String", + "printedName": "Swift.String", + "usr": "s:SS" + } + ], + "declKind": "Var", + "usr": "s:7Amplify10BucketInfoV6regionSSvp", + "mangledName": "$s7Amplify10BucketInfoV6regionSSvp", + "moduleName": "Amplify", + "declAttributes": [ + "HasStorage" + ], + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "String", + "printedName": "Swift.String", + "usr": "s:SS" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify10BucketInfoV6regionSSvg", + "mangledName": "$s7Amplify10BucketInfoV6regionSSvg", + "moduleName": "Amplify", + "implicit": true, + "declAttributes": [ + "Transparent" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Constructor", + "name": "init", + "printedName": "init(bucketName:region:)", + "children": [ + { + "kind": "TypeNominal", + "name": "BucketInfo", + "printedName": "Amplify.BucketInfo", + "usr": "s:7Amplify10BucketInfoV" + }, + { + "kind": "TypeNominal", + "name": "String", + "printedName": "Swift.String", + "usr": "s:SS" + }, + { + "kind": "TypeNominal", + "name": "String", + "printedName": "Swift.String", + "usr": "s:SS" + } + ], + "declKind": "Constructor", + "usr": "s:7Amplify10BucketInfoV10bucketName6regionACSS_SStcfc", + "mangledName": "$s7Amplify10BucketInfoV10bucketName6regionACSS_SStcfc", + "moduleName": "Amplify", + "init_kind": "Designated" + }, + { + "kind": "Function", + "name": "hash", + "printedName": "hash(into:)", + "children": [ + { + "kind": "TypeNominal", + "name": "Void", + "printedName": "()" + }, + { + "kind": "TypeNominal", + "name": "Hasher", + "printedName": "Swift.Hasher", + "paramValueOwnership": "InOut", + "usr": "s:s6HasherV" + } + ], + "declKind": "Func", + "usr": "s:7Amplify10BucketInfoV4hash4intoys6HasherVz_tF", + "mangledName": "$s7Amplify10BucketInfoV4hash4intoys6HasherVz_tF", + "moduleName": "Amplify", + "implicit": true, + "funcSelfKind": "NonMutating" + }, + { + "kind": "Function", + "name": "__derived_struct_equals", + "printedName": "__derived_struct_equals(_:_:)", + "children": [ + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + }, + { + "kind": "TypeNominal", + "name": "BucketInfo", + "printedName": "Amplify.BucketInfo", + "usr": "s:7Amplify10BucketInfoV" + }, + { + "kind": "TypeNominal", + "name": "BucketInfo", + "printedName": "Amplify.BucketInfo", + "usr": "s:7Amplify10BucketInfoV" + } + ], + "declKind": "Func", + "usr": "s:7Amplify10BucketInfoV23__derived_struct_equalsySbAC_ACtFZ", + "mangledName": "$s7Amplify10BucketInfoV23__derived_struct_equalsySbAC_ACtFZ", + "moduleName": "Amplify", + "static": true, + "implicit": true, + "funcSelfKind": "NonMutating" + }, + { + "kind": "Var", + "name": "hashValue", + "printedName": "hashValue", + "children": [ + { + "kind": "TypeNominal", + "name": "Int", + "printedName": "Swift.Int", + "usr": "s:Si" + } + ], + "declKind": "Var", + "usr": "s:7Amplify10BucketInfoV9hashValueSivp", + "mangledName": "$s7Amplify10BucketInfoV9hashValueSivp", + "moduleName": "Amplify", + "implicit": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Int", + "printedName": "Swift.Int", + "usr": "s:Si" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify10BucketInfoV9hashValueSivg", + "mangledName": "$s7Amplify10BucketInfoV9hashValueSivg", + "moduleName": "Amplify", + "implicit": true, + "accessorKind": "get" + } + ] + } + ], + "declKind": "Struct", + "usr": "s:7Amplify10BucketInfoV", + "mangledName": "$s7Amplify10BucketInfoV", + "moduleName": "Amplify", + "conformances": [ + { + "kind": "Conformance", + "name": "Hashable", + "printedName": "Hashable", + "usr": "s:SH", + "mangledName": "$sSH" + }, + { + "kind": "Conformance", + "name": "Equatable", + "printedName": "Equatable", + "usr": "s:SQ", + "mangledName": "$sSQ" + } + ] + }, + { + "kind": "TypeDecl", + "name": "OutputsStorageBucket", + "printedName": "OutputsStorageBucket", + "children": [ + { + "kind": "Var", + "name": "name", + "printedName": "name", + "children": [ + { + "kind": "TypeNominal", + "name": "String", + "printedName": "Swift.String", + "usr": "s:SS" + } + ], + "declKind": "Var", + "usr": "s:7Amplify20OutputsStorageBucketV4nameSSvp", + "mangledName": "$s7Amplify20OutputsStorageBucketV4nameSSvp", + "moduleName": "Amplify", + "declAttributes": [ + "HasStorage" + ], + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "String", + "printedName": "Swift.String", + "usr": "s:SS" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify20OutputsStorageBucketV4nameSSvg", + "mangledName": "$s7Amplify20OutputsStorageBucketV4nameSSvg", + "moduleName": "Amplify", + "implicit": true, + "declAttributes": [ + "Transparent" + ], + "accessorKind": "get" + } + ] + } + ], + "declKind": "Struct", + "usr": "s:7Amplify20OutputsStorageBucketV", + "mangledName": "$s7Amplify20OutputsStorageBucketV", + "moduleName": "Amplify", + "conformances": [ + { + "kind": "Conformance", + "name": "StorageBucket", + "printedName": "StorageBucket", + "usr": "s:7Amplify13StorageBucketP", + "mangledName": "$s7Amplify13StorageBucketP" + } + ] + }, + { + "kind": "TypeDecl", + "name": "ResolvedStorageBucket", + "printedName": "ResolvedStorageBucket", + "children": [ + { + "kind": "Var", + "name": "bucketInfo", + "printedName": "bucketInfo", + "children": [ + { + "kind": "TypeNominal", + "name": "BucketInfo", + "printedName": "Amplify.BucketInfo", + "usr": "s:7Amplify10BucketInfoV" + } + ], + "declKind": "Var", + "usr": "s:7Amplify21ResolvedStorageBucketV10bucketInfoAA0dF0Vvp", + "mangledName": "$s7Amplify21ResolvedStorageBucketV10bucketInfoAA0dF0Vvp", + "moduleName": "Amplify", + "declAttributes": [ + "HasStorage" + ], + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "BucketInfo", + "printedName": "Amplify.BucketInfo", + "usr": "s:7Amplify10BucketInfoV" + } + ], + "declKind": "Accessor", + "usr": "s:7Amplify21ResolvedStorageBucketV10bucketInfoAA0dF0Vvg", + "mangledName": "$s7Amplify21ResolvedStorageBucketV10bucketInfoAA0dF0Vvg", + "moduleName": "Amplify", + "implicit": true, + "declAttributes": [ + "Transparent" + ], + "accessorKind": "get" + } + ] + } + ], + "declKind": "Struct", + "usr": "s:7Amplify21ResolvedStorageBucketV", + "mangledName": "$s7Amplify21ResolvedStorageBucketV", + "moduleName": "Amplify", + "conformances": [ + { + "kind": "Conformance", + "name": "StorageBucket", + "printedName": "StorageBucket", + "usr": "s:7Amplify13StorageBucketP", + "mangledName": "$s7Amplify13StorageBucketP" + } + ] + }, { "kind": "TypeDecl", "name": "StorageCategory", @@ -179735,7 +180993,7 @@ "-module", "Amplify", "-o", - "\/var\/folders\/hn\/5bx1f4_d4ds5vhwhkxc7vdcr0000gn\/T\/tmp.nAGRifhwH6\/Amplify.json", + "\/var\/folders\/m_\/cksx93ys47x4621g0zbw_m4m0000gn\/T\/tmp.xrcnJX8DBh\/Amplify.json", "-I", ".build\/debug", "-sdk-version", diff --git a/api-dump/CoreMLPredictionsPlugin.json b/api-dump/CoreMLPredictionsPlugin.json index 1a9879407f..03a015b749 100644 --- a/api-dump/CoreMLPredictionsPlugin.json +++ b/api-dump/CoreMLPredictionsPlugin.json @@ -430,7 +430,7 @@ "-module", "CoreMLPredictionsPlugin", "-o", - "\/var\/folders\/hn\/5bx1f4_d4ds5vhwhkxc7vdcr0000gn\/T\/tmp.nAGRifhwH6\/CoreMLPredictionsPlugin.json", + "\/var\/folders\/m_\/cksx93ys47x4621g0zbw_m4m0000gn\/T\/tmp.xrcnJX8DBh\/CoreMLPredictionsPlugin.json", "-I", ".build\/debug", "-sdk-version",