xRDSessionDeployment: Get-TargetResource fails when RDMS service does not exist

[peppekerstens]

• Changes to xRDSessionDeployment
  • When RDMS service does not exist the Get-TargetResource will no longer throw an error (issue #47).

Fixes #47 Fixes #50

---

This change is 

[codecov-io]

Codecov Report

Merging #48 into dev will increase coverage by 2.36%. The diff coverage is 100%.

@@            Coverage Diff            @@
##              dev     #48      +/-   ##
=========================================
+ Coverage   85.03%   87.4%   +2.36%     
=========================================
  Files           8       8              
  Lines         381     381              
  Branches        9       9              
=========================================
+ Hits          324     333       +9     
+ Misses         48      39       -9     
  Partials        9       9

Impacted Files	Coverage Δ
...RDSessionDeployment/MSFT_xRDSessionDeployment.psm1	94.73% <100%> (ø)	:arrow_up:
DSCResources/MSFT_xRDServer/MSFT_xRDServer.psm1	66.12% <100%> (+14.51%)	:arrow_up:

---

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 df7c4d9...72b79c0. Read the comment docs.

[johlju]

@peppekerstens I updated the PR title and PR description to be more descriptive,

[johlju]

@peppekerstens thought I just remind you that the tests are failing. You are probably working on it, but just wanted to let you know.

[peppekerstens]

will take a look at it this week..

[stale[bot]]

Labeling this pull request (PR) as abandoned since it has gone 14 days or more since the last update. An abandoned PR can be continued by another contributor. The abandoned label will be removed if work on this PR is taken up again.

[peppekerstens]

sorry for delay. very busy at the moment.

[johlju]

There are merge conflicts since your PR was not based on the latest changes. 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.

[peppekerstens]

C:\Users..\GitHub\xRemoteDesktopSessionHost [dev ≡]> git rebase First, rewinding head to replay your work on top of it... Fast-forwarded dev to refs/remotes/origin/dev. C:\Users...\GitHub\xRemoteDesktopSessionHost [dev ≡]> git push --force Everything up-to-date

am i missing something?

[peppekerstens]

just tested on live machine (W16 Azure); tests ok...

[johlju]

@peppekerstens You should first fetch the dev branch from the upstream repo.

git remote -v
git fetch upstream_remote_name dev
git rebase upstream_remote_name/dev

[peppekerstens]

i am sorry...in a loop :( i know what you/we are trying to achieve; update mine with source/origin. but mine does not seem to comply... (my local repo/computer):

git fetch https://github.com/PowerShell/xRemoteDesktopSessionHost.git dev From https://github.com/PowerShell/xRemoteDesktopSessionHost

• branch dev -> FETCH_HEAD

git rebase https://github.com/PowerShell/xRemoteDesktopSessionHost.git/dev fatal: Needed a single revision invalid upstream 'https://github.com/PowerShell/xRemoteDesktopSessionHost.git/dev'

[peppekerstens]

ok, did something wrong in the beginning. i cloned instead of forked i guess..

git remote -v origin https://github.com/peppekerstens/xRemoteDesktopSessionHost.git (fetch) origin https://github.com/peppekerstens/xRemoteDesktopSessionHost.git (push)

oops..

[peppekerstens]

so steps should be;

1. get my (local) repo configged right (pointing to right origin)
2. redo rebase correct?

[johlju]

Yes, you are on the right track. Let’s add a new remote pointing to the upstream repo branch

git remote add upstream https://github.com/PowerShell/xRemoteDesktopSessionHost
git fetch upstream dev
git rebase upstream/dev

I think that should work.

[johlju]

Btw. Cloning is correct. You cloned your fork, which default origin to your forked repository. Then a remote must be added to the upstream. If you clone the upstream repo, then origin is pointing to the upstream repo, and a remote must be created to the forked repo. Either way is correct. Just have to add and use the correct remote name :)

[peppekerstens]

pfff...

[johlju]

It looks like you got a lot of extra files (22 in total) that this PR want to change, and most is already in the dev branch 🤔 Maybe your dev need to track the remote dev 🤔 Could you try to rebase again?

git checkout dev
git branch -u upstream/dev
git fetch upstream dev
git rebase upstream/dev

[peppekerstens]

it became a mess....