Skip to content

Commit

Permalink
fix service import issues
Browse files Browse the repository at this point in the history
  • Loading branch information
vscheuber committed May 2, 2024
1 parent ac20013 commit 269f53e
Show file tree
Hide file tree
Showing 24 changed files with 6,674 additions and 98 deletions.
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
]
},
"dependencies": {
"@rockcarver/frodo-lib": "2.0.0-77",
"@rockcarver/frodo-lib": "2.0.0-79",
"chokidar": "^3.5.3",
"cli-progress": "^3.11.2",
"cli-table3": "^0.6.3",
Expand Down
6 changes: 3 additions & 3 deletions src/cli/service/service-import.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ program
.addOption(
new Option(
'-r, --current-realm',
'Import service(s) into the current realm.'
).default(true)
'Import service(s) into the current realm. Use this flag if you exported a service from one realm and are importing into another realm.'
).default(false)
)
.action(
async (
Expand All @@ -84,7 +84,7 @@ program

const clean = options.clean ?? false;
const globalConfig = options.global ?? false;
const realmConfig = options.currentRealm ?? false;
const realmConfig = globalConfig ? false : options.currentRealm ?? false;

// import by id
if (options.serviceId && options.file && (await getTokens())) {
Expand Down
6 changes: 5 additions & 1 deletion test/client_cli/en/__snapshots__/service-import.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Options:
from. Ignored with -A.
--flush-cache Flush token cache.
-g, --global Import service(s) as global service(s).
(default: false)
-h, --help Help
-i, --service-id <service-id> Service id. If specified, -a and -A are
ignored.
Expand All @@ -58,7 +59,10 @@ Options:
admin login flow of Identity Cloud and handle
MFA (choices: "classic", "cloud", "forgeops")
--no-cache Disable token cache for this operation.
-r, --current-realm Import service(s) into the current realm.
-r, --current-realm Import service(s) into the current realm. Use
this flag if you exported a service from one
realm and are importing into another realm.
(default: false)
--sa-id <sa-id> Service account id.
--sa-jwk-file <file> File containing the JSON Web Key (JWK)
associated with the the service account.
Expand Down
28 changes: 14 additions & 14 deletions test/e2e/mocks/github_584874290/recording.har

Large diffs are not rendered by default.

32 changes: 18 additions & 14 deletions test/e2e/mocks/npmjs_1455397529/recording.har

Large diffs are not rendered by default.

Loading

0 comments on commit 269f53e

Please sign in to comment.