Add null check to task status + fix imports

Author: chkp-adambar

APIFiles/APIClient.go

@@ -240,7 +240,6 @@ read_only: [optional] Login with Read Only permissions. This parameter is not co
 payload: [optional] More settings for the login command
 returns: APIResponse, error
 side-effects: updates the class's uid and server variables
-
 */
 func (c *ApiClient) ApiLogin(username string, password string, continueLastSession bool, domain string, readOnly bool, payload map[string]interface{}) (APIResponse, error) {
 	credentials := map[string]interface{}{
@@ -309,15 +308,16 @@ command: the command is placed in the URL field
 payload: a JSON object (or a string representing a JSON object) with the command arguments
 sid: The Check Point session-id. when omitted use self.sid.
 waitForTask: determines the behavior when the API server responds with a "task-id".
+
 	by default, the function will periodically check the status of the task
 	and will not return until the task is completed.
 	when wait_for_task=False, it is up to the user to call the "show-task" API and check
 	the status of the command.
+
 useProxy: Determines if the user wants to use the proxy server and port provider.
 method: HTTP request method - POST by default
 return: APIResponse object
 side-effects: updates the class's uid and server variables
-
 */
 func (c *ApiClient) ApiCall(command string, payload map[string]interface{}, sid string, waitForTask bool, useProxy bool, method ...string) (APIResponse, error) {
 	return c.apiCall(command, payload, sid, waitForTask, useProxy, false, method...)
@@ -549,7 +549,8 @@ func (c *ApiClient) apiCall(command string, payload map[string]interface{}, sid
 	return res, nil
 }
 
-/**
+/*
+*
 The APIs that return a list of objects are limited by the number of objects that they return.
 To get the full list of objects, there's a need to make repeated API calls each time using a different offset
 until all the objects are returned.
@@ -558,19 +559,25 @@ note: this function calls gen_api_query and iterates over the generator until it
 then returns.
 
 command: name of API command. This command should be an API that returns an array of
+
 	objects (for example: show-hosts, show networks, ...)
+
 details_level: query APIs always take a details-level argument.
+
 	possible values are "standard", "full", "uid"
+
 container_key: name of the key that holds the objects in the JSON response (usually "objects").
 include_container_key: If set to False the 'data' field of the APIResponse object
+
 	will be a list of the wanted objects. Otherwise, the date field of the APIResponse will be a dictionary in the following
+
 format: { container_key: [ List of the wanted objects], "total": size of the list}
 payload: a JSON object (or a string representing a JSON object) with the command arguments
 return: if include-container-key is False:
+
 	an APIResponse object whose .data member contains a list of the objects requested: [ , , , ...]
 	if include-container-key is True:
 	an APIResponse object whose .data member contains a dict: { container_key: [...], "total": n }
-
 */
 func (c *ApiClient) ApiQuery(command string, detailsLevel string, containerKey string, includeContainerKey bool, payload map[string]interface{}) (APIResponse, error) {
 
@@ -617,7 +624,9 @@ This is in contrast to normal API calls that return only a limited number of obj
 This function can be used to show progress when requesting many objects (i.e. "Received x/y objects.")
 
 command: name of API command. This command should be an API that returns an array of objects
+
 	(for example: show-hosts, show networks, ...)
+
 details_level: query APIs always take a details-level argument. Possible values are "standard", "full", "uid"
 container_keys: the field in the .data dict that contains the objects
 payload: a JSON object (or a string representing a JSON object) with the command arguments
@@ -712,7 +721,8 @@ func (c *ApiClient) genApiQuery(command string, detailsLevel string, containerKe
 	return serverResponse
 }
 
-/**
+/*
+*
 When the server needs to perform an API call that may take a long time (e.g. run-script, install-policy,
 publish), the server responds with a 'task-id'.
 Using the show-task API it is possible to check on the status of this task until its completion.
@@ -759,10 +769,10 @@ func (c *ApiClient) waitForTask(taskId string) (APIResponse, error) {
 		totalTasks := 0
 		for _, task := range taskResult.GetData()["tasks"].([]interface{}) {
 			totalTasks++
-			if task.(map[string]interface{})["status"].(string) != InProgress {
+			taskMap := task.(map[string]interface{})
+			if taskMap["status"] != nil && taskMap["status"].(string) != InProgress {
 				completedTasks++
 			}
-
 		}
 
 		if completedTasks == totalTasks {
@@ -778,7 +788,8 @@ func (c *ApiClient) waitForTask(taskId string) (APIResponse, error) {
 
 }
 
-/**
+/*
+*
 The version of waitForTask function for the collection of tasks
 
 task_objects: A list of task objects
@@ -823,7 +834,8 @@ func (c *ApiClient) waitForTasks(taskObjects []interface{}) APIResponse {
 
 }
 
-/**
+/*
+*
 This method checks if one of the tasks failed and if so, changes the response status to be False
 
 task_result: api_response returned from "show-task" command
@@ -846,7 +858,8 @@ func checkTasksStatus(taskResult *APIResponse) {
    @===================@
 */
 
-/**
+/*
+*
 This function checks if the server's certificate is stored in the local fingerprints file.
 If the server's fingerprint is not found, an HTTPS connection is made to the server
 and the user is asked if he or she accepts the server's fingerprint.
@@ -928,7 +941,8 @@ func (c *ApiClient) loadFingerprintFromFile() (string, error) {
 
 }
 
-/**
+/*
+*
 This function takes the content of the file $FILENAME (which is a json file)
 and parses it's content to a map (from string to string)
 
@@ -960,13 +974,16 @@ func (c *ApiClient) fpFileToMap() (map[string]string, error) {
 
 }
 
-/**
+/*
+*
 store a server's fingerprint into a local file.
 
 server: the IP address/name of the Check Point management server.
 fingerprint: A SHA1 fingerprint of the server's certificate.
 filename: The file in which to store the certificates. The file will hold a JSON structure in which
+
 	the key is the server and the value is its fingerprint.
+
 return: 'True' if everything went well. 'False' if there was some kind of error storing the fingerprint.
 */
 func (c *ApiClient) saveFingerprintToFile(server string, fingerprint string) error {

Examples/add_access_rule.go

@@ -1,8 +1,8 @@
 package Examples
 
 import (
-	api "../APIFiles"
 	"fmt"
+	api "github.com/cp-mgmt-api-go-sdk/APIFiles"
 	"os"
 )
 

Examples/add_host.go

@@ -1,8 +1,8 @@
 package Examples
 
 import (
-	api "../APIFiles"
 	"fmt"
+	api "github.com/cp-mgmt-api-go-sdk/APIFiles"
 	"os"
 )
 

Examples/auto_publish.go

@@ -1,8 +1,8 @@
 package Examples
 
 import (
-	api "../APIFiles"
 	"fmt"
+	api "github.com/cp-mgmt-api-go-sdk/APIFiles"
 	"os"
 	"strconv"
 	"time"

Examples/discard_sessions.go

@@ -1,8 +1,8 @@
 package Examples
 
 import (
-	api "../APIFiles"
 	"fmt"
+	api "github.com/cp-mgmt-api-go-sdk/APIFiles"
 	"os"
 )
 

Examples/find_dup_ip.go

@@ -1,8 +1,8 @@
 package Examples
 
 import (
-	api "../APIFiles"
 	"fmt"
+	api "github.com/cp-mgmt-api-go-sdk/APIFiles"
 	"os"
 )
 

Examples/show_hosts.go

@@ -1,8 +1,8 @@
 package Examples
 
 import (
-	api "../APIFiles"
 	"fmt"
+	api "github.com/cp-mgmt-api-go-sdk/APIFiles"
 	"os"
 )
 

main.go

@@ -1,22 +1,22 @@
 package main
 
 import (
-	"./Examples"
 	"fmt"
+	"github.com/cp-mgmt-api-go-sdk/Examples"
 	"os"
 )
 
-func main(){
+func main() {
 	if len(os.Args) < 2 {
-		fmt.Println("Operation not found. Optional operations are rule/discard/add_host/show_hosts/dup_ip/auto_publish")
+		fmt.Println("cp-mgmt-api-go-sdk main : Operation not found. Optional operations are rule/discard/add_host/show_hosts/dup_ip/auto_publish")
 		os.Exit(0)
 	}
 
 	switch os.Args[1] {
 	case "discard":
 		Examples.DiscardSessions()
 	case "rule":
-		Examples.AddAccessRule ()
+		Examples.AddAccessRule()
 	case "add_host":
 		Examples.AddHost()
 	case "show_hosts":