From 9ebb36770eb7170e26530b0fd11b21415553921c Mon Sep 17 00:00:00 2001 From: Nathan Phelps Date: Fri, 21 Jul 2023 09:00:08 -0400 Subject: [PATCH] Back-ported v2.117.0 to v2.110.2 Signed-off-by: Nathan Phelps --- CHANGELOG.md | 21 ++----------------- docs/openapi-3-developer.json | 2 +- docs/openapi-3-user.json | 2 +- src/main/resources/version.txt | 2 +- .../ManagementPoliciesSuite.scala | 6 +++--- 5 files changed, 8 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d7e6b06..edf55dbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,25 +2,16 @@ All notable changes to this project will be documented in this file. -## [2.117.0] - 2023-07-13 +## [2.110.2] - 2023-07-21 +- Back-porting 2.117.0 to 2.110.2 - Issue 686: Added rest parameter `manifest` to Get /v1/orgs//managementpolicies route. - -## [2.116.0] - 2023-07-11 - Issue 676: Added `isNamespaceScoped` attribute to Nodes. - Reorganized table package object source for Nodes and related. - SBT 1.9.0 -> 1.9.2 - -## [2.115.3] - 2023-07-07 - Issue 675: Node tokens can be changed by all User types, and public keys can only be [un]set without changing keys by Nodes. - -## [2.115.2] - 2023-07-07 - Issue 675: Removed extra regular expressions modifying searched Service's URL. - -## [2.115.1] - 2023-07-06 - Issue 675: Fixed User and Node access to searching all Patterns and Services within the Node's Organization. - Corrected error messages. - -## [2.115.0] - 2023-06-28 - Issue 675: Patch /orgs//nodes/ No longer allows setting the Node's token if a public key is set. - Added a new database table to handle Service querying and matching. - pattern and userInput are now User archetype authorization scoped. @@ -29,23 +20,15 @@ All notable changes to this project will be documented in this file. - SBT 1.8.2 -> 1.9.0 - swagger-scala-module 2.8.2 -> 2.11.0 - Swagger UI 4.15.5 -> 5.1.0 - -## [2.114.0] - 2023-05-01 - Issue 639: Moved top-level attribute clusterNamespace to a sub-attribute under service for Deployment Policies. - -## [2.113.0] - 2023-04-26 - Issue 637 - Added CORS support. Can be configurated via the Exchange's config.json file. - Changed Java package path to the prefix org.openhorizon. - Moved source handling routing to new sub-package org.openhorizon.route.. - AdminRoutes and AgbotRoutes have been further sub-divided based on rest resource. - Deprecated custom methods for handling Akka configuration parameters in favor of framework defaults. - Backwards compatibility is still maintained. - -## [2.112.0] - 2023-04-07 - Issue 640: Added `clusterNamespace` attribute to Deployment Patterns. - Issue 641: Added `clusterNamespace` attribute to Nodes. - -## [2.111.0] - 2023-04-03 - Issue 639: Added `clusterNamespace` attribute to Deployment Policies. ## [2.110.1] - 2023-03-01 diff --git a/docs/openapi-3-developer.json b/docs/openapi-3-developer.json index 870e440b..e9ab99ce 100644 --- a/docs/openapi-3-developer.json +++ b/docs/openapi-3-developer.json @@ -8,7 +8,7 @@ "name" : "Apache License Version 2.0", "url" : "https://www.apache.org/licenses/LICENSE-2.0" }, - "version" : "2.117.0" + "version" : "2.110.2" }, "externalDocs" : { "description" : "Open-horizon ExchangeAPI", diff --git a/docs/openapi-3-user.json b/docs/openapi-3-user.json index d0f94ef9..89b7fe45 100644 --- a/docs/openapi-3-user.json +++ b/docs/openapi-3-user.json @@ -8,7 +8,7 @@ "name" : "Apache License Version 2.0", "url" : "https://www.apache.org/licenses/LICENSE-2.0" }, - "version" : "2.117.0" + "version" : "2.110.2" }, "externalDocs" : { "description" : "Open-horizon ExchangeAPI", diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt index 98b004c2..bd166dd7 100644 --- a/src/main/resources/version.txt +++ b/src/main/resources/version.txt @@ -1 +1 @@ -2.117.0 +2.110.2 diff --git a/src/test/scala/org/openhorizon/exchangeapi/route/managementpolicy/ManagementPoliciesSuite.scala b/src/test/scala/org/openhorizon/exchangeapi/route/managementpolicy/ManagementPoliciesSuite.scala index bfd94f1e..8f577a3d 100644 --- a/src/test/scala/org/openhorizon/exchangeapi/route/managementpolicy/ManagementPoliciesSuite.scala +++ b/src/test/scala/org/openhorizon/exchangeapi/route/managementpolicy/ManagementPoliciesSuite.scala @@ -7,7 +7,7 @@ import org.junit.runner.RunWith import org.openhorizon.exchangeapi.route.organization.{ChangeEntry, ResourceChangesRequest, ResourceChangesRespObject} import org.openhorizon.exchangeapi.route.user.PostPutUsersRequest import org.openhorizon.exchangeapi.table.node.{NodeRow, NodesTQ} -import org.openhorizon.exchangeapi.table.{ManagementPolicy, OneProperty, OrgRow, OrgsTQ} +import org.openhorizon.exchangeapi.table.{ManagementPolicy, OneProperty, OrgRow, OrgsTQ, ResourceChangesTQ} import org.openhorizon.exchangeapi.{ApiResponse, ApiTime, ApiUtils, HttpCode, Role, TestDBConnection} import org.scalatest.BeforeAndAfterAll import org.scalatest.funsuite.AnyFunSuite @@ -76,8 +76,8 @@ class ManagementPoliciesSuite extends AnyFunSuite with BeforeAndAfterAll{ // Teardown testing harness and cleanup. override def afterAll(): Unit = { - /*Await.ready(DBCONNECTION.getDb.run(ResourceChangesTQ.filter(_.orgId startsWith "MgmtPolSuite").delete andThen - OrgsTQ.filter(_.orgid startsWith "MgmtPolSuite").delete), AWAITDURATION)*/ + Await.ready(DBCONNECTION.getDb.run(ResourceChangesTQ.filter(_.orgId startsWith "MgmtPolSuite").delete andThen + OrgsTQ.filter(_.orgid startsWith "MgmtPolSuite").delete), AWAITDURATION) DBCONNECTION.getDb.close() }