Skip to content

Commit

Permalink
Set defaults for EndpointSubsets (#3454)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nokel81 authored Jul 27, 2021
1 parent 270d9d6 commit f507ec9
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 20 deletions.
60 changes: 60 additions & 0 deletions src/renderer/api/__tests__/endpoint.api.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/**
* Copyright (c) 2021 OpenLens Authors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

import { EndpointSubset } from "../endpoints";

describe("endpoint tests", () => {
describe("EndpointSubset", () => {
it.each([
4,
false,
null,
{},
[],
"ahe",
/a/,
])("should always initialize fields when given %j", (data: any) => {
const sub = new EndpointSubset(data);

expect(sub.addresses).toStrictEqual([]);
expect(sub.notReadyAddresses).toStrictEqual([]);
expect(sub.ports).toStrictEqual([]);
});

it("toString should be addresses X ports", () => {
const sub = new EndpointSubset({
addresses: [{
ip: "1.1.1.1",
}, {
ip: "1.1.1.2",
}] as any,
notReadyAddresses: [],
ports: [{
port: "81",
}, {
port: "82",
}] as any,
});

expect(sub.toString()).toBe("1.1.1.1:81, 1.1.1.1:82, 1.1.1.2:81, 1.1.1.2:82");
});
});
});
37 changes: 17 additions & 20 deletions src/renderer/api/endpoints/endpoint.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { autoBind } from "../../utils";
import { KubeObject } from "../kube-object";
import { KubeApi } from "../kube-api";
import type { KubeJsonApiData } from "../kube-json-api";
import { get } from "lodash";

export interface IEndpointPort {
name?: string;
Expand Down Expand Up @@ -63,6 +64,10 @@ export class EndpointAddress implements IEndpointAddress {
resourceVersion: string;
};

static create(data: IEndpointAddress): EndpointAddress {
return new EndpointAddress(data);
}

constructor(data: IEndpointAddress) {
Object.assign(this, data);
}
Expand Down Expand Up @@ -90,35 +95,27 @@ export class EndpointSubset implements IEndpointSubset {
ports: IEndpointPort[];

constructor(data: IEndpointSubset) {
Object.assign(this, data);
this.addresses = get(data, "addresses", []);
this.notReadyAddresses = get(data, "notReadyAddresses", []);
this.ports = get(data, "ports", []);
}

getAddresses(): EndpointAddress[] {
const addresses = this.addresses || [];

return addresses.map(a => new EndpointAddress(a));
return this.addresses.map(EndpointAddress.create);
}

getNotReadyAddresses(): EndpointAddress[] {
const notReadyAddresses = this.notReadyAddresses || [];

return notReadyAddresses.map(a => new EndpointAddress(a));
return this.notReadyAddresses.map(EndpointAddress.create);
}

toString(): string {
if(!this.addresses) {
return "";
}

return this.addresses.map(address => {
if (!this.ports) {
return address.ip;
}

return this.ports.map(port => {
return `${address.ip}:${port.port}`;
}).join(", ");
}).join(", ");
return this.addresses
.map(address => (
this.ports
.map(port => `${address.ip}:${port.port}`)
.join(", ")
))
.join(", ");
}
}

Expand Down

0 comments on commit f507ec9

Please sign in to comment.