You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/07/09 22:41:09 UTC

[GitHub] pritidesai closed pull request #958: Updating trigger creation/deletion process

pritidesai closed pull request #958: Updating trigger creation/deletion process
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/958
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/deployers/servicedeployer.go b/deployers/servicedeployer.go
index 970629aa..2e266c08 100644
--- a/deployers/servicedeployer.go
+++ b/deployers/servicedeployer.go
@@ -910,38 +910,32 @@ func (deployer *ServiceDeployer) createFeedAction(trigger *whisk.Trigger, feedNa
 
 	var err error
 	var response *http.Response
+	if err = deployer.createTrigger(t); err != nil {
+		return err
+	}
+	qName, err := utils.ParseQualifiedName(feedName, deployer.ClientConfig.Namespace)
+	if err != nil {
+		return err
+	}
+
+	namespace := deployer.Client.Namespace
+	deployer.Client.Namespace = qName.Namespace
 	err = retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error {
-		_, response, err = deployer.Client.Triggers.Insert(t, true)
+		_, response, err = deployer.Client.Actions.Invoke(qName.EntityName, params, true, false)
 		return err
 	})
-	if err != nil {
-		return createWhiskClientError(err.(*whisk.WskError), response, wski18n.TRIGGER_FEED, true)
-	} else {
+	deployer.Client.Namespace = namespace
 
-		qName, err := utils.ParseQualifiedName(feedName, deployer.ClientConfig.Namespace)
-		if err != nil {
-			return err
-		}
+	if err != nil {
+		// Remove the created trigger
+		deployer.Client.Triggers.Delete(trigger.Name)
 
-		namespace := deployer.Client.Namespace
-		deployer.Client.Namespace = qName.Namespace
-		err = retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error {
-			_, response, err = deployer.Client.Actions.Invoke(qName.EntityName, params, true, false)
+		retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error {
+			_, _, err := deployer.Client.Triggers.Delete(trigger.Name)
 			return err
 		})
-		deployer.Client.Namespace = namespace
-
-		if err != nil {
-			// Remove the created trigger
-			deployer.Client.Triggers.Delete(trigger.Name)
-
-			retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error {
-				_, _, err := deployer.Client.Triggers.Delete(trigger.Name)
-				return err
-			})
 
-			return createWhiskClientError(err.(*whisk.WskError), response, wski18n.TRIGGER_FEED, false)
-		}
+		return createWhiskClientError(err.(*whisk.WskError), response, wski18n.TRIGGER_FEED, false)
 	}
 
 	displayPostprocessingInfo(wski18n.TRIGGER_FEED, trigger.Name, true)
@@ -1203,11 +1197,10 @@ func (deployer *ServiceDeployer) UnDeployTriggers(deployment *DeploymentProject)
 			if err != nil {
 				return err
 			}
-		} else {
-			err := deployer.deleteTrigger(trigger)
-			if err != nil {
-				return err
-			}
+		}
+		err := deployer.deleteTrigger(trigger)
+		if err != nil {
+			return err
 		}
 	}
 
@@ -1262,15 +1255,17 @@ func (deployer *ServiceDeployer) deleteTrigger(trigger *whisk.Trigger) error {
 
 	displayPreprocessingInfo(parsers.YAML_KEY_TRIGGER, trigger.Name, false)
 
-	var err error
-	var response *http.Response
-	err = retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error {
-		_, response, err = deployer.Client.Triggers.Delete(trigger.Name)
-		return err
-	})
+	if _, _, ok := deployer.Client.Triggers.Get(trigger.Name); ok == nil {
+		var err error
+		var response *http.Response
+		err = retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error {
+			_, response, err = deployer.Client.Triggers.Delete(trigger.Name)
+			return err
+		})
 
-	if err != nil {
-		return createWhiskClientError(err.(*whisk.WskError), response, parsers.YAML_KEY_TRIGGER, false)
+		if err != nil {
+			return createWhiskClientError(err.(*whisk.WskError), response, parsers.YAML_KEY_TRIGGER, false)
+		}
 	}
 
 	displayPostprocessingInfo(parsers.YAML_KEY_TRIGGER, trigger.Name, false)
@@ -1279,6 +1274,8 @@ func (deployer *ServiceDeployer) deleteTrigger(trigger *whisk.Trigger) error {
 
 func (deployer *ServiceDeployer) deleteFeedAction(trigger *whisk.Trigger, feedName string) error {
 
+	displayPreprocessingInfo(parsers.YAML_KEY_FEED, trigger.Name, false)
+
 	params := make(whisk.KeyValueArr, 0)
 	// TODO() define keys and operations as const
 	params = append(params, whisk.KeyValue{Key: "authKey", Value: deployer.ClientConfig.AuthToken})
@@ -1295,6 +1292,11 @@ func (deployer *ServiceDeployer) deleteFeedAction(trigger *whisk.Trigger, feedNa
 		return err
 	}
 
+	if _, _, ok := deployer.Client.Triggers.Get(trigger.Name); ok != nil {
+		displayPostprocessingInfo(parsers.YAML_KEY_FEED, trigger.Name, false)
+		return nil
+	}
+
 	namespace := deployer.Client.Namespace
 	deployer.Client.Namespace = qName.Namespace
 	var response *http.Response
@@ -1312,19 +1314,8 @@ func (deployer *ServiceDeployer) deleteFeedAction(trigger *whisk.Trigger, feedNa
 		whisk.Debug(whisk.DbgError, errString)
 		return wskderrors.NewWhiskClientError(wskErr.Error(), wskErr.ExitCode, response)
 
-	} else {
-		trigger.Parameters = nil
-		var err error
-		err = retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error {
-			_, response, err = deployer.Client.Triggers.Delete(trigger.Name)
-			return err
-		})
-
-		if err != nil {
-			return createWhiskClientError(err.(*whisk.WskError), response, parsers.YAML_KEY_TRIGGER, false)
-		}
 	}
-
+	displayPostprocessingInfo(parsers.YAML_KEY_FEED, trigger.Name, false)
 	return nil
 }
 
@@ -1332,15 +1323,17 @@ func (deployer *ServiceDeployer) deleteRule(rule *whisk.Rule) error {
 
 	displayPreprocessingInfo(parsers.YAML_KEY_RULE, rule.Name, false)
 
-	var err error
-	var response *http.Response
-	err = retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error {
-		response, err = deployer.Client.Rules.Delete(rule.Name)
-		return err
-	})
+	if _, _, ok := deployer.Client.Rules.Get(rule.Name); ok == nil {
+		var err error
+		var response *http.Response
+		err = retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error {
+			response, err = deployer.Client.Rules.Delete(rule.Name)
+			return err
+		})
 
-	if err != nil {
-		return createWhiskClientError(err.(*whisk.WskError), response, parsers.YAML_KEY_RULE, false)
+		if err != nil {
+			return createWhiskClientError(err.(*whisk.WskError), response, parsers.YAML_KEY_RULE, false)
+		}
 	}
 	displayPostprocessingInfo(parsers.YAML_KEY_RULE, rule.Name, false)
 	return nil
diff --git a/utils/misc.go b/utils/misc.go
index 177fe105..81ea403d 100644
--- a/utils/misc.go
+++ b/utils/misc.go
@@ -34,7 +34,7 @@ import (
 )
 
 const (
-	DEFAULT_HTTP_TIMEOUT = 30
+	DEFAULT_HTTP_TIMEOUT = 60
 	DEFAULT_PROJECT_PATH = "."
 	HTTP_FILE_EXTENSION  = "http"
 	// name of manifest and deployment files


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services