add rabbitmq user and fix the ferretdb database name

Author: ftechmax

README.md

@@ -45,7 +45,6 @@ This is not meant to be the only way to do things. It's just a set of defaults t
 - [.NET SDK 10](https://dotnet.microsoft.com/download)
 - [Node.js LTS](https://nodejs.org/)
 
-
 ## Quick start
 
 Download the generator script from the [latest release](https://github.com/ftechmax/msa-templates/releases/latest) and run it. The script automatically installs the matching `MSA.Templates` NuGet package and downloads the matching Kubernetes manifests.
@@ -55,14 +54,14 @@ Download the generator script from the [latest release](https://github.com/ftech
 ```sh
 curl -fsSLO https://github.com/ftechmax/msa-templates/releases/latest/download/generator.sh && \
 chmod +x generator.sh && \
-./generator.sh ~/git AwesomeApp rabbitmq-default-user
+./generator.sh ~/git AwesomeApp
 ```
 
 **PowerShell (Windows):**
 
 ```powershell
 Invoke-WebRequest -Uri https://github.com/ftechmax/msa-templates/releases/latest/download/generator.ps1 -OutFile generator.ps1 ; `
-.\generator.ps1 -DestinationFolder c:/git -ServiceName AwesomeApp -RabbitMqUserSecret rabbitmq-default-user
+.\generator.ps1 -DestinationFolder c:/git -ServiceName AwesomeApp
 ```
 
 > ⚠️ Security note: the commands above will run a script pulled from the net. Convenient? Absolutely. Auditable? Not unless you read it first.

generator.ps1

@@ -3,8 +3,6 @@ param (
     [string]$DestinationFolder = "C:/git",
     [Parameter(Mandatory = $true, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
     [string]$ServiceName,
-    [Parameter(Mandatory = $true, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
-    [string]$RabbitMqUserSecret,
     [Parameter(Mandatory = $false, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
     [string]$Namespace = "default"
 )
@@ -22,6 +20,7 @@ if ($ServiceName -notmatch '^[A-Z][a-zA-Z0-9]+$') {
 # Prepare service name
 $kebabCaseServiceName = ($ServiceName -creplace '([A-Z]+)([A-Z][a-z])', '$1-$2' -creplace '([a-z0-9])([A-Z])', '$1-$2').toLower()
 $dotCaseServiceName = ($ServiceName -creplace '([A-Z]+)([A-Z][a-z])', '$1.$2' -creplace '([a-z0-9])([A-Z])', '$1.$2')
+$snakeCaseServiceName = $kebabCaseServiceName -replace '-', '_'
 
 # Install matching template version
 $csproj = Join-Path (Join-Path $ScriptDir "src") "MSA.Templates.csproj"
@@ -84,8 +83,8 @@ Get-ChildItem -Path "$ProjectFolder/k8s" -Recurse | ForEach-Object {
         Write-Host "Patching $filePath"
 
         (Get-Content -Path $filePath) `
-            -creplace '{{RABBITMQ-SECRET-NAME}}', $RabbitMqUserSecret `
             -creplace '{{NAMESPACE}}', $Namespace `
+            -creplace 'applicationname_snake', $snakeCaseServiceName `
             -creplace 'applicationname', $kebabCaseServiceName `
             -creplace 'ApplicationName', $dotCaseServiceName `
         | Set-Content -Path $filePath

generator.sh

@@ -5,15 +5,14 @@ GENERATOR_VERSION="develop"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 GITHUB_REPO="ftechmax/msa-templates"
 
-if [ "$#" -lt 3 ]; then
-  echo "Usage: $0 <destination_folder> <service_name> <rabbitmq_user_secret> [namespace]" >&2
+if [ "$#" -lt 2 ]; then
+  echo "Usage: $0 <destination_folder> <service_name> [namespace]" >&2
   exit 1
 fi
 
 DESTINATION_FOLDER="$1"
 SERVICE_NAME="$2"
-RABBITMQ_USER_SECRET="$3"
-NAMESPACE="${4:-default}"
+NAMESPACE="${3:-default}"
 
 # Validate service name is PascalCase
 if [[ ! "$SERVICE_NAME" =~ ^[A-Z][a-zA-Z0-9]+$ ]]; then
@@ -24,6 +23,7 @@ fi
 # Prepare service name
 KEBAB_CASE_SERVICE_NAME=$(printf '%s' "$SERVICE_NAME" | sed -E 's/([A-Z]+)([A-Z][a-z])/\1-\2/g' | sed -E 's/([a-z0-9])([A-Z])/\1-\2/g' | tr '[:upper:]' '[:lower:]')
 DOT_CASE_SERVICE_NAME=$(printf '%s' "$SERVICE_NAME" | sed -E 's/([A-Z]+)([A-Z][a-z])/\1.\2/g' | sed -E 's/([a-z0-9])([A-Z])/\1.\2/g')
+SNAKE_CASE_SERVICE_NAME=$(printf '%s' "$KEBAB_CASE_SERVICE_NAME" | tr '-' '_')
 
 # Install matching template version
 CSPROJ="$SCRIPT_DIR/src/MSA.Templates.csproj"
@@ -82,8 +82,8 @@ cp -R "$K8S_SOURCE" "$PROJECT_FOLDER"
 find "$PROJECT_FOLDER/k8s" -type f -print0 | while IFS= read -r -d '' file_path; do
   echo "Patching $file_path"
   tmp_file="$file_path.tmp"
-  sed -e "s/{{RABBITMQ-SECRET-NAME}}/$RABBITMQ_USER_SECRET/g" \
-      -e "s/{{NAMESPACE}}/$NAMESPACE/g" \
+  sed -e "s/{{NAMESPACE}}/$NAMESPACE/g" \
+      -e "s/applicationname_snake/$SNAKE_CASE_SERVICE_NAME/g" \
       -e "s/applicationname/$KEBAB_CASE_SERVICE_NAME/g" \
       -e "s/ApplicationName/$DOT_CASE_SERVICE_NAME/g" \
       "$file_path" > "$tmp_file"

k8s/base/api/deployment.yaml

@@ -38,19 +38,16 @@ spec:
               containerPort: 8080
           env:
             - name: rabbitmq__host
-              valueFrom:
-                secretKeyRef:
-                  name: '{{RABBITMQ-SECRET-NAME}}'
-                  key: host
+              value: rabbitmq.default.svc
             - name: rabbitmq__username
               valueFrom:
                 secretKeyRef:
-                  name: '{{RABBITMQ-SECRET-NAME}}'
+                  name: applicationname-rabbitmq
                   key: username
             - name: rabbitmq__password
               valueFrom:
                 secretKeyRef:
-                  name: '{{RABBITMQ-SECRET-NAME}}'
+                  name: applicationname-rabbitmq
                   key: password
             - name: valkey__connection-string
               value: 'applicationname-cache:6379'

k8s/base/worker/db-user.yaml k8s/base/database-user.yamlk8s/base/worker/db-user.yaml renamed to k8s/base/database-user.yaml

@@ -2,10 +2,10 @@
 apiVersion: k8s.ftechmax.net/v1alpha1
 kind: FerretDbUser
 metadata:
-  name: applicationname-user
+  name: applicationname-database
 spec:
-  database: applicationname
-  secret: applicationname-user
+  database: applicationname_snake
+  secret: applicationname-database
   roles:
     - readWrite
     - dbAdmin

k8s/base/kustomization.yaml

@@ -3,6 +3,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./sa.yaml
+  - ./rabbitmq-user.yaml
+  - ./database-user.yaml
   - ./worker
   - ./api
   - ./web

k8s/base/rabbitmq-user.yaml

@@ -0,0 +1,27 @@
+---
+apiVersion: rabbitmq.com/v1beta1
+kind: Permission
+metadata:
+  name: applicationname-rabbitmq
+spec:
+  vhost: /
+  userReference:
+    name: applicationname-rabbitmq
+  permissions:
+    write: '.*'
+    configure: '.*'
+    read: '.*'
+  rabbitmqClusterReference:
+    name: rabbitmq
+    namespace: default
+---
+apiVersion: rabbitmq.com/v1beta1
+kind: User
+metadata:
+  name: applicationname-rabbitmq
+spec:
+  rabbitmqClusterReference:
+    name: rabbitmq
+    namespace: default
+  importCredentialsSecret:
+    name: applicationname-rabbitmq

k8s/base/worker/deployment.yaml

@@ -37,22 +37,19 @@ spec:
               containerPort: 8080
           envFrom:
             - secretRef:
-                name: applicationname-user
+                name: applicationname-database
           env:
             - name: rabbitmq__host
-              valueFrom:
-                secretKeyRef:
-                  name: '{{RABBITMQ-SECRET-NAME}}'
-                  key: host
+              value: rabbitmq.default.svc
             - name: rabbitmq__username
               valueFrom:
                 secretKeyRef:
-                  name: '{{RABBITMQ-SECRET-NAME}}'
+                  name: applicationname-rabbitmq
                   key: username
             - name: rabbitmq__password
               valueFrom:
                 secretKeyRef:
-                  name: '{{RABBITMQ-SECRET-NAME}}'
+                  name: applicationname-rabbitmq
                   key: password
             - name: mongodb__connection-string
               value: 'mongodb://$(database_username):$(database_password)@ferretdb.ferretdb-system.svc:27017/'

k8s/base/worker/kustomization.yaml

@@ -2,6 +2,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./db-user.yaml
   - ./deployment.yaml
-  - ./service.yaml
+  - ./service.yaml

k8s/overlays/development/kustomization.yaml

@@ -1,7 +1,7 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: {{NAMESPACE}}
+namespace: '{{NAMESPACE}}'
 resources:
   - ./../../base
 images: