Merge pull request #2 from MCBrandenburg/unadmin

fix: remove cluster admin

Author: MCBrandenburg

pkg/prom/collector.go

@@ -1280,21 +1280,6 @@ func (c *SolidfireCollector) collectAccounts(ctx context.Context, ch chan<- prom
 	return nil
 }
 
-func (c *SolidfireCollector) collectClusterAdmins(ctx context.Context, ch chan<- prometheus.Metric) error {
-	clusterAdmins, err := c.client.ListClusterAdmins(ctx)
-	if err != nil {
-		return err
-	}
-	mu.Lock()
-	defer mu.Unlock()
-	ch <- prometheus.MustNewConstMetric(
-		MetricDescriptions.ClusterAdminCount,
-		prometheus.CounterValue,
-		float64(len(clusterAdmins.Result.ClusterAdmins)),
-	)
-	return nil
-}
-
 func (c *SolidfireCollector) collectInitiators(ctx context.Context, ch chan<- prometheus.Metric) error {
 	initiators, err := c.client.ListInitiators(ctx)
 	if err != nil {
@@ -1372,9 +1357,6 @@ func (c *SolidfireCollector) Collect(ch chan<- prometheus.Metric) {
 	metricsGroup.Go(func() error {
 		return c.collectAccounts(ctx, ch)
 	})
-	metricsGroup.Go(func() error {
-		return c.collectClusterAdmins(ctx, ch)
-	})
 	metricsGroup.Go(func() error {
 		return c.collectInitiators(ctx, ch)
 	})

pkg/prom/collector_test.go

@@ -238,13 +238,6 @@ func newMockedClient(t *testing.T, mockErrs mockErrors) *testutils.MockSolidfire
 	require.NoError(t, json.Unmarshal(bytes, &listAccountsResponse))
 	mockSfClient.On(string(call), mock.Anything).Return(listAccountsResponse, mockErrs[call])
 
-	listClusterAdminsResponse := solidfire.ListClusterAdminsResponse{}
-	call = solidfire.RPCListClusterAdmins
-	bytes, err = ioutil.ReadFile(testutils.ResolveFixturePath(fixtureBasePath, call))
-	require.NoError(t, err)
-	require.NoError(t, json.Unmarshal(bytes, &listClusterAdminsResponse))
-	mockSfClient.On(string(call), mock.Anything).Return(listClusterAdminsResponse, mockErrs[call])
-
 	listInitiatorsResponse := solidfire.ListInitiatorsResponse{}
 	call = solidfire.RPCListInitiators
 	bytes, err = ioutil.ReadFile(testutils.ResolveFixturePath(fixtureBasePath, call))

pkg/solidfire/solidfire.go

@@ -30,7 +30,6 @@ const (
 	RPCListVolumes             RPC = "ListVolumes"
 	RPCListVolumeStats         RPC = "ListVolumeStats"
 	RPCListAccounts            RPC = "ListAccounts"
-	RPCListClusterAdmins       RPC = "ListClusterAdmins"
 	RPCListInitiators          RPC = "ListInitiators"
 	RPCListVolumeAccessGroups  RPC = "ListVolumeAccessGroups"
 )
@@ -329,28 +328,6 @@ func (s *Client) ListISCSISessions(ctx context.Context) (ListISCSISessionsRespon
 	return r, nil
 }
 
-func (s *Client) ListClusterAdmins(ctx context.Context) (ListClusterAdminsResponse, error) {
-	payload := &RPCBody{
-		Method: RPCListClusterAdmins,
-		Params: ListClusterAdminsParams{},
-		ID:     1,
-	}
-
-	payloadBytes, err := json.Marshal(&payload)
-	r := ListClusterAdminsResponse{}
-	bodyBytes, err := s.doRpcCall(ctx, payloadBytes)
-
-	if err != nil {
-		return r, err
-	}
-	err = json.Unmarshal(bodyBytes, &r)
-
-	if err != nil {
-		return r, err
-	}
-	return r, nil
-}
-
 func (s *Client) ListAccounts(ctx context.Context) (ListAccountsResponse, error) {
 	payload := &RPCBody{
 		Method: RPCListAccounts,

pkg/solidfire/solidfire_test.go

@@ -475,49 +475,6 @@ func TestClient_ListAccounts(t *testing.T) {
 		})
 	}
 }
-func TestClient_ListClusterAdmins(t *testing.T) {
-	fixture, err := ioutil.ReadFile(testutils.ResolveFixturePath(fixtureBasePath, solidfire.RPCListClusterAdmins))
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	tests := []struct {
-		name    string
-		s       solidfire.Client
-		want    string
-		wantErr bool
-	}{
-		{
-			name: "Username of first cluster admin should match fixture",
-			want: "admin",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			defer gock.Off()
-			//gock.Observe(gock.DumpRequest)
-			gock.New(sfHost).
-				Post(sfRPCEndpoint).
-				MatchType("json").
-				JSON(solidfire.RPCBody{
-					ID:     1,
-					Method: solidfire.RPCListClusterAdmins,
-					Params: solidfire.ListClusterAdminsParams{},
-				}).
-				Reply(200).
-				BodyString(string(fixture))
-			gotRaw, err := sfClient.ListClusterAdmins(context.Background())
-			got := gotRaw.Result.ClusterAdmins[0].Username
-			if (err != nil) != tt.wantErr {
-				t.Errorf("Client.ListClusterAdmins() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Client.ListClusterAdmins() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
 
 func TestClient_ListInitiators(t *testing.T) {
 	fixture, err := ioutil.ReadFile(testutils.ResolveFixturePath(fixtureBasePath, solidfire.RPCListInitiators))

pkg/solidfire/types.go

@@ -50,7 +50,6 @@ type Interface interface {
 	ListVolumes(ctx context.Context) (ListVolumesResponse, error)
 	ListVolumeStats(ctx context.Context) (ListVolumeStatsResponse, error)
 	ListAccounts(ctx context.Context) (ListAccountsResponse, error)
-	ListClusterAdmins(ctx context.Context) (ListClusterAdminsResponse, error)
 	ListInitiators(ctx context.Context) (ListInitiatorsResponse, error)
 	ListVolumeAccessGroups(ctx context.Context) (ListVolumeAccessGroupsResponse, error)
 }
@@ -107,10 +106,6 @@ type ListAccountsParams struct {
 	// No params needed
 }
 
-type ListClusterAdminsParams struct {
-	// No params needed
-}
-
 type ListInitiatorsParams struct {
 	// No params needed
 }
@@ -518,19 +513,6 @@ type ListAccountsResponse struct {
 	} `json:"result"`
 }
 
-type ListClusterAdminsResponse struct {
-	ID     int `json:"id"`
-	Result struct {
-		ClusterAdmins []struct {
-			Access         []string    `json:"access"`
-			Attributes     interface{} `json:"attributes"`
-			AuthMethod     string      `json:"authMethod"`
-			ClusterAdminID int         `json:"clusterAdminID"`
-			Username       string      `json:"username"`
-		} `json:"clusterAdmins"`
-	} `json:"result"`
-}
-
 type ListInitiatorsResponse struct {
 	ID     int `json:"id"`
 	Result struct {

pkg/testutils/collector.go

@@ -9,7 +9,6 @@ solidfire_cluster_account_count 2
 solidfire_cluster_active_block_space_bytes 4.977419581e+09
 solidfire_cluster_active_faults{code="driveAvailable",details="Node ID 1 has 1 available drive(s).",drive_id="0.000000",node_hardware_fault_id="0.000000",node_id="1",node_name="n01",resolved="false",service_id="0.000000",severity="warning",type="drive"} 1
 solidfire_cluster_active_sessions 1
-solidfire_cluster_admin_account 3
 solidfire_cluster_average_io_bytes 0
 solidfire_cluster_average_iops 0
 solidfire_cluster_block_fullness{level="stage1Happy"} 0
@@ -300,7 +299,6 @@ solidfire_cluster_account_count 2
 solidfire_cluster_active_block_space_bytes 4.977419581e+09
 solidfire_cluster_active_faults{code="driveAvailable",details="Node ID 1 has 1 available drive(s).",drive_id="0.000000",node_hardware_fault_id="0.000000",node_id="1",node_name="n01",resolved="false",service_id="0.000000",severity="warning",type="drive"} 1
 solidfire_cluster_active_sessions 1
-solidfire_cluster_admin_account 3
 solidfire_cluster_average_io_bytes 0
 solidfire_cluster_average_iops 0
 solidfire_cluster_block_fullness{level="stage1Happy"} 0

pkg/testutils/solidfire_mock.go

@@ -59,10 +59,6 @@ func (m *MockSolidfireClient) ListAccounts(ctx context.Context) (solidfire.ListA
 	args := m.Called(ctx)
 	return args.Get(0).(solidfire.ListAccountsResponse), args.Error(1)
 }
-func (m *MockSolidfireClient) ListClusterAdmins(ctx context.Context) (solidfire.ListClusterAdminsResponse, error) {
-	args := m.Called(ctx)
-	return args.Get(0).(solidfire.ListClusterAdminsResponse), args.Error(1)
-}
 func (m *MockSolidfireClient) ListInitiators(ctx context.Context) (solidfire.ListInitiatorsResponse, error) {
 	args := m.Called(ctx)
 	return args.Get(0).(solidfire.ListInitiatorsResponse), args.Error(1)