Allow users to change the default k8s schema

Add a new notification to allow users to change the default Kubernetes schema on the fly.
redhat-developer · Mar 19, 2023 · c739bce · c739bce
1 parent c51b12c
commit c739bce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/src/languageserver/handlers/notificationHandlers.ts b/src/languageserver/handlers/notificationHandlers.ts
@@ -8,6 +8,7 @@ import { LanguageService, SchemaConfiguration } from '../../languageservice/yaml
 import {
   CustomSchemaRequest,
   DynamicCustomSchemaRequestRegistration,
+  KubernetesURLNotification,
   SchemaAssociationNotification,
   SchemaSelectionRequests,
   VSCodeContentRequestRegistration,
@@ -36,10 +37,15 @@ export class NotificationHandlers {
       this.schemaAssociationNotificationHandler(associations)
     );
     this.connection.onNotification(DynamicCustomSchemaRequestRegistration.type, () => this.dynamicSchemaRequestHandler());
+    this.connection.onNotification(KubernetesURLNotification.type, (url) => this.kubernetesURLNotification(url));
     this.connection.onNotification(VSCodeContentRequestRegistration.type, () => this.vscodeContentRequestHandler());
     this.connection.onNotification(SchemaSelectionRequests.type, () => this.schemaSelectionRequestHandler());
   }
 
+  private kubernetesURLNotification(url: string): void {
+    this.yamlSettings.kubernetesSchemaUrl = url;
+  }
+
   /**
    * Received a notification from the client with schema associations from other extensions
    * Update the associations in the server

diff --git a/src/languageserver/handlers/settingsHandlers.ts b/src/languageserver/handlers/settingsHandlers.ts
@@ -338,7 +338,7 @@ export class SettingsHandler {
       languageSettings.schemas.push({ uri, fileMatch: fileMatch, schema: schema, priority: priorityLevel });
     }
 
-    if (uri.normalize().includes('kubernetes')) {
+    if (uri === this.yamlSettings.kubernetesSchemaUrl) {
       if (fileMatch.constructor === Array) {
         fileMatch.forEach((url) => {
           this.yamlSettings.specificValidatorPaths.push(url);
@@ -347,7 +347,6 @@ export class SettingsHandler {
         this.yamlSettings.specificValidatorPaths.push(fileMatch);
       }
     }
-
     return languageSettings;
   }
-}
+}
diff --git a/src/requestTypes.ts b/src/requestTypes.ts
@@ -46,6 +46,10 @@ export namespace DynamicCustomSchemaRequestRegistration {
   export const type: NotificationType<{}> = new NotificationType('yaml/registerCustomSchemaRequest');
 }
 
+export namespace KubernetesURLNotification {
+  export const type: NotificationType<string> = new NotificationType('yaml/kubernetesURL');
+}
+
 export namespace VSCodeContentRequestRegistration {
   export const type: NotificationType<{}> = new NotificationType('yaml/registerContentRequest');
 }

diff --git a/src/yamlSettings.ts b/src/yamlSettings.ts
@@ -4,7 +4,7 @@ import { ISchemaAssociations } from './requestTypes';
 import { URI } from 'vscode-uri';
 import { JSONSchema } from './languageservice/jsonSchema';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { JSON_SCHEMASTORE_URL } from './languageservice/utils/schemaUrls';
+import { JSON_SCHEMASTORE_URL, KUBERNETES_SCHEMA_URL } from './languageservice/utils/schemaUrls';
 import { YamlVersion } from './languageservice/parser/yamlParser07';
 
 // Client settings interface to grab settings relevant for the language server
@@ -77,6 +77,7 @@ export class SettingsState {
   customTags = [];
   schemaStoreEnabled = true;
   schemaStoreUrl = JSON_SCHEMASTORE_URL;
+  kubernetesSchemaUrl = KUBERNETES_SCHEMA_URL;
   indentation: string | undefined = undefined;
   disableAdditionalProperties = false;
   disableDefaultProperties = false;