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

[merge jam] Master port 49261 - consul modules #58101

Merged
merged 25 commits into from
Jan 20, 2022

Conversation

garethgreenaway
Copy link
Contributor

@garethgreenaway garethgreenaway commented Jul 30, 2020

What does this PR do?

Master port #49261

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@garethgreenaway garethgreenaway requested a review from a team as a code owner July 30, 2020 19:24
@ghost ghost requested review from waynew and removed request for a team July 30, 2020 19:24
Copy link
Contributor

@waynew waynew left a comment

Choose a reason for hiding this comment

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

This does need a changelog file. Otherwise 👍

@garethgreenaway garethgreenaway changed the title [merge jam] Master port 49261 [merge jam] Master port 49261 - consul modules Apr 14, 2021
krionbsd
krionbsd previously approved these changes Apr 14, 2021
twangboy
twangboy previously approved these changes Apr 14, 2021
waynew
waynew previously approved these changes Nov 22, 2021
@waynew waynew dismissed stale reviews from twangboy, krionbsd, and themself via fcdc035 November 22, 2021 18:20
@github-actions
Copy link

Hi! I'm your friendly PR bot!

You might be wondering what I'm doing commenting here on your PR.

Yes, as a matter of fact, I am...

I'm just here to help us improve the documentation. I can't respond to
questions or anything, but what I can do, I do well!

Okay... so what do you do?

I detect modules that are missing docstrings or "CLI Example" on existing docstrings!
When I was created we had a lot of these. The documentation for these
modules need some love and attention to make Salt better for our users.

So what does that have to do with my PR?

I noticed that in this PR there are some files changed that have some of these
issues. So I'm leaving this comment to let you know your options.

Okay, what are they?

Well, my favorite, is that since you were making changes here I'm hoping that
you would be the most familiar with this module and be able to add some other
examples or fix any of the reported issues.

If I can, then what?

Well, you can either add them to this PR or add them to another PR. Either way is fine!

Well... what if I can't, or don't want to?

That's also fine! We appreciate all contributions to the Salt Project. If you
can't add those other examples, either because you're too busy, or unfamiliar,
or you just aren't interested, we still appreciate the contributions that
you've made already.

Whatever approach you decide to take, just drop a comment here letting us know!

Detected Issues (click me)
[INFO] Initializing environment for https://github.com/saltstack/pip-tools-compile-impersonate.
[INFO] Initializing environment for https://github.com/asottile/pyupgrade.
[INFO] Initializing environment for https://github.com/saltstack/pre-commit-remove-import-headers.
[INFO] Initializing environment for https://github.com/s0undt3ch/salt-rewrite.
[INFO] Initializing environment for https://github.com/timothycrosley/isort.
[INFO] Initializing environment for https://github.com/timothycrosley/isort:toml.
[INFO] Initializing environment for https://github.com/psf/black.
[INFO] Initializing environment for https://github.com/asottile/blacken-docs.
[INFO] Initializing environment for https://github.com/asottile/blacken-docs:black==21.7b0.
[INFO] Initializing environment for https://github.com/PyCQA/bandit.
[INFO] Initializing environment for https://github.com/saltstack/invoke-pre-commit.
[INFO] Initializing environment for https://github.com/saltstack/invoke-pre-commit:blessings,distro,jinja2,msgpack,pyyaml.
[INFO] Initializing environment for https://github.com/saltstack/mirrors-nox.
[INFO] Initializing environment for https://github.com/saltstack/mirrors-nox:pip>=20.2.4,<21.2,setuptools<58.0.
[INFO] Installing environment for https://github.com/saltstack/invoke-pre-commit.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
Check Known Missing Docstrings...........................................Passed
- hook id: invoke
- duration: 5.78s

Thanks again!

waynew
waynew previously approved these changes Dec 13, 2021
Copy link
Contributor

@waynew waynew left a comment

Choose a reason for hiding this comment

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

I'm pretty sure those were flaky test failures. Re-running the tests.

@waynew
Copy link
Contributor

waynew commented Jan 5, 2022

@garethgreenaway looks like black/pre-commit failures, wanna run that locally?

salt/modules/consul.py Outdated Show resolved Hide resolved
salt/states/consul.py Show resolved Hide resolved
@Ch3LL Ch3LL added this to the Phosphorus v3005.0 milestone Jan 19, 2022
@Ch3LL Ch3LL added the Phosphorus v3005.0 Release code name and version label Jan 19, 2022
@Ch3LL Ch3LL merged commit fb825aa into saltstack:master Jan 20, 2022
garethgreenaway added a commit to bryceml/salt that referenced this pull request Jan 21, 2022
* add consul states and acl function present/absent

* add consul to states doc index

* refact/fix consul states

* fix doc, fix states

* fix name parameter for acl_changes

* fixing pylint errors

* small changes after review by @rallytime

* fix header count

* Update consul.py

* fix acl_exists description, fix when both id and name are missing

* Adding some tests for consul module and consul state module.  Some additional fixes in the consul module.

* Fixing tests.

* Fixing failing tests on Windows.

* Adding changelog.

* Adding some tests for consul module and consul state module.  Some additional fixes in the consul module.

* moving tests to pytest.

* manual black changes.

* One more manual black change.

* fixing formatting.  Adding versionadded for state module.

Co-authored-by: Rémi Jouannet <remi.jouannet@outscale.com>
Co-authored-by: Mike Place <mp@saltstack.com>
Co-authored-by: Daniel Wozniak <dwozniak@saltstack.com>
Co-authored-by: Wayne Werner <wwerner@vmware.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
master-port Phosphorus v3005.0 Release code name and version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants