@@ -58,7 +58,7 @@ func triggerHTTPProbe(probe v1alpha1.ProbeAttributes, resultDetails *types.Resul
5858 method := getHTTPMethodType (probe .HTTPProbeInputs .Method )
5959
6060 // initialize simple http client with default attributes
61- timeout := time .Duration (probe .HTTPProbeInputs . ResponseTimeout ) * time .Millisecond
61+ timeout := time .Duration (probe .RunProperties . ProbeTimeout ) * time .Millisecond
6262 client := & http.Client {Timeout : timeout }
6363 // impose properties to http client with cert check disabled
6464 if probe .HTTPProbeInputs .InsecureSkipVerify {
@@ -75,7 +75,7 @@ func triggerHTTPProbe(probe v1alpha1.ProbeAttributes, resultDetails *types.Resul
7575 "URL" : probe .HTTPProbeInputs .URL ,
7676 "Criteria" : probe .HTTPProbeInputs .Method .Get .Criteria ,
7777 "ResponseCode" : probe .HTTPProbeInputs .Method .Get .ResponseCode ,
78- "ResponseTimeout" : probe .HTTPProbeInputs . ResponseTimeout ,
78+ "ResponseTimeout" : probe .RunProperties . ProbeTimeout ,
7979 })
8080 if err := httpGet (probe , client , resultDetails ); err != nil {
8181 return err
@@ -87,7 +87,7 @@ func triggerHTTPProbe(probe v1alpha1.ProbeAttributes, resultDetails *types.Resul
8787 "Body" : probe .HTTPProbeInputs .Method .Post .Body ,
8888 "BodyPath" : probe .HTTPProbeInputs .Method .Post .BodyPath ,
8989 "ContentType" : probe .HTTPProbeInputs .Method .Post .ContentType ,
90- "ResponseTimeout" : probe .HTTPProbeInputs . ResponseTimeout ,
90+ "ResponseTimeout" : probe .RunProperties . ProbeTimeout ,
9191 })
9292 if err := httpPost (probe , client , resultDetails ); err != nil {
9393 return err
@@ -111,9 +111,8 @@ func httpGet(probe v1alpha1.ProbeAttributes, client *http.Client, resultDetails
111111 // it contains a timeout per iteration of retry. if the timeout expires without success then it will go to next try
112112 // for a timeout, it will run the command, if it fails wait for the interval and again execute the command until timeout expires
113113 return retry .Times (uint (probe .RunProperties .Retry )).
114- Timeout (int64 (probe .RunProperties .ProbeTimeout )).
115114 Wait (time .Duration (probe .RunProperties .Interval ) * time .Second ).
116- TryWithTimeout (func (attempt uint ) error {
115+ Try (func (attempt uint ) error {
117116 // getting the response from the given url
118117 resp , err := client .Get (probe .HTTPProbeInputs .URL )
119118 if err != nil {
@@ -146,9 +145,8 @@ func httpPost(probe v1alpha1.ProbeAttributes, client *http.Client, resultDetails
146145 // it contains a timeout per iteration of retry. if the timeout expires without success then it will go to next try
147146 // for a timeout, it will run the command, if it fails wait for the interval and again execute the command until timeout expires
148147 return retry .Times (uint (probe .RunProperties .Retry )).
149- Timeout (int64 (probe .RunProperties .ProbeTimeout )).
150148 Wait (time .Duration (probe .RunProperties .Interval ) * time .Second ).
151- TryWithTimeout (func (attempt uint ) error {
149+ Try (func (attempt uint ) error {
152150 resp , err := client .Post (probe .HTTPProbeInputs .URL , probe .HTTPProbeInputs .Method .Post .ContentType , strings .NewReader (body ))
153151 if err != nil {
154152 return err
0 commit comments