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

[Modules] Multi additions to staticSites #1662

Merged
merged 34 commits into from
Oct 4, 2022

Conversation

AlexanderSehr
Copy link
Contributor

@AlexanderSehr AlexanderSehr commented Jul 12, 2022

Description

Based on PR by @itpropro #1655

Added the following to staticSites

  • config (app config and function app config)
  • customDomains with different validations depending on apex or not
  • linkedBackends with the 2022-03-01 API to add custom function apps. The userDefinedFunctions endpoint should not be used and is currently broken.

Changes were verified, pester and deployment tested with the respective PowerShell functions. Readme and parameter files have been updated.

Pipeline references

For module/pipeline changes, please create and attach the status badge of your successful run.

Pipeline
Web: StaticSites

Type of Change

Please delete options that are not relevant.

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Update to documentation

AlexanderSehr and others added 2 commits July 12, 2022 10:30
* feat(staticsites):  Added linkedBackends to staticSites extension

* feat(staticsites):  Added tests, readme, linkedBackends

* docs(staticsites):  Removed parameter placeholder

* Update modules/Microsoft.Web/staticSites/config/readme.md

Co-authored-by: Alexander Sehr <ASehr@hotmail.de>

* Update modules/Microsoft.Web/staticSites/config/readme.md

Co-authored-by: Alexander Sehr <ASehr@hotmail.de>

* Update modules/Microsoft.Web/staticSites/customDomains/readme.md

Co-authored-by: Alexander Sehr <ASehr@hotmail.de>

* Update modules/Microsoft.Web/staticSites/linkedBackends/readme.md

Co-authored-by: Alexander Sehr <ASehr@hotmail.de>

* fix(staticsites):  Integrated PR feedback

Co-authored-by: Alexander Sehr <ASehr@hotmail.de>
@AlexanderSehr AlexanderSehr requested a review from a team as a code owner July 12, 2022 08:32
@AlexanderSehr AlexanderSehr added enhancement New feature or request [cat] modules category: modules labels Jul 12, 2022
@github-actions
Copy link

github-actions bot commented Jul 12, 2022

Unit Test Results

    1 files  ±    0      1 suites  ±0   1m 17s ⏱️ +56s
165 tests +143  161 ✔️ +140  4 💤 +3  0 ±0 
172 runs  +150  167 ✔️ +146  5 💤 +4  0 ±0 

Results for commit 372fd69. ± Comparison against base commit b1101a2.

This pull request removes 22 and adds 165 tests. Note that renamed tests count towards both.
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ File/folder tests..test folder.[Microsoft.Network/connections] *parameters.json files in the .test folder should be valid json
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ File/folder tests..test folder.[Microsoft.Network/connections] folder should contain one or more *parameters.json files
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ File/folder tests.General module folder tests.[Microsoft.Network/connections] Module should contain a [.test] folder
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ File/folder tests.General module folder tests.[Microsoft.Network/connections] Module should contain a [deploy.json/deploy.bicep] file
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ File/folder tests.General module folder tests.[Microsoft.Network/connections] Module should contain a [readme.md] file
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ File/folder tests.General module folder tests.[Microsoft.Network/connections] Module should contain a [version.json] file
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ File/folder tests.General module folder tests.[Microsoft.Network/connections] Module should have a GitHub workflow
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ File/folder tests.General module folder tests.[Microsoft.Network/connections] Module should have an Azure DevOps pipeline
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ Parameter file tests.Deployment test file tests.[Microsoft.Network/connections] Bicep test deployment files should invoke test like [module testDeployment '../.*deploy.bicep' = {]
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ Parameter file tests.Deployment test file tests.[Microsoft.Network/connections] Bicep test deployment name should contain [-test-]
…
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ API version tests [All apiVersions in the template should be 'recent'].In [Microsoft.Web/staticSites/config] used resource type [staticSites/config] should use one of the recent API version(s). Currently using [2022-03-01]
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ API version tests [All apiVersions in the template should be 'recent'].In [Microsoft.Web/staticSites/customDomains] used resource type [staticSites/customDomains] should use one of the recent API version(s). Currently using [2022-03-01]
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ API version tests [All apiVersions in the template should be 'recent'].In [Microsoft.Web/staticSites/linkedBackends] used resource type [staticSites/linkedBackends] should use one of the recent API version(s). Currently using [2022-03-01]
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ API version tests [All apiVersions in the template should be 'recent'].In [Microsoft.Web/staticSites] used resource type [locks] should use one of the recent API version(s). Currently using [2017-04-01]
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ API version tests [All apiVersions in the template should be 'recent'].In [Microsoft.Web/staticSites] used resource type [privateEndpoints/privateDnsZoneGroups] should use one of the recent API version(s). Currently using [2021-08-01]
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ API version tests [All apiVersions in the template should be 'recent'].In [Microsoft.Web/staticSites] used resource type [privateEndpoints] should use one of the recent API version(s). Currently using [2021-08-01]
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ API version tests [All apiVersions in the template should be 'recent'].In [Microsoft.Web/staticSites] used resource type [roleassignments] should use one of the recent API version(s). Currently using [2022-04-01]
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ API version tests [All apiVersions in the template should be 'recent'].In [Microsoft.Web/staticSites] used resource type [staticSites/config] should use one of the recent API version(s). Currently using [2022-03-01]
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ API version tests [All apiVersions in the template should be 'recent'].In [Microsoft.Web/staticSites] used resource type [staticSites/customDomains] should use one of the recent API version(s). Currently using [2022-03-01]
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ API version tests [All apiVersions in the template should be 'recent'].In [Microsoft.Web/staticSites] used resource type [staticSites/linkedBackends] should use one of the recent API version(s). Currently using [2022-03-01]
…
This pull request removes 1 skipped test and adds 4 skipped tests. Note that renamed tests count towards both.
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ File/folder tests..test folder.[Microsoft.Network/connections] *parameters.json files in the .test folder should be valid json
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ Deployment template tests.Deployment template tests.[Microsoft.Web/staticSites/config] Variable names should be camel-cased (no dashes or underscores and must start with lower-case letter)
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ Deployment template tests.Deployment template tests.[Microsoft.Web/staticSites/customDomains] Variable names should be camel-cased (no dashes or underscores and must start with lower-case letter)
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ Deployment template tests.Deployment template tests.[Microsoft.Web/staticSites/linkedBackends] Variable names should be camel-cased (no dashes or underscores and must start with lower-case letter)
/home/runner/work/ResourceModules/ResourceModules/utilities/pipelines/staticValidation/module.tests.ps1 ‑ File/folder tests..test folder.[Microsoft.Web/staticSites] *parameters.json files in the .test folder should be valid json

♻️ This comment has been updated with latest results.

@AlexanderSehr AlexanderSehr marked this pull request as draft July 12, 2022 15:45
@AlexanderSehr AlexanderSehr marked this pull request as ready for review July 12, 2022 20:28
@AlexanderSehr AlexanderSehr enabled auto-merge (squash) July 15, 2022 17:17
Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
@itpropro
Copy link
Contributor

@eriqua and @MrMCake can we finally close this PR? The pipeline is failing because of the word "id" is not in uppercase in the linked backends readme, maybe someone can do a quick fix here. Besides that, there is nothing left and I would really like to consume the changes from this module 😅

@AlexanderSehr
Copy link
Contributor Author

Hey @itpropro, I'll take care of it once #1898 is in to make it as easy for me as possible resolving conflicts. Should happen in the next couple days.

@eriqua
Copy link
Contributor

eriqua commented Sep 27, 2022

Hey @itpropro, I'll take care of it once #1898 is in to make it as easy for me as possible resolving conflicts. Should happen in the next couple days.

@MrMCake, @itpropro PR #1898 is approved and ready to be merged.

@AlexanderSehr
Copy link
Contributor Author

Merged and retesting

AlexanderSehr and others added 7 commits September 28, 2022 16:44
Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
Copy link
Contributor

@eriqua eriqua left a comment

Choose a reason for hiding this comment

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

🆗

@AlexanderSehr AlexanderSehr merged commit 48cf5e3 into main Oct 4, 2022
@AlexanderSehr AlexanderSehr deleted the users/itpropro/staticSites branch October 4, 2022 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[cat] modules category: modules enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants