Merge pull request #410 from rockcarver/pr/409

Pr/409

package.json

@@ -114,7 +114,7 @@
     ]
   },
   "devDependencies": {
-    "@rockcarver/frodo-lib": "2.0.0-93",
+    "@rockcarver/frodo-lib": "2.0.0-94",
     "@types/colors": "^1.2.1",
     "@types/fs-extra": "^11.0.1",
     "@types/jest": "^29.2.3",

test/e2e/__snapshots__/agent-delete.e2e.test.js.snap

@@ -1,14 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`frodo agent delete "frodo agent delete --agent-id frodo-test-ig-agent": should display error when the agent with id 'frodo-test-ig-agent' cannot be deleted since it does not exist 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 Error deleting agent frodo-test-ig-agent
   Agent 'frodo-test-ig-agent' not found!
 "
 `;
 
 exports[`frodo agent delete "frodo agent delete --all": should do nothing when no agents can be deleted 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 "
 `;
 

test/e2e/__snapshots__/agent-gateway-delete.e2e.test.js.snap

@@ -1,14 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`frodo agent gateway delete "frodo agent gateway delete --agent-id frodo-test-ig-agent": should display error when the agent gateway with id 'frodo-test-ig-agent' cannot be deleted since it does not exist 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 Error deleting identity gateway agent frodo-test-ig-agent
   Identity gateway agent 'frodo-test-ig-agent' not found!
 "
 `;
 
 exports[`frodo agent gateway delete "frodo agent gateway delete --all": should do nothing when no agent gateways can be deleted 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 "
 `;
 

test/e2e/__snapshots__/agent-java-delete.e2e.test.js.snap

@@ -1,14 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`frodo agent java delete "frodo agent java delete --agent-id frodo-test-java-agent": should display error when the java agent with id 'frodo-test-java-agent' cannot be deleted since it does not exist 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 Error deleting java agent frodo-test-java-agent
   Java agent 'frodo-test-java-agent' not found!
 "
 `;
 
 exports[`frodo agent java delete "frodo agent java delete --all": should do nothing when no java agent can be deleted since none exist 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 "
 `;
 

test/e2e/__snapshots__/agent-web-delete.e2e.test.js.snap

@@ -1,14 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`frodo agent web delete "frodo agent web delete --agent-id frodo-test-web-agent": should display error when the web agent with id 'frodo-test-web-agent' cannot be deleted since it does not exist 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 Error deleting web agent frodo-test-web-agent
   Web agent 'frodo-test-web-agent' not found!
 "
 `;
 
 exports[`frodo agent web delete "frodo agent web delete --all": should do nothing when no web agent can be deleted 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 "
 `;
 

test/e2e/__snapshots__/authz-policy-delete.e2e.test.js.snap

@@ -3,14 +3,14 @@
 exports[`frodo authz policy delete "frodo authz policy delete --all --set-id test-policy-set": should delete all policies in the test-policy-set set 1`] = `""`;
 
 exports[`frodo authz policy delete "frodo authz policy delete --all": should do nothing when no policies can be deleted 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Retrieving all policies...
 ✔ Found 0 policies.
 "
 `;
 
 exports[`frodo authz policy delete "frodo authz policy delete --policy-id 'Test Policy'": should display error when the policies with id 'Test Policy' cannot be deleted since it does not exist 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Deleting Test Policy...
 ✖ Error deleting policy Test Policy
 Error deleting policy Test Policy

test/e2e/__snapshots__/authz-set-delete.e2e.test.js.snap

@@ -1,14 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`frodo authz set delete "frodo authz set delete --all": should do nothing when no policy sets can be deleted 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Retrieving all policy sets...
 ✔ Found 0 policy sets.
 "
 `;
 
 exports[`frodo authz set delete "frodo authz set delete --set-id test-policy-set": should display error when the policy set with id 'test-policy-set' cannot be deleted since it does not exist 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Deleting test-policy-set...
 ✖ Error deleting policy set test-policy-set
 Error deleting policy set test-policy-set

test/e2e/__snapshots__/authz-type-delete.e2e.test.js.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`frodo authz type delete "frodo authz type delete --type-id 0aa5ed25-0c62-4ff5-9a42-3bda8c5cbb76": should display error when the resource type with id 0aa5ed25-0c62-4ff5-9a42-3bda8c5cbb76 cannot be deleted since it does not exist 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Deleting 0aa5ed25-0c62-4ff5-9a42-3bda8c5cbb76...
 ✖ Error deleting resource type 0aa5ed25-0c62-4ff5-9a42-3bda8c5cbb76
 Error deleting resource type 0aa5ed25-0c62-4ff5-9a42-3bda8c5cbb76
@@ -14,7 +14,7 @@ Error deleting resource type 0aa5ed25-0c62-4ff5-9a42-3bda8c5cbb76
 `;
 
 exports[`frodo authz type delete "frodo authz type delete --type-name FrodoTestResourceType13": should display error when the resource type with name FrodoTestResourceType13 cannot be deleted since it does not exist 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Deleting FrodoTestResourceType13...
 ✖ Error deleting resource type FrodoTestResourceType13
 Error deleting resource type FrodoTestResourceType13

test/e2e/__snapshots__/config-import.e2e.test.js.snap

@@ -1,10 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`frodo config import "frodo config import --current-realm --default -CAD test/e2e/exports/all-separate/everything" Import everything from directory "test/e2e/exports/all-separate/everything", including default scripts. Import services as realm services, and clean old services 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701393386423 [ba58ff99-76d3-4c69-9c4a-7f150ac70e2c]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Resolving dependencies
 ✔ Resolved all dependencies.
 Errors occurred during full config import
+  Error importing config entities
+  Error updating config entity bravoOrgPrivileges
+  HTTP client error
+    Code: ERR_BAD_REQUEST
+    Status: 401
+    Reason: Unauthorized
+    Message: Unauthorized
   Error importing services
   Error putting realm full service configs
   Error putting global full service config CorsService
@@ -18,10 +25,17 @@ Errors occurred during full config import
 `;
 
 exports[`frodo config import "frodo config import --global -CAD test/e2e/exports/all-separate/everything" Import everything from directory "test/e2e/exports/all-separate/everything". Import services as global services, and clean old services 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701393386423 [ba58ff99-76d3-4c69-9c4a-7f150ac70e2c]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Resolving dependencies
 ✔ Resolved all dependencies.
 Errors occurred during full config import
+  Error importing config entities
+  Error updating config entity bravoOrgPrivileges
+  HTTP client error
+    Code: ERR_BAD_REQUEST
+    Status: 401
+    Reason: Unauthorized
+    Message: Unauthorized
   Error importing services
   Error putting global full service configs
   Error putting global full service config CorsService
@@ -43,10 +57,8 @@ Errors occurred during full config import
   Error deleting service 'baseurl' before import
   Error deleting global full service config baseurl
   HTTP client error
-    Code: ERR_BAD_REQUEST
-    Status: 403
-    Reason: Forbidden
-    Message: This operation is not available in ForgeRock Identity Cloud.
+    Code: ERR_BAD_RESPONSE
+    Status: 502
   Error putting global full service config dashboard
   Error deleting service 'dashboard' before import
   HTTP client error
@@ -58,8 +70,10 @@ Errors occurred during full config import
   Error deleting service 'oauth-oidc' before import
   Error deleting global full service config oauth-oidc
   HTTP client error
-    Code: ERR_BAD_RESPONSE
-    Status: 502
+    Code: ERR_BAD_REQUEST
+    Status: 403
+    Reason: Forbidden
+    Message: This operation is not available in ForgeRock Identity Cloud.
   Error putting global full service config pingOneWorkerService
   Error deleting service 'pingOneWorkerService' before import
   Error deleting global full service config pingOneWorkerService
@@ -72,8 +86,10 @@ Errors occurred during full config import
   Error deleting service 'policyconfiguration' before import
   Error deleting global full service config policyconfiguration
   HTTP client error
-    Code: ERR_BAD_RESPONSE
-    Status: 502
+    Code: ERR_BAD_REQUEST
+    Status: 403
+    Reason: Forbidden
+    Message: This operation is not available in ForgeRock Identity Cloud.
   Error putting global full service config selfServiceTrees
   Error deleting service 'selfServiceTrees' before import
   Error deleting global full service config selfServiceTrees
@@ -98,12 +114,25 @@ Errors occurred during full config import
 "
 `;
 
-exports[`frodo config import "frodo config import -AD test/e2e/exports/all-separate/everything --include-active-values" Import everything with secret values from directory "test/e2e/exports/all-separate/everything" 1`] = `undefined`;
+exports[`frodo config import "frodo config import -AD test/e2e/exports/all-separate/everything --include-active-values" Import everything with secret values from directory "test/e2e/exports/all-separate/everything" 1`] = `
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
+- Resolving dependencies
+✔ Resolved all dependencies.
+Errors occurred during full config import
+  Error importing config entities
+  Error updating config entity bravoOrgPrivileges
+  HTTP client error
+    Code: ERR_BAD_REQUEST
+    Status: 401
+    Reason: Unauthorized
+    Message: Unauthorized
+"
+`;
 
-exports[`frodo config import "frodo config import -AD test/e2e/exports/all-separate/everything" Import everything from directory "test/e2e/exports/all-separate/everything" 1`] = `undefined`;
+exports[`frodo config import "frodo config import -AD test/e2e/exports/all-separate/everything" Import everything from directory "test/e2e/exports/all-separate/everything" 1`] = `""`;
 
 exports[`frodo config import "frodo config import -adf test/e2e/exports/all/Alpha.everything.json" Import everything from "Alpha.everything.json", including default scripts. 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701393386423 [ba58ff99-76d3-4c69-9c4a-7f150ac70e2c]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Resolving dependencies
 ✔ Resolved all dependencies.
 Errors occurred during full config import
@@ -124,11 +153,17 @@ Errors occurred during full config import
 `;
 
 exports[`frodo config import "frodo config import -agCf test/e2e/exports/all/Alpha.everything.json" Import everything from "Alpha.everything.json". Import services as global services, and clean old services 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701393386423 [ba58ff99-76d3-4c69-9c4a-7f150ac70e2c]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Resolving dependencies
 ✔ Resolved all dependencies.
 Errors occurred during full config import
   Error importing config entities
+  Error updating config entity bravoOrgPrivileges
+  HTTP client error
+    Code: ERR_BAD_REQUEST
+    Status: 401
+    Reason: Unauthorized
+    Message: Unauthorized
   Error updating config entity emailTemplate/baselineDemoEmailVerification
   HTTP client error
     Code: ERR_BAD_REQUEST
@@ -153,17 +188,17 @@ Errors occurred during full config import
   Error putting global full service config SocialIdentityProviders
   Error deleting service 'SocialIdentityProviders' before import
   Error deleting global full service config SocialIdentityProviders
-  HTTP client error
-    Code: ERR_BAD_RESPONSE
-    Status: 502
-  Error putting global full service config baseurl
-  Error deleting service 'baseurl' before import
-  Error deleting global full service config baseurl
   HTTP client error
     Code: ERR_BAD_REQUEST
     Status: 403
     Reason: Forbidden
     Message: This operation is not available in ForgeRock Identity Cloud.
+  Error putting global full service config baseurl
+  Error deleting service 'baseurl' before import
+  Error deleting global full service config baseurl
+  HTTP client error
+    Code: ERR_BAD_RESPONSE
+    Status: 502
   Error putting global full service config dashboard
   Error deleting service 'dashboard' before import
   HTTP client error
@@ -175,16 +210,16 @@ Errors occurred during full config import
   Error deleting service 'oauth-oidc' before import
   Error deleting global full service config oauth-oidc
   HTTP client error
-    Code: ERR_BAD_REQUEST
-    Status: 403
-    Reason: Forbidden
-    Message: This operation is not available in ForgeRock Identity Cloud.
+    Code: ERR_BAD_RESPONSE
+    Status: 502
   Error putting global full service config pingOneWorkerService
   Error deleting service 'pingOneWorkerService' before import
   Error deleting global full service config pingOneWorkerService
   HTTP client error
-    Code: ERR_BAD_RESPONSE
-    Status: 502
+    Code: ERR_BAD_REQUEST
+    Status: 403
+    Reason: Forbidden
+    Message: This operation is not available in ForgeRock Identity Cloud.
   Error putting global full service config policyconfiguration
   Error deleting service 'policyconfiguration' before import
   Error deleting global full service config policyconfiguration
@@ -210,24 +245,20 @@ Errors occurred during full config import
   Error deleting service 'validation' before import
   Error deleting global full service config validation
   HTTP client error
-    Code: ERR_BAD_RESPONSE
-    Status: 502
+    Code: ERR_BAD_REQUEST
+    Status: 403
+    Reason: Forbidden
+    Message: This operation is not available in ForgeRock Identity Cloud.
 "
 `;
 
 exports[`frodo config import "frodo config import -arCf test/e2e/exports/all/Alpha.everything.json" Import everything from "Alpha.everything.json". Import services as realm services, and clean old services 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701393386423 [ba58ff99-76d3-4c69-9c4a-7f150ac70e2c]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Resolving dependencies
 ✔ Resolved all dependencies.
 Errors occurred during full config import
   Error importing config entities
-  Error updating config entity emailTemplate/baselineDemoEmailVerification
-  HTTP client error
-    Code: ERR_BAD_REQUEST
-    Status: 401
-    Reason: Unauthorized
-    Message: Unauthorized
-  Error importing email templates
+  Error updating config entity bravoOrgPrivileges
   HTTP client error
     Code: ERR_BAD_REQUEST
     Status: 401

test/e2e/__snapshots__/esv-secret-delete.e2e.test.js.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`frodo esv secret delete "frodo esv secret delete --secret-id esv-test-secret-pi-generic": should display error when the secret with id 'esv-test-secret-pi-generic' cannot be deleted since it does not exist 1`] = `
-"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account frodo-test [b672336b-41ef-428d-ae4a-e0c082875377]
+"Connected to https://openam-frodo-dev.forgeblocks.com/am [alpha] as service account Frodo-SA-1701807230743 [b672336b-41ef-428d-ae4a-e0c082875377]
 - Deleting secret esv-test-secret-pi-generic...
 ✖ Error deleting secret esv-test-secret-pi-generic
 HTTP client error