chore: Store state for persistent storage types

Author: PythonGermany

config/endpoint/condition_test.go

@@ -44,6 +44,7 @@ func TestCondition_Validate(t *testing.T) {
 		{condition: "[STATUS] = = 201", expectedErr: errors.New("invalid condition: [STATUS] = = 201")},
 		{condition: "[STATUS] ==", expectedErr: errors.New("invalid condition: [STATUS] ==")},
 		{condition: "[STATUS]", expectedErr: errors.New("invalid condition: [STATUS]")},
+		// TODO#227 Test linked state conditions
 		// FIXME: Should return an error, but doesn't because jsonpath isn't evaluated due to body being empty in Condition.Validate()
 		//{condition: "len([BODY].users == 100", expectedErr: nil},
 	}

config/endpoint/endpoint.go

@@ -343,7 +343,7 @@ func (e *Endpoint) EvaluateHealthWithContext(context *gontext.Gontext) *Result {
 	} else { // Go over condition results to see if any of them has a specific state to set
 		for _, conditionResult := range result.ConditionResults {
 			if !conditionResult.Success && len(conditionResult.LinkedState) > 0 {
-				result.State = conditionResult.LinkedState // TODO#227 Only set if no other state with h
+				result.State = conditionResult.LinkedState // TODO#227 Only set if no other state with higher priority has been set
 				break
 			}
 		}

config/endpoint/result.go

@@ -36,7 +36,7 @@ type Result struct {
 	Success bool `json:"success"`
 
 	// State of the endpoint after evaluating the result
-	State string `json:"state,omitempty"` // TODO#227 Omitempty correct?
+	State string `json:"state"`
 
 	// Timestamp when the request was sent
 	Timestamp time.Time `json:"timestamp"`

storage/store/sql/specific_postgres.go

@@ -56,6 +56,7 @@ func (s *Store) createPostgresSchema() error {
 			endpoint_result_id     BIGSERIAL PRIMARY KEY,
 			endpoint_id            BIGINT    NOT NULL REFERENCES endpoints(endpoint_id) ON DELETE CASCADE,
 			success                BOOLEAN   NOT NULL,
+			state                  TEXT      NOT NULL,
 			errors                 TEXT      NOT NULL,
 			connected              BOOLEAN   NOT NULL,
 			status                 BIGINT    NOT NULL,

storage/store/sql/specific_sqlite.go

@@ -56,6 +56,7 @@ func (s *Store) createSQLiteSchema() error {
 			endpoint_result_id     INTEGER PRIMARY KEY,
 			endpoint_id            INTEGER   NOT NULL REFERENCES endpoints(endpoint_id) ON DELETE CASCADE,
 			success                INTEGER   NOT NULL,
+			state                  TEXT      NOT NULL,
 			errors                 TEXT      NOT NULL,
 			connected              INTEGER   NOT NULL,
 			status                 INTEGER   NOT NULL,

storage/store/sql/sql.go

@@ -623,12 +623,13 @@ func (s *Store) insertEndpointResultWithSuiteID(tx *sql.Tx, endpointID int64, re
 	var endpointResultID int64
 	err := tx.QueryRow(
 		`
-			INSERT INTO endpoint_results (endpoint_id, success, errors, connected, status, dns_rcode, certificate_expiration, domain_expiration, hostname, ip, duration, timestamp, suite_result_id)
-			VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)
+			INSERT INTO endpoint_results (endpoint_id, success, state, errors, connected, status, dns_rcode, certificate_expiration, domain_expiration, hostname, ip, duration, timestamp, suite_result_id)
+			VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
 			RETURNING endpoint_result_id
 		`,
 		endpointID,
 		result.Success,
+		result.State,
 		strings.Join(result.Errors, arraySeparator),
 		result.Connected,
 		result.HTTPStatus,
@@ -791,7 +792,7 @@ func (s *Store) getEndpointEventsByEndpointID(tx *sql.Tx, endpointID int64, page
 func (s *Store) getEndpointResultsByEndpointID(tx *sql.Tx, endpointID int64, page, pageSize int) (results []*endpoint.Result, err error) {
 	rows, err := tx.Query(
 		`
-			SELECT endpoint_result_id, success, errors, connected, status, dns_rcode, certificate_expiration, domain_expiration, hostname, ip, duration, timestamp
+			SELECT endpoint_result_id, success, state, errors, connected, status, dns_rcode, certificate_expiration, domain_expiration, hostname, ip, duration, timestamp
 			FROM endpoint_results
 			WHERE endpoint_id = $1
 			ORDER BY endpoint_result_id DESC -- Normally, we'd sort by timestamp, but sorting by endpoint_result_id is faster
@@ -809,7 +810,7 @@ func (s *Store) getEndpointResultsByEndpointID(tx *sql.Tx, endpointID int64, pag
 		result := &endpoint.Result{}
 		var id int64
 		var joinedErrors string
-		err = rows.Scan(&id, &result.Success, &joinedErrors, &result.Connected, &result.HTTPStatus, &result.DNSRCode, &result.CertificateExpiration, &result.DomainExpiration, &result.Hostname, &result.IP, &result.Duration, &result.Timestamp)
+		err = rows.Scan(&id, &result.Success, &result.State, &joinedErrors, &result.Connected, &result.HTTPStatus, &result.DNSRCode, &result.CertificateExpiration, &result.DomainExpiration, &result.Hostname, &result.IP, &result.Duration, &result.Timestamp)
 		if err != nil {
 			logr.Errorf("[sql.getEndpointResultsByEndpointID] Silently failed to retrieve endpoint result for endpointID=%d: %s", endpointID, err.Error())
 			err = nil

watchdog/endpoint.go

@@ -52,6 +52,7 @@ func executeEndpoint(ep *endpoint.Endpoint, cfg *config.Config, extraLabels []st
 	if inMaintenanceWindow && !result.Success {
 		result.State = state.DefaultMaintenanceStateName
 	}
+	// TODO#227 Evaluate result.Success based on set states' healthiness configuration once that config option is implemented
 	if cfg.Metrics {
 		metrics.PublishMetricsForEndpoint(ep, result, extraLabels)
 	}