refactor: renaming gather after review

Author: Ricardo Lüders

docs/gathered-data.md

@@ -542,32 +542,6 @@ None
 None
 
 
-## ClusterStorageClasses
-
-Collects the cluster `StorageClass` available in cluster.
-
-### API Reference
-- https://docs.openshift.com/container-platform/4.13/rest_api/storage_apis/storageclass-storage-k8s-io-v1.html
-
-### Sample data
-- [docs/insights-archive-sample/config/storage/storageclasses/standard-csi.json](./insights-archive-sample/config/storage/storageclasses/standard-csi.json)
-
-### Location in archive
-- `config/storage/storageclasses/{name}.json`
-
-### Config ID
-`clusterconfig/storage_classes`
-
-### Released version
-- 4.15
-
-### Backported versions
-None
-
-### Changes
-None
-
-
 ## ClusterVersion
 
 Collects the `ClusterVersion` (including the cluster ID) with the name
@@ -1910,6 +1884,32 @@ None
 None
 
 
+## StorageClasses
+
+Collects the cluster `StorageClass` available in cluster.
+
+### API Reference
+- https://docs.openshift.com/container-platform/4.13/rest_api/storage_apis/storageclass-storage-k8s-io-v1.html
+
+### Sample data
+- [docs/insights-archive-sample/config/storage/storageclasses/standard-csi.json](./insights-archive-sample/config/storage/storageclasses/standard-csi.json)
+
+### Location in archive
+- `config/storage/storageclasses/{name}.json`
+
+### Config ID
+`clusterconfig/storage_classes`
+
+### Released version
+- 4.15
+
+### Backported versions
+None
+
+### Changes
+None
+
+
 ## StorageCluster
 
 Collects `storageclusters.ocs.openshift.io` resources

pkg/gatherers/clusterconfig/clusterconfig_gatherer.go

@@ -82,7 +82,7 @@ var gatheringFunctions = map[string]gathererFuncPtr{
 	"scheduler_logs":                    (*Gatherer).GatherSchedulerLogs,
 	"service_accounts":                  (*Gatherer).GatherServiceAccounts,
 	"silenced_alerts":                   (*Gatherer).GatherSilencedAlerts,
-	"storage_classes":                   (*Gatherer).GatherClusterStorageClasses,
+	"storage_classes":                   (*Gatherer).GatherStorageClasses,
 	"storage_cluster":                   (*Gatherer).GatherStorageCluster,
 	"support_secret":                    (*Gatherer).GatherSupportSecret,
 	"tsdb_status":                       (*Gatherer).GatherPrometheusTSDBStatus,

pkg/gatherers/clusterconfig/gather_cluster_storageclass.go renamed to pkg/gatherers/clusterconfig/gather_storageclass.go

@@ -12,7 +12,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
-// GatherClusterStorageClasses Collects the cluster `StorageClass` available in cluster.
+// GatherStorageClasses Collects the cluster `StorageClass` available in cluster.
 //
 // ### API Reference
 // - https://docs.openshift.com/container-platform/4.13/rest_api/storage_apis/storageclass-storage-k8s-io-v1.html
@@ -34,16 +34,16 @@ import (
 //
 // ### Changes
 // None
-func (g *Gatherer) GatherClusterStorageClasses(ctx context.Context) ([]record.Record, []error) {
+func (g *Gatherer) GatherStorageClasses(ctx context.Context) ([]record.Record, []error) {
 	kubeClient, err := kubernetes.NewForConfig(g.gatherKubeConfig)
 	if err != nil {
 		return nil, []error{err}
 	}
 
-	return gatherClusterStorageClasses(ctx, kubeClient.StorageV1())
+	return gatherStorageClasses(ctx, kubeClient.StorageV1())
 }
 
-func gatherClusterStorageClasses(ctx context.Context, storageClient v1.StorageV1Interface) ([]record.Record, []error) {
+func gatherStorageClasses(ctx context.Context, storageClient v1.StorageV1Interface) ([]record.Record, []error) {
 	storageClasses, err := listStorageClasses(ctx, storageClient.StorageClasses())
 	if err != nil {
 		return nil, []error{err}

pkg/gatherers/clusterconfig/gather_cluster_storageclass_test.go renamed to pkg/gatherers/clusterconfig/gather_storageclass_test.go

@@ -11,7 +11,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 )
 
-func TestGatherClusterStorageClasses(t *testing.T) {
+func TestGatherStorageClasses(t *testing.T) {
 	tests := []struct {
 		name           string
 		storageClasses []storagev1.StorageClass
@@ -51,7 +51,7 @@ func TestGatherClusterStorageClasses(t *testing.T) {
 			name:           "Failed retrieval of cluster storage classes",
 			storageClasses: nil, // Simulating an error scenario with an empty list
 			wantRecords:    nil,
-			wantErrCount:   1,
+			wantErrCount:   0, // The fake test client doesn't provide any error
 		},
 	}
 
@@ -62,8 +62,8 @@ func TestGatherClusterStorageClasses(t *testing.T) {
 				Items: tt.storageClasses,
 			})
 
-			// Call the gatherClusterStorageClasses function with the fake client
-			records, errs := gatherClusterStorageClasses(context.TODO(), kubeClient.StorageV1())
+			// Call the gatherStorageClasses function with the fake client
+			records, errs := gatherStorageClasses(context.TODO(), kubeClient.StorageV1())
 
 			// Verify the results
 			assert.Equal(t, tt.wantRecords, records)