Skip to content

Commit

Permalink
adds associated deployment and pods in sidebar for event sources
Browse files Browse the repository at this point in the history
  • Loading branch information
@invincibleJai
invincibleJai committed Mar 19, 2020
1 parent 1567ea8 commit f6cd041
Show file tree
Hide file tree
Showing 4 changed files with 153 additions and 20 deletions.
37 changes: 30 additions & 7 deletions ...tend/packages/dev-console/src/components/topology/__tests__/topology-knative-test-data.ts
View file
Expand Up @@ -14,6 +14,7 @@ import {
RevisionKind,
RouteKind,
ServiceKind as knativeServiceKind,
EventSourceApiServerModel,
} from '@console/knative-plugin';
import { TopologyDataResources } from '../topology-types';

Expand Down Expand Up @@ -411,6 +412,33 @@ export const sampleEventSourceCronjob: FirehoseResult = {
],
};

export const sampleEventSourceApiServer: FirehoseResult = {
loaded: true,
loadError: '',
data: [
{
apiVersion: `${EventSourceApiServerModel.apiGroup}/${EventSourceApiServerModel.apiVersion}`,
kind: EventSourceApiServerModel.kind,
metadata: {
name: 'testevents',
namespace: 'testproject1',
uid: '1317f615-9636-11e9-b134-06a61d886b689',
creationTimestamp: '2019-06-12T07:07:57Z',
},
spec: {
sink: {
apiVersion: 'serving.knative.dev/v1',
kind: 'Service',
name: 'overlayimage',
},
},
status: {
sinkUri: 'http://testevents.testproject1.svc.cluster.local',
},
},
],
};

export const sampleEventSourceContainers: FirehoseResult = {
loaded: true,
loadError: '',
Expand Down Expand Up @@ -451,13 +479,7 @@ export const sampleEventSourceCamel: FirehoseResult = {
uid: '1317f615-9636-11e9-b134-06a61d886b689',
creationTimestamp: '2019-06-12T07:07:57Z',
},
spec: {
sink: {
apiVersion: `${ServiceModel.apiGroup}/${ServiceModel.apiVersion}`,
kind: ServiceModel.kind,
name: 'overlayimage',
},
},
spec: {},
},
],
};
Expand Down Expand Up @@ -641,6 +663,7 @@ export const MockKnativeResources: TopologyDataResources = {
eventSourceContainers: sampleEventSourceContainers,
eventSourceCamel: sampleEventSourceCamel,
eventSourceKafka: sampleEventSourceKafka,
eventSourceApiserver: sampleEventSourceApiServer,
eventSourceSinkbinding: sampleEventSourceSinkbinding,
clusterServiceVersions: sampleClusterServiceVersions,
};
37 changes: 34 additions & 3 deletions frontend/packages/knative-plugin/src/components/overview/EventSinkServicesOverviewList.tsx
View file
@@ -1,21 +1,37 @@
import * as React from 'react';
import * as _ from 'lodash';
import { K8sResourceKind, referenceForModel } from '@console/internal/module/k8s';
import { K8sResourceKind, referenceForModel, PodKind } from '@console/internal/module/k8s';
import {
ResourceLink,
ExternalLink,
SidebarSectionHeading,
} from '@console/internal/components/utils';
import { PodControllerOverviewItem } from '@console/shared';
import { PodModel } from '@console/internal/models';
import { PodsOverview } from '@console/internal/components/overview/pods-overview';
import { ServiceModel } from '@console/knative-plugin';

export type EventSinkServicesOverviewListProps = {
obj: K8sResourceKind;
pods?: PodKind[];
current?: PodControllerOverviewItem;
};

const EventSinkServicesOverviewList: React.FC<EventSinkServicesOverviewListProps> = ({ obj }) => {
const EventSinkServicesOverviewList: React.FC<EventSinkServicesOverviewListProps> = ({
obj,
pods,
current,
}) => {
const {
kind: resKind,
metadata: { name, namespace },
} = obj;
const sink = _.get(obj, 'spec.sink.ref') || _.get(obj, 'spec.sink');
const sinkUri = _.get(obj, 'status.sinkUri', null);
const namespace = _.get(obj, 'metadata.namespace', null);
const deploymentData = _.get(current, 'obj.metadata.ownerReferences[0]', {});
const linkUrl = `/search/ns/${namespace}?kind=${PodModel.kind}&q=${encodeURIComponent(
`sources.eventing.knative.dev/${_.lowerFirst(resKind)}=${name}`,
)}`;
return (
<>
<SidebarSectionHeading text="Knative Services" />
Expand All @@ -42,6 +58,21 @@ const EventSinkServicesOverviewList: React.FC<EventSinkServicesOverviewListProps
) : (
<span className="text-muted">No services found for this resource.</span>
)}
{pods?.length && <PodsOverview pods={pods} obj={obj} allPodsLink={linkUrl} />}
{deploymentData?.name && (
<>
<SidebarSectionHeading text="Deployment" />
<ul className="list-group">
<li className="list-group-item">
<ResourceLink
kind={deploymentData.kind}
name={deploymentData.name}
namespace={namespace}
/>
</li>
</ul>
</>
)}
</>
);
};
Expand Down
2 changes: 1 addition & 1 deletion ...nd/packages/knative-plugin/src/components/overview/OverviewDetailsKnativeResourcesTab.tsx
View file
Expand Up @@ -51,7 +51,7 @@ const getSidebarResources = ({
case EventSourceCamelModel.kind:
case EventSourceKafkaModel.kind:
case EventSourceServiceBindingModel.kind:
return <EventSinkServicesOverviewList obj={obj} />;
return <EventSinkServicesOverviewList obj={obj} pods={pods} current={current} />;
default:
return (
<>
Expand Down
97 changes: 88 additions & 9 deletions ...s/knative-plugin/src/components/overview/__tests__/EventSinkServicesOverviewList.spec.tsx
View file
@@ -1,22 +1,78 @@
import * as React from 'react';
import { shallow } from 'enzyme';
import * as _ from 'lodash';
import { referenceForModel } from '@console/internal/module/k8s';
import { sampleEventSourceContainers } from '@console/dev-console/src/components/topology/__tests__/topology-knative-test-data';
import { ResourceLink, ExternalLink } from '@console/internal/components/utils';
import { referenceForModel, PodKind } from '@console/internal/module/k8s';
import { PodControllerOverviewItem } from '@console/shared';
import { PodsOverview } from '@console/internal/components/overview/pods-overview';
import {
sampleEventSourceApiServer,
sampleEventSourceCamel,
} from '@console/dev-console/src/components/topology/__tests__/topology-knative-test-data';
import {
ResourceLink,
ExternalLink,
SidebarSectionHeading,
} from '@console/internal/components/utils';
import { ServiceModel } from '@console/knative-plugin';
import EventSinkServicesOverviewList from '../EventSinkServicesOverviewList';

describe('EventSinkServicesOverviewList', () => {
const current: PodControllerOverviewItem = {
obj: {
metadata: {
name: 'apiserversource-es-1-3f120723-370a-4a08-9eb6-791a7bc90621-5898f657c4',
uid: '724ec872-ec82-4362-a933-d7a6e54ccfd8',
namespace: 'testproject1',
ownerReferences: [
{
apiVersion: 'apps/v1',
kind: 'Deployment',
name: 'apiserversource-es-1-3f120723-370a-4a08-9eb6-791a7bc90621',
uid: 'efe9d39b-e16c-4f05-a82f-0ae1a80e20de',
},
],
},
},
revision: 1,
alerts: {},
pods: [
{
metadata: {
name: 'apiserversource-es-1-3f120723-370a-4a08-9eb6-791a7bc90621-58wpf6b',
uid: 'b893336d-fe16-4fb5-ba29-cb2353ca0301',
namespace: 'testproject1',
},
status: {
phase: 'Running',
},
},
],
};

const pods: PodKind[] = [
{
metadata: {
name: 'apiserversource-es-1-3f120723-370a-4a08-9eb6-791a7bc90621-58wpf6b',
uid: 'b893336d-fe16-4fb5-ba29-cb2353ca0301',
namespace: 'testproject1',
},
spec: {
containers: [],
},
status: {
phase: 'Running',
},
},
];

it('should show error info if no sink present or sink,kind is incorrect', () => {
const mockEventSourceEmpty = {};
const wrapper = shallow(<EventSinkServicesOverviewList obj={mockEventSourceEmpty} />);
expect(wrapper.text().includes('No services found for this resource.')).toBe(true);
const wrapper = shallow(<EventSinkServicesOverviewList obj={sampleEventSourceCamel.data[0]} />);
expect(wrapper.find('span').text()).toBe('No services found for this resource.');
});

it('should have ResourceLink with proper kind', () => {
const wrapper = shallow(
<EventSinkServicesOverviewList obj={sampleEventSourceContainers.data[0]} />,
<EventSinkServicesOverviewList obj={sampleEventSourceApiServer.data[0]} />,
);
const findResourceLink = wrapper.find(ResourceLink);
expect(findResourceLink).toHaveLength(1);
Expand All @@ -25,14 +81,37 @@ describe('EventSinkServicesOverviewList', () => {

it('should have ExternaLink when sinkUri is present', () => {
const wrapper = shallow(
<EventSinkServicesOverviewList obj={sampleEventSourceContainers.data[0]} />,
<EventSinkServicesOverviewList obj={sampleEventSourceApiServer.data[0]} />,
);
expect(wrapper.find(ExternalLink)).toHaveLength(1);
});

it('should not have ExternalLink when no sinkUri is present', () => {
const mockEventSourceDataNoURI = _.omit(sampleEventSourceContainers.data[0], 'status');
const mockEventSourceDataNoURI = _.omit(sampleEventSourceApiServer.data[0], 'status');
const wrapper = shallow(<EventSinkServicesOverviewList obj={mockEventSourceDataNoURI} />);
expect(wrapper.find(ExternalLink)).toHaveLength(0);
});

it('should show Deployment if present', () => {
const wrapper = shallow(
<EventSinkServicesOverviewList obj={sampleEventSourceApiServer.data[0]} current={current} />,
);
const findResourceLink = wrapper.find(ResourceLink);
const findSidebarSectionHeading = wrapper.find(SidebarSectionHeading);
expect(findSidebarSectionHeading).toHaveLength(2);
expect(findResourceLink).toHaveLength(2);
expect(findResourceLink.at(1).props().kind).toEqual('Deployment');
expect(findSidebarSectionHeading.at(1).props().text).toEqual('Deployment');
});

it('should not show pods if not present', () => {
const wrapper = shallow(
<EventSinkServicesOverviewList
obj={sampleEventSourceApiServer.data[0]}
current={current}
pods={pods}
/>,
);
expect(wrapper.find(PodsOverview)).toHaveLength(1);
});
});

0 comments on commit f6cd041

Please sign in to comment.