chore: inline Cloudwatch.filter

flanksource · Jul 3, 2023 · 2dbc3a8 · 2dbc3a8
1 parent 4ae4cdf
commit 2dbc3a8
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 69 deletions.
diff --git a/api/v1/checks.go b/api/v1/checks.go
@@ -144,10 +144,10 @@ func (c S3Check) GetType() string {
 }
 
 type CloudWatchCheck struct {
-	Description   `yaml:",inline" json:",inline"`
-	AWSConnection `yaml:",inline" json:",inline"`
-	Templatable   `yaml:",inline" json:",inline"`
-	Filter        CloudWatchFilter `yaml:",inline" json:",inline"`
+	Description      `yaml:",inline" json:",inline"`
+	AWSConnection    `yaml:",inline" json:",inline"`
+	Templatable      `yaml:",inline" json:",inline"`
+	CloudWatchFilter `yaml:",inline" json:",inline"`
 }
 
 type CloudWatchFilter struct {
@@ -159,11 +159,11 @@ type CloudWatchFilter struct {
 
 func (c CloudWatchCheck) GetEndpoint() string {
 	endpoint := c.Region
-	if c.Filter.ActionPrefix != nil {
-		endpoint += "-" + *c.Filter.ActionPrefix
+	if c.CloudWatchFilter.ActionPrefix != nil {
+		endpoint += "-" + *c.CloudWatchFilter.ActionPrefix
 	}
-	if c.Filter.AlarmPrefix != nil {
-		endpoint += "-" + *c.Filter.AlarmPrefix
+	if c.CloudWatchFilter.AlarmPrefix != nil {
+		endpoint += "-" + *c.CloudWatchFilter.AlarmPrefix
 	}
 	return endpoint
 }

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/checks/cloudwatch.go b/checks/cloudwatch.go
@@ -49,10 +49,10 @@ func (c *CloudWatchChecker) Check(ctx *context.Context, extConfig external.Check
 	client := cloudwatch.NewFromConfig(*cfg)
 	maxRecords := int32(100)
 	alarms, err := client.DescribeAlarms(ctx, &cloudwatch.DescribeAlarmsInput{
-		AlarmNames:      check.Filter.Alarms,
-		AlarmNamePrefix: check.Filter.AlarmPrefix,
-		ActionPrefix:    check.Filter.ActionPrefix,
-		StateValue:      types.StateValue(check.Filter.State),
+		AlarmNames:      check.CloudWatchFilter.Alarms,
+		AlarmNamePrefix: check.CloudWatchFilter.AlarmPrefix,
+		ActionPrefix:    check.CloudWatchFilter.ActionPrefix,
+		StateValue:      types.StateValue(check.CloudWatchFilter.State),
 		MaxRecords:      &maxRecords,
 	})
 	if err != nil {

diff --git a/config/schemas/canary.schema.json b/config/schemas/canary.schema.json
@@ -704,19 +704,6 @@
         "transform": {
           "$ref": "#/$defs/Template"
         },
-        "Filter": {
-          "$ref": "#/$defs/CloudWatchFilter"
-        }
-      },
-      "additionalProperties": false,
-      "type": "object",
-      "required": [
-        "name",
-        "Filter"
-      ]
-    },
-    "CloudWatchFilter": {
-      "properties": {
         "actionPrefix": {
           "type": "string"
         },
@@ -734,7 +721,10 @@
         }
       },
       "additionalProperties": false,
-      "type": "object"
+      "type": "object",
+      "required": [
+        "name"
+      ]
     },
     "ConfigDBCheck": {
       "properties": {

diff --git a/config/schemas/component.schema.json b/config/schemas/component.schema.json
@@ -610,19 +610,6 @@
         "transform": {
           "$ref": "#/$defs/Template"
         },
-        "Filter": {
-          "$ref": "#/$defs/CloudWatchFilter"
-        }
-      },
-      "additionalProperties": false,
-      "type": "object",
-      "required": [
-        "name",
-        "Filter"
-      ]
-    },
-    "CloudWatchFilter": {
-      "properties": {
         "actionPrefix": {
           "type": "string"
         },
@@ -640,7 +627,10 @@
         }
       },
       "additionalProperties": false,
-      "type": "object"
+      "type": "object",
+      "required": [
+        "name"
+      ]
     },
     "Component": {
       "properties": {

diff --git a/config/schemas/health_cloudwatch.schema.json b/config/schemas/health_cloudwatch.schema.json
@@ -50,19 +50,6 @@
         "transform": {
           "$ref": "#/$defs/Template"
         },
-        "Filter": {
-          "$ref": "#/$defs/CloudWatchFilter"
-        }
-      },
-      "additionalProperties": false,
-      "type": "object",
-      "required": [
-        "name",
-        "Filter"
-      ]
-    },
-    "CloudWatchFilter": {
-      "properties": {
         "actionPrefix": {
           "type": "string"
         },
@@ -80,7 +67,10 @@
         }
       },
       "additionalProperties": false,
-      "type": "object"
+      "type": "object",
+      "required": [
+        "name"
+      ]
     },
     "ConfigMapKeySelector": {
       "properties": {

diff --git a/config/schemas/topology.schema.json b/config/schemas/topology.schema.json
@@ -610,19 +610,6 @@
         "transform": {
           "$ref": "#/$defs/Template"
         },
-        "Filter": {
-          "$ref": "#/$defs/CloudWatchFilter"
-        }
-      },
-      "additionalProperties": false,
-      "type": "object",
-      "required": [
-        "name",
-        "Filter"
-      ]
-    },
-    "CloudWatchFilter": {
-      "properties": {
         "actionPrefix": {
           "type": "string"
         },
@@ -640,7 +627,10 @@
         }
       },
       "additionalProperties": false,
-      "type": "object"
+      "type": "object",
+      "required": [
+        "name"
+      ]
     },
     "ComponentCheck": {
       "properties": {