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

TRE Merge #53

Draft
wants to merge 117 commits into
base: imperial-development-tmp
Choose a base branch
from
Draft

TRE Merge #53

wants to merge 117 commits into from

Conversation

tim-p-allen
Copy link
Collaborator

Resolves HASH_SIGN_FOLLOWED_BY_ISSUE_NUMBER

What is being addressed

Describe the current behavior you are modifying. Please also remember to update any impacted documentation.

How is this addressed

  • Describe the changes made, and if appropriate, why they are addressed this way
  • Note any pending work (with links to the issues that will address them)
  • Update documentation
  • Update CHANGELOG.md if needed
  • Increment template version if needed, for guidelines see Authoring templates - versioning

tamirkamara and others added 30 commits February 8, 2024 15:50
@tamirkamara
Add permissions to pr_bot and flag_external_pr workflows (#3843)
7be040b 
* Add permissions block

* add permissions for pr bot
@tamirkamara
Update permissions for 'checks' (#3844)
d080e11 
update permissions for checks
@tamirkamara
Add permissions to parent workflows (#3845)
fab7bc3
@tamirkamara
More workflow permissions (#3846)
3835e5a 
more permissions
@yahya130
fixing react router dom version and switching to absolute routing whe… (
e8da262 
#3841)
@tamirkamara
Update CodeQL actions (#3851)
f15c0bc
@tamirkamara
Delete InnerEye from workflows
1e48253
@tamirkamara
Update important dependencies (#3852)
b40e4e7 
* update dependencies

* Remove InnerEye from E2Es
@marrobi
Add report check status to Test Results (#3856)
ab39972 
Add check status.
@nasaldrops
Fix registration of templates with no required or authorizedRoles def…
c3bc779 
…ined. (#3849)
@marrobi
Add network rule set for Service Bus namespace (#3858)
21dbd24
@jonnyry
Fix argument quoting in second ACR job step in 'Deploy TRE Reusable' …
05b0b93 
…GitHub Action (#3861)

Fix argument quoting in second ACR job step in 'Deploy TRE Reusable' github action
@jonnyry
Destroy TRE script unbound variable fix (#3864)
b2caab3
@marrobi
Update Docker dependency update schedule (#3868)
e8d2f89
@marrobi
Update packages for February Security Updates (#3866)
ddddbf6
Update Azure MySQL Server to Flexible Server (#3892)
8cd68b5 
* Initial Commit

* Update SQL SKU variables

* add in sql_sku to template

* "updateable": true

* ignore zone

* update to azurerm_mysql_flexible_database

* add password

* update sku list

* update user login details for mysql

* update changelog

* doc updates and version updates

* resolving comments
Firewall Policy Rule Fix (#3894)
4f79ddb 
* add in dependencies to all of the route table associations

* update fw version

* update CHANGELOG.md
Prep For Release v0.17.0 (#3896)
086be33 
* update CHANGELOG.md

* remove trailing space

* Firewall Policy Rule Fix (#3894)

* add in dependencies to all of the route table associations

* update fw version

* update CHANGELOG.md

* update CHANGELOG.md

* Firewall Policy Rule Fix (#3894)

* add in dependencies to all of the route table associations

* update fw version

* update CHANGELOG.md

* update CHANGELOG.md

* update fw version
Documentation Pipeline Fix (#3898)
de14165 
add in permissions to pipeline
@wojciechcloudkubed
Feature/GitHub actions update (#3897)
ea63ebf 
* Update clean_validation_envs.yml

* azure login (#19)

Co-authored-by: Wojciech <[email protected]>

* GitHub actions update (#22)

* azure login

* reset cron

* update action versions

---------

Co-authored-by: wojciechcloudkubed <[email protected]>

* change conclusion action

* add in teams

---------

Co-authored-by: wojciechcloudkubed <[email protected]>
@dependabot
Bump the npm_and_yarn group in /ui/app with 3 updates (#3891)
47c8182 
* Bump the npm_and_yarn group in /ui/app with 3 updates

Bumps the npm_and_yarn group in /ui/app with 3 updates: [express](https://github.com/expressjs/express), [follow-redirects](https://github.com/follow-redirects/follow-redirects) and [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware).


Updates `express` from 4.18.3 to 4.19.2
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.18.3...4.19.2)

Updates `follow-redirects` from 1.15.5 to 1.15.6
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.5...v1.15.6)

Updates `webpack-dev-middleware` from 5.3.3 to 5.3.4
- [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
- [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
- [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
  dependency-group: npm_and_yarn-security-group
- dependency-name: follow-redirects
  dependency-type: indirect
  dependency-group: npm_and_yarn-security-group
- dependency-name: webpack-dev-middleware
  dependency-type: indirect
  dependency-group: npm_and_yarn-security-group
...

Signed-off-by: dependabot[bot] <[email protected]>

* update ui version

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tim Allen <[email protected]>
@wojciechcloudkubed
Update "Azure AD" references to "Microsoft Entra ID" (#3873)
bc2f233 
* rename Azure AD to Microsoft Entra Workforce ID

* update Azure Active Directory to Microsoft Entra Workforce ID

* replace

* update version

* change stale version

* update from stale

* update version

* update readme

* Microsoft Entra Workforce ID -> Microsoft Entra ID

* AAD -> Microsoft Entra ID

* Delete .devcontainer/devcontainer.json

* Revert "Delete .devcontainer/devcontainer.json"

This reverts commit 5dd6d5c.

* revert code changes

* remove double names

* update version

* go back version

* api update version

* revert for linting

* revert test linting

* fix linting

* roll back linting

* increase line length

* fix linting

* fix formatting

* fix lintin 3

* update urls

* update aad urls

---------

Co-authored-by: Tim Allen <[email protected]>
Update Resource processor Ubuntu Image (#3902)
cb59c99 
* Update clean_validation_envs.yml

* update

* update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

* update core resource processor image

* remove clean env

* update version

* update changelog
@jonnyry
Remove TLS1.0/1.1 support. Resolves #3914 (#3916)
c8e5ed3
@marrobi
Ubuntu 2204 update (#3924)
606a5d9 
* Update clean_validation_envs.yml

* update

* update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

* Squashed commit of the following:

commit e66cd82
Author: tim-allen-ck <[email protected]>
Date:   Tue May 7 16:35:57 2024 +0100

    squash commits

commit 933e160
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 4 15:54:39 2024 +0100

    update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

commit 379e93c
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 4 15:52:25 2024 +0100

    update

commit 161880f
Author: Tim Allen <[email protected]>
Date:   Tue Apr 2 09:38:19 2024 +0100

    Update clean_validation_envs.yml

commit 7908043
Author: tim-allen-ck <[email protected]>
Date:   Tue May 7 16:32:15 2024 +0100

    update changelog

commit 76466e4
Author: tim-allen-ck <[email protected]>
Date:   Tue May 7 16:28:55 2024 +0100

    update changelog

commit 9b3b98e
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 12 09:27:52 2024 +0100

    changelog update

commit d199c77
Author: Tim Allen <[email protected]>
Date:   Fri Apr 12 09:01:26 2024 +0100

    Update Resource processor Ubuntu Image (#3902)

    * Update clean_validation_envs.yml

    * update

    * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

    * update core resource processor image

    * remove clean env

    * update version

    * update changelog

commit c4d8404
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit 81dd79b
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit 8cecc55
Author: wojciechcloudkubed <[email protected]>
Date:   Tue Apr 2 09:23:37 2024 +0100

    Ubuntu update (#1)

    * personal

    * update ubuntu image

    * revert changes

    * update ubuntu version

    * update version

    * update offer

    * update sku

    * change offer

    ---------

    Co-authored-by: Wojciech <[email protected]>

commit 49813bf
Author: Jonny Rylands <[email protected]>
Date:   Wed May 1 18:22:19 2024 +0100

     Remove TLS1.0/1.1 support. Resolves #3914 (#3916)

commit a094c19
Author: tim-allen-ck <[email protected]>
Date:   Tue May 7 16:12:53 2024 +0100

    doc update

commit 004a9c0
Author: tim-allen-ck <[email protected]>
Date:   Tue May 7 10:27:09 2024 +0100

    update script

commit 8044fb7
Author: tim-allen-ck <[email protected]>
Date:   Wed May 1 15:19:48 2024 +0100

    updaet

commit 218aa8b
Author: tim-allen-ck <[email protected]>
Date:   Wed May 1 15:19:40 2024 +0100

    update

commit 0ac060f
Author: tim-allen-ck <[email protected]>
Date:   Tue Apr 30 15:44:47 2024 +0100

    update

commit 0486933
Author: tim-allen-ck <[email protected]>
Date:   Tue Apr 30 12:43:46 2024 +0100

    update vm config

commit c9f0749
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 29 18:11:50 2024 +0100

    Prevent screen timeout

commit 7c2db7f
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 29 18:09:49 2024 +0100

    updates

commit 8d6cf1d
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 29 17:16:38 2024 +0100

    update

commit 3ecdec7
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 29 12:21:28 2024 +0100

    update

commit eb59085
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 29 12:19:33 2024 +0100

    nexus update

commit 915c6bc
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 29 10:24:45 2024 +0100

    updste

commit 2345db2
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 29 10:24:36 2024 +0100

    update proxy url

commit 6b454a3
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 29 10:03:44 2024 +0100

    update

commit 2ce801b
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 29 09:48:20 2024 +0100

    add in r studio download

commit 3b83b4c
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 29 09:46:11 2024 +0100

    add in snapcraft to nexus

commit dfb6b7b
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 16:55:45 2024 +0100

    spelling

commit f896ce3
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 16:08:41 2024 +0100

    update version

commit fd540af
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 16:08:32 2024 +0100

    clean up script

commit 1f8456f
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 14:27:31 2024 +0100

    update

commit 89e65eb
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 14:27:23 2024 +0100

    update

commit ae4cb04
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 14:22:13 2024 +0100

    update

commit c33e033
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 14:10:46 2024 +0100

    update

commit 2e290e1
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 14:03:41 2024 +0100

    update

commit 2c16b60
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 13:57:50 2024 +0100

    update

commit 757d565
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 12:18:28 2024 +0100

    update

commit 977b487
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 11:45:21 2024 +0100

    update

commit 572c27c
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 11:45:12 2024 +0100

    update

commit dc7a6c5
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 11:39:38 2024 +0100

    add in extensions

commit e46c5bb
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 11:34:57 2024 +0100

    add sleeps

commit fa15720
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 11:33:44 2024 +0100

    update

commit 893cf8d
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 10:20:12 2024 +0100

    update

commit 42223aa
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 10:16:27 2024 +0100

    commit

commit 0a7b1e8
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 10:16:19 2024 +0100

    update

commit 6ce77b0
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 26 09:43:49 2024 +0100

    update

commit f1d68da
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 25 17:58:40 2024 +0100

    update

commit 060b6fd
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 25 16:17:09 2024 +0100

    vm update

commit c4e7094
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 25 14:20:05 2024 +0100

    update

commit 760f783
Author: tim-allen-ck <[email protected]>
Date:   Tue Apr 23 16:58:05 2024 +0100

    updat

commit 943e07b
Author: tim-allen-ck <[email protected]>
Date:   Tue Apr 23 15:16:03 2024 +0100

    add in ms download and other apps

commit 7a4d250
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 18 09:57:54 2024 +0100

    update linux

commit 770e4c7
Author: tim-allen-ck <[email protected]>
Date:   Tue Apr 16 15:31:25 2024 +0100

    fix linting

commit 4354ca0
Author: tim-allen-ck <[email protected]>
Date:   Tue Apr 16 14:06:49 2024 +0100

    format

commit 6980ecb
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 15 16:16:50 2024 +0100

    update

commit a3e5492
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 15 16:16:38 2024 +0100

    update

commit f9d9ffc
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 15 14:44:27 2024 +0100

    update

commit d5a4045
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 15 14:39:17 2024 +0100

    update

commit aa4713c
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 15 12:08:41 2024 +0100

    update image version

commit 2082559
Author: tim-allen-ck <[email protected]>
Date:   Mon Apr 15 09:28:08 2024 +0100

    update to gen2

commit cd1a4db
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 12 16:49:59 2024 +0100

    updaet vm config

commit eff7050
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 12 16:00:41 2024 +0100

    edit

commit ba9ae50
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 12 15:10:09 2024 +0100

    update

commit 81801f8
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 12 14:36:17 2024 +0100

    update version

commit 86909a3
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 12 12:50:34 2024 +0100

    vm-config

commit c5ce11b
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 12 10:43:48 2024 +0100

    update config

commit b1bb5c9
Merge: 9a28c42 cb59c99
Author: Tim Allen <[email protected]>
Date:   Fri Apr 12 09:32:38 2024 +0100

    Merge branch 'main' into ubuntu-update

commit 9a28c42
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 12 09:31:47 2024 +0100

    reset

commit 4a2036b
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 12 09:29:53 2024 +0100

    update resource proccesor

commit e193943
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 12 09:27:52 2024 +0100

    changelog update

commit e8ba5fd
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit f3b4efb
Author: Tim Allen <[email protected]>
Date:   Fri Apr 12 09:01:26 2024 +0100

    Update Resource processor Ubuntu Image (#3902)

    * Update clean_validation_envs.yml

    * update

    * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

    * update core resource processor image

    * remove clean env

    * update version

    * update changelog

commit 85cdb98
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit b17bfab
Author: wojciechcloudkubed <[email protected]>
Date:   Tue Apr 2 09:23:37 2024 +0100

    Ubuntu update (#1)

    * personal

    * update ubuntu image

    * revert changes

    * update ubuntu version

    * update version

    * update offer

    * update sku

    * change offer

    ---------

    Co-authored-by: Wojciech <[email protected]>

commit d8fa5d4
Author: Tim Allen <[email protected]>
Date:   Fri Apr 12 09:01:26 2024 +0100

    Update Resource processor Ubuntu Image (#3902)

    * Update clean_validation_envs.yml

    * update

    * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

    * update core resource processor image

    * remove clean env

    * update version

    * update changelog

commit 5e2cdb5
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit 9af4f05
Author: wojciechcloudkubed <[email protected]>
Date:   Tue Apr 2 09:23:37 2024 +0100

    Ubuntu update (#1)

    * personal

    * update ubuntu image

    * revert changes

    * update ubuntu version

    * update version

    * update offer

    * update sku

    * change offer

    ---------

    Co-authored-by: Wojciech <[email protected]>

commit aa4b948
Author: Tim Allen <[email protected]>
Date:   Fri Apr 12 09:01:26 2024 +0100

    Update Resource processor Ubuntu Image (#3902)

    * Update clean_validation_envs.yml

    * update

    * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

    * update core resource processor image

    * remove clean env

    * update version

    * update changelog

commit 39aa284
Author: tim-allen-ck <[email protected]>
Date:   Fri Apr 12 09:12:48 2024 +0100

    resolving comments

commit cb59c99
Author: Tim Allen <[email protected]>
Date:   Fri Apr 12 09:01:26 2024 +0100

    Update Resource processor Ubuntu Image (#3902)

    * Update clean_validation_envs.yml

    * update

    * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

    * update core resource processor image

    * remove clean env

    * update version

    * update changelog

commit e06dbcd
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 19:57:14 2024 +0100

    moby-tini || true

commit c08a2b7
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 17:02:01 2024 +0100

    update version

commit 1049390
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 17:01:21 2024 +0100

    remove moby-tini

commit ce4dc82
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 15:53:12 2024 +0100

    update version

commit 7a43e65
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 15:52:58 2024 +0100

    update vm config

commit 7db0e5f
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 14:46:09 2024 +0100

    update ds install_ui: true

commit 8ff7f69
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 14:08:22 2024 +0100

    update script

commit be7212b
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 13:40:29 2024 +0100

    update version

commit 3a30d23
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 13:40:18 2024 +0100

    ds install_ui: false

commit a3d9109
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit 875f2f4
Author: wojciechcloudkubed <[email protected]>
Date:   Tue Apr 2 09:23:37 2024 +0100

    Ubuntu update (#1)

    * personal

    * update ubuntu image

    * revert changes

    * update ubuntu version

    * update version

    * update offer

    * update sku

    * change offer

    ---------

    Co-authored-by: Wojciech <[email protected]>

commit 9fc272b
Merge: 3a9eecb bc2f233
Author: Tim Allen <[email protected]>
Date:   Thu Apr 11 12:12:57 2024 +0100

    Merge branch 'main' into ubuntu-update

commit 3a9eecb
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 12:12:16 2024 +0100

    testing

commit 3b7522e
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 11:49:49 2024 +0100

    version for guac

commit d75e442
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 11:34:15 2024 +0100

    update to gen2

commit d4a57a3
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 11:28:21 2024 +0100

    update Readme for user resources

commit af50b39
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 11:12:46 2024 +0100

    update apt-get

commit bc414b7
Author: tim-allen-ck <[email protected]>
Date:   Thu Apr 11 11:07:43 2024 +0100

    update config

commit bc2f233
Author: wojciechcloudkubed <[email protected]>
Date:   Thu Apr 11 09:50:09 2024 +0100

    Update "Azure AD" references to "Microsoft Entra ID" (#3873)

    * rename Azure AD to Microsoft Entra Workforce ID

    * update Azure Active Directory to Microsoft Entra Workforce ID

    * replace

    * update version

    * change stale version

    * update from stale

    * update version

    * update readme

    * Microsoft Entra Workforce ID -> Microsoft Entra ID

    * AAD -> Microsoft Entra ID

    * Delete .devcontainer/devcontainer.json

    * Revert "Delete .devcontainer/devcontainer.json"

    This reverts commit 5dd6d5c.

    * revert code changes

    * remove double names

    * update version

    * go back version

    * api update version

    * revert for linting

    * revert test linting

    * fix linting

    * roll back linting

    * increase line length

    * fix linting

    * fix formatting

    * fix lintin 3

    * update urls

    * update aad urls

    ---------

    Co-authored-by: Tim Allen <[email protected]>

commit a09af34
Author: tim-allen-ck <[email protected]>
Date:   Wed Apr 10 16:44:01 2024 +0100

    update apt-source-list

commit 271c7e0
Author: tim-allen-ck <[email protected]>
Date:   Wed Apr 10 15:57:32 2024 +0100

    update pypi source

commit 1ea1159
Author: tim-allen-ck <[email protected]>
Date:   Wed Apr 10 15:53:40 2024 +0100

    update

commit d1beb03
Author: tim-allen-ck <[email protected]>
Date:   Wed Apr 10 15:51:51 2024 +0100

    updaye

commit 9c2211b
Author: tim-allen-ck <[email protected]>
Date:   Wed Apr 10 15:31:17 2024 +0100

    update core

commit c7ebc5b
Author: tim-allen-ck <[email protected]>
Date:   Wed Apr 10 15:29:00 2024 +0100

    update linux vms

commit 18df98c
Author: tim-allen-ck <[email protected]>
Date:   Wed Apr 10 15:27:42 2024 +0100

    update version

commit 19316a1
Author: tim-allen-ck <[email protected]>
Date:   Wed Apr 10 14:03:08 2024 +0100

    update install UI

commit 47c8182
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Apr 9 19:39:14 2024 +0300

    Bump the npm_and_yarn group in /ui/app with 3 updates (#3891)

    * Bump the npm_and_yarn group in /ui/app with 3 updates

    Bumps the npm_and_yarn group in /ui/app with 3 updates: [express](https://github.com/expressjs/express), [follow-redirects](https://github.com/follow-redirects/follow-redirects) and [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware).

    Updates `express` from 4.18.3 to 4.19.2
    - [Release notes](https://github.com/expressjs/express/releases)
    - [Changelog](https://github.com/expressjs/express/blob/master/History.md)
    - [Commits](expressjs/express@4.18.3...4.19.2)

    Updates `follow-redirects` from 1.15.5 to 1.15.6
    - [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
    - [Commits](follow-redirects/follow-redirects@v1.15.5...v1.15.6)

    Updates `webpack-dev-middleware` from 5.3.3 to 5.3.4
    - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
    - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
    - [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4)

    ---
    updated-dependencies:
    - dependency-name: express
      dependency-type: indirect
      dependency-group: npm_and_yarn-security-group
    - dependency-name: follow-redirects
      dependency-type: indirect
      dependency-group: npm_and_yarn-security-group
    - dependency-name: webpack-dev-middleware
      dependency-type: indirect
      dependency-group: npm_and_yarn-security-group
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

    * update ui version

    ---------

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Tim Allen <[email protected]>

commit 072cfdc
Author: tim-allen-ck <[email protected]>
Date:   Tue Apr 9 17:26:28 2024 +0100

    add in microsoft-apt/ubuntu/20.04 to source-list

commit 30ecfa2
Author: tim-allen-ck <[email protected]>
Date:   Tue Apr 9 14:55:25 2024 +0100

    add in image to enum

commit 33d14be
Author: tim-allen-ck <[email protected]>
Date:   Tue Apr 9 14:33:52 2024 +0100

    update image options

commit 7aa64ba
Author: tim-allen-ck <[email protected]>
Date:   Tue Apr 9 12:09:38 2024 +0100

    update

commit ea63ebf
Author: Tim Allen <[email protected]>
Date:   Tue Apr 9 06:37:40 2024 +0100

    Feature/GitHub actions update (#3897)

    * Update clean_validation_envs.yml

    * azure login (#19)

    Co-authored-by: Wojciech <[email protected]>

    * GitHub actions update (#22)

    * azure login

    * reset cron

    * update action versions

    ---------

    Co-authored-by: wojciechcloudkubed <[email protected]>

    * change conclusion action

    * add in teams

    ---------

    Co-authored-by: wojciechcloudkubed <[email protected]>

commit de14165
Author: Tim Allen <[email protected]>
Date:   Fri Apr 5 12:42:03 2024 +0100

    Documentation Pipeline Fix (#3898)

    add in permissions to pipeline

commit c92494e
Merge: 2716749 086be33
Author: Tim Allen <[email protected]>
Date:   Thu Apr 4 16:54:43 2024 +0100

    Merge branch 'main' into ubuntu-update

commit 2716749
Author: wojciechcloudkubed <[email protected]>
Date:   Tue Apr 2 09:23:37 2024 +0100

    Ubuntu update (#1)

    * personal

    * update ubuntu image

    * revert changes

    * update ubuntu version

    * update version

    * update offer

    * update sku

    * change offer

    ---------

    Co-authored-by: Wojciech <[email protected]>

* update env yaml

* update bash

* update linting

* update docs

* comment fixes

* update

* update nexus sku

* Update docs/tre-templates/user-resources/guacamole-linux-vm.md

Co-authored-by: Marcus Robinson <[email protected]>

* update docs

* docs

---------

Co-authored-by: Marcus Robinson <[email protected]>
@marrobi
Create KEY_VAULT_URL env var when a private.env file exists (#3727)
bd0aa62 
* Add in variablkes required when have a local porter config.yaml

* skip SC2153

* fix typo

---------

Co-authored-by: Tim Allen <[email protected]>
@marrobi
Add storage account check to avoid name clash (#3863)
d866ec5 
* Add storage account check

* update changelog. version and fix linting

* Update _version.py

---------

Co-authored-by: Tim Allen <[email protected]>
@dependabot
Bump the npm_and_yarn group in /ui/app with 2 updates (#3918)
7b572af 
* Bump the npm_and_yarn group in /ui/app with 2 updates

Bumps the npm_and_yarn group in /ui/app with 2 updates: [ejs](https://github.com/mde/ejs) and [tar](https://github.com/isaacs/node-tar).


Updates `ejs` from 3.1.9 to 3.1.10
- [Release notes](https://github.com/mde/ejs/releases)
- [Commits](mde/ejs@v3.1.9...v3.1.10)

Updates `tar` from 6.2.0 to 6.2.1
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](isaacs/node-tar@v6.2.0...v6.2.1)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: tar
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <[email protected]>

* update version

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tim Allen <[email protected]>
@dependabot
Bump the pip group across 3 directories with 2 updates (#3930)
565fd4d 
* Bump the pip group across 3 directories with 2 updates

Bumps the pip group with 2 updates in the /api_app directory: [aiohttp](https://github.com/aio-libs/aiohttp) and [gunicorn](https://github.com/benoitc/gunicorn).
Bumps the pip group with 1 update in the /cli directory: [aiohttp](https://github.com/aio-libs/aiohttp).
Bumps the pip group with 1 update in the /resource_processor/vmss_porter directory: [aiohttp](https://github.com/aio-libs/aiohttp).


Updates `aiohttp` from 3.9.3 to 3.9.4
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](aio-libs/aiohttp@v3.9.3...v3.9.4)

Updates `gunicorn` from 21.2.0 to 22.0.0
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@21.2.0...22.0.0)

Updates `aiohttp` from 3.9.3 to 3.9.4
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](aio-libs/aiohttp@v3.9.3...v3.9.4)

Updates `aiohttp` from 3.9.3 to 3.9.4
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](aio-libs/aiohttp@v3.9.3...v3.9.4)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: gunicorn
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: aiohttp
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: aiohttp
  dependency-type: direct:production
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <[email protected]>

* update version

* update RP version

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tim Allen <[email protected]>
Snyk updates 0524 (#3932)
ddbbffe 
* Update clean_validation_envs.yml

* update

* update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

* snyk update

* update version

* update

* update

* update

* update version

* update
Tim Allen and others added 30 commits November 12, 2024 11:39
@tp-allen
Update local debugging for RBAC key vaults (#4133)
897f1b1 
* update

* update core version

---------

Co-authored-by: Tim Allen <[email protected]>
@tamirkamara
Update obsolete TF properties (#4136)
158dce1 
update obsolete TF properties

Co-authored-by: Tamir Kamara <[email protected]>
@tamirkamara
Update Guacamole and deps versions (#4140)
16dff47 
* Update Guacamole and deps versions

* update changelog

---------

Co-authored-by: Tamir Kamara <[email protected]>
@jonnyry
Disable storage account cross tenant replication (#4116)
f40dee6 
* Disable storage account cross tenant replication

* Update CHANGELOG.md

* Update version numbers after merge (code in merge used them)

* Increment core version number following merge

* Increment core version number following merge
@yuvalyaron
Add CMK support for core resources (#4149)
38bd432 
* added management key vault

* added cmk for vmss and storage accounts

* add default value for variables

* add CMK for cosmos accounts

* move tre-encryption key from mgmt to core

* fix order of creation for encryption key

* add cmk for the state store in mgmt

* add support for external KV

* revert CMK for cosmos - not working, need to redo this

* refine comments and files names

* remove redundant space

* add space

* upper case in comment

* revert cosmos tags

* update changelog + core version

* remove unused var

* remove redundant variable

* remove redundant variables

* add check for enable_cmk_encryption for the key_store_id variable in tf

* bugfix: remove redundant data keyword

* add enable_cmk_encryption check in module variables

---------

Co-authored-by: Matthew Fortunka <[email protected]>
@yuvalyaron
Update Azure CLI (#4157)
af90f06 
update az cli
@marrobi
Deprecate and remove ML Flow and InnerEye bundles (#4159)
d3f5684 
* Depreciation of ML Flow and InnerEye bundles.
Fixes #4127

* add missed file
@jonnyry
Enable storage account infrastructure encryption (#4139)
90274e5 
* Enable infrastructure encryption on storage accounts #73

* Enable infrastructure encryption on storage accounts #73

* Enable infrastructure encryption on storage accounts #73

* Update storage_accounts.tf
@yuvalyaron
Add CMK support for Cosmos DB (core) (#4154)
b69ab01 
* added management key vault

* added cmk for vmss and storage accounts

* add default value for variables

* add CMK for cosmos accounts

* move tre-encryption key from mgmt to core

* fix order of creation for encryption key

* add cmk for the state store in mgmt

* add support for external KV

* revert CMK for cosmos - not working, need to redo this

* refine comments and files names

* remove redundant space

* add space

* upper case in comment

* revert cosmos tags

* update changelog + core version

* remove unused var

* remove redundant variable

* remove redundant variables

* add check for enable_cmk_encryption for the key_store_id variable in tf

* bugfix: remove redundant data keyword

* add enable_cmk_encryption check in module variables

* remove redundant key_vault_id from ignore_changes for cmk

* remove redundant sign/verify

* add cmk support for cosmos db

* update changelog + add comments

* update core version

* fix linting issue

* add null provider to providers block

* remove duplicates that were created by merge

* update core version

* remove redundant terraform data

* bump core version

---------

Co-authored-by: Matthew Fortunka <[email protected]>
Co-authored-by: Tim Allen <[email protected]>
@dependabot @tp-allen
Bump npm_and_yarn dependencies (#4085)
b67018f 
* Bump micromatch

Bumps the npm_and_yarn group with 1 update in the /.github/scripts directory: [micromatch](https://github.com/micromatch/micromatch).


Updates `micromatch` from 4.0.5 to 4.0.8
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](micromatch/micromatch@4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <[email protected]>

* update yarn.lock and package.json

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tim Allen <[email protected]>
Co-authored-by: Tim Allen <[email protected]>
@marrobi
Add GitHub PR Bot Commands page to documentation (#4167)
43cab59
@tamirkamara
Fix Dockerfile 'AS' casting (#4170)
0e30b9b
@tamirkamara
Block CosmosDB key authentication (#4175)
d718721 
Co-authored-by: Tamir Kamara <[email protected]>
@yuvalyaron
Add CMK support for Base Workspace (#4161)
ac5787c 
* added management key vault

* added cmk for vmss and storage accounts

* add default value for variables

* add CMK for cosmos accounts

* move tre-encryption key from mgmt to core

* fix order of creation for encryption key

* add cmk for the state store in mgmt

* add support for external KV

* revert CMK for cosmos - not working, need to redo this

* refine comments and files names

* remove redundant space

* add space

* upper case in comment

* revert cosmos tags

* update changelog + core version

* remove unused var

* remove redundant variable

* remove redundant variables

* add check for enable_cmk_encryption for the key_store_id variable in tf

* bugfix: remove redundant data keyword

* add enable_cmk_encryption check in module variables

* remove redundant key_vault_id from ignore_changes for cmk

* remove redundant sign/verify

* add cmk support for cosmos db

* update changelog + add comments

* update core version

* fix linting issue

* add null provider to providers block

* remove duplicates that were created by merge

* update core version

* remove redundant terraform data

* Add support for CMK encryption in workspace configuration

* add cmk for the ws storage accounts

* fix encryption_identity being sent when cmk was disabled

* update changelog

* update changelog

* fix linting issues

* bump rp version

* bump core version

* update docs

* use foreach for airlock cmks

* update the porter upgrade command + minor version

* change the default value for key_store_id variable to an empty string

* set default value of key_store_id variable to null

* Update default value of key_store_id variable to 'TWEAKME'

* Remove default value for key_store_id variable in variables.tf

* Set default value of key_store_id variable to an empty string in locals

* update core version

---------

Co-authored-by: Matthew Fortunka <[email protected]>
Co-authored-by: Tim Allen <[email protected]>
@tamirkamara
Extend validation environment TTL (#4179)
80c7ab9 
Extended validation environment TTL before stopping
@yuvalyaron
Add CMK encryption support for Azure Container Registry (ACR) and Ser…
6146484 
…vice Bus (#4178)

* change cmk name to include tre-id + add dependency to one of the stg accounts

* add cmk for ACR and service bus

* add null default for acr_sku

* bump core version to 0.11.8

* revert mistake
@jonnyry
Bump porter + terraform version, template base image Debian versions,…
b6cbef9 
… and template terraform and az cli versions (#4158)

* Bump porter, mixin, azcli & terraform versions in templates

* Bump porter, mixin, azcli & terraform versions in templates

* Revert OHDSI debian version back to bullseye as sqlcmd not available for bookworm

* Update CHANGELOG.md

* Revert MLFlow base image version back to bullseye due to incompatibilities

* Revert MLFlow Server image to bullseye due to incompatibilities

* Update porter mixin versions to canary (until the tagged version numbers are added to their releases feed)

* Update terraform version in Dev Container from 1.4.5 to 1.9.8

* Update porter az-mixin and terraform-mixin versions

* Bump base workspace version
@marrobi
Linux VM script fixes (#4185)
6f4220f
@yuvalyaron
Enable CMK encryption for storage queues and tables (#4181)
cb42226 
* change cmk name to include tre-id + add dependency to one of the stg accounts

* add cmk for ACR and service bus

* add null default for acr_sku

* bump core version to 0.11.8

* set 'Enable support for customer-managed keys' for tables and queues in storage accounts (core/mgmt only)

* add key type encryption to state store
@marrobi
Fix Unix soft links support in shared filesystem (#4193)
fbc4b55
@gauravmishrack @tp-allen
Python 3.12 Upgrade (#4164)
6c7a450 
* Python version upgraded from 3.8 to 3.11

* Python version changes done in build_docker_images.yml file

* Testng 3.8 version test results

* Testing 3.8 tests results

* python 3.11 testing

* Final Commit for python upgrade

* requirements.txt updated for testing

* bullseye to bookworm python update

* service bus version update

* rolledback requirement.txt file

* resource procesor change

* Bookworm to Bullseye Changes

* 3.12 version upgrade for python

* airlockfiles changes

* mlflow changes

* remove stuff

* add in 'the'

* update

* update requirements

* updaet

* update

* update

* update pytest versions

* update starlette

* update

* update mlflow

* update

* update vmss_porter

* update

* update core version

* python updates

* update StrEnum

* fix api messages

* add in user, edit output.sh, revert schema_extra

* updates

* update oydantic version

* update

* update

* update

* linting

* update

* update changelog

* remove pydantic chnages

* update

* update

* update cli dependencies

* update version

* update

* remove setuptools test

* remove

---------

Co-authored-by: Neosoft <[email protected]>
Co-authored-by: gauravmishrack <[email protected]>
Co-authored-by: Tim Allen <[email protected]>
@tamirkamara
Update Windows VM images (#4198)
df31985 
* Update VM images

* update changelog

---------

Co-authored-by: Tamir Kamara <[email protected]>
@marrobi
Enable VS Code Extension Gallery to be proxied via Sonatype Nexus RM (#…
397ab13 
…4188)
@marrobi
Fix unable to delete Guacamole VM in stopped state (#4203)
beea683
@marrobi
Fix tests failing due to missing .env file and logging issue with res…
5e9d1b9 
…ource processor (#4208)
@tp-allen
Update aiohttp (#4197)
5e857f6 
* update aiohttp

* update chnagelog

* update versions

* revert

* message update

* update

* update

---------

Co-authored-by: Tim Allen <[email protected]>
@marrobi @tamirkamara
Enable scheduled shutdown of Guacamole Linux VM (#4196)
a7c9a28 
* Enable scheduled shutdown of Guacamole VMs

* Enable Scheduled Shutdown of Guacamole VMs
Fixes #4186

* Fix defaults.

* Update templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml

Co-authored-by: Tamir Kamara <[email protected]>

---------

Co-authored-by: Tamir Kamara <[email protected]>
Co-authored-by: Tim Allen <[email protected]>
@TonyWildish-BH @TonyWildish @marrobi
Attempt to fix problem with Nexus getting stuck while running with to…
5bccd99 
…o little memory (#4189)

* Attempt to fix Nexus problem of running with too little memory

* Attempt to fix Nexus problem of running with too little memory

* Update CHANGELOG

* Update templates/shared_services/sonatype-nexus-vm/terraform/vm.tf

Co-authored-by: Marcus Robinson <[email protected]>

---------

Co-authored-by: Tony Wildish <[email protected]>
Co-authored-by: Marcus Robinson <[email protected]>
@marrobi
Enhance DPI settings for Linux VM display (#4206)
04df2b8 
Linux VM VDI image is blurred.
Fixes #4200

Co-authored-by: Tim Allen <[email protected]>
@jonnyry
Bump terraform version in windows vm template (#4213)
6632ed0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.