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

OfficeOnlineServerHost: New resource proposal #63

Closed

Conversation

JonasCassier
Copy link
Contributor

@JonasCassier JonasCassier commented Nov 3, 2023

Pull Request (PR) description

OfficeOnlineServerHost: New resource proposal

This Pull Request (PR) fixes the following issues

Task list

  • Added an entry to the change log under the Unreleased section of the
    file CHANGELOG.md. Entry should say what was changed and how that
    affects users (if applicable), and reference the issue being resolved
    (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 Community Testing Guidelines.
  • Integration tests added/updated (where possible). See DSC Community Testing Guidelines.
  • New/changed code adheres to DSC Community Style Guidelines.

This change is Reviewable

@johlju
Copy link
Member

johlju commented Nov 4, 2023

I think this resource would be better if it instead of AllowList had the parameters Domains, DomainsToInclude and DomainsToExclude. Using the parameter Domains would override (remove) any already configured domains, passing an empty array would remove any configured domains (if. that is a possible scenario). The parameter DomainsToExclude would remove any domain that is present, and leave the rest. The parameter DomainsToInclude would add any domain that is not present, and leave the rest.

I think parameter Ensure should not be used in this resource as Ensure normally is used when ensuring one object can only be present or absent, for example one host domain, one user account, etc. It would also be strange if there is another property is added to the resource, what property would you then want to ensure is present or absent. 🙂

@johlju johlju added the waiting for author response The pull request is waiting for the author to respond to comments in the pull request. label Nov 4, 2023
@JonasCassier
Copy link
Contributor Author

I have adapted the resource according to your suggestions.
Can you please take another look? I still need to change the unit tests.

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.

I see duplicate files. It seems you have copied the resource folder into the resource folder (duplicate folder names here): src/DSCResources/MSFT_OfficeOnlineServerHost/MSFT_OfficeOnlineServerHost/MSFT_OfficeOnlineServerHost.psm1

I will review as soon as I have time.

Reviewable status: 0 of 12 files reviewed, all discussions resolved

@JonasCassier
Copy link
Contributor Author

Thx. I have removed the duplicate folder.

@johlju
Copy link
Member

johlju commented Nov 5, 2023

@JonasCassier I merged a PR updating all the pipeline files, so if your rebase the pipeline in this PR should run correctly.

@johlju johlju added waiting for code fix A review left open comments, and the pull request is waiting for changes to be pushed by the author. and removed waiting for author response The pull request is waiting for the author to respond to comments in the pull request. labels Nov 5, 2023
@johlju
Copy link
Member

johlju commented Nov 9, 2023

Still to many files because you have no remote to the upstream repo that have the new changes, So in your case you need another remote for the upstream to be able to get them down to you local repository.

I think this should work for you, let me know if anything fails:

# add remote to upstream
git remote add upstream https://github.com/dsccommunity/OfficeOnlineServerDsc.git

# fetch changes from upstream branch master
git fetch upstream master

# rebase the local repository branch master
git checkout master
git rebase upstream/master

# push the updated branch master to your forked GitHub repository
git push origin --force

# Rebase the working (PR) branch using the updated local branch master
git checkout Feature/OfficeWebAppsHost
git rebase upstream/master

# Fix any conflicts as you did before

# When there are no more conflicts, run the following to update the working branch in your forked GitHub repository (which will update the PR)
git push origin --force

@JonasCassier
Copy link
Contributor Author

@johlju I got into a mess of merge conflicts, so I created a new Branch:

git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.

git fetch upstream master
From https://github.com/dsccommunity/OfficeOnlineServerDsc

  • branch master -> FETCH_HEAD

git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.

git rebase upstream/master
Current branch master is up to date.

git push origin --force
Everything up-to-date
git branch Feature/OfficeOnlineServerHost
git checkout Feature/OfficeOnlineServerHost

Here is the new PR #66

@johlju johlju added duplicate The issue or PR is the duplicate of another. and removed needs review The pull request needs a code review. labels Nov 11, 2023
@JonasCassier
Copy link
Contributor Author

duplicates #66

@JonasCassier JonasCassier deleted the Feature/OfficeWebAppsHost branch November 13, 2023 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
duplicate The issue or PR is the duplicate of another.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OfficeOnlineServerHost: New resource proposal
2 participants