Release/1.18.0

.github/workflows/detect-secrets.yaml

@@ -8,13 +8,16 @@ jobs:
     container: python:latest
 
     steps:
-    - uses: actions/checkout@v2
-
+    - uses: actions/checkout@v3
+
+    - run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
     - name: Install Yelp's detect secrets
       run: |
         apt-get update && apt-get install -y jq
+        pip install --upgrade pip
         pip install yq
         pip install detect-secrets==$(yq -r .repos[0].rev .pre-commit-config.yaml)
 
     - name: Detect potential secrets
-      run: find -type f -not -path './.git/*' -printf '%P\n' | xargs detect-secrets-hook --baseline .secrets.baseline
+      run: git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: [email protected]:Yelp/detect-secrets
-  rev: v1.0.3
+  rev: v1.4.0
   hooks:
   - id: detect-secrets
     args: ['--baseline', '.secrets.baseline']

.secrets.baseline

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3",
+  "version": "1.4.0",
   "plugins_used": [
     {
       "name": "ArtifactoryDetector"
@@ -20,6 +20,12 @@
     {
       "name": "CloudantDetector"
     },
+    {
+      "name": "DiscordBotTokenDetector"
+    },
+    {
+      "name": "GitHubTokenDetector"
+    },
     {
       "name": "HexHighEntropyString",
       "limit": 3.0
@@ -46,6 +52,9 @@
     {
       "name": "PrivateKeyDetector"
     },
+    {
+      "name": "SendGridDetector"
+    },
     {
       "name": "SlackDetector"
     },
@@ -80,6 +89,12 @@
     {
       "path": "detect_secrets.filters.heuristic.is_likely_id_string"
     },
+    {
+      "path": "detect_secrets.filters.heuristic.is_lock_file"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
+    },
     {
       "path": "detect_secrets.filters.heuristic.is_potential_uuid"
     },
@@ -89,6 +104,9 @@
     {
       "path": "detect_secrets.filters.heuristic.is_sequential_string"
     },
+    {
+      "path": "detect_secrets.filters.heuristic.is_swagger_file"
+    },
     {
       "path": "detect_secrets.filters.heuristic.is_templated_secret"
     }
@@ -98,25 +116,39 @@
       {
         "type": "Secret Keyword",
         "filename": "appconfigservice/README.md",
-        "hashed_secret": "055d8a847dfea9c1c840140dd0940b0a5a832565",
+        "hashed_secret": "3c934d2c3326a4f2d2d77be4629b074872750d76",
         "is_verified": false,
-        "line_number": 22,
+        "line_number": 52,
         "is_secret": false
-      },
+      }
+    ],
+    "appconfigservice/api/test/test_app_config.py": [
       {
         "type": "Secret Keyword",
-        "filename": "appconfigservice/README.md",
-        "hashed_secret": "c2d2d8a23ffdcdee0e074b02d3a076d1546dc803",
+        "filename": "appconfigservice/api/test/test_app_config.py",
+        "hashed_secret": "bb21158c733229347bd4e681891e213d94c685be",
         "is_verified": false,
-        "line_number": 28,
+        "line_number": 55,
         "is_secret": false
-      },
+      }
+    ],
+    "appconfigservice/api/test/test_index.py": [
       {
         "type": "Secret Keyword",
-        "filename": "appconfigservice/README.md",
-        "hashed_secret": "93b6e269c00e67237d474cb068bbfb1362ea48b8",
+        "filename": "appconfigservice/api/test/test_index.py",
+        "hashed_secret": "bb21158c733229347bd4e681891e213d94c685be",
         "is_verified": false,
-        "line_number": 52,
+        "line_number": 29,
+        "is_secret": false
+      }
+    ],
+    "appconfigservice/api/test/test_search_config.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "appconfigservice/api/test/test_search_config.py",
+        "hashed_secret": "bb21158c733229347bd4e681891e213d94c685be",
+        "is_verified": false,
+        "line_number": 29,
         "is_secret": false
       }
     ],
@@ -128,100 +160,118 @@
         "is_verified": false,
         "line_number": 65,
         "is_secret": false
-      }
-    ],
-    "auth-middleware-test-svc/README.md": [
+      },
       {
         "type": "Secret Keyword",
-        "filename": "auth-middleware-test-svc/README.md",
-        "hashed_secret": "055d8a847dfea9c1c840140dd0940b0a5a832565",
+        "filename": "appconfigservice/appconfig.yaml",
+        "hashed_secret": "a45a360e6ff9bceaf3fcfef370a6d6e1d4ba9271",
         "is_verified": false,
-        "line_number": 30,
+        "line_number": 65,
         "is_secret": false
-      }
-    ],
-    "authservice/README.md": [
+      },
       {
         "type": "Secret Keyword",
-        "filename": "authservice/README.md",
-        "hashed_secret": "c2d2d8a23ffdcdee0e074b02d3a076d1546dc803",
+        "filename": "appconfigservice/appconfig.yaml",
+        "hashed_secret": "967b337f4eb99a877c1d326531d6a197b972a713",
         "is_verified": false,
-        "line_number": 73,
+        "line_number": 300,
         "is_secret": false
       }
     ],
-    "contributions/catalog/Dockerfile": [
+    "contributions/README.md": [
       {
-        "type": "Secret Keyword",
-        "filename": "contributions/catalog/Dockerfile",
-        "hashed_secret": "b6ee60926c0a426addcbb7e087d4274498f35b1c",
+        "type": "Hex High Entropy String",
+        "filename": "contributions/README.md",
+        "hashed_secret": "1da0126accdd44a043f50ae89644c355579e9008",
         "is_verified": false,
-        "line_number": 23,
+        "line_number": 150,
         "is_secret": false
-      }
-    ],
-    "eventservice/README.md": [
+      },
       {
-        "type": "Secret Keyword",
-        "filename": "eventservice/README.md",
-        "hashed_secret": "c2d2d8a23ffdcdee0e074b02d3a076d1546dc803",
+        "type": "Hex High Entropy String",
+        "filename": "contributions/README.md",
+        "hashed_secret": "923f444e304cd39f5803a8fe3a64f624837cb0a0",
         "is_verified": false,
-        "line_number": 24,
+        "line_number": 833,
         "is_secret": false
       },
       {
-        "type": "Secret Keyword",
-        "filename": "eventservice/README.md",
-        "hashed_secret": "99f11f7789a5315285e569895445507118f188bd",
+        "type": "Hex High Entropy String",
+        "filename": "contributions/README.md",
+        "hashed_secret": "f6b110e76ea7968dbbfb44b70822238ba8d55740",
+        "is_verified": false,
+        "line_number": 873,
+        "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "contributions/README.md",
+        "hashed_secret": "3b5dcb0f5163198f51b25c9ac24a1e3950f23b6f",
         "is_verified": false,
-        "line_number": 30,
+        "line_number": 1174,
         "is_secret": false
       }
     ],
-    "loggingservice/README.md": [
+    "contributions/contribution.yaml": [
       {
         "type": "Secret Keyword",
-        "filename": "loggingservice/README.md",
-        "hashed_secret": "c2d2d8a23ffdcdee0e074b02d3a076d1546dc803",
+        "filename": "contributions/contribution.yaml",
+        "hashed_secret": "967b337f4eb99a877c1d326531d6a197b972a713",
         "is_verified": false,
-        "line_number": 22,
+        "line_number": 862,
         "is_secret": false
-      },
+      }
+    ],
+    "eventservice/README.md": [
+      {
+        "type": "Hex High Entropy String",
+        "filename": "eventservice/README.md",
+        "hashed_secret": "738cfd4b80282ef1adafa910355da8c0f4ba3a83",
+        "is_verified": false,
+        "line_number": 120,
+        "is_secret": false
+      }
+    ],
+    "eventservice/events.yaml": [
       {
         "type": "Secret Keyword",
-        "filename": "loggingservice/README.md",
-        "hashed_secret": "99f11f7789a5315285e569895445507118f188bd",
+        "filename": "eventservice/events.yaml",
+        "hashed_secret": "967b337f4eb99a877c1d326531d6a197b972a713",
         "is_verified": false,
-        "line_number": 28,
+        "line_number": 950,
         "is_secret": false
       }
     ],
-    "profileservice/README.md": [
+    "lib/auth-middleware/auth_middleware/__init__.py": [
       {
         "type": "Secret Keyword",
-        "filename": "profileservice/README.md",
-        "hashed_secret": "055d8a847dfea9c1c840140dd0940b0a5a832565",
+        "filename": "lib/auth-middleware/auth_middleware/__init__.py",
+        "hashed_secret": "f6e3f71c77bbae9e01381e855927239c0d679530",
         "is_verified": false,
-        "line_number": 38,
+        "line_number": 34,
         "is_secret": false
-      },
+      }
+    ],
+    "loggingservice/logging.yaml": [
       {
         "type": "Secret Keyword",
-        "filename": "profileservice/README.md",
-        "hashed_secret": "c2d2d8a23ffdcdee0e074b02d3a076d1546dc803",
+        "filename": "loggingservice/logging.yaml",
+        "hashed_secret": "967b337f4eb99a877c1d326531d6a197b972a713",
         "is_verified": false,
-        "line_number": 44,
+        "line_number": 155,
         "is_secret": false
-      },
+      }
+    ],
+    "profileservice/profile.yaml": [
       {
         "type": "Secret Keyword",
-        "filename": "profileservice/README.md",
-        "hashed_secret": "99f11f7789a5315285e569895445507118f188bd",
+        "filename": "profileservice/profile.yaml",
+        "hashed_secret": "967b337f4eb99a877c1d326531d6a197b972a713",
         "is_verified": false,
-        "line_number": 50,
+        "line_number": 673,
         "is_secret": false
       }
     ]
   },
-  "generated_at": "2021-11-17T22:48:48Z"
+  "generated_at": "2023-03-07T18:58:39Z"
 }

CHANGELOG.md

@@ -6,6 +6,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.18.0] - 2023-03-30
+### Added
+- Footer to all pages. [#1044](https://github.com/rokwire/rokwire-building-blocks-api/issues/1044)
+- Input validation for contribute create page. [#1103](https://github.com/rokwire/rokwire-building-blocks-api/issues/1103)
+
+### Changed
+- UI for capability view page. [#1034](https://github.com/rokwire/rokwire-building-blocks-api/issues/1034)
+- Updated footer UI. [#1036](https://github.com/rokwire/rokwire-building-blocks-api/issues/1036)
+- UI changes to top navigation bar. [#1040](https://github.com/rokwire/rokwire-building-blocks-api/issues/1040)
+- UI for talent view page. [#1060](https://github.com/rokwire/rokwire-building-blocks-api/issues/1060)
+- UI changes for contribution details page. [#1041](https://github.com/rokwire/rokwire-building-blocks-api/issues/1041)
+- Catalog home page UI. [#1063](https://github.com/rokwire/rokwire-building-blocks-api/issues/1063)
+- CODEOWNERS file to include CHANGELOG. [#1059](https://github.com/rokwire/rokwire-building-blocks-api/issues/1059)
+- Create contribution page UI. [#1065](https://github.com/rokwire/rokwire-building-blocks-api/issues/1065)
+- Review block in contribution details page. [#1066](https://github.com/rokwire/rokwire-building-blocks-api/issues/1066)
+- Rearranged divs in contribute page. [#1079](https://github.com/rokwire/rokwire-building-blocks-api/issues/1079)
+- Element stylings in contribute page. [#1087](https://github.com/rokwire/rokwire-building-blocks-api/issues/1087)
+- Cryptography version bump for contributions. [#1089](https://github.com/rokwire/rokwire-building-blocks-api/issues/1089)
+- Cryptography version bump for appconfigservice. [#1089](https://github.com/rokwire/rokwire-building-blocks-api/issues/1100)
+- Catalog home page card alignment. [#1084](https://github.com/rokwire/rokwire-building-blocks-api/issues/1084)
+- Updated button styles to match design. [#1085](https://github.com/rokwire/rokwire-building-blocks-api/issues/1085)
+- Update werkzeug version in catalog. [#1099](https://github.com/rokwire/rokwire-building-blocks-api/issues/1099)
+- Custom dropdown menu style. [#1090](https://github.com/rokwire/rokwire-building-blocks-api/issues/1090)
+- Fill footer at the bottom of pages. [#1092](https://github.com/rokwire/rokwire-building-blocks-api/issues/1092)
+- Contribute form field labels and placeholders. [#1102](https://github.com/rokwire/rokwire-building-blocks-api/issues/1102)
+- Wordings of view pages. [#1069](https://github.com/rokwire/rokwire-building-blocks-api/issues/1069)
+
+### Fixed
+- Detect secrets GitHub action build error and updated baseline. [#1077](https://github.com/rokwire/rokwire-building-blocks-api/issues/1077)
+- Overlapping divs in catalog contribute create page. [#1054](https://github.com/rokwire/rokwire-building-blocks-api/issues/1054)
+
 ## [1.17.0] - 2022-12-06
 ### Added
 - Cancel button in contribution edit page. [#986](https://github.com/rokwire/rokwire-building-blocks-api/issues/986)
@@ -548,6 +579,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - References to AWS keys and variables in the Events Building Block.
 
+[Unreleased]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.18.0...HEAD
+[1.18.0]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.17.0...1.18.0
 [Unreleased]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.17.0...HEAD
 [1.17.0]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.16.0...1.17.0
 [1.16.0]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.15.0...1.16.0

CODEOWNERS

@@ -1,6 +1,9 @@
 # Default assignment
 * @sandeep-ps
 
+# CHANGELOG
+CHANGELOG.md @minump @bingzhang @sandeep-ps
+
 # App Config Building Block
 /appconfigservice/ @minump
 

SECURITY.md

@@ -6,6 +6,7 @@ Patches for **Rokwire Building Blocks** in this repository will only be applied
 
 | Version  | Supported          |
 |----------| ------------------ |
+| 1.18.0   | :white_check_mark: |
 | 1.17.0   | :white_check_mark: |
 | 1.16.0   | :white_check_mark: |
 | 1.15.0   | :white_check_mark: |

appconfigservice/appconfig.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.0
 info:
   title: Rokwire App Config Building Block API
   description: App Config Building Block API Documentation
-  version: 1.16.0
+  version: 1.18.0
 servers:
 - url: https://api.rokwire.illinois.edu
   description: Production server

appconfigservice/requirements.txt

@@ -5,10 +5,10 @@ pymongo[tls,srv]==3.7.2
 pytest==5.0.1
 requests==2.22.0
 pyjwt==2.4.0
-cryptography==3.3.2
+cryptography==39.0.1
 gunicorn==20.0.4
 python-dotenv==0.10.3
-gevent==20.9.0
+gevent==21.12.0
 diskcache==4.0.0
 connexion[swagger-ui]==2.9.0
 

contributions/catalog/requirements.txt

@@ -1,5 +1,5 @@
-Flask==1.1.1
-werkzeug==2.0.2
+Flask==2.2.3
+werkzeug==2.2.3
 itsdangerous==2.0.1
 Jinja2==3.0.3
 pymongo==3.7.2