Skip to content

Pr/482 #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vscheuber wants to merge 3 commits into from
Closed

Pr/482 #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abd87e4
Remove duplicate IDPs from full export
phalestrivir Dec 10, 2024
1860e21
Remove duplicate IDPs from full export
phalestrivir Dec 10, 2024
811bfb8
Merge branch 'fix/fix-idp-duplication' of https://github.com/trivir/f…
vscheuber Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
324 changes: 160 additions & 164 deletions src/ops/ConfigOps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
},
collectErrors: Error[]
): Promise<(object | any[])[]> {
return importFullConfiguration({

Check failure on line 169 in src/ops/ConfigOps.ts

View workflow job for this annotation

GitHub Actions / Build 

Cannot find name 'importFullConfiguration'. Did you mean 'exportFullConfiguration'?
importData,
options,
collectErrors,
Expand Down Expand Up @@ -494,178 +494,174 @@
...config.global,
} as FullGlobalExportInterface;

// Clean up duplicates
if (globalConfig.idm) {
Object.keys(globalConfig.idm)
.filter(
(k) =>
k === 'ui/themerealm' ||
k === 'sync' ||
k.startsWith('mapping/') ||
k.startsWith('emailTemplate/')
)
.forEach((k) => delete globalConfig.idm[k]);
}
//Clean up global duplicates
if (globalConfig.idm) {
Object.keys(globalConfig.idm)
.filter(
(k) =>
k === 'ui/themerealm' ||
k === 'sync' ||
k.startsWith('mapping/') ||
k.startsWith('emailTemplate/')
)
.forEach((k) => delete globalConfig.idm[k]);
}

const realmConfig = {};
if (!onlyGlobal || onlyRealm) {
// Export realm configs
const activeRealm = state.getRealm();
for (const realm of Object.keys(config.realm)) {
const currentRealm = getRealmUsingExportFormat(realm);
if (
onlyRealm &&
(activeRealm.startsWith('/') ? activeRealm : '/' + activeRealm) !==
currentRealm
) {
continue;
}
state.setRealm(currentRealm);
// Export saml2 providers and circle of trusts
let saml = (
(await exportWithErrorHandling(
exportSaml2Providers,
stateObj,
errors
)) as CirclesOfTrustExportInterface
)?.saml;
const cotExport = await exportWithErrorHandling(
exportCirclesOfTrust,
const currentRealm = state.getRealm();
for (const realm of Object.keys(config.realm)) {
state.setRealm(getRealmUsingExportFormat(realm));
//Export saml2 providers and circle of trusts
let saml = (
(await exportWithErrorHandling(
exportSaml2Providers,
stateObj,
errors
);
if (saml) {
saml.cot = cotExport?.saml.cot;
} else {
saml = cotExport?.saml;
}
realmConfig[realm] = {
agentGroup: (
await exportWithErrorHandling(exportAgentGroups, stateObj, errors)
)?.agentGroup,
agent: (
await exportWithErrorHandling(exportAgents, realmStateObj, errors)
)?.agent,
application: (
await exportWithErrorHandling(
exportOAuth2Clients,
{
options: { deps: false, useStringArrays },
state,
},
errors
)
)?.application,
authentication: (
await exportWithErrorHandling(
exportAuthenticationSettings,
realmStateObj,
errors
)
)?.authentication,
idp: (
await exportWithErrorHandling(
exportSocialIdentityProviders,
stateObj,
errors
)
)?.idp,
trees: (
await exportWithErrorHandling(
exportJourneys,
{
options: { deps: false, useStringArrays, coords },
state,
},
errors
)
)?.trees,
managedApplication: (
await exportWithErrorHandling(
exportApplications,
{
options: { deps: false, useStringArrays },
state,
},
errors,
isPlatformDeployment
)
)?.managedApplication,
policy: (
await exportWithErrorHandling(
exportPolicies,
{
options: { deps: false, prereqs: false, useStringArrays },
state,
},
errors
)
)?.policy,
policyset: (
await exportWithErrorHandling(
exportPolicySets,
{
options: { deps: false, prereqs: false, useStringArrays },
state,
},
errors
)
)?.policyset,
resourcetype: (
await exportWithErrorHandling(exportResourceTypes, stateObj, errors)
)?.resourcetype,
saml,
script: (
await exportWithErrorHandling(
exportScripts,
{
options: {
deps: false,
includeDefault,
useStringArrays,
},
state,
},
errors
)
)?.script,
secretstore: (
await exportWithErrorHandling(
exportSecretStores,
realmStateObj,
errors,
isClassicDeployment
)
)?.secretstore,
service: (
await exportWithErrorHandling(exportServices, realmStateObj, errors)
)?.service,
theme: (
await exportWithErrorHandling(
exportThemes,
{
state,
},
errors,
isPlatformDeployment
)
)?.theme,
trustedJwtIssuer: (
await exportWithErrorHandling(
exportOAuth2TrustedJwtIssuers,
{
options: { deps: false, useStringArrays },
state,
)) as CirclesOfTrustExportInterface
)?.saml;
const cotExport = await exportWithErrorHandling(
exportCirclesOfTrust,
stateObj,
errors
);
if (saml) {
saml.cot = cotExport?.saml.cot;
} else {
saml = cotExport?.saml;
}
realmConfig[realm] = {
agentGroup: (
await exportWithErrorHandling(exportAgentGroups, stateObj, errors)
)?.agentGroup,
agent: (
await exportWithErrorHandling(exportAgents, realmStateObj, errors)
)?.agent,
application: (
await exportWithErrorHandling(
exportOAuth2Clients,
{
options: { deps: false, useStringArrays },
state,
},
errors
)
)?.application,
authentication: (
await exportWithErrorHandling(
exportAuthenticationSettings,
realmStateObj,
errors
)
)?.authentication,
idp: (
await exportWithErrorHandling(
exportSocialIdentityProviders,
stateObj,
errors
)
)?.idp,
trees: (
await exportWithErrorHandling(
exportJourneys,
{
options: { deps: false, useStringArrays, coords },
state,
},
errors
)
)?.trees,
managedApplication: (
await exportWithErrorHandling(
exportApplications,
{
options: { deps: false, useStringArrays },
state,
},
errors,
isPlatformDeployment
)
)?.managedApplication,
policy: (
await exportWithErrorHandling(
exportPolicies,
{
options: { deps: false, prereqs: false, useStringArrays },
state,
},
errors
)
)?.policy,
policyset: (
await exportWithErrorHandling(
exportPolicySets,
{
options: { deps: false, prereqs: false, useStringArrays },
state,
},
errors
)
)?.policyset,
resourcetype: (
await exportWithErrorHandling(exportResourceTypes, stateObj, errors)
)?.resourcetype,
saml,
script: (
await exportWithErrorHandling(
exportScripts,
{
options: {
deps: false,
includeDefault,
useStringArrays,
},
errors
)
)?.trustedJwtIssuer,
...config.realm[realm],
};
state,
},
errors
)
)?.script,
secretstore: (
await exportWithErrorHandling(
exportSecretStores,
realmStateObj,
errors,
isClassicDeployment
)
)?.secretstore,
service: (
await exportWithErrorHandling(exportServices, realmStateObj, errors)
)?.service,
theme: (
await exportWithErrorHandling(
exportThemes,
{
state,
},
errors,
isPlatformDeployment
)
)?.theme,
trustedJwtIssuer: (
await exportWithErrorHandling(
exportOAuth2TrustedJwtIssuers,
{
options: { deps: false, useStringArrays },
state,
},
errors
)
)?.trustedJwtIssuer,
...config.realm[realm],
};
//Clean up realm duplicates
if (
realmConfig[realm].service &&
realmConfig[realm].service['SocialIdentityProviders']
) {
delete realmConfig[realm].service['SocialIdentityProviders']
.nextDescendents;
}
state.setRealm(activeRealm);
}
state.setRealm(currentRealm);

if (throwErrors && errors.length > 0) {
throw new FrodoError(`Error exporting full config`, errors);
Expand Down Expand Up @@ -1226,3 +1222,3 @@
Object.keys((o as ServerExportInterface).server).length > 0)
);
}
2 changes: 1 addition & 1 deletion src/ops/ServiceOps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ export async function putFullService({
});

// return fast if no next descendents supplied
if (nextDescendents.length === 0) {
if (!nextDescendents || nextDescendents.length === 0) {
debugMessage({
message: `ServiceOps.putFullService: end (w/o descendents)`,
state,
Expand Down
Loading
Loading