Skip to content
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

Catch possible errors with incomplete Ingress objects #1041

Merged
merged 2 commits into from
May 30, 2019
Merged

Catch possible errors with incomplete Ingress objects #1041

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80e6ad1
Catch possible errors with incomplete Ingress objects
May 23, 2019
7fa9058
Merge branch 'master' into incompleteIngress
May 30, 2019
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
55 changes: 39 additions & 16 deletions dashboard/src/components/AppView/AccessURLTable/AccessURLItem/AccessURLIngressHelper.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { GetURLItemFromIngress } from "./AccessURLIngressHelper";
describe("GetURLItemFromIngress", () => {
interface Itest {
description: string;
hosts: string[];
paths: IHTTPIngressPath[];
tlsHosts: string[];
hosts?: string[];
paths?: IHTTPIngressPath[];
tlsHosts?: string[];
expectedURLs: string[];
}
const tests: Itest[] = [
Expand Down Expand Up @@ -38,6 +38,27 @@ describe("GetURLItemFromIngress", () => {
tlsHosts: ["foo.bar"],
expectedURLs: ["https://foo.bar", "http://not-foo.bar"],
},
{
description: "it should ignore an ingress if it has no hosts",
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this still show an entry for the Ingress in the AccessURLTable, though without any clickable links? I think we'd still want to show that an Ingress exists, but that the hosts are not correctly defined.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry, this test is misleading, hosts is not a valid field in an ingress so I am adding a test for the test code 😅

In any case, I have just realized two new cases: when an ingress has no rules and when a rule has no host. I am adding test cases for those. For the first it should return an error, for the second we should catch the host as a wildcard (not undefined).

hosts: undefined,
paths: [],
tlsHosts: ["foo.bar"],
expectedURLs: [],
},
{
description: "it should ignore paths if undefined",
hosts: ["foo.bar"],
paths: undefined,
tlsHosts: [],
expectedURLs: ["http://foo.bar"],
},
{
description: "it should ignore TLS if the hosts are undefined",
hosts: ["foo.bar"],
paths: [],
tlsHosts: undefined,
expectedURLs: ["http://foo.bar"],
},
];
tests.forEach(test => {
it(test.description, () => {
Expand All @@ -49,19 +70,21 @@ describe("GetURLItemFromIngress", () => {
rules: [],
} as IIngressSpec,
} as IResource;
test.hosts.forEach(h => {
const rule = {
host: h,
http: {
paths: [],
},
} as IIngressRule;
if (test.paths.length > 0) {
rule.http.paths = test.paths;
}
ingress.spec.rules.push(rule);
});
if (test.tlsHosts.length > 0) {
if (test.hosts) {
test.hosts.forEach(h => {
const rule = {
host: h,
http: {
paths: [],
},
} as IIngressRule;
if (test.paths && test.paths.length > 0) {
rule.http.paths = test.paths;
}
ingress.spec.rules.push(rule);
});
}
if (test.tlsHosts && test.tlsHosts.length > 0) {
ingress.spec.tls = [
{
hosts: test.tlsHosts,
Expand Down
22 changes: 12 additions & 10 deletions dashboard/src/components/AppView/AccessURLTable/AccessURLItem/AccessURLIngressHelper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ import { IURLItem } from "./IURLItem";
function URLs(ingress: IResource): string[] {
const spec = ingress.spec as IIngressSpec;
const res: string[] = [];
spec.rules.forEach(r => {
if (r.http.paths.length > 0) {
r.http.paths.forEach(p => {
res.push(getURL(r.host, spec.tls, p.path));
});
} else {
res.push(getURL(r.host, spec.tls));
}
});
if (spec.rules) {
spec.rules.forEach(r => {
if (r.http && r.http.paths.length > 0) {
r.http.paths.forEach(p => {
res.push(getURL(r.host, spec.tls, p.path));
});
} else {
res.push(getURL(r.host, spec.tls));
}
});
}
return res;
}

Expand All @@ -23,7 +25,7 @@ function getURL(hostname: string, tls?: IIngressTLS[], path?: string) {
const protocol =
tls &&
tls.some(tlsRule => {
return tlsRule.hosts.indexOf(hostname) > -1;
return tlsRule.hosts && tlsRule.hosts.indexOf(hostname) > -1;
})
? "https"
: "http";
Expand Down