fix: Use correct category plugins to populate dev menu

Amplify/DefaultPlugins/AWSHubPlugin/AWSHubPlugin.swift

@@ -5,6 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+import Foundation
+
 /// The default Hub plugin provided with the Amplify Framework
 ///
 /// **No guaranteed delivery order**
@@ -80,3 +82,4 @@ final public class AWSHubPlugin: HubCategoryPlugin {
     }
 
 }
+

Amplify/DefaultPlugins/AWSUnifiedLoggingPlugin/AWSUnifiedLoggingPlugin.swift

@@ -99,3 +99,4 @@ extension AWSUnifiedLoggingPlugin {
         return wrapper
     }
 }
+

Amplify/DevMenu/AmplifyVersionable.swift

@@ -8,6 +8,14 @@
 import Foundation
 
 /// Implement this protocol to support versioning in your plugin
-protocol AmplifyVersionable {
+public protocol AmplifyVersionable {
     var version: String { get }
 }
+
+extension AmplifyVersionable where Self: AnyObject {
+    public var version: String {
+        let bundle = Bundle(for: type(of: self))
+        let version = bundle.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
+        return version ?? "Not Available"
+    }
+}

Amplify/DevMenu/Data/EnvironmentInfoHelper.swift

@@ -16,7 +16,7 @@ struct EnvironmentInfoHelper {
 
     static func fetchDeveloperInformationFromJson(filename: String) -> [EnvironmentInfoItem] {
         guard let url = Bundle.main.url(forResource: filename, withExtension: "json") else {
-            Amplify.Logging.error(DevMenuStringConstants.logTag + "json file doesn't exist")
+            Amplify.Logging.error(DevMenuStringConstants.logTag + " json file doesn't exist")
             return [EnvironmentInfoItem]()
         }
 
@@ -26,7 +26,7 @@ struct EnvironmentInfoHelper {
             let environmentInfo = try decoder.decode(DevEnvironmentInfo.self, from: jsonData)
             return getDeveloperEnvironmentInformation(devEnvInfo: environmentInfo)
         } catch {
-            Amplify.Logging.error(DevMenuStringConstants.logTag + "json file parsing failed")
+            Amplify.Logging.error(DevMenuStringConstants.logTag + " json file parsing failed")
             return [EnvironmentInfoItem]()
         }
     }

Amplify/DevMenu/Data/PluginInfoHelper.swift

@@ -14,86 +14,59 @@ struct PluginInfoHelper {
     static func getPluginInformation() -> [PluginInfoItem] {
         var pluginList = [PluginInfoItem]()
 
-        // Add Analytics plugins information
-        for pluginKey in Amplify.Analytics.plugins.keys {
-            if let versionable = (try? Amplify.Auth.getPlugin(for: pluginKey)) as? AmplifyVersionable {
-                pluginList.append(PluginInfoItem(displayName: pluginKey, information: versionable.version))
-            } else {
-                pluginList.append(PluginInfoItem(displayName: pluginKey,
-                                                 information: DevMenuStringConstants.versionNotAvailable))
+        pluginList.append(contentsOf: Amplify.Analytics.plugins.map {
+                makePluginInfoItem(for: $0.key, versionable: $0.value as? AmplifyVersionable)
             }
-        }
+        )
 
-        // Add API plugins information
         if let apiCategoryPlugin = Amplify.API as? AmplifyAPICategory {
-            for pluginKey in apiCategoryPlugin.plugins.keys {
-                if let versionable = (try? Amplify.Auth.getPlugin(for: pluginKey)) as? AmplifyVersionable {
-                    pluginList.append(PluginInfoItem(displayName: pluginKey, information: versionable.version))
-                } else {
-                    pluginList.append(PluginInfoItem(displayName: pluginKey,
-                                                     information: DevMenuStringConstants.versionNotAvailable))
+            pluginList.append(contentsOf: apiCategoryPlugin.plugins.map {
+                    makePluginInfoItem(for: $0.key, versionable: $0.value as? AmplifyVersionable)
                 }
-            }
+            )
         }
 
-        // Add Auth plugins information
-        for pluginKey in Amplify.Analytics.plugins.keys {
-            if let versionable = (try? Amplify.Auth.getPlugin(for: pluginKey)) as? AmplifyVersionable {
-                pluginList.append(PluginInfoItem(displayName: pluginKey, information: versionable.version))
-            } else {
-                pluginList.append(PluginInfoItem(displayName: pluginKey,
-                                                 information: DevMenuStringConstants.versionNotAvailable))
+        pluginList.append(contentsOf: Amplify.Auth.plugins.map {
+                makePluginInfoItem(for: $0.key, versionable: $0.value as? AmplifyVersionable)
             }
-        }
+        )
 
-        // Add DataStore plugins information
-        for pluginKey in Amplify.DataStore.plugins.keys {
-            if let versionable = (try? Amplify.DataStore.getPlugin(for: pluginKey)) as? AmplifyVersionable {
-                pluginList.append(PluginInfoItem(displayName: pluginKey, information: versionable.version))
-            } else {
-                pluginList.append(PluginInfoItem(displayName: pluginKey,
-                                                 information: DevMenuStringConstants.versionNotAvailable))
+        pluginList.append(contentsOf: Amplify.DataStore.plugins.map {
+                makePluginInfoItem(for: $0.key, versionable: $0.value as? AmplifyVersionable)
             }
-        }
+        )
 
-        // Add Hub plugins information
-        for pluginKey in Amplify.Hub.plugins.keys {
-            if let versionable = (try? Amplify.DataStore.getPlugin(for: pluginKey)) as? AmplifyVersionable {
-                pluginList.append(PluginInfoItem(displayName: pluginKey, information: versionable.version))
-            } else {
-                pluginList.append(PluginInfoItem(displayName: pluginKey,
-                                                 information: DevMenuStringConstants.versionNotAvailable))
+        pluginList.append(contentsOf: Amplify.Hub.plugins.map {
+                makePluginInfoItem(for: $0.key, versionable: $0.value as? AmplifyVersionable)
             }
-        }
+        )
 
-        // Add Logging plugins information
-        if let versionable = Amplify.Logging.plugin as? AmplifyVersionable {
-            pluginList.append(PluginInfoItem(displayName: Amplify.Logging.plugin.key, information: versionable.version))
-        } else {
-            pluginList.append(PluginInfoItem(displayName: Amplify.Logging.plugin.key,
-                                             information: DevMenuStringConstants.versionNotAvailable))
-        }
+        pluginList.append(
+            makePluginInfoItem(
+                for: Amplify.Logging.plugin.key,
+                versionable: Amplify.Logging.plugin as? AmplifyVersionable
+            )
+        )
 
-        // Add Predictions plugins information
-        for pluginKey in Amplify.Predictions.plugins.keys {
-            if let versionable = (try? Amplify.Predictions.getPlugin(for: pluginKey)) as? AmplifyVersionable {
-                pluginList.append(PluginInfoItem(displayName: pluginKey, information: versionable.version))
-            } else {
-                pluginList.append(PluginInfoItem(displayName: pluginKey,
-                                                 information: DevMenuStringConstants.versionNotAvailable))
+        pluginList.append(contentsOf: Amplify.Predictions.plugins.map {
+                makePluginInfoItem(for: $0.key, versionable: $0.value as? AmplifyVersionable)
             }
-        }
+        )
 
-        // Add Storage plugins information
-        for pluginKey in Amplify.Storage.plugins.keys {
-            if let versionable = (try? Amplify.Predictions.getPlugin(for: pluginKey)) as? AmplifyVersionable {
-                pluginList.append(PluginInfoItem(displayName: pluginKey, information: versionable.version))
-            } else {
-                pluginList.append(PluginInfoItem(displayName: pluginKey,
-                                                 information: DevMenuStringConstants.versionNotAvailable))
+        pluginList.append(contentsOf: Amplify.Storage.plugins.map {
+                makePluginInfoItem(for: $0.key, versionable: $0.value as? AmplifyVersionable)
             }
-        }
+        )
 
         return pluginList
     }
+
+    private static func makePluginInfoItem(
+        for pluginKey: String,
+        versionable: AmplifyVersionable?
+    ) -> PluginInfoItem {
+        let version = versionable?.version ?? DevMenuStringConstants.versionNotAvailable
+        return PluginInfoItem(displayName: pluginKey, information: version)
+    }
+
 }

Amplify/DevMenu/DevEnvironmentInfo.swift

@@ -9,12 +9,12 @@ import Foundation
 
 // struct to decode/encode information about developer environment in json format
 struct DevEnvironmentInfo: Codable {
-    let nodejsVersion: String
-    let npmVersion: String
-    let amplifyCLIVersion: String
-    let podVersion: String
-    let xcodeVersion: String
-    let osVersion: String
+    let nodejsVersion: String?
+    let npmVersion: String?
+    let amplifyCLIVersion: String?
+    let podVersion: String?
+    let xcodeVersion: String?
+    let osVersion: String?
 
     enum CodingKeys: String, CodingKey {
         case nodejsVersion

Amplify/DevMenu/Logging/PersistentLoggingPlugin.swift

@@ -45,3 +45,4 @@ public class PersistentLoggingPlugin: LoggingCategoryPlugin {
         return persistentLogWrapper!
     }
 }
+

AmplifyPlugins/API/AWSAPICategoryPlugin/AWSAPIPlugin.swift

@@ -81,3 +81,4 @@ extension URLSessionFactory {
         return factory
     }
 }
+

AmplifyPlugins/Analytics/AWSPinpointAnalyticsPlugin/AWSPinpointAnalyticsPlugin.swift

@@ -39,3 +39,4 @@ public final class AWSPinpointAnalyticsPlugin: AnalyticsCategoryPlugin {
     /// Instantiates an instance of the AWSPinpointAnalyticsPlugin
     public init() {}
 }
+

AmplifyPlugins/Auth/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin.swift

@@ -50,3 +50,4 @@ final public class AWSCognitoAuthPlugin: AuthCategoryPlugin {
     public init() {
     }
 }
+

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStorePlugin.swift

@@ -184,3 +184,4 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
     }
 
 }
+

AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin.swift

@@ -41,3 +41,4 @@ final public class AWSPredictionsPlugin: PredictionsCategoryPlugin {
     public init() {
     }
 }
+

AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/CoreMLPredictionsPlugin.swift

@@ -30,3 +30,4 @@ final public class CoreMLPredictionsPlugin: PredictionsCategoryPlugin {
     public init() {
     }
 }
+

AmplifyPlugins/Storage/AWSS3StoragePlugin/AWSS3StoragePlugin.swift

@@ -33,3 +33,4 @@ final public class AWSS3StoragePlugin: StorageCategoryPlugin {
     public init() {
     }
 }
+