Skip to content

Improve type checking of object metadata #2848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 30, 2019
Merged

Improve type checking of object metadata #2848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...s/dev-console/src/components/topology/__tests__/__snapshots__/topology-utils.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ Object {
"annotations": Object {
"openshift.io/scc": "restricted",
},
"creationTimestaResourcePropsmp": "2019-04-26T10:23:41Z",
"creationTimestamp": "2019-04-26T10:23:41Z",
"generateName": "analytics-deployment-59dd7c47d4-",
"labels": Object {
"app.kubernetes.io/component": "backend",
Expand Down Expand Up @@ -444,7 +444,7 @@ Object {
"annotations": Object {
"openshift.io/scc": "restricted",
},
"creationTimestaResourcePropsmp": "2019-04-26T10:23:41Z",
"creationTimestamp": "2019-04-26T10:23:41Z",
"generateName": "analytics-deployment-59dd7c47d4-",
"labels": Object {
"app.kubernetes.io/component": "backend",
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/dev-console/src/components/topology/__tests__/topology-test-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ export const samplePods: Resource = {
resourceVersion: '1395096',
name: 'analytics-deployment-59dd7c47d4-2jp7t',
uid: '5cec460e-680d-11e9-8c69-5254003f9382',
creationTimestaResourcePropsmp: '2019-04-26T10:23:41Z',
Copy link
Contributor

@alecmerdler alecmerdler Sep 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol what happened here

Copy link
Contributor

@christianvogt christianvogt Sep 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Garbage in, garbage out :)

creationTimestamp: '2019-04-26T10:23:41Z',
namespace: 'testproject3',
ownerReferences: [
{
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/operator-lifecycle-manager/mocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ export const testOperatorDeployment: K8sResourceKind = {
apiVersion: testClusterServiceVersion.apiVersion,
},
],
spec: {},
},
spec: {},
};

export const testSubscription: SubscriptionKind = {
Expand Down
2 changes: 1 addition & 1 deletion ...end/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const OperatorHubList: React.SFC<OperatorHubListProps> = (props) => {
longDescription: currentCSVDesc.description || currentCSVAnnotations.description,
provider: _.get(pkg, 'status.provider.name', _.get(pkg, 'metadata.labels.provider')),
providerType: getOperatorProviderType(pkg),
tags: pkg.metadata.tags,
tags: [],
version: _.get(currentCSVDesc, 'version'),
categories: _.get(currentCSVAnnotations, 'categories', '')
.split(',')
Expand Down
6 changes: 3 additions & 3 deletions frontend/public/components/catalog/catalog-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Helmet } from 'react-helmet';

import { ANNOTATIONS, FLAGS } from '../../const';
import { CatalogTileViewPage } from './catalog-items';
import { k8sListPartialMetadata, referenceForModel, serviceClassDisplayName, K8sResourceKind, ObjectMetadata } from '../../module/k8s';
import { k8sListPartialMetadata, referenceForModel, serviceClassDisplayName, K8sResourceKind, PartialObjectMetadata } from '../../module/k8s';
import { withStartGuide } from '../start-guide';
import { connectToFlags, flagPending } from '../../reducers/features';
import { Firehose, LoadError, PageHeading, skeletonCatalog, StatusBox, FirehoseResult } from '../utils';
Expand Down Expand Up @@ -286,8 +286,8 @@ export const CatalogPage = withStartGuide(({match, noProjectsAvailable}) => {
export type CatalogListPageProps = {
clusterServiceClasses?: FirehoseResult<K8sResourceKind[]>;
imageStreams?: FirehoseResult<K8sResourceKind[]>;
templateMetadata?: ObjectMetadata[];
projectTemplateMetadata?: ObjectMetadata[];
templateMetadata?: PartialObjectMetadata[];
projectTemplateMetadata?: PartialObjectMetadata[];
loaded: boolean;
loadError?: string;
namespace?: string;
Expand Down
28 changes: 20 additions & 8 deletions frontend/public/module/k8s/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,28 @@ export type ObjectReference = {
};

export type ObjectMetadata = {
name?: string;
annotations?: {[key: string]: string};
clusterName?: string;
creationTimestamp?: string;
deletionGracePeriodSeconds?: number;
deletionTimestamp?: string;
finalizers?: string[];
generateName?: string;
uid?: string;
annotations?: {[key: string]: string},
namespace?: string,
generation?: number;
labels?: {[key: string]: string},
ownerReferences?: OwnerReference[],
deletionTimestamp?: string;
creationTimestamp?: string;
[key: string]: any,
managedFields?: any[];
name?: string;
namespace?: string;
ownerReferences?: OwnerReference[];
resourceVersion?: string;
selfLink?: string;
uid?: string;
};

export type PartialObjectMetadata = {
apiVersion: string;
kind: string;
metadata: ObjectMetadata;
};

export enum K8sResourceConditionStatus {
Expand Down