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 duplication in MSFT_xWebsite.psm1 #384

Merged

Conversation

kmorcinek
Copy link
Contributor

@kmorcinek kmorcinek commented Jul 20, 2018

We removed duplicated code in 'if' and 'else' branches and moved it behind if/else.


This change is Reviewable

@msftclas
Copy link

msftclas commented Jul 20, 2018

CLA assistant check
All CLA requirements met.

@codecov-io
Copy link

codecov-io commented Jul 20, 2018

Codecov Report

Merging #384 into dev will increase coverage by 0.18%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##              dev     #384      +/-   ##
==========================================
+ Coverage   90.43%   90.61%   +0.18%     
==========================================
  Files          17       17              
  Lines        2467     2409      -58     
==========================================
- Hits         2231     2183      -48     
+ Misses        236      226      -10
Impacted Files Coverage Δ
DSCResources/MSFT_xWebsite/MSFT_xWebsite.psm1 97.02% <100%> (+1.38%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0fd8568...7c86b20. Read the comment docs.

@kmorcinek
Copy link
Contributor Author

These PR is addressing problems of duplication mentioned in #241

Copy link
Member

@johlju johlju left a comment

Choose a reason for hiding this comment

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

Thank you for fixing duplicate code! The tests passes so it seems this change works without issue.

Reviewable status: 0 of 1 files reviewed, 2 unresolved discussions (waiting on @kmorcinek)

a discussion (no related file):
Could you please add an descriptive entry, for each change/issue, to the Unreleased section of the change log in the file README.md? If an entry resolves an issue please reference the issue where applicable. You may suffix (it's optional) each entry with your name. Example of the format for the entry.

* Descriptive entry ([issue #123](https://github.com/PowerShell/xPSDesiredStateConfiguration/issues/123). [Name/Alias (@github_account)](https://github.com/github_account)


DSCResources/MSFT_xWebsite/MSFT_xWebsite.psm1, line 304 at r1 (raw file):

            }

            # Update Enabled Protocols if required

There are more here that seems duplicate? Would you like to resolve that to, or should we leave that for another PR?

@johlju johlju added the waiting for code fix A review left open comments, and the pull request is waiting for changes to be pushed by the author. label Jul 23, 2018
Copy link
Contributor Author

@kmorcinek kmorcinek left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 2 files reviewed, 2 unresolved discussions (waiting on @kmorcinek)

a discussion (no related file):

Previously, johlju (Johan Ljunggren) wrote…

Could you please add an descriptive entry, for each change/issue, to the Unreleased section of the change log in the file README.md? If an entry resolves an issue please reference the issue where applicable. You may suffix (it's optional) each entry with your name. Example of the format for the entry.

* Descriptive entry ([issue #123](https://github.com/PowerShell/xPSDesiredStateConfiguration/issues/123). [Name/Alias (@github_account)](https://github.com/github_account)

Just added.


Copy link
Contributor Author

@kmorcinek kmorcinek left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 2 files reviewed, 2 unresolved discussions (waiting on @johlju and @kmorcinek)


DSCResources/MSFT_xWebsite/MSFT_xWebsite.psm1, line 304 at r1 (raw file):

Previously, johlju (Johan Ljunggren) wrote…

There are more here that seems duplicate? Would you like to resolve that to, or should we leave that for another PR?

I prefer to close this (and learn how to contribute - the full cycle), and then I will refactor the rest.

Copy link
Member

@johlju johlju left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r1, 1 of 1 files at r2.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @kmorcinek)

a discussion (no related file):
There was a new release of this resource module yesterday, because of that the change log is not up to date. You need to get the latest changes in the dev branch. Could you please rebase against branch dev using git rebase (not by using git pull or git merge, to keep the commit history). If you don't know how to rebase your local dev and working branch, please look at how to Resolve merge conflicts.
Let me know if you need any assistance.


@johlju
Copy link
Member

johlju commented Jul 26, 2018

I prefer to close this (and learn how to contribute - the full cycle), and then I will refactor the rest.

Works for me. Let's get this one to the finish line first. Almost there, just need the rebase as mention in previous comment :)

@kmorcinek kmorcinek force-pushed the remove-duplication-in-xwebsitepsm1 branch from bf0c54f to f05d079 Compare July 26, 2018 15:05
Copy link
Contributor Author

@kmorcinek kmorcinek left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 of 2 files reviewed, 1 unresolved discussion (waiting on @johlju)

a discussion (no related file):

Previously, kmorcinek (Krzysztof Morcinek) wrote…

Just added.

Done.


a discussion (no related file):

Previously, johlju (Johan Ljunggren) wrote…

There was a new release of this resource module yesterday, because of that the change log is not up to date. You need to get the latest changes in the dev branch. Could you please rebase against branch dev using git rebase (not by using git pull or git merge, to keep the commit history). If you don't know how to rebase your local dev and working branch, please look at how to Resolve merge conflicts.
Let me know if you need any assistance.

Done. rebased and force pushed.


Copy link
Member

@johlju johlju left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r3.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @johlju)

a discussion (no related file):

Previously, kmorcinek (Krzysztof Morcinek) wrote…

Done. rebased and force pushed.

There was another PR merged, so now there is a merge conflict in the change log. Can you please rebase again to resolve the merge conflict?


@kmorcinek kmorcinek force-pushed the remove-duplication-in-xwebsitepsm1 branch from f05d079 to 7c86b20 Compare July 30, 2018 15:52
Copy link
Contributor Author

@kmorcinek kmorcinek left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 of 2 files reviewed, 1 unresolved discussion (waiting on @johlju)

a discussion (no related file):

Previously, johlju (Johan Ljunggren) wrote…

There was another PR merged, so now there is a merge conflict in the change log. Can you please rebase again to resolve the merge conflict?

Done. rebased and force pushed.


Copy link
Member

@johlju johlju left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 1 of 1 files at r4.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@johlju johlju added needs review The pull request needs a code review. and removed waiting for code fix A review left open comments, and the pull request is waiting for changes to be pushed by the author. labels Jul 31, 2018
@johlju
Copy link
Member

johlju commented Jul 31, 2018

@regedit32 Can you look this over and merge if you don't find any more review comments?

@regedit32 regedit32 merged commit 674b8dd into dsccommunity:dev Aug 1, 2018
@regedit32
Copy link
Member

LGTM

@johlju johlju removed the needs review The pull request needs a code review. label Aug 1, 2018
gstorme pushed a commit to gstorme/xWebAdministration that referenced this pull request Feb 14, 2020
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.

None yet

5 participants