-
Notifications
You must be signed in to change notification settings - Fork 95
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
Fork: Remove 'Enterprise' and related references from user-visible codebase #142
Fork: Remove 'Enterprise' and related references from user-visible codebase #142
Conversation
b5a0a5d
to
83c6ebd
Compare
bb19748
to
f82fe38
Compare
a7bd97f
to
357ab27
Compare
There seem to be a few tests broken, under builtin/logical/database and /vault/external_tests/raft but I don't think they are related to these changes. Also, as my previous contributions to vault were only crypto related there might be additional places where references to enterprise are made but I'm not aware of, if so, please let me know. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Broadly I think this looks fairly good and am happy to see this merged, with or without the constants.IsEnterprise
removal!
Long term, I think we should think about removing all the stubs from files that are marked //go:build !enterprise
: we'll need to remove a lot of call sites, but these should be unnecessary to keep given we don't have Vault Enterprise code.
Just committed the removal of all "enterprise" stubs in the files. With your previous comment did you mean just that or the files that had that stub and all code references/calls to that code? |
Ah, I was thinking that you'd remove the functions themselves, and maybe the files too, to that where you can... E.g., Its more work, but reduces our code size a fair bit :-) That's why I thought that perhaps a separate PR (maybe logically grouped -- one for managed keys, one for clustering hooks, &c) could be better. :-) |
I see, maybe having separate PRs for that, as you are suggesting, is a better idea. Do I need to revert the commit the removed the "enterprise" stubs? |
@Gabrielopesantos No, I think this is fine as-is, just need to remember which files you need to trim up later. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks very nice @Gabrielopesantos!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Gabrielopesantos Your commits need to be signed before I can merge your pull request.
3a7b895
to
b8319cd
Compare
Hey @naphelps, do you mean GPG-signed? If it's just the "signed-off-by" message they are already signed and the DCO check is passing. |
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
build is breaking Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
b8319cd
to
bb0b542
Compare
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, wonder if something got messed up in a rebase:
# github.com/openbao/openbao/command [github.com/openbao/openbao/command.test]
command/operator_diagnose.go:29:2: could not import github.com/openbao/openbao/helper/constants (open : no such file or directory)
command/operator_diagnose.go:598:15: coreConfig.LicensePath undefined (type "github.com/openbao/openbao/vault".CoreConfig has no field or method LicensePath)
command/operator_diagnose.go:601:15: coreConfig.License undefined (type "github.com/openbao/openbao/vault".CoreConfig has no field or method License)
command/server.go:436:29: config.Entropy undefined (type *server.Config has no field or method Entropy)
command/server.go:438:10: config.Entropy undefined (type *server.Config has no field or method Entropy)
command/server.go:1138:10: config.LicensePath undefined (type *server.Config has no field or method LicensePath)
command/server.go:1141:10: config.License undefined (type *server.Config has no field or method License)
command/server.go:1656:19: undefined: vault.LicenseReload
command/server.go:2751:3: unknown field License in struct literal of type "github.com/openbao/openbao/vault".CoreConfig
command/server.go:2751:42: config.License undefined (type *server.Config has no field or method License)
command/server.go:2751:3: too many errors
? github.com/openbao/openbao/builtin/plugin/v5 [no test files]
FAIL github.com/openbao/openbao/command [build failed]
--- FAIL: TestUnknownFieldValidation (0.00s)
config_test_helpers.go:453: found unexpected error: unknown or unsupported field license_path found in configuration at ./test-fixtures/config.hcl:54:1
FAIL
FAIL github.com/openbao/openbao/command/server 15.330s
This error was fairly simple to fix but it seems I broke some additional tests. Having a look. |
Signed-off-by: Gabriel Santos <gabrielopesantos97@gmail.com>
67fd5ca
to
f595e81
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks much better, thanks @Gabrielopesantos ! Tests pass again :-D
@Gabrielopesantos said:
Yeah, if you look at the |
Resolves #121
Description
Removes references to upstream Enterprise features;
Target Release
Alpha