Merge branch 'master' into feature/64960-service-csv-export-without-internal-comments

Author: linusfromscratch

.bundler-audit.yml

@@ -0,0 +1,4 @@
+---
+# ignore specific CVEs from bundler-audit checks
+ignore:
+  - CVE-2024-6484 # non use bootstrap carousel feature

.github/workflows/build-manual.yaml

@@ -35,8 +35,6 @@ jobs:
       environment: ${{ inputs.environment }}
       project_name: ${{ inputs.project_name  }}
       push: ${{ inputs.push }}
-      registry: harbor.puzzle.ch
-      registry_url: harbor.puzzle.ch/pitc-ruby-public/ptime/int/rails
     secrets:
       PUZZLE_REGISTRY_USERNAME: ${{ secrets.PUZZLE_REGISTRY_USERNAME }}
       PUZZLE_REGISTRY_TOKEN: ${{ secrets.PUZZLE_REGISTRY_TOKEN }}

.github/workflows/reusable-build.yaml

@@ -1,5 +1,5 @@
 ---
-name: 'Reusable: Build and push image'
+name: "Reusable: Build and push image"
 
 "on":
   workflow_call:
@@ -17,32 +17,56 @@ name: 'Reusable: Build and push image'
         type: boolean
         default: false
       registry:
-        description: 'FQDN of the registry'
+        description: "FQDN of the registry"
         type: string
-        required: true
+        required: false
+        default: ""
       registry_url:
-        description: 'URL to push image to'
+        description: "URL to push image to"
         type: string
         required: false
-        default: 'harbor.puzzle.ch/pitc-ruby-public/ptime/int/rails'
+        default: ""
 
     secrets:
       PUZZLE_REGISTRY_USERNAME:
-        description: 'Needed for the registry login'
+        description: "Needed for the registry login"
         required: true
       PUZZLE_REGISTRY_TOKEN:
-        description: 'Needed for the registry login'
+        description: "Needed for the registry login"
         required: true
 
 jobs:
   build:
     environment: ${{ inputs.environment }}
-    runs-on: 'ubuntu-latest'
+    runs-on: "ubuntu-latest"
+
+    env:
+      BUILD_REGISTRY: ${{ inputs.registry || vars.REGISTRY }}
+      BUILD_REGISTRY_URL: ${{ inputs.registry_url || vars.REGISTRY_URL }}
+
     steps:
+      - name: Input Validation
+        run: |
+          exit_code=0
+
+          if [ -z "${BUILD_REGISTRY}" ]; then
+            echo "::error title=Configuration Error::BUILD_REGISTRY is empty."
+            echo "Please ensure 'registry' input is set or 'REGISTRY' variable is configured in the ${{ inputs.environment }} environment."
+            exit_code=1
+          fi
+
+          if [ -z "${BUILD_REGISTRY_URL}" ]; then
+            echo "::error title=Configuration Error::BUILD_REGISTRY_URL is empty."
+            echo "Please ensure 'registry_url' input is set or 'REGISTRY_URL' variable is configured in the ${{ inputs.environment }} environment."
+            exit_code=1
+          fi
+
+          exit "${exit_code}"
+
       - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v3
         with:
-          registry: ${{ inputs.registry }}
+          registry: ${{ env.BUILD_REGISTRY }}
           username: ${{ secrets.PUZZLE_REGISTRY_USERNAME }}
           password: ${{ secrets.PUZZLE_REGISTRY_TOKEN }}
       - uses: docker/build-push-action@v4
@@ -55,9 +79,8 @@ jobs:
             GITHUB_SHA=${{ github.sha }}
           target: app
           tags: |
-            ${{ inputs.registry_url }}:latest
-            ${{ inputs.registry_url }}:${{ github.sha }}
+            ${{ env.BUILD_REGISTRY_URL }}:latest
+            ${{ env.BUILD_REGISTRY_URL }}:git-${{ github.sha }}
           push: ${{ inputs.push }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-...

.rubocop.yml

@@ -1,4 +1,8 @@
 ---
+inherit_mode:
+  merge:
+    - Exclude
+
 inherit_from: .rubocop_todo.yml
 
 plugins:
@@ -11,11 +15,21 @@ AllCops:
 
 Metrics:
   Exclude:
-    - 'test/**/*'
+    - "test/**/*"
+
+Metrics/BlockLength:
+  Exclude:
+    - "test/**/*" # Please do not ignore this exclude
+    - config/routes.rb
+
+Metrics/ModuleLength:
+  Exclude:
+    - "test/**/*" # Please do not ignore this exclude
+    - "app/helpers/evaluator_helper.rb"
 
 Naming/InclusiveLanguage:
   Exclude:
-    - config/environments/development.rb  # Bullet uses whitelist :(
+    - config/environments/development.rb # Bullet uses whitelist :(
 
 # Not gonna rewrite all our tests...
 Minitest/MultipleAssertions:
@@ -27,33 +41,28 @@ Rails/ActionControllerTestCase:
 # Ignore for existing migrations
 Rails/CreateTableWithTimestamps:
   Exclude:
-    - 'db/migrate/20150930143851_create_tables.rb'
-    - 'db/migrate/20151105101420_create_sectors_and_services.rb'
-    - 'db/migrate/20160919101807_add_daily_plannings.rb'
-    - 'db/migrate/20160929150008_create_custom_lists.rb'
-    - 'db/migrate/20170321095600_employee_master_data.rb'
-    - 'db/migrate/20170724095653_create_additional_crm_orders.rb'
-    - 'db/migrate/20190204150125_add_expenses.rb'
-    - 'db/migrate/20220322152042_create_workplaces.rb'
-    - 'db/migrate/20230207231358_create_active_storage_variant_records.active_storage.rb'
+    - "db/migrate/20150930143851_create_tables.rb"
+    - "db/migrate/20151105101420_create_sectors_and_services.rb"
+    - "db/migrate/20160919101807_add_daily_plannings.rb"
+    - "db/migrate/20160929150008_create_custom_lists.rb"
+    - "db/migrate/20170321095600_employee_master_data.rb"
+    - "db/migrate/20170724095653_create_additional_crm_orders.rb"
+    - "db/migrate/20190204150125_add_expenses.rb"
+    - "db/migrate/20220322152042_create_workplaces.rb"
+    - "db/migrate/20230207231358_create_active_storage_variant_records.active_storage.rb"
 
 Rails/DangerousColumnNames:
   Exclude:
-    - 'db/migrate/20240311175613_add_id_to_order_team_members.rb' # Added id to many_to_many join table
+    - "db/migrate/20240311175613_add_id_to_order_team_members.rb" # Added id to many_to_many join table
 
 Style/SafeNavigationChainLength:
   Exclude:
-    - 'app/views/work_items/search.json.jbuilder' # Okish for jbuilder 
+    - "app/views/work_items/search.json.jbuilder" # Okish for jbuilder
 
 Naming/AccessorMethodName:
   Exclude:
-    - 'app/domain/invoicing/small_invoice/client_sync.rb'
+    - "app/domain/invoicing/small_invoice/client_sync.rb"
 
 Style/SymbolProc:
   Exclude:
-    - 'app/serializers/api/v1/employee_serializer.rb'
-
-Metrics/BlockLength:
-  Exclude:
-    - config/routes.rb
-...
+    - "app/serializers/api/v1/employee_serializer.rb"