some lint and rebase errors

Author: joshri

core/server/objects.go

@@ -95,7 +95,6 @@ func (cs *coreServer) ListObjects(ctx context.Context, msg *pb.ListObjectsReques
 				if gvk.Kind == v2beta1.HelmReleaseKind {
 					inventory, err = getUnstructuredHelmReleaseInventory(ctx, object, clustersClient, n)
 					if err != nil {
-
 						respErrors = append(respErrors, &pb.ListError{ClusterName: n, Message: err.Error()})
 						inventory = nil // We can still display most things without inventory
 

core/server/objects_test.go

@@ -576,6 +576,7 @@ func TestListObject_HelmReleaseCantGetSecret(t *testing.T) {
 	g := NewGomegaWithT(t)
 
 	scheme, err := kube.CreateScheme()
+	g.Expect(err).NotTo(HaveOccurred())
 	ctx := context.Background()
 
 	ns := &corev1.Namespace{

ui/components/AlertsTable.tsx

@@ -3,7 +3,8 @@ import qs from "query-string";
 import * as React from "react";
 import styled from "styled-components";
 import { useFeatureFlags } from "../hooks/featureflags";
-import { Alert, CrossNamespaceObjectRef, Kind } from "../lib/objects";
+import { Kind } from "../lib/api/core/types.pb";
+import { Alert, CrossNamespaceObjectRef } from "../lib/objects";
 import { V2Routes } from "../lib/types";
 import { statusSortHelper } from "../lib/utils";
 import DataTable, {
@@ -20,7 +21,6 @@ type Props = {
   className?: string;
   rows?: Alert[];
 };
-
 export const makeEventSourceLink = (obj: CrossNamespaceObjectRef) => {
   const url =
     obj.kind === Kind.Kustomization || obj.kind === Kind.HelmRelease

ui/components/__tests__/AlertsTable.test.tsx

@@ -1,3 +1,4 @@
+import { Kind } from "../../lib/api/core/types.pb";
 import { makeEventSourceLink } from "../AlertsTable";
 
 describe("AlertsTable", () => {
@@ -7,7 +8,7 @@ describe("AlertsTable", () => {
         apiVersion: "v1",
         name: "*",
         namespace: "space",
-        kind: "GitRepository",
+        kind: Kind.GitRepository,
         matchLabels: [],
       };
       const sourceLink = makeEventSourceLink(allNames);
@@ -20,7 +21,7 @@ describe("AlertsTable", () => {
         apiVersion: "v1",
         name: "goose",
         namespace: "*",
-        kind: "HelmRelease",
+        kind: Kind.HelmRelease,
         matchLabels: [],
       };
       const automationLink = makeEventSourceLink(allNamespaces);

ui/components/__tests__/CheckboxActions.test.tsx

@@ -1,4 +1,5 @@
 import "jest-styled-components";
+import { Kind } from "../../lib/api/core/types.pb";
 import { makeObjects } from "../CheckboxActions";
 
 describe("CheckboxActions", () => {
@@ -7,14 +8,14 @@ describe("CheckboxActions", () => {
     const rows = [
       {
         name: "name",
-        kind: "kind",
+        kind: Kind.GitRepository,
         namespace: "namespace",
         clusterName: "clusterName",
         uid: "123",
       },
       {
         name: "name",
-        kind: "kind",
+        kind: Kind.HelmRelease,
         namespace: "namespace",
         clusterName: "clusterName",
         uid: "321",
@@ -23,7 +24,7 @@ describe("CheckboxActions", () => {
     expect(makeObjects(checked, rows)).toEqual([
       {
         name: "name",
-        kind: "kind",
+        kind: Kind.GitRepository,
         namespace: "namespace",
         clusterName: "clusterName",
       },

ui/contexts/__tests__/CoreClientContext.test.tsx

@@ -1,5 +1,5 @@
-import { QueryClient, QueryClientProvider } from "react-query";
 import * as React from "react";
+import { QueryClient, QueryClientProvider } from "react-query";
 import renderer from "react-test-renderer";
 import { Core } from "../../lib/api/core/core.pb";
 import CoreClientContextProvider, {
@@ -10,7 +10,7 @@ describe("CoreContextProvider", () => {
   it("returns a non-empty api", () => {
     function TestComponent() {
       const { api } = React.useContext(CoreClientContext);
-      expect(api.ListKustomizations).toBeTruthy();
+      expect(api.ListObjects).toBeTruthy();
       return <div />;
     }
 

ui/hooks/flux.ts

@@ -12,15 +12,14 @@ import {
   Kind,
   UnstructuredObject,
 } from "../lib/api/core/types.pb";
-import { getChildren } from "../lib/graph";
+import { getChildren, UnstructuredObjectWithChildren } from "../lib/graph";
 import {
   DefaultCluster,
   NoNamespace,
   ReactQueryOptions,
   RequestError,
 } from "../lib/types";
 import { notifyError, notifySuccess } from "../lib/utils";
-
 export function useListFluxRuntimeObjects(
   clusterName = DefaultCluster,
   namespace = NoNamespace,

ui/lib/__tests__/objects.test.ts

@@ -131,7 +131,7 @@ describe("objects lib", () => {
 
     it("extracts source ref", () => {
       expect(obj.sourceRef).toEqual({
-        kind: "KindHelmRepository",
+        kind: Kind.HelmRepository,
         name: "helmrepository",
         namespace: "metadata",
       });
@@ -328,7 +328,7 @@ describe("objects lib", () => {
       expect(obj.helmChart.name).toEqual("flux-system-ww-gitops");
       expect(obj.helmChart.namespace).toEqual("flux-system");
       expect(obj.helmChart.sourceRef).toEqual({
-        kind: "KindHelmRepository",
+        kind: Kind.HelmRepository,
         name: "ww-gitops",
         namespace: "flux-system",
       });
@@ -339,7 +339,7 @@ describe("objects lib", () => {
     });
     it("finds the source ref for the helm repository", () => {
       expect(obj.sourceRef).toEqual({
-        kind: "KindHelmRepository",
+        kind: Kind.HelmRepository,
         name: "ww-gitops",
         namespace: "flux-system",
       });
@@ -397,7 +397,7 @@ describe("objects lib", () => {
     });
     it("extracts sourceRef", () => {
       expect(obj.sourceRef).toEqual({
-        kind: "KindGitRepository",
+        kind: Kind.GitRepository,
         name: "webapp",
         namespace: "default",
       });

ui/lib/__tests__/utils.test.ts

@@ -306,7 +306,7 @@ describe("utils lib", () => {
 
       const kustomization = new Kustomization(response);
 
-      expect(getSourceRefForAutomation(kustomization)).toBe(
+      expect(getSourceRefForAutomation(kustomization)).toEqual(
         kustomization.sourceRef
       );
     });
@@ -321,7 +321,7 @@ describe("utils lib", () => {
 
       const helmRelease = new HelmRelease(object);
 
-      expect(getSourceRefForAutomation(helmRelease)).toBe(
+      expect(getSourceRefForAutomation(helmRelease)).toEqual(
         helmRelease.helmChart.sourceRef
       );
     });