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.

Sign up for GitHub

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

Jump to bottom

xActiveDirectory: Restoring an object no longer fails #272

Merged
merged 3 commits into from
May 14, 2019
Merged

xActiveDirectory: Restoring an object no longer fails #272

merged 3 commits into from
May 14, 2019

Conversation

johlju
Copy link
Member

@johlju johlju commented May 11, 2019 •
edited
Loading

Pull Request (PR) description

  • Changes to xADComputer
    • Restoring a computer account from the recycle bin no longer fails if
      there are more than one object with the same name in the recycle bin.
      Now it uses the object that was changed last using the property
      whenChanged (issue #271).
  • Changes to xADGroup
    • Restoring a group from the recycle bin no longer fails if there are
      more than one object with the same name in the recycle bin. Now it
      uses the object that was changed last using the property whenChanged
      (issue #271).
  • Changes to xADOrganizationalUnit
    • Restoring a organization unit from the recycle bin no longer fails if
      there are more than one object with the same name in the recycle bin.
      Now it uses the object that was changed last using the property
      whenChanged (issue #271).
  • Changes to xADUser
    • Restoring a user from the recycle bin no longer fails if there are
      more than one object with the same name in the recycle bin. Now it
      uses the object that was changed last using the property whenChanged
      (issue #271).

This Pull Request (PR) fixes the following issues

Task list

  • Added an entry under the Unreleased section in the CHANGELOG.md.
    Entry should say what was changed, and how that affects users (if applicable).
  • Resource documentation added/updated in README.md.
  • Resource parameter descriptions added/updated in README.md, schema.mof
    and comment-based help.
  • Comment-based help added/updated.
  • Localization strings added/updated in all localization files as appropriate.
  • Examples appropriately added/updated.
  • Unit tests added/updated. See DSC Resource Testing Guidelines.
  • Integration tests added/updated (where possible). See DSC Resource Testing Guidelines.
  • New/changed code adheres to DSC Resource Style Guidelines and Best Practices.

This change is Reviewable

johlju added 2 commits May 11, 2019 16:09
@johlju
Changes to xActiveDirectory
7b50612 
- Changes to xADComputer
  - Restoring a computer account from the recycle bin no longer fails if
    there are more than one object with the same name in the recycle bin.
    Now it uses the object that was changed last using the property
    whenChanged (issue dsccommunity#271).
- Changes to xADGroup
  - Restoring a group from the recycle bin no longer fails if there are
    more than one object with the same name in the recycle bin. Now it
    uses the object that was changed last using the property whenChanged
    (issue dsccommunity#271).
- Changes to xADOrganizationalUnit
  - Restoring a organization unit from the recycle bin no longer fails if
    there are more than one object with the same name in the recycle bin.
    Now it uses the object that was changed last using the property whenChanged
    (issue dsccommunity#271).
- Changes to xADUser
  - Restoring a user from the recycle bin no longer fails if there are
    more than one object with the same name in the recycle bin. Now it
    uses the object that was changed last using the property whenChanged
    (issue dsccommunity#271).
@johlju
Update unit tests
be5abb9
@johlju johlju added the needs review The pull request needs a code review. label May 11, 2019
@codecov-io
Copy link

Codecov Report

Merging #272 into dev will increase coverage by <1%.
The diff coverage is 100%.

Impacted file tree graph

@@         Coverage Diff          @@
##            dev   #272    +/-   ##
====================================
+ Coverage    89%    89%   +<1%     
====================================
  Files        20     20            
  Lines      2030   2033     +3     
  Branches     10     10            
====================================
+ Hits       1807   1810     +3     
  Misses      213    213            
  Partials     10     10

@johlju
Copy link
Member Author

johlju commented May 11, 2019 •
edited
Loading

@nyanhp @devopsjesus @rchristman89 could anyone of you review this when you have a few minutes over? It is a relatively easy one. Thanks!

devopsjesus
devopsjesus approved these changes May 13, 2019
View reviewed changes
Copy link
Contributor

@devopsjesus devopsjesus 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 3 files reviewed, 2 unresolved discussions (waiting on @johlju)

CHANGELOG.md, line 36 at r1 (raw file):

- Changes to xADComputer
  - Restoring a computer account from the recycle bin no longer fails if
    there are more than one object with the same name in the recycle bin.
  • Restoring a computer account from the recycle bin no longer fails if
    there are more than one object with the same name in the recycle bin.

change 'are' to 'is' in each paragraph for correct grammar :)

CHANGELOG.md, line 45 at r1 (raw file):

    ([issue #271](https://github.com/PowerShell/xActiveDirectory/issues/271)).
- Changes to xADOrganizationalUnit
  - Restoring a organization unit from the recycle bin no longer fails if
  • Restoring a organizational unit

Change 'a' to 'an' for correct grammar

@devopsjesus
Copy link
Contributor

@johlju Just a couple tiny grammar changes in the changelog. Otherwise, everything else looks great, so I've approved the changes.

johlju
johlju commented May 14, 2019
View reviewed changes
Copy link
Member Author

@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.

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

CHANGELOG.md, line 36 at r1 (raw file):

Previously, devopsjesus (Jason Ryberg) wrote…
  • Restoring a computer account from the recycle bin no longer fails if
    there are more than one object with the same name in the recycle bin.

change 'are' to 'is' in each paragraph for correct grammar :)

Done.

CHANGELOG.md, line 45 at r1 (raw file):

Previously, devopsjesus (Jason Ryberg) wrote…
  • Restoring a organizational unit

Change 'a' to 'an' for correct grammar

Done.

@johlju
Copy link
Member Author

johlju commented May 14, 2019

@devopsjesus Thank you so much for the review! I fixed the grammar. Very much appreciated the help with the grammar! I will merge this as soon as the tests passes.

@johlju johlju merged commit 8c8d835 into dsccommunity:dev May 14, 2019
@kwirkykat kwirkykat removed the needs review The pull request needs a code review. label May 14, 2019
@johlju johlju deleted the fix-issue-271 branch May 14, 2019 05:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@devopsjesus devopsjesus devopsjesus approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

xADComputer: Restoring from recycle bin fails
4 participants
@johlju @codecov-io @devopsjesus @kwirkykat