Refactor/removed v130

.github/workflows/auto_update_base_image.yml

@@ -33,4 +33,4 @@ jobs:
               workflow_id: 'build_container_develop_branch.yml',
               ref: 'refs/heads/develop'
             });
-        if: steps.baseupdatecheck.outputs.needs-updating == 'true'
+        if: steps.baseupdatecheck.outputs.needs-updating == 'true'

.github/workflows/build_container_develop_branch.yml

@@ -153,4 +153,4 @@ jobs:
           cosign sign -y --key cosign.key \
                       docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC
         env:
-          COSIGN_PASSWORD: "${{secrets.COSIGN_PASSWORD}}"
+          COSIGN_PASSWORD: "${{secrets.COSIGN_PASSWORD}}"

.github/workflows/build_container_non_develop_branch.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "*"
+      - '**'
       - "!develop"
 
 env:
@@ -149,4 +150,4 @@ jobs:
           cosign sign -y --key cosign.key \
                       docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA
         env:
-          COSIGN_PASSWORD: "${{secrets.COSIGN_PASSWORD}}"
+          COSIGN_PASSWORD: "${{secrets.COSIGN_PASSWORD}}"

.github/workflows/build_pull_request.yml

@@ -118,4 +118,4 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
-          path: pull/
+          path: pull/

.github/workflows/run_trivy.yml

@@ -50,4 +50,4 @@ jobs:
       - name: Upload Trivy scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@v3
         with:
-          sarif_file: "trivy-results.sarif"
+          sarif_file: "trivy-results.sarif"

obp-api/src/main/scala/bootstrap/liftweb/Boot.scala

@@ -464,7 +464,7 @@ class Boot extends MdcLoggable {
     // Add the various API versions
     ScannedApis.versionMapScannedApis.keys.foreach(enableVersionIfAllowed) // process all scanned apis versions
     enableVersionIfAllowed(ApiVersion.v1_2_1)
-    enableVersionIfAllowed(ApiVersion.v1_3_0)
+    //enableVersionIfAllowed(ApiVersion.v1_3_0)
     enableVersionIfAllowed(ApiVersion.v1_4_0)
     enableVersionIfAllowed(ApiVersion.v2_0_0)
     enableVersionIfAllowed(ApiVersion.v2_1_0)

obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala

@@ -12,7 +12,6 @@ import code.api.util.ExampleValue.endpointMappingRequestBodyExample
 import code.api.util.FutureUtil.EndpointContext
 import code.api.util.NewStyle.HttpCode
 import code.api.util._
-import code.api.util.YAMLUtils
 import code.api.v1_4_0.JSONFactory1_4_0.ResourceDocsJson
 import code.api.v1_4_0.{APIMethods140, JSONFactory1_4_0, OBPAPI1_4_0}
 import code.api.v2_2_0.{APIMethods220, OBPAPI2_2_0}
@@ -33,19 +32,17 @@ import com.openbankproject.commons.util.ApiStandards._
 import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion}
 import net.liftweb.common.{Box, Empty, Full}
 import net.liftweb.http.{LiftRules, S}
-import net.liftweb.http.{InMemoryResponse, LiftRules, PlainTextResponse}
 import net.liftweb.json
 import net.liftweb.json.JsonAST.{JField, JString, JValue}
 import net.liftweb.json._
 
 import java.util.concurrent.ConcurrentHashMap
-import scala.collection.immutable
 import scala.collection.immutable.{List, Nil}
 import scala.concurrent.Future
 
 // JObject creation
 import code.api.v1_2_1.{APIMethods121, OBPAPI1_2_1}
-import code.api.v1_3_0.{APIMethods130, OBPAPI1_3_0}
+//import code.api.v1_3_0.{APIMethods130, OBPAPI1_3_0}
 import code.api.v2_0_0.{APIMethods200, OBPAPI2_0_0}
 import code.api.v2_1_0.{APIMethods210, OBPAPI2_1_0}
 
@@ -60,7 +57,7 @@ import com.openbankproject.commons.ExecutionContext.Implicits.global
 
 
 
-trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMethods210 with APIMethods200 with APIMethods140 with APIMethods130 with APIMethods121{
+trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMethods210 with APIMethods200 with APIMethods140 /*with APIMethods130*/ with APIMethods121{
   //needs to be a RestHelper to get access to JsonGet, JsonPost, etc.
   // We add previous APIMethods so we have access to the Resource Docs
   self: OBPRestHelper =>
@@ -128,9 +125,9 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth
         case ApiVersion.v3_0_0 => OBPAPI3_0_0.allResourceDocs
         case ApiVersion.v2_2_0 => OBPAPI2_2_0.allResourceDocs
         case ApiVersion.v2_1_0 => OBPAPI2_1_0.allResourceDocs
-        case ApiVersion.v2_0_0 => Implementations2_0_0.resourceDocs ++ Implementations1_4_0.resourceDocs ++ Implementations1_3_0.resourceDocs ++ Implementations1_2_1.resourceDocs
-        case ApiVersion.v1_4_0 => Implementations1_4_0.resourceDocs ++ Implementations1_3_0.resourceDocs ++ Implementations1_2_1.resourceDocs
-        case ApiVersion.v1_3_0 => Implementations1_3_0.resourceDocs ++ Implementations1_2_1.resourceDocs
+        case ApiVersion.v2_0_0 => Implementations2_0_0.resourceDocs ++ Implementations1_4_0.resourceDocs /*++ Implementations1_3_0.resourceDocs*/ ++ Implementations1_2_1.resourceDocs
+        case ApiVersion.v1_4_0 => Implementations1_4_0.resourceDocs /*++ Implementations1_3_0.resourceDocs*/ ++ Implementations1_2_1.resourceDocs
+        case ApiVersion.v1_3_0 => ArrayBuffer.empty[ResourceDoc]
         case ApiVersion.v1_2_1 => Implementations1_2_1.resourceDocs
         case ApiVersion.`dynamic-endpoint` => OBPAPIDynamicEndpoint.allResourceDocs
         case ApiVersion.`dynamic-entity` => OBPAPIDynamicEntity.allResourceDocs
@@ -152,7 +149,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth
         case ApiVersion.v2_1_0 => OBPAPI2_1_0.routes
         case ApiVersion.v2_0_0 => OBPAPI2_0_0.routes
         case ApiVersion.v1_4_0 => OBPAPI1_4_0.routes
-        case ApiVersion.v1_3_0 => OBPAPI1_3_0.routes
+        case ApiVersion.v1_3_0 => Nil
         case ApiVersion.v1_2_1 => OBPAPI1_2_1.routes
         case ApiVersion.`dynamic-endpoint` => OBPAPIDynamicEndpoint.routes
         case ApiVersion.`dynamic-entity` => OBPAPIDynamicEntity.routes
@@ -1257,4 +1254,3 @@ so the caller must specify any required filtering by catalog explicitly.
 
 
 }
-

obp-api/src/main/scala/code/api/util/APIUtil.scala

@@ -2781,7 +2781,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
         //        case ApiVersion.v1_2 => LiftRules.statelessDispatch.append(v1_2.OBPAPI1_2)
         // Can we depreciate the above?
         case ApiVersion.v1_2_1 => LiftRules.statelessDispatch.append(v1_2_1.OBPAPI1_2_1)
-        case ApiVersion.v1_3_0 => LiftRules.statelessDispatch.append(v1_3_0.OBPAPI1_3_0)
+        //case ApiVersion.v1_3_0 => LiftRules.statelessDispatch.append(v1_3_0.OBPAPI1_3_0)
         case ApiVersion.v1_4_0 => LiftRules.statelessDispatch.append(v1_4_0.OBPAPI1_4_0)
         case ApiVersion.v2_0_0 => LiftRules.statelessDispatch.append(v2_0_0.OBPAPI2_0_0)
         case ApiVersion.v2_1_0 => LiftRules.statelessDispatch.append(v2_1_0.OBPAPI2_1_0)
@@ -3078,10 +3078,10 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
     else 
       getCorrelationId()
 
-    val reqHeaders = if (cc.requestHeaders.nonEmpty) 
-      cc.requestHeaders 
-    else 
-      S.request.openOrThrowException(attemptedToOpenAnEmptyBox).request.headers
+    val reqHeaders = if (cc.requestHeaders.nonEmpty)
+      cc.requestHeaders
+    else
+      S.request.map(_.request.headers).openOr(Nil)
 
     val remoteIpAddress = if (cc.ipAddress.nonEmpty) 
       cc.ipAddress 
@@ -5189,4 +5189,4 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
       .distinct // List pairs (bank_id, account_id)
   }
 
-}
+}