Making the linter happy

grafana · Jul 26, 2022 · 3b8e4e6 · 3b8e4e6
1 parent fa886e7
commit 3b8e4e6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/controllers/grafanadatasource/datasource_pipeline.go b/controllers/grafanadatasource/datasource_pipeline.go
@@ -34,6 +34,20 @@ func (i *DatasourcePipelineImpl) ProcessDatasource(known *v1.ConfigMap) error {
 	return nil
 }
 
+func applyCustomJsonData(datasource *v1alpha1.GrafanaDataSourceFields, unmarshaledDatasource map[string]interface{}) (needsRemarshaling bool) {
+	if datasource.CustomJsonData != nil {
+		needsRemarshaling = true
+		unmarshaledDatasource["jsonData"] = unmarshaledDatasource["customJsonData"]
+		delete(unmarshaledDatasource, "customJsonData")
+	}
+	if datasource.CustomSecureJsonData != nil {
+		needsRemarshaling = true
+		unmarshaledDatasource["secureJsonData"] = unmarshaledDatasource["customSecureJsonData"]
+		delete(unmarshaledDatasource, "customSecureJsonData")
+	}
+	return
+}
+
 func (i *DatasourcePipelineImpl) parse() error {
 	datasources := struct {
 		ApiVersion  int                                `json:"apiVersion"`
@@ -52,29 +66,20 @@ func (i *DatasourcePipelineImpl) parse() error {
 		return err
 	}
 	unmarshaledDatasourceList, ok := unmarshaledDatasources["datasources"].([]interface{})
+	needsRemarshaling := false
 	if ok {
-		needsRemarshaling := false
 		for ix, datasource := range i.datasource.Spec.Datasources {
 			unmarshaledDatasource, ok := unmarshaledDatasourceList[ix].(map[string]interface{})
 			if !ok {
 				continue
 			}
-			if datasource.CustomJsonData != nil {
-				needsRemarshaling = true
-				unmarshaledDatasource["jsonData"] = unmarshaledDatasource["customJsonData"]
-				delete(unmarshaledDatasource, "customJsonData")
-			}
-			if datasource.CustomSecureJsonData != nil {
-				needsRemarshaling = true
-				unmarshaledDatasource["secureJsonData"] = unmarshaledDatasource["customSecureJsonData"]
-				delete(unmarshaledDatasource, "customSecureJsonData")
-			}
+			needsRemarshaling = needsRemarshaling || applyCustomJsonData(&datasource, unmarshaledDatasource)
 		}
-		if needsRemarshaling {
-			bytes, err = yaml.Marshal(unmarshaledDatasources)
-			if err != nil {
-				return err
-			}
+	}
+	if needsRemarshaling {
+		bytes, err = yaml.Marshal(unmarshaledDatasources)
+		if err != nil {
+			return err
 		}
 	}
 	i.contents = string(bytes)

diff --git a/deploy/manifests/latest/crds.yaml b/deploy/manifests/latest/crds.yaml
@@ -212,13 +212,13 @@ spec:
                     customJsonData:
                       description: CustomJsonData will be used in place of jsonData,
                         if present, and supports arbitrary JSON, not just those of
-                        offical datasources
+                        official datasources
                       type: object
                       x-kubernetes-preserve-unknown-fields: true
                     customSecureJsonData:
                       description: SecureCustomJsonData will be used in place of secureJsonData,
                         if present, and supports arbitrary JSON, not just those of
-                        offical datasources
+                        official datasources
                       type: object
                       x-kubernetes-preserve-unknown-fields: true
                     database:

diff --git a/documentation/api.md b/documentation/api.md
@@ -598,14 +598,14 @@ GrafanaDataSourceSpec defines the desired state of GrafanaDataSource
         <td><b>customJsonData</b></td>
         <td>object</td>
         <td>
-          CustomJsonData will be used in place of jsonData, if present, and supports arbitrary JSON, not just those of offical datasources<br/>
+          CustomJsonData will be used in place of jsonData, if present, and supports arbitrary JSON, not just those of official datasources<br/>
         </td>
         <td>false</td>
       </tr><tr>
         <td><b>customSecureJsonData</b></td>
         <td>object</td>
         <td>
-          SecureCustomJsonData will be used in place of secureJsonData, if present, and supports arbitrary JSON, not just those of offical datasources<br/>
+          SecureCustomJsonData will be used in place of secureJsonData, if present, and supports arbitrary JSON, not just those of official datasources<br/>
         </td>
         <td>false</td>
       </tr><tr>