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

Remove LDAP that was deprecated last commit #265

Merged
merged 6 commits into from
Sep 9, 2024

Conversation

RedProkofiev
Copy link
Contributor

@RedProkofiev RedProkofiev commented Sep 18, 2023

Resolves #225
Resolves GT-215

Goodbye, LDAP. Hello, new world! This pull request cleanly exorcises LDAP from our codebase, leaving the only mark of its passing the mention of a BDII in the setup/config files.

@RedProkofiev RedProkofiev force-pushed the nick-dev-breaking-brokers branch from e27b32d to b91e701 Compare September 18, 2023 15:00
@RedProkofiev RedProkofiev marked this pull request as ready for review September 18, 2023 15:10
@RedProkofiev RedProkofiev requested a review from a team as a code owner September 18, 2023 15:10
@tofu-rocketry tofu-rocketry self-assigned this Sep 18, 2023
@gregcorbett
Copy link
Member

I assume this means we can now remove LDAP as a requirement from these places:

@RedProkofiev
Copy link
Contributor Author

Yes, that should be correct. I'll get rid of them, next.

@RedProkofiev
Copy link
Contributor Author

Anything I've missed?

@tofu-rocketry
Copy link
Member

The [broker] section of the two configs could do with tidying up.

conf/sender.cfg Outdated Show resolved Hide resolved
@gregcorbett
Copy link
Member

What happens at https://github.com/apel/ssm/pull/265/files#diff-24d78e07bee2eb3c5108ab36194eba3f8765c8c6b86da792ac2b1a87447dc4b6L180-L184 now that brokers isn't set in the Ssm2.STOMP_MESSAGING case?

Does the SSM just refuse to run because brokers is None so has length 0?

@tofu-rocketry, does this change negate apel/apel#40 ?

@RedProkofiev
Copy link
Contributor Author

try:
    host = cp.get('broker', 'host')
    port = cp.get('broker', 'port')
    brokers = [(host, int(port))]
except ConfigParser.NoOptionError:
    ...
    sys.exit(1)

I may be missing something but I don't think there's a non exiting case in stomp SSL where brokers will ever be 0 if host and port has been set correctly

@gregcorbett
Copy link
Member

try:
    host = cp.get('broker', 'host')
    port = cp.get('broker', 'port')
    brokers = [(host, int(port))]
except ConfigParser.NoOptionError:
    ...
    sys.exit(1)

I may be missing something but I don't think there's a non exiting case in stomp SSL where brokers will ever be 0 if host and port has been set correctly

Yes, you're right - I'm being silly.

Copy link
Member

@tofu-rocketry tofu-rocketry left a comment

Choose a reason for hiding this comment

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

All that beautiful code lost, like tears in rain. 🥲

apel-ssm.spec Outdated Show resolved Hide resolved
ssm/agents.py Outdated Show resolved Hide resolved
@tofu-rocketry tofu-rocketry added this to the 4.0.0 milestone Oct 6, 2023
@RedProkofiev RedProkofiev force-pushed the nick-dev-breaking-brokers branch from 22e8713 to 5159e1d Compare November 6, 2023 11:53
Copy link
Contributor Author

@RedProkofiev RedProkofiev left a comment

Choose a reason for hiding this comment

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

Just went through the requested changes: everything was done though I needed to add back the changelog tag

Copy link
Member

@tofu-rocketry tofu-rocketry left a comment

Choose a reason for hiding this comment

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

Bit about installing LDAP in the README needs removing.

@RedProkofiev
Copy link
Contributor Author

my first PR to this repository, ready! a PR to destroy so much LDAP! my eyes are getting misty :,)

@tofu-rocketry
Copy link
Member

my first PR to this repository, ready! a PR to destroy so much LDAP! my eyes are getting misty :,)

Thanks for doing that fix! I wasn't expecting you to do it personally.

@RedProkofiev
Copy link
Contributor Author

RedProkofiev commented May 9, 2024 via email

@tofu-rocketry tofu-rocketry force-pushed the nick-dev-breaking-brokers branch from 29c1c28 to b8bd4c6 Compare September 9, 2024 10:33
RedProkofiev and others added 3 commits September 9, 2024 11:36
Deprecation of LDAP requires removal of brokers.py, test_brokers.py and modifications to agent.py which this commit does.
@tofu-rocketry tofu-rocketry force-pushed the nick-dev-breaking-brokers branch from b8bd4c6 to 3dbd30d Compare September 9, 2024 10:36
@tofu-rocketry tofu-rocketry dismissed their stale review September 9, 2024 11:39

Requested changes made

Copy link
Member

@gregcorbett gregcorbett left a comment

Choose a reason for hiding this comment

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

LGTM

@tofu-rocketry tofu-rocketry merged commit 0539eb6 into apel:dev Sep 9, 2024
10 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Deprecate python-ldap usage
3 participants