Merge branch 'alan-turing-institute:develop' into entra-id

alan-turing-institute · Nov 10, 2023 · 9013499 · 9013499
2 parents 50b49f7 + 85c1bc4
commit 9013499
Show file tree

Hide file tree

Showing 15 changed files with 767 additions and 69 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
diff --git a/.lychee.toml b/.lychee.toml
@@ -100,7 +100,8 @@ exclude = [
 # Exclude these filesystem paths from getting checked.
 # exclude_path = ["file/path/to/Ignore", "./other/file/path/to/Ignore"]
 exclude_path = [
-  'docs/build/html/_static/webpack-macros.html'
+  'docs/build/html/_static/webpack-macros.html',
+  'docs/build/html/contributing/index.html'
 ]
 
 # URLs to check (supports regex). Has preference over all excludes.

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -27,6 +27,7 @@ Jump to the following sections:
     - [Who's involved in the project](#whos-involved-in-the-project)
     - [Make a change with a pull request](#making-a-change-with-a-pull-request)
     - [Make a change to the documentation](#making-a-change-to-the-documentation)
+    - [Adding new contributors](#adding-new-contributors)
 
 ## A DevOps development philosophy
 
@@ -230,44 +231,15 @@ To preview your changes, you can build the docs locally. See [docs/README.md](do
 
 ### Who's involved in the project
 
-As some users have `GitHub` IDs that make it a little difficult to know who they are in real life and it's sometimes nice to know **who** you're working with on the project, hopefully this table will help you put names to faces and IDs :sparkles:
-
-The following people have made one or more commits to the project:
-
-| Name                 | GitHub ID                                                  |
-| -------------------- | ---------------------------------------------------------- |
-| Daniel Allen         | [@sysdan](https://github.com/sysdan)                       |
-| Diego Arenas         | [@darenasc](https://github.com/darenasc)                   |
-| David Beavan         | [@DavidBeavan](https://github.com/DavidBeavan)             |
-| Alvaro Cabrejas Egea | [@ACabrejas](https://github.com/ACabrejas)                 |
-| Ian Carter           | [@getcarter21](https://github.com/getcarter21)             |
-| Ed Chalstrey         | [@edwardchalstrey1](https://github.com/edwardchalstrey1)   |
-| Rob Clarke           | [@RobC-CTL](https://github.com/RobC-CTL)                   |
-| James Cunningham     | [@james-c](https://github.com/james-c)                     |
-| Tom Doel             | [@tomdoel](https://github.com/tomdoel)                     |
-| Chris Edsall         | [@christopheredsall](https://github.com/christopheredsall) |
-| Oliver Forrest       | [@oforrest](https://github.com/oforrest)                   |
-| Oscar Giles          | [@OscartGiles](https://github.com/OscartGiles)             |
-| James Hetherington   | [@jamespjh](https://github.com/jamespjh)                   |
-| Tim Hobson           | [@thobson88](https://github.com/thobson88)                 |
-| George Holmes        | [@ens-george-holmes](https://github.com/ens-george-holmes) |
-| Catherine Lawrence   | [@cathiest](https://github.com/cathiest)                   |
-| Tomas Lazauskas      | [@tomaslaz](https://github.com/tomaslaz)                   |
-| Jim Madge            | [@JimMadge](https://github.com/JimMadge)                   |
-| Jules Manser         | [@JulesMarz](https://github.com/JulesMarz)                 |
-| Miguel Morin         | [@miguelmorin](https://github.com/miguelmorin)             |
-| Federico Nanni       | [@fedenanni](https://github.com/fedenanni)                 |
-| Guillaume Noell      | [@gn5](https://github.com/gn5)                             |
-| Martin O'Reilly      | [@martintoreilly](https://github.com/martintoreilly)       |
-| Jack Roberts         | [@jack89roberts](https://github.com/jack89roberts)         |
-| James Robinson       | [@jemrobinson](https://github.com/jemrobinson)             |
-| Brett Todd           | [@ens-brett-todd](https://github.com/ens-brett-todd)       |
-| Sebastian Vollmer    | [@vollmersj](https://github.com/vollmersj)                 |
-| Ben Walden           | [@bw-faststream](https://github.com/bw-faststream)         |
-| Kirstie Whitaker     | [@KirstieJane](https://github.com/KirstieJane)             |
-| Rachel Winstanley    | [@rwinstanley1](https://github.com/rwinstanley1)           |
-| Warwick Wood         | [@warwick26](https://github.com/warwick26)                 |
-| Kevin Xu             | [@kevinxufs](https://github.com/kevinxufs)                 |
+Take a look at the full list of contributors on our [README](README.md).
+
+### Adding new contributors
+
+We use @all-contributors to maintain the contributor list on the README, however we do not use the GitHub bot.
+
+You should follow the same instructions as above to [make a change with a pull request](#making-a-change-with-a-pull-request) when adding a new contributor.
+
+To add new contributor to the README table, see the [all-contributors CLI documentation](https://allcontributors.org/docs/en/cli/overview) and use the CLI to add the new contributor, then make a pull request with your changes.
 
 ## Get in touch
 

diff --git a/README.md b/README.md
diff --git a/deployment/administration/SHM_Delete_Unassigned_Users.ps1 b/deployment/administration/SHM_Delete_Unassigned_Users.ps1
@@ -30,4 +30,4 @@ if ($dryRun.IsPresent) {
 }
 $result = Invoke-RemoteScript -Shell "PowerShell" -ScriptPath $script -VMName $config.dc.vmName -ResourceGroupName $config.dc.rg -Parameter $params
 
-$null = Set-AzContext -Context $originalContext -ErrorAction Stop
+$null = Set-AzContext -Context $originalContext -ErrorAction Stop
diff --git a/deployment/administration/remote/Delete_Unassigned_Users.ps1 b/deployment/administration/remote/Delete_Unassigned_Users.ps1
@@ -30,4 +30,4 @@ if ($dryRun -eq "no") {
     } catch {
         Write-Output "Unable to run Azure Active Directory synchronisation!"
     }
-}
+}
diff --git a/deployment/common/Configuration.psm1 b/deployment/common/Configuration.psm1
@@ -479,7 +479,10 @@ function Get-ShmConfig {
 
     # Storage config
     # --------------
-    $shmStoragePrefix = "shm$($shm.id)"
+    if ($shm.id.Contains("-")) {
+        Add-LogMessage -Level Warning "The hyphen character is not allowed in storage account names and will be removed."
+    }
+    $shmStoragePrefix = "shm$($shm.id)".Replace("-", "")
     $shmStorageSuffix = New-RandomLetters -SeedPhrase "$($shm.subscriptionName)$($shm.id)"
     $storageRg = "$($shm.rgPrefix)_STORAGE".ToUpper()
     $shm.storage = [ordered]@{
@@ -737,8 +740,11 @@ function Get-SreConfig {
 
     # Storage config
     # --------------
+    if ($config.sre.id.Contains("-")) {
+        Add-LogMessage -Level Warning "The hyphen character is not allowed in storage account names and will be removed."
+    }
     $storageRg = "$($config.sre.rgPrefix)_STORAGE".ToUpper()
-    $sreStoragePrefix = "$($config.shm.id)$($config.sre.id)"
+    $sreStoragePrefix = "$($config.shm.id)$($config.sre.id)".Replace("-", "")
     $sreStorageSuffix = New-RandomLetters -SeedPhrase "$($config.sre.subscriptionName)$($config.sre.id)"
     $config.sre.storage = [ordered]@{
         accessPolicies  = [ordered]@{

diff --git a/deployment/secure_research_desktop/packages/deb-rstudio-focal.version b/deployment/secure_research_desktop/packages/deb-rstudio-focal.version
@@ -1,4 +1,4 @@
-hash: 52f513f75af83032e7e6a7402a2c2c4e65d65a298b1838454b05c31831d43494
-version: 2023.09.0-463
+hash: 89054e48a855de355e329360f916448532c55b104c49f2b7d08897d671b9add6
+version: 2023.09.1-494
 debfile: rstudio-|VERSION|-amd64.deb
 remote: https://download1.rstudio.org/electron/focal/amd64/|DEBFILE|
diff --git a/deployment/secure_research_desktop/packages/deb-rstudio-jammy.version b/deployment/secure_research_desktop/packages/deb-rstudio-jammy.version
@@ -1,4 +1,4 @@
-hash: 24083e5c32fb3ad759a3e43fffe8726eb9f82280dd528ef6c178b8cfefadfad2
-version: 2023.09.0-463
+hash: b04d8132c80123c87e349981b29e73b940f633037fc24950a42bcaf5aa24834f
+version: 2023.09.1-494
 debfile: rstudio-|VERSION|-amd64.deb
 remote: https://download1.rstudio.org/electron/jammy/amd64/|DEBFILE|
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -83,5 +83,5 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 typing-extensions==4.6.1
     # via pydata-sphinx-theme
-urllib3==2.0.6
+urllib3==2.0.7
     # via requests
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -79,6 +79,7 @@
     },
     "secondary_sidebar_items": ["page-toc", "edit-this-page", "sourcelink"],
     "use_edit_page_button": True,
+    "header_links_before_dropdown": 6
 }
 
 # Location of favicon
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,4 +30,4 @@ if ($dryRun -eq "no") { @@
         } catch {
             Write-Output "Unable to run Azure Active Directory synchronisation!"
         }
-    }
+    }