merge to main (#276)

nam20485 · Apr 20, 2024 · 3835fb9 · 3835fb9
2 parents 3b1c621 + f7aeca8
commit 3835fb9
Show file tree

Hide file tree

Showing 43 changed files with 72 additions and 810 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -52,7 +52,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+      uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
       with:        
         languages: ${{ matrix.language }}
         config-file: ${{ github.workspace }}/.github/codeql-config.yml        
@@ -83,6 +83,6 @@ jobs:
       run: cmake --build --preset linux-release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+      uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -112,7 +112,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
+        uses: docker/build-push-action@af5a7ed5ba88268d5278f7203fb52cd833f66d6e
         with:
           context: .          
           push: ${{ github.event_name != 'pull_request' }}

diff --git a/.github/workflows/docker-scout-scan.yml b/.github/workflows/docker-scout-scan.yml
@@ -89,7 +89,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
+        uses: docker/build-push-action@af5a7ed5ba88268d5278f7203fb52cd833f66d6e
         with:
           context: .          
           push: false
@@ -123,7 +123,7 @@ jobs:
       - name: Analyze for critical and high CVEs
         id: docker-scout-cves       
         # if: ${{ github.event_name != 'pull_request_target' }} 
-        uses: docker/scout-action@67eb1afe777307506aaecb9acd9a0e0389cb99ae # v1.5.0
+        uses: docker/scout-action@b3dd3d6c420903eb3ff2812ac1b1d146ffb93a41 # v1.5.1
         with:
           command: cves,recommendations
           image: ${{ steps.meta.outputs.tags }}
@@ -133,14 +133,14 @@ jobs:
 
       - name: Upload SARIF result
         id: upload-sarif
-        uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         with:
           sarif_file: sarif.output.json
 
       - name: Docker Scout Compare to Latest
         id: docker-scout
         if: ${{ github.event_name == 'pull_request' }}
-        uses: docker/scout-action@67eb1afe777307506aaecb9acd9a0e0389cb99ae # v1.5.0
+        uses: docker/scout-action@b3dd3d6c420903eb3ff2812ac1b1d146ffb93a41 # v1.5.1
         with:
           command: compare
           image: ${{ steps.meta.outputs.tags }}

diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
@@ -33,6 +33,12 @@ jobs:
 
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Install Doxygen
+        run: sudo apt install -y doxygen
+
+      - name: Generate Doxygen docs
+        run: doxygen ./OdbDesignLib/doxygen.conf         
 
       - name: Setup Pages
         uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4.0.0
@@ -42,6 +48,9 @@ jobs:
         with:
           source: ./docs
           destination: ./_site
+
+      # - name: Copy Doxygen docs
+      #   run: cp -r ./OdbDesignLib/doxygen/html ./_site/api
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -75,6 +75,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         with:
           sarif_file: results.sarif
diff --git a/.gitignore b/.gitignore
@@ -4,19 +4,6 @@
 
 /.vs
 /out
-OdbDesignLib/OdbDesignLib_wrap.cxx
-PyOdbDesignLib/dist/
-PyOdbDesignLib/_PyOdbDesignLib.dll
-PyOdbDesignLib/PyOdbDesignLib.py
-PyOdbDesignLib/_PyOdbDesignLib.pyd
-PyOdbDesignLib/__pycache__/
-PyOdbDesignServer/Lib/
-PyOdbDesignServer/PyOdbDesignServer/__pycache__/
-PyOdbDesignServer/pyvenv.cfg
-PyOdbDesignServer/db.sqlite3
-PyOdbDesignServer/Scripts/
-PyOdbDesignServer/api/__pycache__/
-PyOdbDesignServer/PyOdbDesignLib/
 /cmake-build-debug
 build/
 /vcpkg_installed
@@ -25,7 +12,6 @@ build/
 /.idea/workspace.xml
 ssl/
 artifacts/
-doxygen/docs/
 /TEST_DATA
 OdbDesignTests/Testing/
 Testing/
@@ -36,15 +22,9 @@ testlog.xml
 /OdbDesignTests/CMakeLists_Local.txt
 /OdbDesignTests/DesignNameTests_Local.cpp
 /output
-OdbDesignServer/api/__pycache__/
-OdbDesignServer/api/migrations/__pycache__/
-OdbDesignServer/OdbDesignServer/__pycache__/
-OdbDesignServer/PyOdbDesignLib/__pycache__/
-OdbDesignServer/PyOdbDesignLib/PyOdbDesignLib.py
-OdbDesignServer/db.sqlite3
-OdbDesignServer/PyOdbDesignLib/_PyOdbDesignLib.pyd
 /TEST_DATA.zip
 deploy/kubeconfig
 Dockerfile.commentedOut
 scripts/create-release-invoker.js
 /compose-designs
+docs/api/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,9 +16,6 @@ if (NOT DEFINED ENV{CI})
     set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_EXE}")
 endif()
 
-# required for SWIG python wrapper
-#set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
 #
 # GoogleTest support
 #
@@ -58,6 +55,7 @@ if (MSVC)
     add_compile_options(/wd4251)
     # ignore C4100: 'identifier': unreferenced formal parameter
     add_compile_options(/wd4100)
+    #add_compile_options(/sdl)
 else()
     # additional warnings    
     add_compile_options(-Wall -Wextra -Wpedantic)
@@ -73,27 +71,3 @@ add_subdirectory("OdbDesignLib")
 add_subdirectory("OdbDesignServer")
 add_subdirectory("Utils")
 add_subdirectory("OdbDesignTests")
-
-#
-# Doxygen
-#
-find_package(Doxygen)
-
-if (DOXYGEN_FOUND)
-    # set input and output files
-    set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/Doxyfile.in)
-    set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.out)
-
-    # request to configure the file
-    configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
-    message("Configuring Doxygen")
-
-    # Note: do not put "ALL" - this builds docs together with application EVERY TIME!
-    add_custom_target( docs
-        COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMENT "Generating API documentation with Doxygen"
-        VERBATIM )
-else (DOXYGEN_FOUND)
-  message("Doxygen needs to be installed to generate the doxygen documentation")
-endif (DOXYGEN_FOUND)
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -36,33 +36,15 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug"
       }
-    },
-    {
-      "name": "python-x64-debug",
-      "displayName": "Python x64 Debug",
-      "inherits": "x64-debug",
-      "cacheVariables": {
-        "PYTHON_MODULE_BUILD": true,
-        "CMAKE_POSITION_INDENPENDENT_CODE": true
-      }
-    },
+    },    
     {
       "name": "x64-release",
       "displayName": "x64 Release",
       "inherits": "x64-debug",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release"
       }
-    },
-    {
-      "name": "python-x64-release",
-      "displayName": "Python x64 Release",
-      "inherits": "x64-release",
-      "cacheVariables": {
-        "PYTHON_MODULE_BUILD": true,
-        "CMAKE_POSITION_INDENPENDENT_CODE": true
-      }
-    },
+    },   
     {
       "name": "x86-debug",
       "displayName": "x86 Debug",
@@ -123,23 +105,7 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release"      
       }     
-    },
-    {
-      "name": "python-linux-release",
-      "displayName": "Python Linux Release",
-      "inherits": "linux-release",
-      "cacheVariables": {        
-        "PYTHON_MODULE_BUILD": true
-      }
-    },
-    {
-      "name": "python-linux-debug",
-      "displayName": "Python Linux Debug",
-      "inherits": "linux-debug",
-      "cacheVariables": {        
-        "PYTHON_MODULE_BUILD": true
-      }
-    },
+    },    
     {
       "name": "linux-mingw-w64-debug",
       "displayName": "Linux MinGW-w64 Debug",  
@@ -235,19 +201,7 @@
       "displayName": "x86 Release",
       "inherits": "windows-base",
       "configurePreset": "x86-release"
-    },
-    {
-      "name": "python-x64-debug",
-      "displayName": "Python x64 Debug",
-      "inherits": "windows-base",
-      "configurePreset": "python-x64-debug"
-    },
-    {
-      "name": "python-x64-release",
-      "displayName": "Python x64 Release",
-      "inherits": "windows-base",
-      "configurePreset": "python-x64-release"
-    },
+    },    
     {
       "name": "linux-base",
       "hidden": true,
@@ -268,19 +222,7 @@
       "displayName": "Linux Release",
       "configurePreset": "linux-release",
       "inherits": "linux-base"
-    },
-    {
-      "name": "python-linux-debug",
-      "displayName": "Python Linux Debug",
-      "configurePreset": "python-linux-debug",
-      "inherits": "linux-base"
-    },
-    {
-      "name": "python-linux-release",
-      "displayName": "Python Linux Release",
-      "configurePreset": "python-linux-release",
-      "inherits": "linux-base"
-    },
+    },   
     {
       "name": "linux-mingw-w64-base",
       "hidden": true,
@@ -357,19 +299,7 @@
       "displayName": "Test x86-Release",
       "inherits": "windows-base",
       "configurePreset": "x86-release"
-    },
-    {
-      "name": "python-x64-debug",
-      "displayName": "Test Python x64 Debug",  
-      "inherits": "windows-base",    
-      "configurePreset": "python-x64-debug"
-    },
-    {
-      "name": "python-x64-release",
-      "displayName": "Test Python x64 Release",
-      "inherits": "windows-base",
-      "configurePreset": "python-x64-release"
-    },
+    }, 
     {
       "name": "linux-base",
       "hidden": true,
@@ -390,19 +320,7 @@
       "displayName": "Test Linux Release",
       "configurePreset": "linux-release",
       "inherits": "linux-base"
-    },
-    {
-      "name": "python-linux-debug",
-      "displayName": "Test Python Linux Debug",
-      "configurePreset": "python-linux-debug",
-      "inherits": "linux-base"
-    },
-    {
-      "name": "python-linux-release",
-      "displayName": "Test Python Linux Release",
-      "configurePreset": "python-linux-release",
-      "inherits": "linux-base"
-    },
+    },   
     {
       "name": "linux-mingw-w64-base",
       "hidden": true,

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM debian:bookworm-20240211-slim@sha256:d02c76d82364cedca16ba3ed6f9102406fa9fa8833076a609cabf14270f43dfc AS build
+FROM --platform=$BUILDPLATFORM debian:bookworm-20240408-slim@sha256:3d5df92588469a4c503adbead0e4129ef3f88e223954011c2169073897547cac AS build
 
 ARG OWNER=nam20485
 ARG GITHUB_TOKEN="PASSWORD"
@@ -66,7 +66,7 @@ RUN cmake --build --preset linux-release
 # RUN cmake --build --preset linux-debug
 
 # much smaller runtime image
-FROM --platform=$BUILDPLATFORM debian:bookworm-20240211-slim@sha256:d02c76d82364cedca16ba3ed6f9102406fa9fa8833076a609cabf14270f43dfc AS run
+FROM --platform=$BUILDPLATFORM debian:bookworm-20240408-slim@sha256:3d5df92588469a4c503adbead0e4129ef3f88e223954011c2169073897547cac AS run
 # ARG ODBDESIGN_SERVER_REQUEST_USERNAME=""
 # ARG ODBDESIGN_SERVER_REQUEST_PASSWORD=""
 LABEL org.opencontainers.image.source=https://github.com/nam20485/OdbDesign \