feat(pkger): add support for check resource to pkger parser

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 1. [16234](https://github.com/influxdata/influxdb/pull/16234): add support for notification endpoints to influx templates/pkgs.
 2. [16242](https://github.com/influxdata/influxdb/pull/16242): drop id prefix for secret key requirement for notification endpoints 
+3. [16259](https://github.com/influxdata/influxdb/pull/16259): add support for check resource to pkger parser 
 
 ### Bug Fixes
 

http/check_service.go

@@ -378,6 +378,7 @@ func decodePostCheckRequest(r *http.Request) (postCheckRequest, error) {
 		}
 	}
 	defer r.Body.Close()
+
 	chk, err := check.UnmarshalJSON(b)
 	if err != nil {
 		return postCheckRequest{}, &influxdb.Error{
@@ -387,17 +388,15 @@ func decodePostCheckRequest(r *http.Request) (postCheckRequest, error) {
 	}
 
 	var ds decodeStatus
-	err = json.Unmarshal(b, &ds)
-	if err != nil {
+	if err := json.Unmarshal(b, &ds); err != nil {
 		return postCheckRequest{}, &influxdb.Error{
 			Code: influxdb.EInvalid,
 			Err:  err,
 		}
 	}
 
 	var dl decodeLabels
-	err = json.Unmarshal(b, &dl)
-	if err != nil {
+	if err := json.Unmarshal(b, &dl); err != nil {
 		return postCheckRequest{}, &influxdb.Error{
 			Code: influxdb.EInvalid,
 			Err:  err,

http/swagger.yml

@@ -10083,7 +10083,7 @@ components:
             query:
               description: URL to retrieve flux script for this check
               $ref: "#/components/schemas/Link"
-      required: [name, type, orgID, query]
+      required: [name, orgID, query]
     ThresholdCheck:
       allOf:
         - $ref: "#/components/schemas/CheckBase"

notification/check/check.go

@@ -187,22 +187,20 @@ var typeToCheck = map[string](func() influxdb.Check){
 	"threshold": func() influxdb.Check { return &Threshold{} },
 }
 
-type rawRuleJSON struct {
-	Typ string `json:"type"`
-}
-
 // UnmarshalJSON will convert
 func UnmarshalJSON(b []byte) (influxdb.Check, error) {
-	var raw rawRuleJSON
+	var raw struct {
+		Type string `json:"type"`
+	}
 	if err := json.Unmarshal(b, &raw); err != nil {
 		return nil, &influxdb.Error{
 			Msg: "unable to detect the check type from json",
 		}
 	}
-	convertedFunc, ok := typeToCheck[raw.Typ]
+	convertedFunc, ok := typeToCheck[raw.Type]
 	if !ok {
 		return nil, &influxdb.Error{
-			Msg: fmt.Sprintf("invalid check type %s", raw.Typ),
+			Msg: fmt.Sprintf("invalid check type %s", raw.Type),
 		}
 	}
 	converted := convertedFunc()

notification/check/threshold.go

@@ -387,10 +387,9 @@ func (td Lesser) Type() string {
 	return "lesser"
 }
 
-type lesserAlias Lesser
-
 // MarshalJSON implement json.Marshaler interface.
 func (td Lesser) MarshalJSON() ([]byte, error) {
+	type lesserAlias Lesser
 	return json.Marshal(
 		struct {
 			lesserAlias
@@ -412,10 +411,9 @@ func (td Greater) Type() string {
 	return "greater"
 }
 
-type greaterAlias Greater
-
 // MarshalJSON implement json.Marshaler interface.
 func (td Greater) MarshalJSON() ([]byte, error) {
+	type greaterAlias Greater
 	return json.Marshal(
 		struct {
 			greaterAlias
@@ -439,10 +437,9 @@ func (td Range) Type() string {
 	return "range"
 }
 
-type rangeAlias Range
-
 // MarshalJSON implement json.Marshaler interface.
 func (td Range) MarshalJSON() ([]byte, error) {
+	type rangeAlias Range
 	return json.Marshal(
 		struct {
 			rangeAlias

notification/duration.go

@@ -43,3 +43,12 @@ func (d *Duration) UnmarshalJSON(b []byte) error {
 
 	return nil
 }
+
+// FromTimeDuration converts a time.Duration to a notification.Duration type.
+func FromTimeDuration(d time.Duration) (Duration, error) {
+	dur, err := parser.ParseDuration(d.String())
+	if err != nil {
+		return Duration{}, err
+	}
+	return Duration(*dur), nil
+}