Merge pull request #833 from rokwire/release/1.12.0

Release/1.12.0
rokwire · Nov 22, 2021 · 52506cf · 52506cf
2 parents b3e077a + a397c6e
commit 52506cf
Show file tree

Hide file tree

Showing 70 changed files with 3,790 additions and 1,164 deletions.
diff --git a/.github/workflows/detect-secrets.yaml b/.github/workflows/detect-secrets.yaml
@@ -14,7 +14,7 @@ jobs:
       run: |
         apt-get update && apt-get install -y jq
         pip install yq
-        pip install detect-secrets==$(yq -r .[0].rev .pre-commit-config.yaml)
+        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
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,5 +1,6 @@
+repos:
 - repo: [email protected]:Yelp/detect-secrets
-  rev: v0.14.1
+  rev: v1.0.3
   hooks:
   - id: detect-secrets
     args: ['--baseline', '.secrets.baseline']

diff --git a/.secrets.baseline b/.secrets.baseline
@@ -1,20 +1,18 @@
 {
-  "custom_plugin_paths": [],
-  "exclude": {
-    "files": null,
-    "lines": null
-  },
-  "generated_at": "2020-08-05T02:59:28Z",
+  "version": "1.0.3",
   "plugins_used": [
+    {
+      "name": "ArtifactoryDetector"
+    },
     {
       "name": "AWSKeyDetector"
     },
     {
-      "name": "ArtifactoryDetector"
+      "name": "AzureStorageKeyDetector"
     },
     {
-      "base64_limit": 4.5,
-      "name": "Base64HighEntropyString"
+      "name": "Base64HighEntropyString",
+      "limit": 4.5
     },
     {
       "name": "BasicAuthDetector"
@@ -23,8 +21,8 @@
       "name": "CloudantDetector"
     },
     {
-      "hex_limit": 3,
-      "name": "HexHighEntropyString"
+      "name": "HexHighEntropyString",
+      "limit": 3.0
     },
     {
       "name": "IbmCloudIamDetector"
@@ -36,12 +34,15 @@
       "name": "JwtTokenDetector"
     },
     {
-      "keyword_exclude": null,
-      "name": "KeywordDetector"
+      "name": "KeywordDetector",
+      "keyword_exclude": ""
     },
     {
       "name": "MailchimpDetector"
     },
+    {
+      "name": "NpmDetector"
+    },
     {
       "name": "PrivateKeyDetector"
     },
@@ -51,141 +52,176 @@
     {
       "name": "SoftlayerDetector"
     },
+    {
+      "name": "SquareOAuthDetector"
+    },
     {
       "name": "StripeDetector"
     },
     {
       "name": "TwilioKeyDetector"
     }
   ],
+  "filters_used": [
+    {
+      "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
+    },
+    {
+      "path": "detect_secrets.filters.common.is_baseline_file",
+      "filename": ".secrets.baseline"
+    },
+    {
+      "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
+      "min_level": 2
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_indirect_reference"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_likely_id_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_potential_uuid"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_sequential_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_templated_secret"
+    }
+  ],
   "results": {
     "appconfigservice/README.md": [
       {
-        "hashed_secret": "0dd91d7d2dee491919369a6d60e20954ba22ea7c",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "appconfigservice/README.md",
+        "hashed_secret": "055d8a847dfea9c1c840140dd0940b0a5a832565",
         "is_verified": false,
         "line_number": 22,
-        "type": "Secret Keyword"
+        "is_secret": false
       },
       {
-        "hashed_secret": "81b127e2222d9bfc4609053faec85300f7525463",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "appconfigservice/README.md",
+        "hashed_secret": "c2d2d8a23ffdcdee0e074b02d3a076d1546dc803",
         "is_verified": false,
         "line_number": 28,
-        "type": "Secret Keyword"
+        "is_secret": false
       },
       {
-        "hashed_secret": "a91dbe46987cdf705256b5833997728c9add55f6",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "appconfigservice/README.md",
+        "hashed_secret": "93b6e269c00e67237d474cb068bbfb1362ea48b8",
         "is_verified": false,
         "line_number": 52,
-        "type": "Secret Keyword"
-      }
-    ],
-    "appconfigservice/appconfig-v010.json": [
-      {
-        "hashed_secret": "a523e602e6a14449f8a8c3a4a2a2d00525eeb556",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 20,
-        "type": "Basic Auth Credentials"
-      }
-    ],
-    "appconfigservice/appconfig-v094.json": [
-      {
-        "hashed_secret": "a523e602e6a14449f8a8c3a4a2a2d00525eeb556",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 27,
-        "type": "Basic Auth Credentials"
+        "is_secret": false
       }
     ],
     "appconfigservice/appconfig.yaml": [
       {
+        "type": "Hex High Entropy String",
+        "filename": "appconfigservice/appconfig.yaml",
         "hashed_secret": "a45a360e6ff9bceaf3fcfef370a6d6e1d4ba9271",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 65,
-        "type": "Hex High Entropy String"
+        "is_secret": false
       }
     ],
     "auth-middleware-test-svc/README.md": [
       {
-        "hashed_secret": "0dd91d7d2dee491919369a6d60e20954ba22ea7c",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "auth-middleware-test-svc/README.md",
+        "hashed_secret": "055d8a847dfea9c1c840140dd0940b0a5a832565",
         "is_verified": false,
         "line_number": 30,
-        "type": "Secret Keyword"
+        "is_secret": false
       }
     ],
     "authservice/README.md": [
       {
-        "hashed_secret": "81b127e2222d9bfc4609053faec85300f7525463",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "authservice/README.md",
+        "hashed_secret": "c2d2d8a23ffdcdee0e074b02d3a076d1546dc803",
         "is_verified": false,
         "line_number": 73,
-        "type": "Secret Keyword"
+        "is_secret": false
+      }
+    ],
+    "contributions/catalog/Dockerfile": [
+      {
+        "type": "Secret Keyword",
+        "filename": "contributions/catalog/Dockerfile",
+        "hashed_secret": "b6ee60926c0a426addcbb7e087d4274498f35b1c",
+        "is_verified": false,
+        "line_number": 23,
+        "is_secret": false
       }
     ],
     "eventservice/README.md": [
       {
-        "hashed_secret": "81b127e2222d9bfc4609053faec85300f7525463",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "eventservice/README.md",
+        "hashed_secret": "c2d2d8a23ffdcdee0e074b02d3a076d1546dc803",
         "is_verified": false,
         "line_number": 24,
-        "type": "Secret Keyword"
+        "is_secret": false
       },
       {
-        "hashed_secret": "289a8d69fc17eb0668911e4a2c2f43f409c1b6e0",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "eventservice/README.md",
+        "hashed_secret": "99f11f7789a5315285e569895445507118f188bd",
         "is_verified": false,
         "line_number": 30,
-        "type": "Secret Keyword"
+        "is_secret": false
       }
     ],
     "loggingservice/README.md": [
       {
-        "hashed_secret": "81b127e2222d9bfc4609053faec85300f7525463",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "loggingservice/README.md",
+        "hashed_secret": "c2d2d8a23ffdcdee0e074b02d3a076d1546dc803",
         "is_verified": false,
         "line_number": 22,
-        "type": "Secret Keyword"
+        "is_secret": false
       },
       {
-        "hashed_secret": "289a8d69fc17eb0668911e4a2c2f43f409c1b6e0",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "loggingservice/README.md",
+        "hashed_secret": "99f11f7789a5315285e569895445507118f188bd",
         "is_verified": false,
         "line_number": 28,
-        "type": "Secret Keyword"
+        "is_secret": false
       }
     ],
     "profileservice/README.md": [
       {
-        "hashed_secret": "0dd91d7d2dee491919369a6d60e20954ba22ea7c",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "profileservice/README.md",
+        "hashed_secret": "055d8a847dfea9c1c840140dd0940b0a5a832565",
         "is_verified": false,
         "line_number": 38,
-        "type": "Secret Keyword"
+        "is_secret": false
       },
       {
-        "hashed_secret": "81b127e2222d9bfc4609053faec85300f7525463",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "profileservice/README.md",
+        "hashed_secret": "c2d2d8a23ffdcdee0e074b02d3a076d1546dc803",
         "is_verified": false,
         "line_number": 44,
-        "type": "Secret Keyword"
+        "is_secret": false
       },
       {
-        "hashed_secret": "289a8d69fc17eb0668911e4a2c2f43f409c1b6e0",
-        "is_secret": false,
+        "type": "Secret Keyword",
+        "filename": "profileservice/README.md",
+        "hashed_secret": "99f11f7789a5315285e569895445507118f188bd",
         "is_verified": false,
         "line_number": 50,
-        "type": "Secret Keyword"
+        "is_secret": false
       }
     ]
   },
-  "version": "0.14.1",
-  "word_list": {
-    "file": null,
-    "hash": null
-  }
+  "generated_at": "2021-11-17T22:48:48Z"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,47 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - More information to logs in event services when performing POST, PUT, DELETE. [#822](https://github.com/rokwire/rokwire-building-blocks-api/issues/822)
 
+## [1.12.0] - 2021-11-19
+### Added
+- Add edit contribution capability in catalog. [#737](https://github.com/rokwire/rokwire-building-blocks-api/issues/737)
+- Add edit contribution button based on the logged in user. [#766](https://github.com/rokwire/rokwire-building-blocks-api/issues/766)
+- Add contributionAdmins to capability and talent detail end point. [#730](https://github.com/rokwire/rokwire-building-blocks-api/issues/730)
+- Catalog release script. [#784](https://github.com/rokwire/rokwire-building-blocks-api/issues/784)
+- /ok endpoint for healthcheck in AppConfig.[#754](https://github.com/rokwire/rokwire-building-blocks-api/issues/754)
+- /version endpoint in AppConfig.[#760](https://github.com/rokwire/rokwire-building-blocks-api/issues/760)
+- Core BB Auth Support [#808](https://github.com/rokwire/rokwire-building-blocks-api/issues/808)
+- Core BB profile migration [#809](https://github.com/rokwire/rokwire-building-blocks-api/issues/809)
+- SECURITY.md file. [#804](https://github.com/rokwire/rokwire-building-blocks-api/issues/804)
+- Add version endpoint in Events building block.[#725](https://github.com/rokwire/rokwire-building-blocks-api/issues/725)
+
+### Changed
+- Updated pre-commit config and corresponding GitHub Action to use `Yelp/detect-secrets` version 1.0.3. [#649](https://github.com/rokwire/rokwire-building-blocks-api/issues/649)
+- Make catalog pages to show all the items for contribution admins. [#728](https://github.com/rokwire/rokwire-building-blocks-api/issues/728)
+- Make contribution details pages to show all items for reviewers and admins. [#728](https://github.com/rokwire/rokwire-building-blocks-api/issues/728)
+- Catalog default port and default URL prefix. [#784](https://github.com/rokwire/rokwire-building-blocks-api/issues/784)
+- Modified contribution schema for required capability [#790](https://github.com/rokwire/rokwire-building-blocks-api/issues/790)
+- Default Contributions Catalog port to 5000 and made it configurable. [#788](https://github.com/rokwire/rokwire-building-blocks-api/issues/788)
+
+### Fixed
+- Fix get event endpoint with user auth key. [#746](https://github.com/rokwire/rokwire-building-blocks-api/issues/746)
+- Fix published capabilities and talents not showing without login. [#767](https://github.com/rokwire/rokwire-building-blocks-api/issues/767)
+- Fix catalog use python generated result instead of java script.  [#772](https://github.com/rokwire/rokwire-building-blocks-api/issues/772)
+- Contribution POST gives proper error message. [#714](https://github.com/rokwire/rokwire-building-blocks-api/issues/714)
+- Hard coded base url. [#780](https://github.com/rokwire/rokwire-building-blocks-api/issues/780)
+- Multiple bugs/improvements around login. [#782](https://github.com/rokwire/rokwire-building-blocks-api/issues/782)
+- Fix login problem with session. [#796](https://github.com/rokwire/rokwire-building-blocks-api/issues/796)
+- Fix logout. [#775](https://github.com/rokwire/rokwire-building-blocks-api/issues/775)
+- Fix top navigation to provide correct login info. [#773](https://github.com/rokwire/rokwire-building-blocks-api/issues/773)
+- Fix login button provide correct info when user not logged in. [#778](https://github.com/rokwire/rokwire-building-blocks-api/issues/778)
+- Contributions Catalog release script and Dockerfile. [#787](https://github.com/rokwire/rokwire-building-blocks-api/issues/787)
+- Added version and gitsha in catalog footer [#770](https://github.com/rokwire/rokwire-building-blocks-api/issues/770)
+- Auth middleware lib to recognize Rokwire issuer.  [#823](https://github.com/rokwire/rokwire-building-blocks-api/issues/823)
+- Groups membership request in Events BB. [#823](https://github.com/rokwire/rokwire-building-blocks-api/issues/823)
+
+## [1.11.3] - 2021-11-18
+### Added
+- More information to logs in event services when performing POST, PUT, DELETE. [#822](https://github.com/rokwire/rokwire-building-blocks-api/issues/822)
+
 ## [1.11.2] - 2021-09-17
 ### Changed
 - Update Events Building Block logs and related configuration. [#793](https://github.com/rokwire/rokwire-building-blocks-api/issues/793)
@@ -374,7 +415,10 @@ 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.11.1...HEAD
+[Unreleased]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.12.0...HEAD
+[1.12.0]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.11.3...1.12.0
+[1.11.3]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.11.2...1.11.3
+[1.11.2]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.11.1...1.11.2
 [1.11.1]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.11.0...1.11.1
 [1.11.0]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.10.0...1.11.0
 [1.10.0]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.9.1...1.10.0

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ API definitions of the Rokwire Platform building blocks
 ## Install commit hooks
 
 ```
-$ pip install detect-secrets pre-commit
+$ pip install -r requirements-dev.txt
 $ pre-commit install
 ```