fastlane-plugin-airwatch_workspaceone 2.0.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24d6f4778a212b4ecd777581295f7455de5d3feb8a6fc664017106b97c4e0455
-  data.tar.gz: f26078ad12791c18fa6bde200e0c5e97633eec8f56f2cbc2868b00387515986c
+  metadata.gz: 23a24e8e7abab45317fbb762787db007bc81cc11c36bda46c5b17b26cd949b56
+  data.tar.gz: 002cc296d31c9bdc141b8325ab887761294142dcef9d61ccf9286faa43bf1ff8
 SHA512:
-  metadata.gz: 5f03c8eaee4e59ea57e1043164eb728f45294591d87b5d177d43ecaf1adc670c350a79cc8fc481a07ee04c77cfa0b8470bf2ee62742145ea73139ca27d9915c3
-  data.tar.gz: cf7bb83f7658e8eda12cf337ef3345c5fcb0c8de2235e8d8f6b239c50905a45becb1b2bd58588b9878d0c11378eb95a36c5ba263f818a1a56748adecf0d018ab
+  metadata.gz: 9d42673b8e6596baf6ac3ee2830bb63078a345d9789690bb9c4b15721ebf08567004b4f8c322139d7039bd64f396318d702e91e80cde84ea6187855f990f189a
+  data.tar.gz: dcd4263e484eccbd0aeed3dbee8cac11ff8429b2b6abbd535e246ffa580a5da817bad3ed904ae69b1a5cc215f3854e5397643bacbf4c85c6bb89869e7e901792

data/README.md

@@ -15,13 +15,14 @@ fastlane add_plugin airwatch_workspaceone
 The main purpose of this plugin is to upload an IPA or an APK file to an AirWatch or Workspace ONE enterprise instance/console. For Android, the plugin works only with legacy AirWatch console and not with Workspace ONE console.
 
 This plugin features following actions :-
-1. deploy_build - To upload an iOS ipa to both legacy AirWatch and Workspace ONE console. Also, to upload an Android APK to legacy AirWatch console.
+1. deploy_build - The main purpose of this action is to upload an IPA or an APK file to an AirWatch or Workspace ONE enterprise console.
 2. retire_previous_versions - The main purpose of this action is to retire previous active versions of an application. This action takes a string parameter where you can specify the number of latest versions to keep if you do not want to retire all the previous active versions.
 3. delete_previous_versions - The main purpose of this action is to delete versions of an application. This action takes a string parameter where you can specify the number of latest versions to keep if you do not want to delete all the versions.
 4. retire_specific_version - The main purpose of this action is to retire a specific version of an application. This action takes a string parameter where you can specify the version number to retire.
 5. delete_specific_version - The main purpose of this action is to delete a specific version of an application. This action takes a string parameter where you can specify the version number to delete.
-6. add_or_update_assignments_action - The main purpose of this action is to add a new smart group assignment to an application or to update an existing smart group assignment of an application with a given dictionary of deployment/assignment parameters. If a smart group name is provided which does not exist yet on Console, assignment for that smart group is ignored.
+6. add_or_update_assignments - The main purpose of this action is to add a new smart group assignment to an application or to update an existing smart group assignment of an application with a given dictionary of deployment/assignment parameters. If a smart group name is provided which does not exist yet on Console, assignment for that smart group is ignored.
 7. unretire_all_versions - The main purpose of this action is to unretire all retired versions of an application.
+8. unretire_specific_version - The main purpose of this action is to unretire a specific version of an application. This action takes a string parameter where you can specify the version number to unretire.
 
 ## Available options
 
@@ -48,10 +49,24 @@ fastlane action add_or_update_assignments
 ```bash
 fastlane action unretire_all_versions
 ```
-
+```bash
+fastlane action unretire_specific_version
+```
+Please do not append /API/ at the end of host_url option in any of the actions; you should pass something like - https://asxxx.awmdm.com. Thanks to [Willie Stewart](https://github.com/wstewartii) for facing an [issue](https://github.com/letsbondiway/fastlane-plugin-airwatch_workspaceone/issues/2) because of this due to which this gets documented.
 ## Example
 
-Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin.
+Check out the [example `Fastfile`](fastlane/Fastfile) to see example lanes.
+
+To make use of this plugin, run one of the lanes using the following command -
+
+```bash
+bundle exec fastlane lane_name
+```
+If you are using .env files (please find sample - .env.development at the same folder where Fastfile is located), please specify using --env parameter
+
+```bash
+bundle exec fastlane lane_name --env development
+```
 
 ## Run tests for this plugin
 

data/lib/fastlane/plugin/airwatch_workspaceone/actions/add_or_update_assignments_action.rb

@@ -5,7 +5,6 @@ module Fastlane
   module Actions
     class AddOrUpdateAssignmentsAction < Action
 
-      APP_VERSIONS_LIST_SUFFIX      = "/API/mam/apps/search?bundleid=%s"
       ADD_UPDATE_ASSIGNMENT_SUFFIX  = "/API/mam/apps/internal/%d/assignments"
       SEARCH_SMART_GROUP_SUFFIX     = "/API/mdm/smartgroups/search?name=%s&organizationgroupid=%d"
 
@@ -103,8 +102,8 @@ module Fastlane
 
       def self.find_app_smart_groups(app_identifier)
         # get the list of apps 
-        data = list_app_versions(app_identifier)
-        app_versions = data['Application']
+        apps = Helper::AirwatchWorkspaceoneHelper.list_app_versions(app_identifier, $host_url, $aw_tenant_code, $b64_encoded_auth, $org_group_id, debug)
+        app_versions = apps['Application']
 
         if app_versions.count <= 0
           UI.user_error!("No app found on the console having bundle identifier: %s" % [app_identifier])
@@ -112,41 +111,21 @@ module Fastlane
           exit
         end
 
+        app_versions.sort_by! { |app_version| app_version["Id"]["Value"] }
         latest_app_version = app_versions.last
         $app_id_int = latest_app_version['Id']['Value']
         app_smart_groups = latest_app_version['SmartGroups']
         return app_smart_groups
       end
 
-      def self.list_app_versions(app_identifier)
-        require 'rest-client'
-        require 'json'
-        
-        response = RestClient.get($host_url + APP_VERSIONS_LIST_SUFFIX % [app_identifier], {accept: :json, 'aw-tenant-code': $aw_tenant_code, 'Authorization': "Basic " + $b64_encoded_auth})
-
-        if debug
-          UI.message("Response code: %d" % [response.code])
-          UI.message("Response body:")
-          UI.message(response.body)
-        end
-
-        if response.code != 200
-          UI.user_error!("There was an error in finding app versions. One possible reason is that an app with the bundle identifier given does not exist on Console.")
-          exit
-        end
-
-        json = JSON.parse(response.body)
-        return json
-      end
-
       def self.find_smart_group_id(smart_group_name)
-        data = fetch_smart_group_details(smart_group_name)
+        smart_groups = fetch_smart_group_details(smart_group_name)
         smart_group_id = -1
-        if data.empty?
+        if smart_groups.empty?
           return smart_group_id
         end
 
-        data['SmartGroups'].each do |smart_group|
+        smart_groups['SmartGroups'].each do |smart_group|
           smart_group_id = smart_group['SmartGroupID']
         end
 
@@ -221,29 +200,29 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :host_url,
                                   env_name: "AIRWATCH_HOST_API_URL",
-                               description: "Host API URL of the AirWatch instance",
+                               description: "Host API URL of the AirWatch/Workspace ONE instance without /API/ at the end",
                                   optional: false,
                                       type: String,
                               verify_block: proc do |value|
-                                              UI.user_error!("No AirWatch Host API URl given.") unless value and !value.empty?
+                                              UI.user_error!("No AirWatch/Workspace ONE Host API URl given, pass using `host_url: 'https://yourhost.com'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :aw_tenant_code,
                                   env_name: "AIRWATCH_API_KEY",
-                               description: "API key or the tenant code to access AirWatch Rest APIs",
+                               description: "API key or the tenant code to access AirWatch/Workspace ONE Rest APIs",
                                   optional: false,
                                       type: String,
                               verify_block: proc do |value|
-                                              UI.user_error!("Api tenant code header is missing.") unless value and !value.empty?
+                                              UI.user_error!("Api tenant code header is missing, pass using `aw_tenant_code: 'yourapikey'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :b64_encoded_auth,
                                   env_name: "AIRWATCH_BASE64_ENCODED_BASIC_AUTH_STRING",
-                               description: "The base64 encoded Basic Auth string generated by authorizing username and password to the AirWatch instance",
+                               description: "The base64 encoded Basic Auth string generated by authorizing username and password to the AirWatch/Workspace ONE instance",
                                   optional: false,
                                       type: String,
                               verify_block: proc do |value|
-                                              UI.user_error!("The authorization header is empty or the scheme is not basic") unless value and !value.empty?
+                                              UI.user_error!("The authorization header is empty or the scheme is not basic, pass using `b64_encoded_auth: 'yourb64encodedauthstring'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :org_group_id,
@@ -252,7 +231,7 @@ module Fastlane
                                   optional: false,
                                       type: String,
                               verify_block: proc do |value|
-                                              UI.user_error!("No Organization Group ID integer given, pass using `org_group_id: MyOrgGroupId`") unless value and !value.empty?
+                                              UI.user_error!("No Organization Group ID integer given, pass using `org_group_id: 'yourorggrpintid'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :app_identifier,
@@ -266,11 +245,11 @@ module Fastlane
 
           FastlaneCore::ConfigItem.new(key: :smart_groups_to_assign,
                                   env_name: "AIRWATCH_SMART_GROUPS_TO_ASSIGN",
-                               description: "Name of the smart group to assign to",
+                               description: "Names of the smart groups to assign the app to",
                                   optional: false,
                                       type: Array,
                               verify_block: proc do |value|
-                                              UI.user_error!("No smart group given, pass using `smart_group_to_assign: 'MyAppDevTeam'`") unless value and !value.empty?
+                                              UI.user_error!("No smart group names given, pass using `smart_groups_to_assign: ['yoursmartgrp1', 'yoursmartgroup2']` or `smart_groups_to_assign: 'yoursmartgrp1'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :assignment_parameters,
@@ -279,7 +258,7 @@ module Fastlane
                                   optional: false,
                                  is_string: false,
                               verify_block: proc do |value|
-                                              UI.user_error!("No deployment parameters given, pass using `assignment_parameters: '{key1: value1, key2: value2}'`") unless value and !value.empty?
+                                              UI.user_error!("No smart group assignment parameters given, pass using `assignment_parameters: '{key1: value1, key2: value2}'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :debug,

data/lib/fastlane/plugin/airwatch_workspaceone/actions/delete_previous_versions_action.rb

@@ -5,9 +5,6 @@ module Fastlane
   module Actions
     class DeletePreviousVersionsAction < Action
       
-      APP_VERSIONS_LIST_SUFFIX    = "/API/mam/apps/search?bundleid=%s"
-      INTERNAL_APP_DELETE_SUFFIX  = "/API/mam/apps/internal/%d"
-      
       $is_debug = false
 
       def self.run(params)
@@ -23,6 +20,7 @@ module Fastlane
           UI.message(" host_url: #{params[:host_url]}")
           UI.message(" aw_tenant_code: #{params[:aw_tenant_code]}")
           UI.message(" b64_encoded_auth: #{params[:b64_encoded_auth]}")
+          UI.message(" organization_group_id: #{params[:org_group_id]}")
           UI.message(" app_identifier: #{params[:app_identifier]}")
           UI.message(" keep_latest_versions_count: #{params[:keep_latest_versions_count]}")
         end
@@ -30,6 +28,7 @@ module Fastlane
         $host_url                   = params[:host_url]
         $aw_tenant_code             = params[:aw_tenant_code]
         $b64_encoded_auth           = params[:b64_encoded_auth]
+        $org_group_id               = params[:org_group_id]
         app_identifier              = params[:app_identifier]
         keep_latest_versions_count  = params[:keep_latest_versions_count]
 
@@ -38,7 +37,7 @@ module Fastlane
         UI.message("1. Finding app versions")
         UI.message("-----------------------")
 
-        app_versions = find_app(app_identifier)
+        app_versions = find_app_versions(app_identifier)
         UI.success("Found %d app version(s)" % [app_versions.count])
         UI.success("Version number(s): %s" % [app_versions.map {|app_version| app_version.values[1]}])
 
@@ -55,77 +54,36 @@ module Fastlane
           app_versions.pop(keep_latest_versions_count_int)
           UI.important("Version number(s) to delete: %s" % [app_versions.map {|app_version| app_version.values[1]}])
           app_versions.each do |app_version|
-            delete_app(app_version)
+            Helper::AirwatchWorkspaceoneHelper.delete_app(app_version, $host_url, $aw_tenant_code, $b64_encoded_auth, debug)
           end
           UI.success("Version(s) %s successfully deleted." % [app_versions.map {|app_version| app_version.values[1]}])
         end
       end
 
-      def self.find_app(app_identifier)
+      def self.find_app_versions(app_identifier)
         # get the list of apps 
-        data = list_app_versions(app_identifier)
+        apps = Helper::AirwatchWorkspaceoneHelper.list_app_versions(app_identifier, $host_url, $aw_tenant_code, $b64_encoded_auth, $org_group_id, debug)
         app_versions = Array.new
         active_app_versions = Array.new
         retired_app_versions = Array.new
 
-        data['Application'].each do |app|
+        apps['Application'].each do |app|
           if app['Status'] == "Active"
-            active_app_version = Hash.new
-            active_app_version['Id'] = app['Id']['Value']
-            active_app_version['Version'] = app['AppVersion']
+            active_app_version = Helper::AirwatchWorkspaceoneHelper.construct_app_version(app)
             active_app_versions << active_app_version
           elsif app["Status"] == "Retired"
-            retired_app_version = Hash.new
-            retired_app_version['Id'] = app['Id']['Value']
-            retired_app_version['Version'] = app['AppVersion']
+            retired_app_version = Helper::AirwatchWorkspaceoneHelper.construct_app_version(app)
             retired_app_versions << retired_app_version
           end
         end
 
+        retired_app_versions.sort_by! { |app_version| app_version["Id"] }
+        active_app_versions.sort_by! { |app_version| app_version["Id"] }
         app_versions.push(*retired_app_versions)
         app_versions.push(*active_app_versions)
         return app_versions
       end
 
-      def self.list_app_versions(app_identifier)
-        require 'rest-client'
-        require 'json'
-        
-        response = RestClient.get($host_url + APP_VERSIONS_LIST_SUFFIX % [app_identifier], {accept: :json, 'aw-tenant-code': $aw_tenant_code, 'Authorization': "Basic " + $b64_encoded_auth})
-
-        if debug
-          UI.message("Response code: %d" % [response.code])
-          UI.message("Response body:")
-          UI.message(response.body)
-        end
-
-        if response.code != 200
-          UI.user_error!("There was an error in finding app versions. One possible reason is that an app with the bundle identifier given does not exist on Console.")
-          exit
-        end
-
-        json = JSON.parse(response.body)
-        return json
-      end
-
-      def self.delete_app(app_version)
-        require 'rest-client'
-        require 'json'
-
-        UI.message("Starting to delete app version: %s" % [app_version['Version']])
-        response = RestClient.delete($host_url + INTERNAL_APP_DELETE_SUFFIX % [app_version['Id']],  {accept: :json, 'aw-tenant-code': $aw_tenant_code, 'Authorization': "Basic " + $b64_encoded_auth})
-
-        if debug
-          UI.message("Response code: %d" % [response.code])
-        end
-
-        if response.code == 204
-          UI.message("Successfully deleted app version: %s" % [app_version['Version']])
-        else
-          UI.message("Failed to delete app version: %s" % [app_version['Version']])
-        end
-      end
-
       def self.description
         "The main purpose of this action is to delete versions of an application. This action takes a string parameter where you can specify the number of latest versions to keep if you do not want to delete all the versions."
       end
@@ -140,36 +98,45 @@ module Fastlane
 
       def self.details
         # Optional:
-        "delete_previous_versions - To delete versions of an application on the AirWatch console."
+        "delete_previous_versions - To delete versions of an application on the AirWatch/Workspace ONE console."
       end
 
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :host_url,
                                   env_name: "AIRWATCH_HOST_API_URL",
-                               description: "Host API URL of the AirWatch instance",
+                               description: "Host API URL of the AirWatch/Workspace ONE instance without /API/ at the end",
                                   optional: false,
                                       type: String,
                               verify_block: proc do |value|
-                                              UI.user_error!("No AirWatch Host API URl given.") unless value and !value.empty?
+                                              UI.user_error!("No AirWatch/Workspace ONE Host API URl given, pass using `host_url: 'https://yourhost.com'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :aw_tenant_code,
                                   env_name: "AIRWATCH_API_KEY",
-                               description: "API key to access AirWatch Rest APIs",
+                               description: "API key or the tenant code to access AirWatch/Workspace ONE Rest APIs",
                                   optional: false,
                                       type: String,
                               verify_block: proc do |value|
-                                              UI.user_error!("Api tenant code header is missing.") unless value and !value.empty?
+                                              UI.user_error!("Api tenant code header is missing, pass using `aw_tenant_code: 'yourapikey'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :b64_encoded_auth,
                                   env_name: "AIRWATCH_BASE64_ENCODED_BASIC_AUTH_STRING",
-                               description: "The base64 encoded Basic Auth string generated by authorizing username and password to the AirWatch instance",
+                               description: "The base64 encoded Basic Auth string generated by authorizing username and password to the AirWatch/Workspace ONE instance",
+                                  optional: false,
+                                      type: String,
+                              verify_block: proc do |value|
+                                              UI.user_error!("The authorization header is empty or the scheme is not basic, pass using `b64_encoded_auth: 'yourb64encodedauthstring'`") unless value and !value.empty?
+                                            end),
+
+          FastlaneCore::ConfigItem.new(key: :org_group_id,
+                                  env_name: "AIRWATCH_ORGANIZATION_GROUP_ID",
+                               description: "Organization Group ID integer identifying the customer or container",
                                   optional: false,
                                       type: String,
                               verify_block: proc do |value|
-                                              UI.user_error!("The authorization header is empty or the scheme is not basic") unless value and !value.empty?
+                                              UI.user_error!("No Organization Group ID integer given, pass using `org_group_id: 'yourorggrpintid'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :app_identifier,
@@ -188,7 +155,7 @@ module Fastlane
                                       type: String,
                              default_value: "0",
                               verify_block: proc do |value|
-                                              UI.user_error!("The number of latest versions to keep can not be negative") unless value.to_i >= 0
+                                              UI.user_error!("The number of latest versions to keep can not be negative, pass using `keep_latest_versions_count: 'count'`") unless value.to_i >= 0
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :debug,

data/lib/fastlane/plugin/airwatch_workspaceone/actions/delete_specific_version_action.rb

@@ -3,10 +3,7 @@ require_relative '../helper/airwatch_workspaceone_helper'
 
 module Fastlane
   module Actions
-    class DeleteSpecificVersionAction < Action
-      
-      APP_VERSIONS_LIST_SUFFIX    = "/API/mam/apps/search?bundleid=%s"
-      INTERNAL_APP_DELETE_SUFFIX  = "/API/mam/apps/internal/%d"
+    class DeleteSpecificVersionAction < Action      
       
       $is_debug = false
 
@@ -23,6 +20,7 @@ module Fastlane
           UI.message(" host_url: #{params[:host_url]}")
           UI.message(" aw_tenant_code: #{params[:aw_tenant_code]}")
           UI.message(" b64_encoded_auth: #{params[:b64_encoded_auth]}")
+          UI.message(" organization_group_id: #{params[:org_group_id]}")
           UI.message(" app_identifier: #{params[:app_identifier]}")
           UI.message(" version_number: #{params[:version_number]}")
         end
@@ -30,6 +28,7 @@ module Fastlane
         $host_url         = params[:host_url]
         $aw_tenant_code   = params[:aw_tenant_code]
         $b64_encoded_auth = params[:b64_encoded_auth]
+        $org_group_id     = params[:org_group_id]
         app_identifier    = params[:app_identifier]
         version_number    = params[:version_number]
 
@@ -38,7 +37,7 @@ module Fastlane
         UI.message("1. Finding app versions")
         UI.message("-----------------------")
 
-        app_versions = find_app(app_identifier)
+        app_versions = Helper::AirwatchWorkspaceoneHelper.find_app_versions(app_identifier, 'None', $host_url, $aw_tenant_code, $b64_encoded_auth, $org_group_id, debug)
         app_version_numbers = app_versions.map {|app_version| app_version.values[1]}
         UI.success("Found %d app version(s)" % [app_versions.count])
         UI.success("Version number(s): %s" % [app_version_numbers])
@@ -51,7 +50,7 @@ module Fastlane
         if app_version_numbers.include? version_number
           version_index = app_version_numbers.index(version_number)
           app_version_to_delete = app_versions[version_index]
-          delete_app(app_version_to_delete)
+          Helper::AirwatchWorkspaceoneHelper.delete_app(app_version_to_delete, $host_url, $aw_tenant_code, $b64_encoded_auth, debug)
         else
           UI.user_error!("A version with the given version number: %s does not exist on the console for this application or is already deleted." % [version_number])
         end
@@ -59,60 +58,6 @@ module Fastlane
         UI.success("Version %s successfully deleted" % [version_number])
       end
 
-      def self.find_app(app_identifier)
-        # get the list of apps 
-        data = list_app_versions(app_identifier)
-        app_versions = Array.new
-
-        data['Application'].each do |app|
-          app_version = Hash.new
-          app_version['Id'] = app['Id']['Value']
-          app_version['Version'] = app['AppVersion']
-          app_versions << app_version
-        end
-
-        return app_versions
-      end
-
-      def self.list_app_versions(app_identifier)
-        require 'rest-client'
-        require 'json'
-        
-        response = RestClient.get($host_url + APP_VERSIONS_LIST_SUFFIX % [app_identifier], {accept: :json, 'aw-tenant-code': $aw_tenant_code, 'Authorization': "Basic " + $b64_encoded_auth})
-
-        if debug
-          UI.message("Response code: %d" % [response.code])
-          UI.message("Response body:")
-          UI.message(response.body)
-        end
-
-        if response.code != 200
-          UI.user_error!("There was an error in finding app versions. One possible reason is that an app with the bundle identifier given does not exist on Console.")
-          exit
-        end
-
-        json = JSON.parse(response.body)
-        return json
-      end
-
-      def self.delete_app(app_version)
-        require 'rest-client'
-        require 'json'
-
-        UI.message("Starting to delete app version: %s" % [app_version['Version']])
-        response = RestClient.delete($host_url + INTERNAL_APP_DELETE_SUFFIX % [app_version['Id']],  {accept: :json, 'aw-tenant-code': $aw_tenant_code, 'Authorization': "Basic " + $b64_encoded_auth})
-
-        if debug
-          UI.message("Response code: %d" % [response.code])
-        end
-
-        if response.code == 204
-          UI.message("Successfully deleted app version: %s" % [app_version['Version']])
-        else
-          UI.message("Failed to delete app version: %s" % [app_version['Version']])
-        end
-      end
-
       def self.description
         "The main purpose of this action is to delete a specific version of an application. This action takes a string parameter where you can specify the version number to delete."
       end
@@ -127,36 +72,45 @@ module Fastlane
 
       def self.details
         # Optional:
-        "delete_specific_version - To delete specific version of an application on the AirWatch console."
+        "delete_specific_version - To delete specific version of an application on the AirWatch/Workspace ONE console."
       end
 
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :host_url,
                                   env_name: "AIRWATCH_HOST_API_URL",
-                               description: "Host API URL of the AirWatch instance",
+                               description: "Host API URL of the AirWatch/Workspace ONE instance without /API/ at the end",
                                   optional: false,
                                       type: String,
                               verify_block: proc do |value|
-                                              UI.user_error!("No AirWatch Host API URl given.") unless value and !value.empty?
+                                              UI.user_error!("No AirWatch/Workspace ONE Host API URl given, pass using `host_url: 'https://yourhost.com'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :aw_tenant_code,
                                   env_name: "AIRWATCH_API_KEY",
-                               description: "API key to access AirWatch Rest APIs",
+                               description: "API key or the tenant code to access AirWatch/Workspace ONE Rest APIs",
                                   optional: false,
                                       type: String,
                               verify_block: proc do |value|
-                                              UI.user_error!("Api tenant code header is missing.") unless value and !value.empty?
+                                              UI.user_error!("Api tenant code header is missing, pass using `aw_tenant_code: 'yourapikey'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :b64_encoded_auth,
                                   env_name: "AIRWATCH_BASE64_ENCODED_BASIC_AUTH_STRING",
-                               description: "The base64 encoded Basic Auth string generated by authorizing username and password to the AirWatch instance",
+                               description: "The base64 encoded Basic Auth string generated by authorizing username and password to the AirWatch/Workspace ONE instance",
+                                  optional: false,
+                                      type: String,
+                              verify_block: proc do |value|
+                                              UI.user_error!("The authorization header is empty or the scheme is not basic, pass using `b64_encoded_auth: 'yourb64encodedauthstring'`") unless value and !value.empty?
+                                            end),
+
+          FastlaneCore::ConfigItem.new(key: :org_group_id,
+                                  env_name: "AIRWATCH_ORGANIZATION_GROUP_ID",
+                               description: "Organization Group ID integer identifying the customer or container",
                                   optional: false,
                                       type: String,
                               verify_block: proc do |value|
-                                              UI.user_error!("The authorization header is empty or the scheme is not basic") unless value and !value.empty?
+                                              UI.user_error!("No Organization Group ID integer given, pass using `org_group_id: 'yourorggrpintid'`") unless value and !value.empty?
                                             end),
 
           FastlaneCore::ConfigItem.new(key: :app_identifier,
@@ -170,7 +124,7 @@ module Fastlane
 
           FastlaneCore::ConfigItem.new(key: :version_number,
                                   env_name: "AIRWATCH_VERSION_NUMBER",
-                               description: "Version number of the application to retire",
+                               description: "Version number of the application to delete",
                                   optional: false,
                                       type: String,
                               verify_block: proc do |value|