generator-codedesignplus 0.4.0 → 0.6.0-beta.12

package/generators/microservice/core/appsettings.mjs

@@ -1,3 +1,5 @@
+import { randomUUID } from 'crypto';
+import { glob } from 'glob';
 import path from 'path';
 
 export default class AppSettingsGenerator {
@@ -10,42 +12,65 @@ export default class AppSettingsGenerator {
 
     async generate(options, sources = []) {
 
-        if(sources.length === 0) {
+        if (sources.length === 0) {
             sources = [
-                options.paths.src.rest,
-                options.paths.src.grpc,
-                options.paths.src.asyncWorker
+                options.paths.src.rest
             ];
+
+            if (options.enableGrpc)
+                sources.push(options.paths.src.grpc);
+
+            if (options.enableAsyncWorker)
+                sources.push(options.paths.src.asyncWorker);
         }
 
         const destination = this._generator.destinationPath();
 
         sources.forEach(source => {
 
-            const appSettingsFile = path.join(destination, source, 'appsettings.json');
-
-            const json = this._generator.fs.readJSON(appSettingsFile, {});
-
-            json.Core.AppName = options.appSettings.appName;
-            json.Core.Description = options.appSettings.description;
-            json.Core.Business = options.appSettings.business;
-            json.Core.Contact.Name = options.appSettings.contact.name;
-            json.Core.Contact.Email = options.appSettings.contact.email;
-            json.Vault.Solution = options.appSettings.vault;
-            json.Vault.AppName = options.appSettings.appName;
-            json.Mongo.Database = options.appSettings.database;
-
-            this._generator.fs.writeJSON(appSettingsFile, json);
+            const files = glob.sync('appsettings.*', { dot: true, nodir: true, cwd: path.join(destination, source) });
+
+            files.forEach(file => {
+
+                const appSettingsFile = path.join(destination, source, file);
+
+                const json = this._generator.fs.readJSON(appSettingsFile, {});
+
+                if (json.Core) {
+                    if (json.Core.Id)
+                        json.Core.Id = randomUUID().toString();
+                    if (json.Core.AppName)
+                        json.Core.AppName = options.appSettings.appName;
+                    if (json.Core.Description)
+                        json.Core.Description = options.appSettings.description;
+                    if (json.Core.Business)
+                        json.Core.Business = options.appSettings.business;
+                    if (json.Core.Contact?.Name)
+                        json.Core.Contact.Name = options.appSettings.contact.name;
+                    if (json.Core.Contact?.Email)
+                        json.Core.Contact.Email = options.appSettings.contact.email;
+                }
+                if (json.Vault) {
+                    json.Vault.Solution = options.appSettings.vault;
+                    json.Vault.AppName = options.appSettings.appName;
+                }
+                if (json.Mongo) {
+                    json.Mongo.Database = options.appSettings.database;
+                }
+
+                this._generator.fs.writeJSON(appSettingsFile, json);
+
+            });
         });
 
         try {
-            this._updateConfigVault(path.join('tools', 'vault','config-vault.ps1'), options);
-            this._updateConfigVault(path.join('tools', 'vault','config-vault.sh'), options);
+            this._updateConfigVault(path.join('tools', 'vault', 'config-vault.ps1'), options);
+            this._updateConfigVault(path.join('tools', 'vault', 'config-vault.sh'), options);
             this._updateReadme(options);
         } catch (error) {
             console.log('The vault configuration could not be updated.');
             console.log(error);
-        }    
+        }
     }
 
     _updateConfigVault(file, options) {

package/generators/microservice/core/grpc.mjs

@@ -59,8 +59,6 @@ export default class GrpcGenerator {
         
         const files = glob.sync('**', { dot: true, nodir: true, cwd: templateGrpcProject, ignore: ignores });
 
-        console.log(templateGrpcProject, files);
-
         await this._utils.generateFiles(options, options.solution, templateGrpcProject, grpcProjectPathDestination, files);
 
         await this._appsettings.generate(options, [options.paths.src.grpc]);

package/generators/microservice/core/utils.mjs

@@ -164,6 +164,7 @@ export default class Utils {
             [/global using CodeDesignPlus\.Net\.Microservice\.Application\.Order\.Queries\.GetAllOrders;/g, ''],
             [/app\.MapGrpcService<OrdersService>\(\)/g, `app.MapGrpcService<${options.proto?.name}Service>()`],
             [/Order/g, options.aggregate.name],
+            [/ms-archetype/g, `${options.appSettings.appName}`],
             ...transformations
         ]
     }
@@ -178,6 +179,7 @@ export default class Utils {
                 .replace(/CodeDesignPlus\.Net\.Microservice/g, namespace)
                 .replace(/Order/g, options.microservice)
                 .replace(/orders.proto/g, options.proto?.file)
+                .replace(/ms-archetype/g, `${options.appSettings.appName }`)
             );
 
             const content = await fs.readFile(src, { encoding: 'utf-8' });

package/generators/microservice/templates/microservice/.github/workflows/ca.yaml

@@ -0,0 +1,51 @@
+name: Continuous DeploymentAdd commentMore actions
+
+on: 
+  workflow_dispatch:
+    inputs:
+      environment:
+        type: choice
+        description: Select the environment to deploy to
+        default: Staging
+        options: 
+        - Staging
+        - Production
+ 
+permissions:
+  contents: write
+  packages: write
+  repository-projects: write
+  id-token: write
+
+jobs:
+
+  version:
+    uses: codedesignplus/workflows/.github/workflows/release.yaml@main
+    with:
+      project-name: CodeDesignPlus.Net.Microservice
+      microservice-name: ms-archetype
+      environment: ${{ github.event.inputs.environment }}
+    secrets: inherit
+
+  container:
+    needs: version
+    if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/dev' }}
+    uses: codedesignplus/workflows/.github/workflows/container-image.yaml@main
+    with:
+      project-name: CodeDesignPlus.Net.Microservice
+      microservice-name: ms-archetype
+      environment: ${{ github.event.inputs.environment }}
+    secrets: inherit
+  
+  deploy:
+    needs: container
+    if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/dev' }}
+    uses: codedesignplus/workflows/.github/workflows/deploy-self-host.yaml@main
+    with:
+      project-name: CodeDesignPlus.Net.Microservice
+      microservice-name: ms-archetype
+      enable-rest: true
+      enable-grpc: true
+      enable-worker: true
+      environment: ${{ github.event.inputs.environment }}
+    secrets: inherit

package/generators/microservice/templates/microservice/.github/workflows/ci.yaml

@@ -0,0 +1,33 @@
+name: Continuous IntegrationAdd commentMore actions
+
+on: 
+  push:
+    branches:
+      - main
+      - rc
+      - dev
+      - feature/*  
+ 
+permissions:
+  contents: write
+  packages: write
+  repository-projects: write
+
+jobs:
+  build:
+    uses: codedesignplus/workflows/.github/workflows/build-microservice.yaml@main
+    with:
+      project-name: CodeDesignPlus.Net.Microservice
+      microservice-name: ms-archetype
+      environment: Development
+    secrets: inherit
+  
+  sonarqube:
+    needs: build
+    if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/dev' }}
+    uses: codedesignplus/workflows/.github/workflows/sonarqube.yaml@main
+    with:
+      project-name: CodeDesignPlus.Net.Microservice
+      microservice-name: ms-archetype
+      environment: Development
+    secrets: inherit

package/generators/microservice/templates/microservice/CodeDesignPlus.Net.Microservice.sln

@@ -52,15 +52,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeDesignPlus.Net.Microser
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeDesignPlus.Net.Microservice.Rest.Test", "tests\unit\CodeDesignPlus.Net.Microservice.Rest.Test\CodeDesignPlus.Net.Microservice.Rest.Test.csproj", "{86BB4D11-6C2F-44CA-B7DF-527FDFE79959}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{9C6578E7-E4FE-79BB-1635-F363CC1E80DD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{E7A3C856-6834-D657-F2F0-05592DF2DDE9}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\ci.yml = .github\workflows\ci.yml
-		.github\workflows\chart.yaml = .github\workflows\chart.yaml
-		.github\workflows\build.yml = .github\workflows\build.yml
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -157,7 +148,6 @@ Global
 		{223DF4AA-8E95-4624-B439-EA232409E903} = {5769C6DB-68E8-4A8C-B43A-243401CDB4A2}
 		{B190F800-89F0-43CD-B9BD-3EDD0C2E4B37} = {5769C6DB-68E8-4A8C-B43A-243401CDB4A2}
 		{86BB4D11-6C2F-44CA-B7DF-527FDFE79959} = {5769C6DB-68E8-4A8C-B43A-243401CDB4A2}
-		{E7A3C856-6834-D657-F2F0-05592DF2DDE9} = {9C6578E7-E4FE-79BB-1635-F363CC1E80DD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {91BAB16E-7151-425E-919F-2725C0813642}

package/generators/microservice/templates/microservice/charts/ms-archetype-grpc/Chart.yaml

@@ -6,5 +6,5 @@ version: 0.0.1
 appVersion: "0.0.1"
 dependencies:
   - name: ms-base
-    version: 0.0.1
+    version: 0.0.10
     repository: "https://www.codedesignplus.com/helm-charts/"

package/generators/microservice/templates/microservice/charts/ms-archetype-grpc/Production.yaml

@@ -0,0 +1,103 @@
+ms-base:
+  environment: Production
+  replicaCount: 1
+
+  image:
+    repository: codedesignplus/ms-archetype-grpc
+    pullPolicy: IfNotPresent
+    tag: "v0.1.0-alpha.100"
+
+  imagePullSecrets: []
+  fullnameOverride: "ms-archetype-grpc"
+  nameOverride: "ms-archetype-grpc"
+
+  serviceAccount:
+    create: true
+    automount: true
+    annotations: {}
+    name: ""
+
+  podAnnotations: {}
+  podLabels: {}
+  podSecurityContext: {}
+    # fsGroup: 2000
+
+  securityContext: {}
+    # capabilities:
+    #   drop:
+    #   - ALL
+    # readOnlyRootFilesystem: true
+    # runAsNonRoot: true
+    # runAsUser: 1000
+
+  service:
+    type: ClusterIP
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
+      - name: grpc
+        port: 5001
+        targetPort: grpc
+        protocol: TCP
+
+  ingress:
+    enabled: false
+    className: ""
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    hosts:
+      - host: services.codedesignplus.com
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+    tls: []
+    #  - secretName: chart-example-tls
+    #    hosts:
+    #      - services.codedesignplus.com
+
+  resources: {}
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
+  livenessProbe:
+    httpGet:
+      path: /health/live
+      port: http
+  readinessProbe:
+    httpGet:
+      path: /health/ready
+      port: http
+
+  autoscaling:
+    enabled: false
+    minReplicas: 1
+    maxReplicas: 100
+    targetCPUUtilizationPercentage: 80
+    # targetMemoryUtilizationPercentage: 80
+
+  volumes: []
+  # - name: foo
+  #   secret:
+  #     secretName: mysecret
+  #     optional: false
+
+  volumeMounts: []
+  # - name: foo
+  #   mountPath: "/etc/foo"
+  #   readOnly: true
+
+  nodeSelector: {}
+
+  tolerations: []
+
+  affinity: {}
+
+  virtualService: 
+    create: false

package/generators/microservice/templates/microservice/charts/ms-archetype-grpc/{values.yaml → Staging.yaml}

@@ -1,4 +1,5 @@
 ms-base:
+  environment: Staging
   replicaCount: 1
 
   image:
@@ -31,7 +32,15 @@ ms-base:
 
   service:
     type: ClusterIP
-    port: 5000
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
+      - name: grpc
+        port: 5001
+        targetPort: grpc
+        protocol: TCP
 
   ingress:
     enabled: false

package/generators/microservice/templates/microservice/charts/ms-archetype-rest/Chart.yaml

@@ -6,5 +6,5 @@ version: 0.0.1
 appVersion: "0.0.1"
 dependencies:
   - name: ms-base
-    version: 0.0.1
+    version: 0.0.10
     repository: "https://www.codedesignplus.com/helm-charts/"

package/generators/microservice/templates/microservice/charts/ms-archetype-rest/Production.yaml

@@ -0,0 +1,115 @@
+ms-base:
+  environment: Production
+  replicaCount: 1
+
+  image:
+    repository: codedesignplus/ms-archetype-rest
+    pullPolicy: IfNotPresent
+    tag: "v0.1.0-alpha.100"
+
+  imagePullSecrets: []
+  fullnameOverride: "ms-archetype-rest"
+  nameOverride: "ms-archetype-rest"
+
+  serviceAccount:
+    create: true
+    automount: true
+    annotations: {}
+    name: ""
+
+  podAnnotations: {}
+  podLabels: {}
+  podSecurityContext: {}
+    # fsGroup: 2000
+
+  securityContext: {}
+    # capabilities:
+    #   drop:
+    #   - ALL
+    # readOnlyRootFilesystem: true
+    # runAsNonRoot: true
+    # runAsUser: 1000
+
+  service:
+    type: ClusterIP
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
+
+  ingress:
+    enabled: false
+    className: ""
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    hosts:
+      - host: services.codedesignplus.com
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+    tls: []
+    #  - secretName: chart-example-tls
+    #    hosts:
+    #      - services.codedesignplus.com
+
+  resources: {}
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
+  livenessProbe:
+    httpGet:
+      path: /health/live
+      port: http
+  readinessProbe:
+    httpGet:
+      path: /health/ready
+      port: http
+
+  autoscaling:
+    enabled: false
+    minReplicas: 1
+    maxReplicas: 100
+    targetCPUUtilizationPercentage: 80
+    # targetMemoryUtilizationPercentage: 80
+
+  volumes: []
+  # - name: foo
+  #   secret:
+  #     secretName: mysecret
+  #     optional: false
+
+  volumeMounts: []
+  # - name: foo
+  #   mountPath: "/etc/foo"
+  #   readOnly: true
+
+  nodeSelector: {}
+
+  tolerations: []
+
+  affinity: {}
+
+  virtualService: 
+    create: true
+    hosts:
+      - services.codedesignplus.com
+    gateways:
+      - istio-ingress/istio-gateway
+    http:
+    - name: ms-archetype
+      match:
+      - uri:
+          prefix: /ms-archetype/
+      rewrite:
+        uri: /
+      route:
+      - destination:
+          host: ms-archetype-rest.urbancore.svc.cluster.local
+          port:
+            number: 5000

package/generators/microservice/templates/microservice/charts/ms-archetype-rest/{values.yaml → Staging.yaml}

@@ -1,4 +1,5 @@
 ms-base:
+  environment: Staging
   replicaCount: 1
 
   image:
@@ -31,7 +32,11 @@ ms-base:
 
   service:
     type: ClusterIP
-    port: 5000
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
 
   ingress:
     enabled: false
@@ -95,7 +100,7 @@ ms-base:
     hosts:
       - services.codedesignplus.com
     gateways:
-      - services-gateway
+      - istio-ingress/istio-gateway
     http:
     - name: ms-archetype
       match:
@@ -105,6 +110,6 @@ ms-base:
         uri: /
       route:
       - destination:
-          host: ms-archetype-rest.default.svc.cluster.local
+          host: ms-archetype-rest.urbancore.svc.cluster.local
           port:
             number: 5000

package/generators/microservice/templates/microservice/charts/ms-archetype-worker/Chart.yaml

@@ -6,5 +6,5 @@ version: 0.0.1
 appVersion: "0.0.1"
 dependencies:
   - name: ms-base
-    version: 0.0.1
+    version: 0.0.10
     repository: "https://www.codedesignplus.com/helm-charts/"

package/generators/microservice/templates/microservice/charts/ms-archetype-worker/Production.yaml

@@ -0,0 +1,99 @@
+ms-base:
+  environment: Production
+  replicaCount: 1
+
+  image:
+    repository: codedesignplus/ms-archetype-worker
+    pullPolicy: IfNotPresent
+    tag: "v0.1.0-alpha.100"
+
+  imagePullSecrets: []
+  fullnameOverride: "ms-archetype-worker"
+  nameOverride: "ms-archetype-worker"
+
+  serviceAccount:
+    create: true
+    automount: true
+    annotations: {}
+    name: ""
+
+  podAnnotations: {}
+  podLabels: {}
+  podSecurityContext: {}
+    # fsGroup: 2000
+
+  securityContext: {}
+    # capabilities:
+    #   drop:
+    #   - ALL
+    # readOnlyRootFilesystem: true
+    # runAsNonRoot: true
+    # runAsUser: 1000
+
+  service:
+    type: ClusterIP
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
+
+  ingress:
+    enabled: false
+    className: ""
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    hosts:
+      - host: services.codedesignplus.com
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+    tls: []
+    #  - secretName: chart-example-tls
+    #    hosts:
+    #      - services.codedesignplus.com
+
+  resources: {}
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
+  livenessProbe:
+    httpGet:
+      path: /health/live
+      port: http
+  readinessProbe:
+    httpGet:
+      path: /health/ready
+      port: http
+
+  autoscaling:
+    enabled: false
+    minReplicas: 1
+    maxReplicas: 100
+    targetCPUUtilizationPercentage: 80
+    # targetMemoryUtilizationPercentage: 80
+
+  volumes: []
+  # - name: foo
+  #   secret:
+  #     secretName: mysecret
+  #     optional: false
+
+  volumeMounts: []
+  # - name: foo
+  #   mountPath: "/etc/foo"
+  #   readOnly: true
+
+  nodeSelector: {}
+
+  tolerations: []
+
+  affinity: {}
+
+  virtualService: 
+    create: false

package/generators/microservice/templates/microservice/charts/ms-archetype-worker/{values.yaml → Staging.yaml}

@@ -1,4 +1,5 @@
 ms-base:
+  environment: Staging
   replicaCount: 1
 
   image:
@@ -31,7 +32,11 @@ ms-base:
 
   service:
     type: ClusterIP
-    port: 5000
+    ports:
+      - name: http
+        port: 5000
+        targetPort: http
+        protocol: TCP
 
   ingress:
     enabled: false

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/CodeDesignPlus.Net.Microservice.Application.csproj

@@ -5,13 +5,13 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="CodeDesignPlus.Net.Generator" Version="0.6.0-beta.28" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-		<PackageReference Include="CodeDesignPlus.Net.Redis.Abstractions" Version="0.6.0-beta.28" />
-		<PackageReference Include="CodeDesignPlus.Net.PubSub.Abstractions" Version="0.6.0-beta.28" />
-		<PackageReference Include="CodeDesignPlus.Net.Cache.Abstractions" Version="0.6.0-beta.28" />
+		<PackageReference Include="CodeDesignPlus.Net.Generator" Version="0.7.0-beta.33" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+		<PackageReference Include="CodeDesignPlus.Net.Redis.Abstractions" Version="0.7.0-beta.33" />
+		<PackageReference Include="CodeDesignPlus.Net.PubSub.Abstractions" Version="0.7.0-beta.33" />
+		<PackageReference Include="CodeDesignPlus.Net.Cache.Abstractions" Version="0.7.0-beta.33" />
 		<PackageReference Include="Mapster" Version="7.4.0" />
 		<PackageReference Include="Mapster.DependencyInjection" Version="1.0.1" />
-		<PackageReference Include="MediatR" Version="12.4.1" />
+		<PackageReference Include="MediatR" Version="12.5.0" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
 	</ItemGroup>
 	<ItemGroup>

package/generators/microservice/templates/microservice/src/domain/CodeDesignPlus.Net.Microservice.Application/Errors.cs

@@ -1,10 +1,8 @@
-using CodeDesignPlus.Net.Core.Abstractions;
-
-namespace CodeDesignPlus.Net.Microservice.Application;
+namespace CodeDesignPlus.Net.Microservice.Application;
 
 public class Errors: IErrorCodes
 {
     public const string OrderNotFound = "200 : The order does not exist.";
     public const string OrderAlreadyExists = "201 : The order already exists.";
-    public const string ClientIsNull = "300 : The client is null.";
+    public const string ClientIsNull = "300 : The client is null."; 
 }