chore(monitor): friendlyName -> name, httpMethod -> method

clevyr · Apr 17, 2024 · 78f0329 · 78f0329
1 parent 41d1809
commit 78f0329
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 26 deletions.
diff --git a/api/v1/monitor_types.go b/api/v1/monitor_types.go
@@ -79,8 +79,8 @@ type Monitor struct {
 //+kubebuilder:validation:XValidation:rule="self.type != 'Port' || has(self.port)", message="Port config is required if type is Port"
 
 type MonitorValues struct {
-	// FriendlyName sets the name that is shown in Uptime Robot.
-	FriendlyName string `json:"friendlyName"`
+	// Name sets the name that is shown in Uptime Robot.
+	Name string `json:"name"`
 
 	// URL is the URL or IP to monitor, including the scheme.
 	URL string `json:"url"`
@@ -101,9 +101,9 @@ type MonitorValues struct {
 	//+kubebuilder:default:="30s"
 	Timeout *metav1.Duration `json:"timeout,omitempty"`
 
-	// HTTPMethod defines the HTTP verb to use.
+	// Method defines the HTTP verb to use.
 	//+kubebuilder:default:="HEAD"
-	HTTPMethod urtypes.HTTPMethod `json:"httpMethod,omitempty"`
+	Method urtypes.HTTPMethod `json:"method,omitempty"`
 
 	// POST configures POST, PUT, PATCH, DELETE, and OPTIONS requests.
 	POST *MonitorPOST `json:"post,omitempty"`

diff --git a/config/crd/bases/uptime-robot.clevyr.com_monitors.yaml b/config/crd/bases/uptime-robot.clevyr.com_monitors.yaml
@@ -119,22 +119,6 @@ spec:
                     required:
                     - type
                     type: object
-                  friendlyName:
-                    description: FriendlyName sets the name that is shown in Uptime
-                      Robot.
-                    type: string
-                  httpMethod:
-                    default: HEAD
-                    description: HTTPMethod defines the HTTP verb to use.
-                    enum:
-                    - HEAD
-                    - GET
-                    - POST
-                    - PUT
-                    - PATCH
-                    - DELETE
-                    - OPTIONS
-                    type: string
                   interval:
                     default: 60s
                     description: Interval is the monitoring interval.
@@ -157,6 +141,21 @@ spec:
                     - type
                     - value
                     type: object
+                  method:
+                    default: HEAD
+                    description: Method defines the HTTP verb to use.
+                    enum:
+                    - HEAD
+                    - GET
+                    - POST
+                    - PUT
+                    - PATCH
+                    - DELETE
+                    - OPTIONS
+                    type: string
+                  name:
+                    description: Name sets the name that is shown in Uptime Robot.
+                    type: string
                   port:
                     description: Port provides configuration for the Port monitor
                       type.
@@ -228,7 +227,7 @@ spec:
                     description: URL is the URL or IP to monitor, including the scheme.
                     type: string
                 required:
-                - friendlyName
+                - name
                 - url
                 type: object
                 x-kubernetes-validations:

diff --git a/config/samples/uptime-robot_v1_monitor.yaml b/config/samples/uptime-robot_v1_monitor.yaml
@@ -9,6 +9,6 @@ spec:
   interval: 24h
   prune: true
   monitor:
-    friendlyName: Example
+    name: Example
     url: https://example.com
     interval: 5m
diff --git a/internal/controller/ingress_controller.go b/internal/controller/ingress_controller.go
@@ -201,7 +201,7 @@ func (r *IngressReconciler) getMatchingAnnotations(ingress *networkingv1.Ingress
 }
 
 func (r *IngressReconciler) updateValues(ingress *networkingv1.Ingress, monitor *uptimerobotv1.Monitor, annotations map[string]string) error {
-	monitor.Spec.Monitor.FriendlyName = ingress.Name
+	monitor.Spec.Monitor.Name = ingress.Name
 	if _, ok := annotations["monitor.url"]; !ok {
 		if len(ingress.Spec.Rules) != 0 {
 			var u url.URL

diff --git a/internal/uptimerobot/client.go b/internal/uptimerobot/client.go
@@ -70,14 +70,14 @@ func (c Client) Do(ctx context.Context, endpoint string, form url.Values) (*http
 }
 
 func (c Client) MonitorValues(monitor uptimerobotv1.MonitorValues, form url.Values, contacts uptimerobotv1.MonitorContacts) url.Values {
-	form.Set("friendly_name", monitor.FriendlyName)
+	form.Set("friendly_name", monitor.Name)
 	form.Set("url", monitor.URL)
 	form.Set("type", strconv.Itoa(int(monitor.Type)))
 	form.Set("interval", strconv.Itoa(int(monitor.Interval.Seconds())))
 	form.Set("timeout", strconv.Itoa(int(monitor.Timeout.Seconds())))
 	form.Set("alert_contacts", contacts.String())
-	form.Set("http_method", strconv.Itoa(int(monitor.HTTPMethod)))
-	switch monitor.HTTPMethod {
+	form.Set("http_method", strconv.Itoa(int(monitor.Method)))
+	switch monitor.Method {
 	case urtypes.MethodHEAD, urtypes.MethodGET:
 	default:
 		if monitor.POST != nil {