eks works

Signed-off-by: ivan katliarchuk <[email protected]>

Author: ivankatliarchuk

with-tests/eks/readme.md

@@ -1,7 +1,7 @@
 
 - [Cluster Versioning](https://docs.aws.amazon.com/id_id/cli/latest/reference/eks/describe-cluster-versions.html)
 - [Describe Versions](https://docs.aws.amazon.com/eks/latest/APIReference/API_DescribeClusterVersions.html)
-
+- [Example Syntax](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/eks/command/DescribeClusterVersionsCommand/)
 
 ## Commands
 
@@ -17,3 +17,8 @@ pnpm start
 ```json
 
 ```
+
+Error
+```sh
+AccessDeniedException: User: arn:aws:sts::048958980748:assumed-role/AWSReservedSSO_PaasLimited_1e6f3b4b8eedd01d/[email protected] is not authorized to perform: eks:DescribeClusterVersions on resource: arn:aws:eks:eu-west-1:048958980748:*
+```

with-tests/eks/src/app.ts

@@ -7,7 +7,7 @@ import {
 
 import type { GetReleasesConfig, ReleaseResult } from './utils/types';
 
-import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+// import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
 
 import { EksFilter } from './schema';
 import { logger } from './utils/logger';
@@ -16,30 +16,30 @@ import { ClusterVersionInformation } from '@aws-sdk/client-eks/dist-types/models
 
 export class AwsEKSDataSource {
 
-  private readonly clients: Record<string, EKSClient> = {};
+  // private readonly clients: Record<string, EKSClient> = {};
 
   async getReleases({
     packageName: serializedFilter
   }: GetReleasesConfig): Promise<ReleaseResult | null> {
     const res = EksFilter.safeParse(serializedFilter);
     if (!res.success) {
+      console.log("UPS ERROR")
       logger.debug(
         { err: res.error, serializedFilter },
         'Error parsing eks-addons config.',
       );
       return null
     }
 
-    const filter = res.data;
-
     const input: DescribeClusterVersionsCommandInput = {
-      defaultOnly: false,
-      includeAll: true,
-      maxResults: 1,
+      defaultOnly: res.data.default ?? undefined,
+      includeAll: res.data?.default === undefined ? true : undefined,
     };
+    console.log(input)
     const cmd = new DescribeClusterVersionsCommand(input)
-    const response: DescribeClusterVersionsCommandOutput = await this.getClient(filter).send(cmd)
+    const response: DescribeClusterVersionsCommandOutput = await this.getClientS().send(cmd)
     const addons: ClusterVersionInformation[] = response.clusterVersions ?? [];
+    // console.log(addons)
     const result = {
       releases: addons
         .filter((info): info is ClusterVersionInformation & { clusterVersion: string } =>
@@ -50,7 +50,7 @@ export class AwsEKSDataSource {
           status: info.status,
         }))
     }
-    console.log(addons)
+    // console.log(addons)
     return result
     // return {
     //   releases: addons
@@ -73,23 +73,30 @@ export class AwsEKSDataSource {
     // };
   }
 
-  private getClient({ region, profile }: EksFilter): EKSClient {
-    const cacheKey = `${region ?? 'default'}#${profile ?? 'default'}`;
-    if (!(cacheKey in this.clients)) {
-      this.clients[cacheKey] = new EKSClient({
-        region: region ?? undefined,
-        credentials: fromNodeProviderChain(profile ? { profile: profile } : undefined)
-      })
-    }
-    return this.clients[cacheKey];
+  // private getClient({ region, profile }: EksFilter): EKSClient {
+  //   const cacheKey = `${region ?? 'default'}#${profile ?? 'default'}`;
+  //   if (!(cacheKey in this.clients)) {
+  //     this.clients[cacheKey] = new EKSClient({
+  //       region: region ?? undefined,
+  //       credentials: fromNodeProviderChain(profile ? { profile: profile } : undefined)
+  //     })
+  //   }
+  //   return this.clients[cacheKey];
+  // }
+
+  private getClientS(): EKSClient {
+    return new EKSClient()
   }
 }
 
 const eks = new AwsEKSDataSource()
 
 const input: readonly string[] = [
   '{}',
-  // '{"addonName":"amazon-cloudwatch-observability", "default":true}'
+  '{"default":true}',
+  '{"default":false}',
+  // '{"status":"standard-support", "default":true}',
+  // '{"status":"standard_support"}',
 ];
 
 input.forEach((el) => {

with-tests/eks/src/schema.ts

@@ -1,6 +1,8 @@
 import { type ZodEffects, type ZodString, z } from 'zod';
 import { Json } from './utils/schema-utils';
 
+// https://github.com/colinhacks/zod
+
 const stringIsBoolSchema: ZodEffects<ZodString, boolean, string> = z
   .string()
   .transform((value) => {
@@ -13,13 +15,10 @@ const stringIsBoolSchema: ZodEffects<ZodString, boolean, string> = z
     }
   });
 
-// declare const ClusterVersionStatus: {
-//   readonly extended_support: "extended-support";
-//   readonly standard_support: "standard-support";
-// };
-
 // added status
 
+// Only one of the defaultOnly, clusterVersions, includeAll or status request parameters is accepted at a time.
+// Only one of the defaultOnly, clusterVersions, includeAll or status request parameters is accepted at a time.
 export const EksFilterSchema = z.object({
   default: z.oboolean().or(stringIsBoolSchema),
   region: z.string().optional(),