Switch HTTP methods to uppercase

Just for consistency... lowercase wasn't helping anything

Author: danopia

common.ts

@@ -1,13 +1,13 @@
 // The API contract that all generated code expects
 
 export type HttpMethods =
-  | "get"
-  | "post"
-  | "delete"
-  | "put"
-  | "patch"
-  | "options"
-  | "head";
+  | "GET"
+  | "POST"
+  | "DELETE"
+  | "PUT"
+  | "PATCH"
+  | "OPTIONS"
+  | "HEAD";
 
 export interface RequestOptions {
   method: HttpMethods;

demo.ts

@@ -8,15 +8,15 @@ querystring.set('limit', '1');
 
 // Grab a normal JSON resource
 console.log(await client.performRequest({
-  method: 'get',
+  method: 'GET',
   path: `/api/v1/namespaces/default/endpoints`,
   expectJson: true,
   querystring,
 }));
 
 // Stream multiple JSON objects for a Watch operation
 for await (const line of await client.performRequest({
-  method: 'get',
+  method: 'GET',
   path: `/api/v1/namespaces/default/endpoints`,
   expectStream: true,
   expectJson: true,
@@ -30,7 +30,7 @@ for await (const line of await client.performRequest({
 
 // Stream plaintext log lines from a pod
 for await (const line of await client.performRequest({
-  method: 'get',
+  method: 'GET',
   path: `/api/v1/namespaces/default/pods/lambdabot-0/log`,
   expectStream: true,
   querystring: new URLSearchParams({

transports/unstable/via-incluster-unstable.ts

@@ -1,4 +1,5 @@
 import { RestClient, HttpMethods, RequestOptions } from '../../common.ts';
+import { JsonParsingTransformer, ReadLineTransformer } from "../../stream-transformers.ts";
 
 function join(...args: string[]) {
   return args.join('/');
@@ -22,7 +23,7 @@ function join(...args: string[]) {
 export class InClusterUnstableRestClient implements RestClient {
   readonly baseUrl: string;
   readonly secretsPath: string;
-  readonly namespace: string;
+  readonly defaultNamespace: string;
   readonly #httpClient: Deno.HttpClient;
   readonly #token: string;
 
@@ -33,34 +34,43 @@ export class InClusterUnstableRestClient implements RestClient {
     this.baseUrl = baseUrl;
     this.secretsPath = secretsPath;
 
-    this.namespace = Deno.readTextFileSync(join(secretsPath, 'namespace'));
+    this.defaultNamespace = Deno.readTextFileSync(join(secretsPath, 'namespace'));
     this.#httpClient = Deno.createHttpClient({ caFile: join(secretsPath, `ca.crt`) });
     this.#token = Deno.readTextFileSync(join(secretsPath, 'token'));
   }
 
-  async performRequest(method: HttpMethods, opts: RequestOptions={}): Promise<any> {
+  async performRequest(opts: RequestOptions): Promise<any> {
     let path = opts.path || '/';
     if (opts.querystring) {
       path += `?${opts.querystring}`;
     }
-    console.error(method.toUpperCase(), path);
+    console.error(opts.method, path);
 
     const resp = await fetch(this.baseUrl + path, {
-      method: method,
-      body: opts.bodyStream ?? JSON.stringify(opts.body),
+      method: opts.method,
+      body: opts.bodyStream ?? opts.bodyRaw ?? JSON.stringify(opts.bodyJson),
       redirect: 'error',
       signal: opts.abortSignal,
       headers: {
         'Authorization': `Bearer ${this.#token}`,
-        'Accept': opts.accept ?? 'application/octet-stream',
+        'Accept': opts.accept ?? (opts.expectJson ? 'application/json' : 'application/octet-stream'),
       },
       client: this.#httpClient,
     });
 
-    if (opts.streaming) {
-      return resp.body;
-    } else if (opts.accept === 'application/json') {
+    if (opts.expectStream) {
+      if (!resp.body) return new ReadableStream();
+      if (opts.expectJson) {
+        return resp.body
+          .pipeThrough(new ReadLineTransformer('utf-8'))
+          .pipeThrough(new JsonParsingTransformer());
+      } else {
+        return resp.body;
+      }
+
+    } else if (opts.expectJson) {
       return resp.json();
+
     } else {
       return new Uint8Array(await resp.arrayBuffer());
     }

transports/unstable/via-kubeconfig.ts

@@ -29,10 +29,10 @@ import { RestClient, HttpMethods, RequestOptions } from '../../common.ts';
 
 export class KubeConfigRestClient implements RestClient {
   constructor(kubeConfig: KubeConfig, httpClient: Deno.HttpClient, namespace?: string) {
-    this.namespace = namespace;
+    this.defaultNamespace = namespace;
     throw new Error(`TODO: implement :)`);
   }
-  namespace?: string;
+  defaultNamespace?: string;
 
   static async fromKubeConfig(path?: string): Promise<KubeConfigRestClient> {
 
@@ -53,12 +53,12 @@ export class KubeConfigRestClient implements RestClient {
   }
 
 
-  async performRequest(method: HttpMethods, opts: RequestOptions={}): Promise<any> {
+  async performRequest(opts: RequestOptions): Promise<any> {
     let path = opts.path || '/';
     if (opts.querystring) {
       path += `?${opts.querystring}`;
     }
-    console.error(method.toUpperCase(), path);
+    console.error(opts.method, path);
 
     throw new Error(`TODO: implement`);
   }

transports/via-incluster.ts

@@ -39,7 +39,7 @@ export class InClusterRestClient implements RestClient {
     if (opts.querystring) {
       path += `?${opts.querystring}`;
     }
-    console.error(opts.method.toUpperCase(), path);
+    console.error(opts.method, path);
 
     const resp = await fetch(this.baseUrl + path, {
       method: opts.method,

transports/via-kubectl-raw.ts

@@ -23,15 +23,15 @@ export class KubectlRawRestClient implements RestClient {
 
   async performRequest(opts: RequestOptions): Promise<any> {
     const command = {
-      get: 'get',
-      post: 'create',
-      delete: 'delete',
-      put: 'replace',
-      patch: '',
-      options: '',
-      head: '',
+      GET: 'get',
+      POST: 'create',
+      DELETE: 'delete',
+      PUT: 'replace',
+      PATCH: '',
+      OPTIONS: '',
+      HEAD: '',
     }[opts.method];
-    if (!command) throw new Error(`KubectlRawRestClient cannot perform HTTP ${opts.method.toUpperCase()}`);
+    if (!command) throw new Error(`KubectlRawRestClient cannot perform HTTP ${opts.method}`);
 
     if (opts.abortSignal?.aborted) throw new Error(`Given AbortSignal is already aborted`);
 
@@ -42,7 +42,7 @@ export class KubectlRawRestClient implements RestClient {
     }
 
     const hasReqBody = opts.bodyJson !== undefined || !!opts.bodyRaw || !!opts.bodyStream;
-    console.error(opts.method.toUpperCase(), path, hasReqBody ? '(w/ body)' : '');
+    console.error(opts.method, path, hasReqBody ? '(w/ body)' : '');
 
     const p = Deno.run({
       cmd: ["kubectl", command, ...(hasReqBody ? ['-f', '-'] : []), "--raw", path],