go-duck-cli 1.3.38 → 1.3.41

package/generators/devops.js

@@ -13,7 +13,12 @@ export const generateDeploymentArtifacts = async (config, projectRootDir) => {
     await fs.ensureDir(keycloakDir);
     await fs.ensureDir(githubDir);
 
+    const toKebabCase = (str) => {
+        if (!str) return '';
+        return str.replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase();
+    };
     const appName = config.name || 'go-duck';
+    const k8sAppName = toKebabCase(appName);
     const parts = appName.split(/[-_]/);
     const shortName = (parts.length > 1 ? parts.map(w => w[0]).join('') : appName).substring(0, 10).toLowerCase() || 'goduck';
     const appPort = config.server?.rest?.port || 8080;
@@ -75,9 +80,11 @@ FROM gcr.io/distroless/static-debian12
 WORKDIR /app
 
 COPY --from=builder /app/server .
+
 COPY --from=builder /app/application.yml .
 COPY --from=builder /app/application-dev.yml .
 COPY --from=builder /app/application-prod.yml .
+COPY --from=builder /app/docs/ /app/docs/
 
 EXPOSE ${appPort}
 ENV GO_PROFILE=prod
@@ -468,21 +475,21 @@ echo "========================================="
     const k8sAppYaml = `apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: ${appName}
+  name: ${k8sAppName}
   labels:
-    app: ${appName}
+    app: ${k8sAppName}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: ${appName}
+      app: ${k8sAppName}
   template:
     metadata:
       labels:
-        app: ${appName}
+        app: ${k8sAppName}
     spec:
       containers:
-        - name: ${appName}
+        - name: ${k8sAppName}
           image: ${appName}:latest
           env:
             - name: GO_PROFILE
@@ -490,7 +497,7 @@ spec:
             - name: GO_DUCK_SERVER_REST_PORT
               value: "${appPort}"
             - name: GO_DUCK_DATASOURCE_HOST
-              value: postgres.${shortName}-postgres-k8s.svc.cluster.local
+              value: postgres.${k8sAppName}-postgres-k8s.svc.cluster.local
             - name: GO_DUCK_DATASOURCE_USERNAME
               value: "${config.datasource?.username || 'postgres'}"
             - name: GO_DUCK_DATASOURCE_PASSWORD
@@ -502,31 +509,31 @@ spec:
             - name: GO_DUCK_DATASOURCE_MONGODB_ENABLED
               value: "${config.datasource?.mongodb?.enabled ? 'true' : 'false'}"
             - name: GO_DUCK_DATASOURCE_MONGODB_URI
-              value: mongodb://mongodb.${shortName}-mongodb-k8s.svc.cluster.local:27017
+              value: mongodb://mongodb.${k8sAppName}-mongodb-k8s.svc.cluster.local:27017
             - name: GO_DUCK_DATASOURCE_MONGODB_DATABASE
               value: "${config.datasource?.mongodb?.database || 'goduck_document_store'}"
             - name: GO_DUCK_CACHE_REDIS_HOST
-              value: redis.${shortName}-redis-k8s.svc.cluster.local:6379
+              value: redis.${k8sAppName}-redis-k8s.svc.cluster.local:6379
             - name: GO_DUCK_CACHE_REDIS_PASSWORD
               value: "${config.cache?.redis?.password || ''}"
             - name: GO_DUCK_MESSAGING_MQTT_BROKER
-              value: tcp://mosquitto.${shortName}-mosquitto-k8s.svc.cluster.local:1883
+              value: tcp://mosquitto.${k8sAppName}-mosquitto-k8s.svc.cluster.local:1883
             - name: GO_DUCK_MESSAGING_MQTT_USERNAME
               value: "${config.messaging?.mqtt?.username || 'dev_user'}"
             - name: GO_DUCK_MESSAGING_MQTT_PASSWORD
               value: "${config.messaging?.mqtt?.password || 'dev_password'}"
             - name: GO_DUCK_MESSAGING_NATS_URL
-              value: nats://nats.${shortName}-nats-k8s.svc.cluster.local:4222
+              value: nats://nats.${k8sAppName}-nats-k8s.svc.cluster.local:4222
             - name: GO_DUCK_TELEMETRY_OTEL_ENDPOINT
-              value: otel-collector.${shortName}-otel-collector-k8s.svc.cluster.local:4317
+              value: otel-collector.${k8sAppName}-otel-collector-k8s.svc.cluster.local:4317
             - name: GO_DUCK_ELASTICSEARCH_ADDRESSES
-              value: http://elasticsearch.${shortName}-elasticsearch-k8s.svc.cluster.local:9200
+              value: http://elasticsearch.${k8sAppName}-elasticsearch-k8s.svc.cluster.local:9200
             - name: GO_DUCK_ELASTICSEARCH_USERNAME
               value: "${config.elasticsearch?.username || 'elastic'}"
             - name: GO_DUCK_ELASTICSEARCH_PASSWORD
               value: "${config.elasticsearch?.password || 'changeme'}"
             - name: GO_DUCK_SECURITY_KEYCLOAK_HOST
-              value: http://keycloak.${shortName}-keycloak-k8s.svc.cluster.local:8080
+              value: http://keycloak.${k8sAppName}-keycloak-k8s.svc.cluster.local:8080
             - name: GO_DUCK_SECURITY_KEYCLOAK_REALM
               value: "${config.security?.['keycloak-realm'] || 'go-duck-realm'}"
             - name: GO_DUCK_SECURITY_KEYCLOAK_APP_CLIENT_ID
@@ -536,7 +543,7 @@ spec:
             - name: GO_DUCK_SECURITY_KEYCLOAK_SERVICE_SECRET
               value: "${config.security?.['keycloak-service-secret'] || 'service-secret-123'}"
             - name: GO_DUCK_STORAGE_MINIO_ENDPOINT
-              value: "http://minio.${shortName}-minio-k8s.svc.cluster.local:9000"
+              value: "http://minio.${k8sAppName}-minio-k8s.svc.cluster.local:9000"
             - name: GO_DUCK_STORAGE_MINIO_ACCESS_KEY
               value: "${config.storage?.minio?.['access-key'] || 'minioadmin'}"
             - name: GO_DUCK_STORAGE_MINIO_SECRET_KEY
@@ -550,7 +557,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: ${appName}
+  name: ${k8sAppName}
 spec:
   type: NodePort
   ports:
@@ -563,7 +570,7 @@ spec:
       targetPort: grpc
       nodePort: 30090
   selector:
-    app: ${appName}
+    app: ${k8sAppName}
 `;
 
     const k8sPostgresYaml = `apiVersion: v1
@@ -1001,7 +1008,7 @@ spec:
     await fs.writeFile(path.join(k8sDir, 'mosquitto.conf'), mosquittoConf);
     // Namespace calculation: unique namespace per service
     const applyNs = (yamlString, serviceName) => {
-        const nsName = `${shortName}-${serviceName}-k8s`;
+        const nsName = `${k8sAppName}-${serviceName}-k8s`;
         const nsBlock = `apiVersion: v1\nkind: Namespace\nmetadata:\n  name: ${nsName}\n---\n`;
         return nsBlock + yamlString.replace(/^metadata:$/gm, `metadata:\n  namespace: ${nsName}`);
     };
@@ -1012,7 +1019,7 @@ spec:
     // We conditionally add minio if storage is enabled (or any blob provider), but for safety we'll just generate its namespace always.
     servicesList.push('minio');
 
-    const k8sNamespaceYaml = servicesList.map(svc => `apiVersion: v1\nkind: Namespace\nmetadata:\n  name: ${shortName}-${svc}-k8s`).join('\n---\n');
+    const k8sNamespaceYaml = servicesList.map(svc => `apiVersion: v1\nkind: Namespace\nmetadata:\n  name: ${k8sAppName}-${svc}-k8s`).join('\n---\n');
 
     await fs.writeFile(path.join(k8sDir, 'namespace.yaml'), k8sNamespaceYaml);
 

package/generators/swagger.js

@@ -17,7 +17,7 @@ export const generateSwaggerDocs = async (config, entities, outputDir, openEntit
             description: `Generated documentation for ${config.name} microservice`
         },
         servers: [
-            { url: `http://localhost:${config.server?.rest?.port || 8080}`, description: 'Local Development Server' }
+            { url: "/", description: "Current Host" }
         ],
         paths: {},
         components: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-duck-cli",
-  "version": "1.3.38",
+  "version": "1.3.41",
   "description": "The Ultimate Evolutionary Go Microservice Scaffolder.",
   "main": "index.js",
   "type": "module",