Skip to content
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.

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

Add New Exports and Imports #454

Merged
merged 9 commits into from
Nov 22, 2024

Conversation

phalestrivir
Copy link
Contributor

This PR contains changes to allow for the addition of new imports and exports in Frodo Lib (see this PR. The changes are all separated in separate commits, and they include:

  • The addition of the new role command which allows for listing, exporting, and importing internal roles.
  • The addition of the new server command which allows for listing, exporting, and importing servers and their corresponding properties and default properties.
  • The addition of export and import sub-commands for the realm command to add export and import functionality for realms.
  • The addition of global exports, imports, and describing of authentication settings.
  • Support for exporting, importing, listing, and describing new agent types, including global agents.
  • Bug fix for sync mapping imports.
  • A few other misc. changes
  • Updates to mocks and tests as needed in order for them to pass.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@phalestrivir can you check if the file starting with capital F is the final one or the one with lower-case f?

Since both files are in git but only one can exist on a filesystem, it creates a weird conflict. I just don't know which one to delete and which one to keep.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@phalestrivir can you check if the file starting with capital F is the final one or the one with lower-case f?

Since both files are in git but only one can exist on a filesystem, it creates a weird conflict. I just don't know which one to delete and which one to keep.

@vscheuber
Copy link
Contributor

@phalestrivir since we released v3.0.0 of the lib, you could, if you want, update the package.json to reference v3 and include it in the PR. That way the tests should run and succeed if everything is well and make the merge easier.

Regarding the issue with these two files:

I've had that happen when I renamed files but the only change was the case of a character in the filename and then I just did a git add, it leads to this conflict. There is a git mv command that instructs git to treat it as a rename so you don't end up with both. I wish IDEs would detect this properly but they don't.

@phalestrivir
Copy link
Contributor Author

@vscheuber I just updated the package.json to the latest lib version 3.0.1-0. I deleted the Federation.authenticationModules.json file. It wasn't a renaming issue, but rather there was an authentication module named Federation in the frodo dev tenant that was being exported in addition to the default federation module, so they were two separate, distinct modules. I went ahead and deleted it from the dev tenant since it doesn't appear to be used anywhere so that way in future exports we don't run into the same problem.

@phalestrivir phalestrivir force-pushed the feature/new-imports-and-exports branch from c6f2957 to 441dd81 Compare November 22, 2024 16:09
@phalestrivir
Copy link
Contributor Author

@vscheuber It seems the checks are failing because it can't find the newest changes to the library code. Both package.json and package-lock.json are updated to the latest version of the lib, so I'm not sure what else is causing it to fail.

@vscheuber vscheuber merged commit 7c7fb2e into rockcarver:main Nov 22, 2024
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants