improve unified setup file

Author: williamlardier

tests/@setup/README.md

@@ -11,7 +11,6 @@ This tool replaces 22+ setup scripts scattered across Bash, Python, and TypeScri
 - **Mock Services**: AWS S3 (CloudServer) and Azure (Azurite) mock deployments
 - **Test Buckets**: Automated creation across AWS, Azure, and Ring providers
 - **Storage Locations**: Management API configuration for all storage backends
-- **Keycloak Setup**: Realm, users, and role configuration
 - **DNS Configuration**: CoreDNS rewrite rules for test domains
 - **RBAC Permissions**: Service account cluster-admin permissions
 
@@ -52,7 +51,7 @@ zenko-setup all --namespace=my-namespace --subdomain=test.local
 
 Skip specific components:
 ```bash
-zenko-setup all --skip-mocks --skip-keycloak
+zenko-setup all --skip-mocks
 ```
 
 ### Individual Components
@@ -68,9 +67,6 @@ zenko-setup buckets --provider=aws
 # Storage locations
 zenko-setup locations
 
-# Keycloak realm and users
-zenko-setup keycloak
-
 # DNS configuration
 zenko-setup dns
 

tests/@setup/package.json

@@ -23,16 +23,16 @@
   "author": "Scality",
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/client-iam": "^3.400.0",
-    "@aws-sdk/client-s3": "^3.400.0",
-    "@azure/storage-blob": "^12.15.0",
-    "@azure/storage-queue": "^12.15.0",
-    "@kubernetes/client-node": "^0.20.0",
-    "axios": "^1.5.0",
-    "commander": "^11.0.0",
-    "dotenv": "^16.3.1",
+    "@aws-sdk/client-iam": "^3.888.0",
+    "@aws-sdk/client-s3": "^3.888.0",
+    "@azure/storage-blob": "^12.28.0",
+    "@azure/storage-queue": "^12.27.0",
+    "@kubernetes/client-node": "^1.3.0",
+    "axios": "^1.12.2",
+    "commander": "^14.0.1",
+    "dotenv": "^17.2.2",
     "werelogs": "scality/werelogs#8.2.2",
-    "yaml": "^2.3.2"
+    "yaml": "^2.8.1"
   },
   "devDependencies": {
     "@eslint/compat": "^1.3.2",

tests/@setup/src/buckets.ts

@@ -30,14 +30,17 @@ async function setupAWSBuckets(k8s: KubernetesClient, options: BucketsOptions):
     logger.info('Creating AWS test buckets');
 
     // Get AWS credentials from mock service
-    const awsSecret = await k8s.coreApi.readNamespacedSecret('aws-mock-credentials', options.namespace);
+    const awsSecret = await k8s.coreApi.readNamespacedSecret({
+        name: 'aws-mock-credentials',
+        namespace: options.namespace,
+    });
     const awsConfig = {
         credentials: {
-        accessKeyId: Buffer.from(awsSecret.data!['aws-access-key-id'], 'base64').toString(),
-        secretAccessKey: Buffer.from(awsSecret.data!['aws-secret-access-key'], 'base64').toString()
-    },
-    region: Buffer.from(awsSecret.data!['aws-region'], 'base64').toString(),
-    endpoint: Buffer.from(awsSecret.data!['aws-endpoint'], 'base64').toString(),
+            accessKeyId: Buffer.from(awsSecret.data!['aws-access-key-id'], 'base64').toString(),
+            secretAccessKey: Buffer.from(awsSecret.data!['aws-secret-access-key'], 'base64').toString()
+        },
+        region: Buffer.from(awsSecret.data!['aws-region'], 'base64').toString(),
+        endpoint: Buffer.from(awsSecret.data!['aws-endpoint'], 'base64').toString(),
         forcePathStyle: true
     };
 
@@ -104,7 +107,10 @@ async function setupAzureBuckets(k8s: KubernetesClient, options: BucketsOptions)
     logger.info('Creating Azure test containers and queues');
 
     // Get Azure credentials from mock service
-    const azureSecret = await k8s.coreApi.readNamespacedSecret('azure-mock-credentials', options.namespace);
+    const azureSecret = await k8s.coreApi.readNamespacedSecret({
+        name: 'azure-mock-credentials',
+        namespace: options.namespace,
+    });
     const accountName = Buffer.from(azureSecret.data!['account-name'], 'base64').toString();
     const accountKey = Buffer.from(azureSecret.data!['account-key'], 'base64').toString();
     const blobEndpoint = Buffer.from(azureSecret.data!['blob-endpoint'], 'base64').toString();

tests/@setup/src/cli.ts

@@ -4,7 +4,6 @@ import { Command } from 'commander';
 import { setupMocks } from './mocks';
 import { setupBuckets } from './buckets';
 import { setupLocations } from './locations';
-import { setupKeycloak } from './keycloak';
 import { setupDNS } from './dns';
 import { setupRBAC } from './rbac';
 import { logger } from './utils/logger';
@@ -88,18 +87,6 @@ program
         });
     });
 
-program
-    .command('keycloak')
-    .description('Setup Keycloak realm, users, and roles')
-    .action(async () => {
-        const globalOptions = program.opts();
-        await setupKeycloak({
-            namespace: globalOptions.namespace || 'default',
-            instanceId: globalOptions.instanceId,
-            dryRun: globalOptions.dryRun,
-        });
-    });
-
 program
     .command('dns')
     .description('Configure CoreDNS for test domains')
@@ -125,7 +112,7 @@ program
 
 async function runSetup(options: any) {
     try {
-    logger.info('🚀 Starting Zenko test environment setup');
+        logger.info('🚀 Starting Zenko test environment setup');
 
         const tasks = [];
 
@@ -178,39 +165,29 @@ async function runSetup(options: any) {
             });
         }
 
-        if (options.keycloak) {
-            tasks.push({
-                name: 'Keycloak', fn: () => setupKeycloak({
-                    namespace: options.namespace || 'default',
-                    instanceId: options.instanceId,
-                    dryRun: options.dryRun,
-                })
-            });
-        }
-
         for (const task of tasks) {
-      logger.info(`📝 Setting up ${task.name}...`);
-      
-      if (options.dryRun) {
-        logger.info(`  [DRY RUN] Would execute ${task.name} setup`);
-        continue;
-      }
-      
-      try {
-        await task.fn();
-        logger.info(`  ✅ ${task.name} setup completed`);
-      } catch (error) {
-        logger.error(`  ❌ ${task.name} setup failed`, { error: error instanceof Error ? error.message : String(error) });
-        throw error;
-      }
+            logger.info(`📝 Setting up ${task.name}...`);
+
+            if (options.dryRun) {
+                logger.info(`  [DRY RUN] Would execute ${task.name} setup`);
+                continue;
+            }
+
+            try {
+                await task.fn();
+                logger.info(`  ✅ ${task.name} setup completed`);
+            } catch (error) {
+                logger.error(`  ❌ ${task.name} setup failed`, { error: error instanceof Error ? error.message : String(error) });
+                throw error;
+            }
         }
 
-    logger.info('🎉 Zenko test environment setup completed successfully!');
-    
-  } catch (error) {
-    logger.error('💥 Setup failed', { error: error instanceof Error ? error.message : String(error) });
-    process.exit(1);
-  }
+        logger.info('🎉 Zenko test environment setup completed successfully!');
+
+    } catch (error) {
+        logger.error('💥 Setup failed', { error: error instanceof Error ? error.message : String(error) });
+        process.exit(1);
+    }
 }
 
 program.parse();

tests/@setup/src/dns.ts

@@ -15,7 +15,10 @@ export async function setupDNS(options: DNSOptions): Promise<void> {
     // Get the current CoreDNS ConfigMap
     let coreDnsConfigMap;
     try {
-        coreDnsConfigMap = await k8s.coreApi.readNamespacedConfigMap('coredns', 'kube-system');
+        coreDnsConfigMap = await k8s.coreApi.readNamespacedConfigMap({
+            name: 'coredns',
+            namespace: 'kube-system',
+        });
     } catch (error: any) {
         if (error.response?.statusCode === 404) {
             logger.warn('CoreDNS ConfigMap not found, attempting to find alternative');
@@ -27,7 +30,10 @@ export async function setupDNS(options: DNSOptions): Promise<void> {
 
             for (const alt of alternatives) {
                 try {
-                    coreDnsConfigMap = await k8s.coreApi.readNamespacedConfigMap(alt.name, alt.namespace);
+                    coreDnsConfigMap = await k8s.coreApi.readNamespacedConfigMap({
+                        name: alt.name,
+                        namespace: alt.namespace,
+                    });
                     break;
                 } catch (e) {
                     continue;
@@ -61,14 +67,18 @@ export async function setupDNS(options: DNSOptions): Promise<void> {
 
     // Update the ConfigMap
     const updatedConfigMap = {
-        ...coreDnsConfigMap.body,
+        ...coreDnsConfigMap,
         data: {
             ...coreDnsConfigMap.data,
             'Corefile': newCorefile
         }
     };
 
-    await k8s.coreApi.replaceNamespacedConfigMap('coredns', 'kube-system', updatedConfigMap);
+    await k8s.coreApi.replaceNamespacedConfigMap({
+        name: 'coredns',
+        namespace: 'kube-system',
+        body: updatedConfigMap,
+    });
 
     // Restart CoreDNS deployment to pick up changes
     await restartCoreDNS(k8s);
@@ -176,15 +186,22 @@ function addRewriteRules(currentCorefile: string, rewriteRules: string, subdomai
 async function restartCoreDNS(k8s: KubernetesClient): Promise<void> {
     try {
         // Get CoreDNS deployment
-        const deployment = await k8s.appsApi.readNamespacedDeployment('coredns', 'kube-system');
+        const deployment = await k8s.appsApi.readNamespacedDeployment({
+            name: 'coredns',
+            namespace: 'kube-system',
+        });
 
         // Add/update restart annotation to trigger rolling restart
         const annotations = deployment.spec?.template.metadata?.annotations || {};
         annotations['kubectl.kubernetes.io/restartedAt'] = new Date().toISOString();
 
         deployment.spec!.template.metadata!.annotations = annotations;
 
-        await k8s.appsApi.replaceNamespacedDeployment('coredns', 'kube-system', deployment.body);
+        await k8s.appsApi.replaceNamespacedDeployment({
+            name: 'coredns',
+            namespace: 'kube-system',
+            body: deployment,
+        });
 
         logger.debug('CoreDNS deployment restart triggered');