From e46bbc2ac7d0dec08b873922697135edba45bebe Mon Sep 17 00:00:00 2001
From: Paul Richardson
Date: Sat, 5 Oct 2024 19:15:12 +0100
Subject: [PATCH] chore: fix format errors from eslint upgrade
---
docker/gateway/src/gateway-api.test.ts | 5 ++---
.../gateway/src/jolokia-agent/jolokia-agent.test.ts | 5 ++---
packages/kubernetes-api/src/client/object-list.ts | 6 ++++--
packages/kubernetes-api/src/client/ws-handler.ts | 9 ++++++---
packages/kubernetes-api/src/helpers.ts | 11 ++++++++++-
packages/oauth/src/form/form-service.ts | 3 ++-
.../oauth/src/form/login/form-auth-login-service.ts | 3 ++-
packages/online-shell/src/discover/context.ts | 3 ++-
8 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/docker/gateway/src/gateway-api.test.ts b/docker/gateway/src/gateway-api.test.ts
index 2e8d9f6a..94dfa141 100644
--- a/docker/gateway/src/gateway-api.test.ts
+++ b/docker/gateway/src/gateway-api.test.ts
@@ -253,7 +253,7 @@ function appPost(uri: string, body: Record | Record {
const testAuth = rbac ? 'RBAC Enabled' : 'RBAC Disabled'
@@ -423,8 +423,7 @@ describe.each([
return appPost(path, testData.jolokia.bulkRequestWithViewerRole.request)
.expect(expectedStatus)
.then(res => {
- if (rbac)
- expect(res.text).toStrictEqual(JSON.stringify(testData.jolokia.bulkRequestWithViewerRole.response))
+ if (rbac) expect(res.text).toStrictEqual(JSON.stringify(testData.jolokia.bulkRequestWithViewerRole.response))
else expect(res.text).toStrictEqual(JSON.stringify(testData.authorization.notAllowedResponse))
})
})
diff --git a/docker/gateway/src/jolokia-agent/jolokia-agent.test.ts b/docker/gateway/src/jolokia-agent/jolokia-agent.test.ts
index 266ed952..4b36b886 100644
--- a/docker/gateway/src/jolokia-agent/jolokia-agent.test.ts
+++ b/docker/gateway/src/jolokia-agent/jolokia-agent.test.ts
@@ -193,7 +193,7 @@ function appPost(uri: string, body: Record | Record {
const testAuth = rbac ? 'RBAC Enabled' : 'RBAC Disabled'
@@ -363,8 +363,7 @@ describe.each([
return appPost(path, testData.jolokia.bulkRequestWithViewerRole.request)
.expect(expectedStatus)
.then(res => {
- if (rbac)
- expect(res.text).toStrictEqual(JSON.stringify(testData.jolokia.bulkRequestWithViewerRole.response))
+ if (rbac) expect(res.text).toStrictEqual(JSON.stringify(testData.jolokia.bulkRequestWithViewerRole.response))
else expect(res.text).toStrictEqual(JSON.stringify(testData.authorization.notAllowedResponse))
})
})
diff --git a/packages/kubernetes-api/src/client/object-list.ts b/packages/kubernetes-api/src/client/object-list.ts
index 7ce459c3..d602148c 100644
--- a/packages/kubernetes-api/src/client/object-list.ts
+++ b/packages/kubernetes-api/src/client/object-list.ts
@@ -35,11 +35,13 @@ export class ObjectListImpl extends EventEmitter implement
this.on(WatchActions.ANY, objects => {
log.debug(this.kind, 'changed:', objects)
})
- this.on(WatchActions.INIT, objects => { // eslint-disable-line
+ this.on(WatchActions.INIT, objects => {
+ // eslint-disable-line
log.debug(this.kind, 'initialized')
})
}
- this.on(WatchActions.ANY, objects => { // eslint-disable-line
+ this.on(WatchActions.ANY, objects => {
+ // eslint-disable-line
this.initialize()
})
}
diff --git a/packages/kubernetes-api/src/client/ws-handler.ts b/packages/kubernetes-api/src/client/ws-handler.ts
index a1472f5b..4cf934e1 100644
--- a/packages/kubernetes-api/src/client/ws-handler.ts
+++ b/packages/kubernetes-api/src/client/ws-handler.ts
@@ -100,7 +100,8 @@ export class WSHandlerImpl implements WSHandler {
if (this.socket) this.socket.send(data)
}
- shouldClose(event: Event): boolean { // eslint-disable-line
+ shouldClose(event: Event): boolean {
+ // eslint-disable-line
if (this.destroyed && this.socket && this.socket.readyState === WebSocket.OPEN) {
log.debug(
'Connection destroyed but still receiving messages, closing websocket, kind:',
@@ -111,7 +112,8 @@ export class WSHandlerImpl implements WSHandler {
try {
log.debug('Closing websocket for kind:', this.watched.kind)
this.socket.close()
- } catch (err) { // eslint-disable-line
+ } catch (err) {
+ // eslint-disable-line
// nothing to do, assume it's already closed
}
return true
@@ -267,7 +269,8 @@ export class WSHandlerImpl implements WSHandler {
log.debug('Closing websocket for kind:', this.watched.kind, 'namespace:', this.watched.namespace)
this.socket.close()
log.debug('Close called on websocket for kind:', this.watched.kind, 'namespace:', this.watched.namespace)
- } catch (err) { // eslint-disable-line
+ } catch (err) {
+ // eslint-disable-line
// nothing to do, assume it's already closed
}
}
diff --git a/packages/kubernetes-api/src/helpers.ts b/packages/kubernetes-api/src/helpers.ts
index b83b3b25..5bbe37df 100644
--- a/packages/kubernetes-api/src/helpers.ts
+++ b/packages/kubernetes-api/src/helpers.ts
@@ -1,4 +1,13 @@
-import { KubeObject, KubePod, K8S_PREFIX, K8S_API_VERSION, K8S_EXT_PREFIX, K8S_EXT_VERSION, OS_PREFIX, OS_API_VERSION } from './globals'
+import {
+ KubeObject,
+ KubePod,
+ K8S_PREFIX,
+ K8S_API_VERSION,
+ K8S_EXT_PREFIX,
+ K8S_EXT_VERSION,
+ OS_PREFIX,
+ OS_API_VERSION,
+} from './globals'
import { PodStatus } from 'kubernetes-types/core/v1'
import { WatchTypes, NamespacedTypes, ExtensionTypes, KindTypes } from './model'
import { joinPaths } from './utils/urls'
diff --git a/packages/oauth/src/form/form-service.ts b/packages/oauth/src/form/form-service.ts
index 30bc53ac..23080df8 100644
--- a/packages/oauth/src/form/form-service.ts
+++ b/packages/oauth/src/form/form-service.ts
@@ -150,7 +150,8 @@ export class FormService implements OAuthProtoService {
}
log.debug('Set authorization header to Openshift auth token for AJAX requests')
- const beforeSend = (xhr: JQueryXHR, settings: JQueryAjaxSettings) => { // eslint-disable-line
+ const beforeSend = (xhr: JQueryXHR, settings: JQueryAjaxSettings) => {
+ // eslint-disable-line
// Set bearer token is used
xhr.setRequestHeader('Authorization', `Bearer ${this.userProfile.getToken()}`)
diff --git a/packages/oauth/src/form/login/form-auth-login-service.ts b/packages/oauth/src/form/login/form-auth-login-service.ts
index 496271cd..f8dfca65 100644
--- a/packages/oauth/src/form/login/form-auth-login-service.ts
+++ b/packages/oauth/src/form/login/form-auth-login-service.ts
@@ -42,7 +42,8 @@ class FormAuthLoginService {
fetchPath(
joinPaths(masterUri, 'api'),
{
- success: async (_: string) => { // eslint-disable-line
+ success: async (_: string) => {
+ // eslint-disable-line
log.debug('Connected to master uri api')
callback.success()
await this.saveTokenAndRedirect(token)
diff --git a/packages/online-shell/src/discover/context.ts b/packages/online-shell/src/discover/context.ts
index 6c862987..d157996f 100644
--- a/packages/online-shell/src/discover/context.ts
+++ b/packages/online-shell/src/discover/context.ts
@@ -92,7 +92,8 @@ type DiscoverContext = {
export const DiscoverContext = createContext({
refreshing: false,
- setRefreshing: (refresh: boolean) => { // eslint-disable-line
+ setRefreshing: (refresh: boolean) => {
+ // eslint-disable-line
// no-op
},
discoverProjects: [],