Merge pull request #85 from srinandan/issue84

handle nexttasks and other options #84
srinandan · Jan 8, 2023 · 6cfa03e · 6cfa03e
2 parents 48edc10 + 2b57a77
commit 6cfa03e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 18 deletions.
diff --git a/client/integrations/integrations.go b/client/integrations/integrations.go
@@ -127,25 +127,26 @@ type triggerconfig struct {
 	TriggerNumber            string                   `json:"triggerNumber,omitempty"`
 	TriggerId                string                   `json:"triggerId,omitempty"`
 	Description              string                   `json:"description,omitempty"`
-	StartTasks               []nexttask               `json:"startTasks,omitempty"`
+	StartTasks               []nextTask               `json:"startTasks,omitempty"`
 	NextTasksExecutionPolicy string                   `json:"nextTasksExecutionPolicy,omitempty"`
 	AlertConfig              []map[string]interface{} `json:"alterConfig,omitempty"`
 	Properties               map[string]string        `json:"properties,omitempty"`
-}
-
-type nexttask struct {
-	TaskConfigId string `json:"taskConfigId,omitempty"`
-	TaskId       string `json:"taskId,omitempty"`
-	Condition    string `json:"condition,omitempty"`
-	DisplayName  string `json:"displayName,omitempty"`
-	Description  string `json:"description,omitempty"`
+	CloudSchedulerConfig     cloudSchedulerConfig     `json:"cloudSchedulerConfig,omitempty"`
 }
 
 type taskconfig struct {
-	Task        string                    `json:"task,omitempty"`
-	TaskId      string                    `json:"taskId,omitempty"`
-	Parameters  map[string]eventparameter `json:"parameters,omitempty"`
-	DisplayName string                    `json:"displayName,omitempty"`
+	Task                         string                    `json:"task,omitempty"`
+	TaskId                       string                    `json:"taskId,omitempty"`
+	Parameters                   map[string]eventparameter `json:"parameters,omitempty"`
+	DisplayName                  string                    `json:"displayName,omitempty"`
+	NextTasks                    []nextTask                `json:"nextTasks,omitempty"`
+	NextTasksExecutionPolicy     string                    `json:"nextTasksExecutionPolicy,omitempty"`
+	TaskExecutionStrategy        string                    `json:"taskExecutionStrategy,omitempty"`
+	JsonValidationOption         string                    `json:"jsonValidationOption,omitempty"`
+	SuccessPolicy                successPolicy             `json:"successPolicy,omitempty"`
+	TaskTemplate                 string                    `json:"taskTemplate,omitempty"`
+	FailurePolicy                failurePolicy             `json:"failurePolicy,omitempty"`
+	SynchronousCallFailurePolicy failurePolicy             `json:"synchronousCallFailurePolicy,omitempty"`
 }
 
 type eventparameter struct {
@@ -164,6 +165,31 @@ type stringarraytype struct {
 	StringValues []string `json:"stringValues,omitempty"`
 }
 
+type nextTask struct {
+	TaskConfigId string `json:"taskConfigId,omitempty"`
+	TaskId       string `json:"taskId,omitempty"`
+	Condition    string `json:"condition,omitempty"`
+	DisplayName  string `json:"displayName,omitempty"`
+	Description  string `json:"description,omitempty"`
+}
+
+type successPolicy struct {
+	FinalState string `json:"finalState,omitempty"`
+}
+
+type failurePolicy struct {
+	RetryStrategy string `json:"retryStrategy,omitempty"`
+	MaxRetries    int    `json:"maxRetries,omitempty"`
+	IntervalTime  string `json:"intervalTime,omitempty"`
+}
+
+type cloudSchedulerConfig struct {
+	ServiceAccountEmail string `json:"serviceAccountEmail,omitempty"`
+	CronTab             string `json:"cronTab,omitempty"`
+	Location            string `json:"location,omitempty"`
+	ErrorMessage        string `json:"errorMessage,omitempty"`
+}
+
 // CreateVersion
 func CreateVersion(name string, content []byte, overridesContent []byte, snapshot string, userlabel string, supressWarnings bool) (respBody []byte, err error) {
 

diff --git a/client/integrations/overrides.go b/client/integrations/overrides.go
@@ -32,11 +32,14 @@ type overrides struct {
 }
 
 type triggeroverrides struct {
-	TriggerNumber string  `json:"triggerNumber,omitempty"`
-	TriggerType   string  `json:"triggerType,omitempty"`
-	ProjectId     *string `json:"projectId,omitempty"`
-	TopicName     *string `json:"topicName,omitempty"`
-	APIPath       *string `json:"apiPath,omitempty"`
+	TriggerNumber                string  `json:"triggerNumber,omitempty"`
+	TriggerType                  string  `json:"triggerType,omitempty"`
+	ProjectId                    *string `json:"projectId,omitempty"`
+	TopicName                    *string `json:"topicName,omitempty"`
+	APIPath                      *string `json:"apiPath,omitempty"`
+	CloudSchedulerServiceAccount *string `json:"cloudSchedulerServiceAccount,omitempty"`
+	CloudSchedulerLocation       *string `json:"cloudSchedulerLocation,omitempty"`
+	CloudSchedulerCronTab        *string `json:"cloudSchedulerCronTab,omitempty"`
 }
 
 type connectionoverrides struct {