lint fix

grafana · Jul 5, 2022 · 2ec5f1b · 2ec5f1b
1 parent ad4b486
commit 2ec5f1b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/api/integreatly/v1alpha1/grafana_types.go b/api/integreatly/v1alpha1/grafana_types.go
@@ -40,7 +40,7 @@ type GrafanaSpec struct {
 	ReadinessProbeSpec         *ReadinessProbeSpec      `json:"readinessProbeSpec,omitempty"`
 
 	// DashboardContentCacheDuration sets a default for when a `GrafanaDashboard` resource doesn't specify a `contentCacheDuration`.
-	// If left unset or 0 the default behaviour is to cache indefinitely.
+	// If left unset or 0 the default behavior is to cache indefinitely.
 	DashboardContentCacheDuration *metav1.Duration `json:"dashboardContentCacheDuration,omitempty"`
 }
 

diff --git a/api/integreatly/v1alpha1/grafanadashboard_types.go b/api/integreatly/v1alpha1/grafanadashboard_types.go
@@ -134,7 +134,7 @@ func (d *GrafanaDashboard) Hash() string {
 	}
 
 	if d.Status.Content != "" {
-		io.WriteString(hash, d.Status.Content)
+		io.WriteString(hash, d.Status.Content) //nolint
 	}
 
 	return fmt.Sprintf("%x", hash.Sum(nil))

diff --git a/config/crd/bases/integreatly.org_grafanas.yaml b/config/crd/bases/integreatly.org_grafanas.yaml
@@ -1842,7 +1842,7 @@ spec:
               dashboardContentCacheDuration:
                 description: DashboardContentCacheDuration sets a default for when
                   a `GrafanaDashboard` resource doesn't specify a `contentCacheDuration`.
-                  If left unset or 0 the default behaviour is to cache indefinitely.
+                  If left unset or 0 the default behavior is to cache indefinitely.
                 type: string
               dashboardLabelSelector:
                 items:

diff --git a/controllers/grafanadashboard/dashboard_pipeline.go b/controllers/grafanadashboard/dashboard_pipeline.go
@@ -267,8 +267,11 @@ func (r *DashboardPipelineImpl) loadDashboardFromURL() error {
 	return nil
 }
 
-func (r *DashboardPipelineImpl) refreshDashboard() error {
-	return r.Client.Get(r.Context, types.NamespacedName{Name: r.Dashboard.Name, Namespace: r.Dashboard.Namespace}, r.Dashboard)
+func (r *DashboardPipelineImpl) refreshDashboard() {
+	err := r.Client.Get(r.Context, types.NamespacedName{Name: r.Dashboard.Name, Namespace: r.Dashboard.Namespace}, r.Dashboard)
+	if err != nil {
+		r.Logger.V(1).Error(err, "refreshing dashboard generation failed")
+	}
 }
 
 func (r *DashboardPipelineImpl) loadDashboardFromGrafanaCom() error {

diff --git a/controllers/grafanadashboard/grafanadashboard_controller.go b/controllers/grafanadashboard/grafanadashboard_controller.go
@@ -264,7 +264,8 @@ func (r *GrafanaDashboardReconciler) reconcileDashboards(request reconcile.Reque
 	}
 
 	// Process new/updated dashboards
-	for _, dashboard := range namespaceDashboards.Items {
+	for i := range namespaceDashboards.Items {
+		dashboard := namespaceDashboards.Items[i]
 		// Is this a dashboard we care about (matches the label selectors)?
 		if !r.isMatch(&dashboard) {
 			log.Log.Info("dashboard found but selectors do not match",

diff --git a/deploy/manifests/latest/crds.yaml b/deploy/manifests/latest/crds.yaml
@@ -2465,7 +2465,7 @@ spec:
               dashboardContentCacheDuration:
                 description: DashboardContentCacheDuration sets a default for when
                   a `GrafanaDashboard` resource doesn't specify a `contentCacheDuration`.
-                  If left unset or 0 the default behaviour is to cache indefinitely.
+                  If left unset or 0 the default behavior is to cache indefinitely.
                 type: string
               dashboardLabelSelector:
                 items:

diff --git a/documentation/api.md b/documentation/api.md
@@ -1963,7 +1963,7 @@ Grafana is the Schema for the grafanas API
         <td><b>dashboardContentCacheDuration</b></td>
         <td>string</td>
         <td>
-          DashboardContentCacheDuration sets a default for when a `GrafanaDashboard` resource doesn't specify a `contentCacheDuration`. If left unset or 0 the default behaviour is to cache indefinitely.<br/>
+          DashboardContentCacheDuration sets a default for when a `GrafanaDashboard` resource doesn't specify a `contentCacheDuration`. If left unset or 0 the default behavior is to cache indefinitely.<br/>
         </td>
         <td>false</td>
       </tr><tr>