Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* scaffold, fluent, react-router, basic layouts and routes * aad auth for root + workspace, auth api calls, basic get workspace / services * read path to user resource, debug panel, breadcrumb * todos * added readme * rbac implementation for root + workspace * included index html * included index.html in gitignore * set config to point to shared env * note in the readme for OCW * moved resource debug to shared * fixed yarn install cmd * error boundaries, auth check + friendly errors, basic spinners * logout process implemented * nav architecture after ux discussion * String -> string * Notifications Panel (#1851) * basic polling * btn placement, panel * fun with polling * mostly implemented * shimmer on loading * polling from config * pr feedback * Fixing notification loading shimmer (#1858) * basic polling * btn placement, panel * fun with polling * mostly implemented * shimmer on loading * polling from config * pr feedback * shimmer at top of list * Resource Card (#1861) * basic resource card * callout and context menu * pr snags * Initial ResourcePropertyPanel (#1869) * ResourcePropertyPanel implemented to display resource properties in a consistent manner. * ResourcePropertyPanel included in WorkspaceItem, WorkspaceServiceItem and UserResourceItem * Property values starting with https:// rendered as links. * updatedWhen formatted using moment. * Connect button on resource card (#1871) * Adds a Connect button to the ResourceCard * Connect button shown if there's a connection_uri available in the resource props. * connection_uri launched in new window. * Enable Browser Debugging of React App (#1874) * enable browser debugging * Update to use pwa-msedge Co-authored-by: Steve Haigh <[email protected]> Co-authored-by: Steve Haigh <[email protected]> * UI - create resources with dynamic forms (#1875) * Added pages within create panel * Added dynamic form and creating page * Added workspace service integration * Added to main services page * Moved navigate hook * New line * New line * Remove npm lock * Disable / Delete / Notifications sync (#1885) * better control of all contexts, resource update management, disable/enable implemented * cards with disable/enable/delete * deleted * merged form, fixed snags * fixed notifications race issues * PR snags * Resource Actions (#1907) * initial actions implementation * moved all workspace props to context for consistency * workspace context fixed + owned by workspace provider * improved stability on adding multiple ops * getting all ops consistently, clearing ws context * customactions implemented and tested * Added some basic Workspace History (#1856) * add empty ResourcePropertyPanel component * add initial display of workspace properties * display workspace service and user resource properties too * Initial work with History * Dynamic Key/value display * UI Tweaks * DetailsList * Sorted the history for most recent Co-authored-by: Christofer Löf <[email protected]> * UI: Shared Services (#1909) * shared services, tweaks to allow Create form to create any resource type * pivot areas used + resource history re-used across all resource types * Clarify app resource and debug setting (#1918) Clarify settings. * feature/UI refresh (#1942) * Fix Guacamole refresh token (#1785) * Fixing Guacamole refresh token * Fix aad tenant bug Co-authored-by: Anat Balzam <[email protected]> * Add Contributor to the Role permissions (#1781) * Put it back to Owner during investigation * Attempt to find correct permissions * User Access Administrator Co-authored-by: Marcus Robinson <[email protected]> * Ignore Only Root index.html (#1800) * fixes #1775 * remove unwanted cli prefix * only ignore root index.html * Gitea/Guacamole should be able to access AAD_TENANT_ID (#1798) * Add auth-tenant-id to ws keyvault * Bump versions * linting * re-instating the deploy/destroy files * Linting * Update deploy.sh * Update destroy.sh * shared services in pr bot and split out in tests (#1813) * Resource Processor: Configure logging handler per process (#1784) * Update TRE Developer doc for API (#1801) * E2E work with scope_id from workspace properties (#1797) * E2E work with local API * Added scope identifier uri into tests * Hangiver from previous method * Try adding a sleep into the endpoint dns * Bump the version * Wait for the private endpoint * Bump version * Forgot to wait on teh sleep * Bumped * refactoring bug * Purge Protection * Bump version * PR Comments * More PR tweaks * typo * shell check comment * Remove purge protection * _get_app_auth_info * Update docs on running End-to-end tests locally (#1829) * Fix check order in pr-bot (#1850) Only check user permissions if a command is detected to avoid adding 'sorry, not allowed' comments in response to comments that aren't commands * Next available IP range calculator only considers active workspaces (#1849) * Increase Azure CLI version (#1864) * update all versions to 0.3 (#1754) * Fix Firewall Logging (#1870) * switch firewall away from dedicated log tables * update TF lock * fix liniting issue with firewall.tf * Change how access properties in get_scope (#1882) * added missing param for invoke-action (#1906) * added missing param * api version * Add Bicep tools to devcontainer (#1848) Co-authored-by: Marcus Robinson <[email protected]> * E2E tests: Fix shared service and performance tests (#1860) * Fix tests * WIP * WIP: add a command to build a user resource * Fix performance test * fix gucacamole dev vm * removed unused import * Fix shared services test * fix user resources command * Revert Makefile changes * fix tabs * Update templates/workspaces/base/terraform/variables.tf Co-authored-by: Ross Smith <[email protected]> * Add .terraform in .dockerignore files (#1872) * Bump pyjwt from 2.3.0 to 2.4.0 in /api_app (#1913) * Add resource id var to shared services. (#1914) * Add resource id var to shared services. * Update gitea version. * Fix linter version. Co-authored-by: Liza Shakury <[email protected]> * add tflint config (#1919) * Update httpx package (#1917) * update httpx package * bump version number of API * Improve documentation for Resource Processor (#1827) * Re-host Nexus on vm (#1584) * Initial commit * Replaced webapp with vm * Amended docker start commands * Amended firewall * Add nexus config to persistent volume * Add private dns zone * Corrected rg var * Added Nexus letsencrypt cert gen * Fixed linting * Changed terraform.lock.hcl to previous version * Removed leftover debug * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * File path amend Co-authored-by: Stuart Leeks <[email protected]> * Fix for cloudapp DNS resolution errors * Docker running on Nexus VM * Documented Letsencrypt process * Permissions fix * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * Formatting changes * Added reference to letsencrypt doc * Added new page reference * Moved password generation for nexus to tf * Write script to fs first before execution * Password reset finally working * Make config nexus script runnable from any dir * Added basic status info * Fix recursive file loop * Typo fix * Updated docs * renamed env file * Fix typo * Added new nexus fqdn to user resources * Add vnet link to workspaces * Bump versions * Removed nexus properties file * Updated execution permissions * Get cert in tf * Added az cli get cert * Amended prune job * Added msi id to login * Amended msi and exported cert pwd * Jetty configuration * Escape jetty vars * Password script fixes * Amended networking to use module * Use https in config script * Removed res proc location variable * Potential linting fix * Linting fixes * Linting directive positioning * Gitea version bump * Terraform format * Reorder linting to workaround superlinter bug with Terraform * Added nexus-cert to build and caching of letsencrypt * Adopted new shared service deploy method * Added cron job to renew nexus cert * Removed location references * And another * Removed location refs and added az cli * Fixed nexus-cert kv permissions * Corrected outputs directory * Fixed shared service deployment steps * Updated docs and removed renew prompt * version bump * Increase bundle versions * remote location from variables files * Removed shared service make * Removed docker prune * Bash headers * Layer clean * Reduce layer * Testing without kv role assignment * Removed kv role assignment * Adding firewall rule to allow letsencrypt from RP * Genericised cert service and added letsencrypt action * Fixed auth hook * Removed make commands * Certbot in bundle container * Tidied naming * Python base image * Generate action successful * Inject cert name to nexus bundle * Implemented app gateway start/stop * Separated cloudinit yaml into scripts * Fixed new line issue * Fixed bash casing * Added local nexus repo config * Added retry logic to config repos * gitea bump * Fixed status code * terraform linting * Added docs * Lint fix * Update docs/tre-developers/letsencrypt.md * Update docs/tre-admins/setup-instructions/configuring-shared-services.md * Update docs/tre-developers/letsencrypt.md * Update docs/tre-developers/letsencrypt.md * Update docs/tre-admins/setup-instructions/configuring-shared-services.md Co-authored-by: Marcus Robinson <[email protected]> * Fix firewall conflict * Added note to docs for cert kv conflicts * Renamed sonatype-nexus to nexus for new version * Added old nexus service code * Lint fix * Renamed folder to be obvious as the nexus-vm * Added docs for upgrade path * Added data.azurerm rg core * linting * bash linting * Require workspace of 0.2.14 or above * Moved new version notes to section below config steps * Removed give new cert name * RP cert permissions * tf format * Added required params for certs and nexus tempalte schema * Added cert import permissions * Added certs delete permission * App gateway az login * Version bumps * tf fmt * Added missing az cred params to certs * Add purge permission * Bump tf versions to 3.4.0 & set purge to false * Removed unsupported property from new provider * Moved nexus private zone to core * Amended location var * Amended zone location * Added upgrade flag for tf * Remove tf lock * Added new tf key * Added key into uninstall * Resolve firewall rule conflicts * Var reference fix * Fix for potential @ symbol in nexus admin password causing curl bug * Added nexus_version variable to user resources for back compat * Added docs for nexus_version * downgrade superlinter * revert superlinter to v4 * Remove lint aws plugin block * Use superlinter latest * Manually set tflint path Co-authored-by: oliver7598 <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: Ross Smith <[email protected]> Co-authored-by: ross-p-smith <[email protected]> Co-authored-by: Jamie D <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: marrobi <[email protected]> * Mandatory client-secret when creating a workspace (#1924) * Mandatory client_secret when creating workspace * Debugging settings * azure rm version * Update templates/workspaces/base/.env.sample Co-authored-by: Marcus Robinson <[email protected]> * Update templates/workspaces/base/.env.sample Co-authored-by: Marcus Robinson <[email protected]> * Update templates/workspaces/base/terraform/variables.tf Co-authored-by: Marcus Robinson <[email protected]> * disable app service's ftp (#1930) * Airlock resources - tf scripts (#1843) * Airlock resources - tf scripts * reusing the existing sb + adding network rules bug fixes * Make etag required in API documentaiton, remove custom check (#1932) * Make etag required in API documentaiton, remove custom check * Update _version.py * tests + remove string Co-authored-by: sharon <[email protected]> * Reimage Resource Processor Automatically (#1929) * reimage resource processor automatically * resource processor vm user docker permissions * update hcl * initial swa deploy * Tag tre core services (#1916) * tag core resources Co-authored-by: Anat Balzam <[email protected]> Co-authored-by: Anat Balzam <[email protected]> Co-authored-by: Ross Smith <[email protected]> Co-authored-by: Marcus Robinson <[email protected]> Co-authored-by: Martin Peck <[email protected]> Co-authored-by: tanya-borisova <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: Tamir Kamara <[email protected]> Co-authored-by: Sven Aelterman <[email protected]> Co-authored-by: Sonali Rajput <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Liza Shakury <[email protected]> Co-authored-by: Liza Shakury <[email protected]> Co-authored-by: James Griffin <[email protected]> Co-authored-by: oliver7598 <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: ross-p-smith <[email protected]> Co-authored-by: Jamie D <[email protected]> Co-authored-by: Elad Iwanir <[email protected]> Co-authored-by: Sharon Hart <[email protected]> Co-authored-by: sharon <[email protected]> Co-authored-by: Guy Bertental <[email protected]> * UI CI (#1935) * Fix Guacamole refresh token (#1785) * Fixing Guacamole refresh token * Fix aad tenant bug Co-authored-by: Anat Balzam <[email protected]> * Add Contributor to the Role permissions (#1781) * Put it back to Owner during investigation * Attempt to find correct permissions * User Access Administrator Co-authored-by: Marcus Robinson <[email protected]> * Ignore Only Root index.html (#1800) * fixes #1775 * remove unwanted cli prefix * only ignore root index.html * Gitea/Guacamole should be able to access AAD_TENANT_ID (#1798) * Add auth-tenant-id to ws keyvault * Bump versions * linting * re-instating the deploy/destroy files * Linting * Update deploy.sh * Update destroy.sh * shared services in pr bot and split out in tests (#1813) * Resource Processor: Configure logging handler per process (#1784) * Update TRE Developer doc for API (#1801) * E2E work with scope_id from workspace properties (#1797) * E2E work with local API * Added scope identifier uri into tests * Hangiver from previous method * Try adding a sleep into the endpoint dns * Bump the version * Wait for the private endpoint * Bump version * Forgot to wait on teh sleep * Bumped * refactoring bug * Purge Protection * Bump version * PR Comments * More PR tweaks * typo * shell check comment * Remove purge protection * _get_app_auth_info * Update docs on running End-to-end tests locally (#1829) * Fix check order in pr-bot (#1850) Only check user permissions if a command is detected to avoid adding 'sorry, not allowed' comments in response to comments that aren't commands * Next available IP range calculator only considers active workspaces (#1849) * Increase Azure CLI version (#1864) * update all versions to 0.3 (#1754) * Fix Firewall Logging (#1870) * switch firewall away from dedicated log tables * update TF lock * fix liniting issue with firewall.tf * Change how access properties in get_scope (#1882) * added missing param for invoke-action (#1906) * added missing param * api version * Add Bicep tools to devcontainer (#1848) Co-authored-by: Marcus Robinson <[email protected]> * E2E tests: Fix shared service and performance tests (#1860) * Fix tests * WIP * WIP: add a command to build a user resource * Fix performance test * fix gucacamole dev vm * removed unused import * Fix shared services test * fix user resources command * Revert Makefile changes * fix tabs * Update templates/workspaces/base/terraform/variables.tf Co-authored-by: Ross Smith <[email protected]> * shared services, tweaks to allow Create form to create any resource type * pivot areas used + resource history re-used across all resource types * Add .terraform in .dockerignore files (#1872) * Bump pyjwt from 2.3.0 to 2.4.0 in /api_app (#1913) * Add resource id var to shared services. (#1914) * Add resource id var to shared services. * Update gitea version. * Fix linter version. Co-authored-by: Liza Shakury <[email protected]> * add tflint config (#1919) * Update httpx package (#1917) * update httpx package * bump version number of API * Improve documentation for Resource Processor (#1827) * Re-host Nexus on vm (#1584) * Initial commit * Replaced webapp with vm * Amended docker start commands * Amended firewall * Add nexus config to persistent volume * Add private dns zone * Corrected rg var * Added Nexus letsencrypt cert gen * Fixed linting * Changed terraform.lock.hcl to previous version * Removed leftover debug * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * File path amend Co-authored-by: Stuart Leeks <[email protected]> * Fix for cloudapp DNS resolution errors * Docker running on Nexus VM * Documented Letsencrypt process * Permissions fix * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * Formatting changes * Added reference to letsencrypt doc * Added new page reference * Moved password generation for nexus to tf * Write script to fs first before execution * Password reset finally working * Make config nexus script runnable from any dir * Added basic status info * Fix recursive file loop * Typo fix * Updated docs * renamed env file * Fix typo * Added new nexus fqdn to user resources * Add vnet link to workspaces * Bump versions * Removed nexus properties file * Updated execution permissions * Get cert in tf * Added az cli get cert * Amended prune job * Added msi id to login * Amended msi and exported cert pwd * Jetty configuration * Escape jetty vars * Password script fixes * Amended networking to use module * Use https in config script * Removed res proc location variable * Potential linting fix * Linting fixes * Linting directive positioning * Gitea version bump * Terraform format * Reorder linting to workaround superlinter bug with Terraform * Added nexus-cert to build and caching of letsencrypt * Adopted new shared service deploy method * Added cron job to renew nexus cert * Removed location references * And another * Removed location refs and added az cli * Fixed nexus-cert kv permissions * Corrected outputs directory * Fixed shared service deployment steps * Updated docs and removed renew prompt * version bump * Increase bundle versions * remote location from variables files * Removed shared service make * Removed docker prune * Bash headers * Layer clean * Reduce layer * Testing without kv role assignment * Removed kv role assignment * Adding firewall rule to allow letsencrypt from RP * Genericised cert service and added letsencrypt action * Fixed auth hook * Removed make commands * Certbot in bundle container * Tidied naming * Python base image * Generate action successful * Inject cert name to nexus bundle * Implemented app gateway start/stop * Separated cloudinit yaml into scripts * Fixed new line issue * Fixed bash casing * Added local nexus repo config * Added retry logic to config repos * gitea bump * Fixed status code * terraform linting * Added docs * Lint fix * Update docs/tre-developers/letsencrypt.md * Update docs/tre-admins/setup-instructions/configuring-shared-services.md * Update docs/tre-developers/letsencrypt.md * Update docs/tre-developers/letsencrypt.md * Update docs/tre-admins/setup-instructions/configuring-shared-services.md Co-authored-by: Marcus Robinson <[email protected]> * Fix firewall conflict * Added note to docs for cert kv conflicts * Renamed sonatype-nexus to nexus for new version * Added old nexus service code * Lint fix * Renamed folder to be obvious as the nexus-vm * Added docs for upgrade path * Added data.azurerm rg core * linting * bash linting * Require workspace of 0.2.14 or above * Moved new version notes to section below config steps * Removed give new cert name * RP cert permissions * tf format * Added required params for certs and nexus tempalte schema * Added cert import permissions * Added certs delete permission * App gateway az login * Version bumps * tf fmt * Added missing az cred params to certs * Add purge permission * Bump tf versions to 3.4.0 & set purge to false * Removed unsupported property from new provider * Moved nexus private zone to core * Amended location var * Amended zone location * Added upgrade flag for tf * Remove tf lock * Added new tf key * Added key into uninstall * Resolve firewall rule conflicts * Var reference fix * Fix for potential @ symbol in nexus admin password causing curl bug * Added nexus_version variable to user resources for back compat * Added docs for nexus_version * downgrade superlinter * revert superlinter to v4 * Remove lint aws plugin block * Use superlinter latest * Manually set tflint path Co-authored-by: oliver7598 <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: Ross Smith <[email protected]> Co-authored-by: ross-p-smith <[email protected]> Co-authored-by: Jamie D <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: marrobi <[email protected]> * Mandatory client-secret when creating a workspace (#1924) * Mandatory client_secret when creating workspace * Debugging settings * azure rm version * Update templates/workspaces/base/.env.sample Co-authored-by: Marcus Robinson <[email protected]> * Update templates/workspaces/base/.env.sample Co-authored-by: Marcus Robinson <[email protected]> * Update templates/workspaces/base/terraform/variables.tf Co-authored-by: Marcus Robinson <[email protected]> * disable app service's ftp (#1930) * Airlock resources - tf scripts (#1843) * Airlock resources - tf scripts * reusing the existing sb + adding network rules bug fixes * workspace nav fix * Make etag required in API documentaiton, remove custom check (#1932) * Make etag required in API documentaiton, remove custom check * Update _version.py * tests + remove string Co-authored-by: sharon <[email protected]> * Reimage Resource Processor Automatically (#1929) * reimage resource processor automatically * resource processor vm user docker permissions * update hcl * initial swa deploy * swa deploy, CORS set * SWA deployment * post deploy manual step message * defaulting ui location as global resource, fmt * deploy_ui feature flag Co-authored-by: Anat Balzam <[email protected]> Co-authored-by: Anat Balzam <[email protected]> Co-authored-by: Ross Smith <[email protected]> Co-authored-by: Marcus Robinson <[email protected]> Co-authored-by: Martin Peck <[email protected]> Co-authored-by: tanya-borisova <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: Tamir Kamara <[email protected]> Co-authored-by: Sven Aelterman <[email protected]> Co-authored-by: Sonali Rajput <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Liza Shakury <[email protected]> Co-authored-by: Liza Shakury <[email protected]> Co-authored-by: James Griffin <[email protected]> Co-authored-by: oliver7598 <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: ross-p-smith <[email protected]> Co-authored-by: Jamie D <[email protected]> Co-authored-by: Elad Iwanir <[email protected]> Co-authored-by: Sharon Hart <[email protected]> Co-authored-by: sharon <[email protected]> * Listing workspace operations. for #1852 (#1867) * workspace operations models * workspaceOperationsPanel * WorkspaceOperations Component * UI operations list * cleanup * Seperate ResourceOperationListItem * Clean up Resorce Operatiion list * using workspaceContext Co-authored-by: Joao Almeida <[email protected]> * UI Enhancements (#1956) * initial swa deploy * extracted context menu to reusable component * context menu on resource pages * shared service page with context menu * component manager custom hook * removed dummy nav items, integrated ops list component everywhere * component action remove on pages@ * hoisted create form to top level and used context * Update resource via the central form * UI: Resource Status + lifecycles (#1972) * initial swa deploy * status implemented * Damoo/resource status (#1974) * initial swa deploy * status implemented * swa config * UI: MVP Readiness (#1982) * initial swa deploy * mvp snagging * fixes resetting state for create form * Move UI to blob storage behind app gw. (#1983) * Switch 404 page to index (#1985) * UI Deploy Fixes (#1986) * initial swa deploy * deploy fixes * UI Snagging + Migration (#1996) * initial swa deploy * fixed create form state reset (again) * added required roles to create buttons * API migration for deploymentStatus field * include num rows in migration * Merged Main (#1999) * Fix Guacamole refresh token (#1785) * Fixing Guacamole refresh token * Fix aad tenant bug Co-authored-by: Anat Balzam <[email protected]> * Add Contributor to the Role permissions (#1781) * Put it back to Owner during investigation * Attempt to find correct permissions * User Access Administrator Co-authored-by: Marcus Robinson <[email protected]> * Ignore Only Root index.html (#1800) * fixes #1775 * remove unwanted cli prefix * only ignore root index.html * Gitea/Guacamole should be able to access AAD_TENANT_ID (#1798) * Add auth-tenant-id to ws keyvault * Bump versions * linting * re-instating the deploy/destroy files * Linting * Update deploy.sh * Update destroy.sh * shared services in pr bot and split out in tests (#1813) * Resource Processor: Configure logging handler per process (#1784) * Update TRE Developer doc for API (#1801) * E2E work with scope_id from workspace properties (#1797) * E2E work with local API * Added scope identifier uri into tests * Hangiver from previous method * Try adding a sleep into the endpoint dns * Bump the version * Wait for the private endpoint * Bump version * Forgot to wait on teh sleep * Bumped * refactoring bug * Purge Protection * Bump version * PR Comments * More PR tweaks * typo * shell check comment * Remove purge protection * _get_app_auth_info * Update docs on running End-to-end tests locally (#1829) * Fix check order in pr-bot (#1850) Only check user permissions if a command is detected to avoid adding 'sorry, not allowed' comments in response to comments that aren't commands * Next available IP range calculator only considers active workspaces (#1849) * Increase Azure CLI version (#1864) * update all versions to 0.3 (#1754) * Fix Firewall Logging (#1870) * switch firewall away from dedicated log tables * update TF lock * fix liniting issue with firewall.tf * Change how access properties in get_scope (#1882) * added missing param for invoke-action (#1906) * added missing param * api version * Add Bicep tools to devcontainer (#1848) Co-authored-by: Marcus Robinson <[email protected]> * E2E tests: Fix shared service and performance tests (#1860) * Fix tests * WIP * WIP: add a command to build a user resource * Fix performance test * fix gucacamole dev vm * removed unused import * Fix shared services test * fix user resources command * Revert Makefile changes * fix tabs * Update templates/workspaces/base/terraform/variables.tf Co-authored-by: Ross Smith <[email protected]> * Add .terraform in .dockerignore files (#1872) * Bump pyjwt from 2.3.0 to 2.4.0 in /api_app (#1913) * Add resource id var to shared services. (#1914) * Add resource id var to shared services. * Update gitea version. * Fix linter version. Co-authored-by: Liza Shakury <[email protected]> * add tflint config (#1919) * Update httpx package (#1917) * update httpx package * bump version number of API * Improve documentation for Resource Processor (#1827) * Re-host Nexus on vm (#1584) * Initial commit * Replaced webapp with vm * Amended docker start commands * Amended firewall * Add nexus config to persistent volume * Add private dns zone * Corrected rg var * Added Nexus letsencrypt cert gen * Fixed linting * Changed terraform.lock.hcl to previous version * Removed leftover debug * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * File path amend Co-authored-by: Stuart Leeks <[email protected]> * Fix for cloudapp DNS resolution errors * Docker running on Nexus VM * Documented Letsencrypt process * Permissions fix * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * Typo fix Co-authored-by: Stuart Leeks <[email protected]> * Formatting changes * Added reference to letsencrypt doc * Added new page reference * Moved password generation for nexus to tf * Write script to fs first before execution * Password reset finally working * Make config nexus script runnable from any dir * Added basic status info * Fix recursive file loop * Typo fix * Updated docs * renamed env file * Fix typo * Added new nexus fqdn to user resources * Add vnet link to workspaces * Bump versions * Removed nexus properties file * Updated execution permissions * Get cert in tf * Added az cli get cert * Amended prune job * Added msi id to login * Amended msi and exported cert pwd * Jetty configuration * Escape jetty vars * Password script fixes * Amended networking to use module * Use https in config script * Removed res proc location variable * Potential linting fix * Linting fixes * Linting directive positioning * Gitea version bump * Terraform format * Reorder linting to workaround superlinter bug with Terraform * Added nexus-cert to build and caching of letsencrypt * Adopted new shared service deploy method * Added cron job to renew nexus cert * Removed location references * And another * Removed location refs and added az cli * Fixed nexus-cert kv permissions * Corrected outputs directory * Fixed shared service deployment steps * Updated docs and removed renew prompt * version bump * Increase bundle versions * remote location from variables files * Removed shared service make * Removed docker prune * Bash headers * Layer clean * Reduce layer * Testing without kv role assignment * Removed kv role assignment * Adding firewall rule to allow letsencrypt from RP * Genericised cert service and added letsencrypt action * Fixed auth hook * Removed make commands * Certbot in bundle container * Tidied naming * Python base image * Generate action successful * Inject cert name to nexus bundle * Implemented app gateway start/stop * Separated cloudinit yaml into scripts * Fixed new line issue * Fixed bash casing * Added local nexus repo config * Added retry logic to config repos * gitea bump * Fixed status code * terraform linting * Added docs * Lint fix * Update docs/tre-developers/letsencrypt.md * Update docs/tre-admins/setup-instructions/configuring-shared-services.md * Update docs/tre-developers/letsencrypt.md * Update docs/tre-developers/letsencrypt.md * Update docs/tre-admins/setup-instructions/configuring-shared-services.md Co-authored-by: Marcus Robinson <[email protected]> * Fix firewall conflict * Added note to docs for cert kv conflicts * Renamed sonatype-nexus to nexus for new version * Added old nexus service code * Lint fix * Renamed folder to be obvious as the nexus-vm * Added docs for upgrade path * Added data.azurerm rg core * linting * bash linting * Require workspace of 0.2.14 or above * Moved new version notes to section below config steps * Removed give new cert name * RP cert permissions * tf format * Added required params for certs and nexus tempalte schema * Added cert import permissions * Added certs delete permission * App gateway az login * Version bumps * tf fmt * Added missing az cred params to certs * Add purge permission * Bump tf versions to 3.4.0 & set purge to false * Removed unsupported property from new provider * Moved nexus private zone to core * Amended location var * Amended zone location * Added upgrade flag for tf * Remove tf lock * Added new tf key * Added key into uninstall * Resolve firewall rule conflicts * Var reference fix * Fix for potential @ symbol in nexus admin password causing curl bug * Added nexus_version variable to user resources for back compat * Added docs for nexus_version * downgrade superlinter * revert superlinter to v4 * Remove lint aws plugin block * Use superlinter latest * Manually set tflint path Co-authored-by: oliver7598 <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: Ross Smith <[email protected]> Co-authored-by: ross-p-smith <[email protected]> Co-authored-by: Jamie D <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: marrobi <[email protected]> * Mandatory client-secret when creating a workspace (#1924) * Mandatory client_secret when creating workspace * Debugging settings * azure rm version * Update templates/workspaces/base/.env.sample Co-authored-by: Marcus Robinson <[email protected]> * Update templates/workspaces/base/.env.sample Co-authored-by: Marcus Robinson <[email protected]> * Update templates/workspaces/base/terraform/variables.tf Co-authored-by: Marcus Robinson <[email protected]> * disable app service's ftp (#1930) * Airlock resources - tf scripts (#1843) * Airlock resources - tf scripts * reusing the existing sb + adding network rules bug fixes * Make etag required in API documentaiton, remove custom check (#1932) * Make etag required in API documentaiton, remove custom check * Update _version.py * tests + remove string Co-authored-by: sharon <[email protected]> * Reimage Resource Processor Automatically (#1929) * reimage resource processor automatically * resource processor vm user docker permissions * update hcl * initial swa deploy * Tag tre core services (#1916) * tag core resources * Setting workspace_owner_object_id when creating workspaces (#1928) * Wait for DNS * workspace_owner_object_id * Bumped version * Added extra value for local testing * Pass through workspace_owner_object_id * workspace_identifier_uri * typo in test name * Kept extra check for 202 * Optimize Guacamole docker image (#1933) * Optimize Guacamole docker image * remove comments * pin tomcat version * lint changes * fix * ignore linter error about the user * fix user * update versions Co-authored-by: Ross Smith <[email protected]> * Upgrade azurerm provider version to 3.5.0 (#1947) * E2E on main run in sequence (#1945) * Allow e2e tests to run in sequence from main * fix * actions lint fix * add missing markers to pytest.ini * fix selector string * update timeout * fix prbot e2eTestsCustomSelector param (#1959) * Airlock processor - function app based - Base (#1950) * Cost Report - Tag Gitea shared service (#1941) * Tag gitea shared service * Fix format * Upgrade mysql * Ignore tflint error due to a bug in it. * CR changes * Move tflint ignore comment. * Fix TF fmt. * Fix TF lint. * Upgrade gitea version Co-authored-by: Liza Shakury <[email protected]> * update-ws-svc-fw-rule-name-ad (#1957) * azurerm_app_service_plan is deprecated and we should use azurerm_service_plan (#1958) * azurerm_app_service_plan ->azurerm_service_plan * Migrate resources * Linter * tflint * azurerm_app_service_plan ->azurerm_service_plan * Migrate resources * Linter * tflint * Handle empty state * Don't migrate Terraform (#1977) * [cost] Tag firewall and nexus shared services. (#1979) * Tag firewall and nexus * Update gitea version. * Update nexus porter * Update nexus parameters * Update nexus variables Co-authored-by: Liza Shakury <[email protected]> * Create Application Administrator (#1975) * Create Application Administrator * Change sp name to have TRE in it * Cleanup bundle dockerfiles (#1969) * cleanup bundle dockerfiles * lint fixes * pin apt-get versions * fix version * bump version * Register VM Bundle for E2E tests (#1987) * Publish before Register (#1988) * Publish before Register * TF_VAR_application_admin_client_id * Registering a user_resource needs the Workspace Service Name (#1989) * WORKSPACE_SERVICE_NAME * run command needs WORKSPACE_SERVICE_NAME * And added to the docker run * add missing dockerfile.tmpl references (#1990) Co-authored-by: Ross Smith <[email protected]> * Create user_resource in e2e tests (#1952) * Create user_resource in e2e tests * Testing user Resource * Purge Protection * Added guacamole-azure-windowsvm fpr e2e * Register the Windows VM * TF_VAR_application_admin_client_id (#1993) * Missing Inputs (#1994) * Use different identity to create applications (#1976) * Use different identity to create applications * Bump version * Mandatory application_admin_client_id * Missing porter parameters * [cost] Tag Guacamole Workspace Service in Terraform (#1971) tag Guacamole workspace service for cost feature Co-authored-by: Ross Smith <[email protected]> Co-authored-by: Tamir Kamara <[email protected]> Co-authored-by: Guy Bertental <[email protected]> * config.sample -> config.source * gitignore config.json * page title, favicon, readme * left nav padding Co-authored-by: Anat Balzam <[email protected]> Co-authored-by: Anat Balzam <[email protected]> Co-authored-by: Ross Smith <[email protected]> Co-authored-by: Marcus Robinson <[email protected]> Co-authored-by: Martin Peck <[email protected]> Co-authored-by: tanya-borisova <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: Tamir Kamara <[email protected]> Co-authored-by: Sven Aelterman <[email protected]> Co-authored-by: Sonali Rajput <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Liza Shakury <[email protected]> Co-authored-by: Liza Shakury <[email protected]> Co-authored-by: James Griffin <[email protected]> Co-authored-by: oliver7598 <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: ross-p-smith <[email protected]> Co-authored-by: Jamie D <[email protected]> Co-authored-by: Elad Iwanir <[email protected]> Co-authored-by: Sharon Hart <[email protected]> Co-authored-by: sharon <[email protected]> Co-authored-by: Guy Bertental <[email protected]> Co-authored-by: dusan-ilic-mhra <[email protected]> Co-authored-by: Ciprian Maftei <[email protected]> * initial swa deploy * api version bump * linting * linting * UI Doc (#2000) * removed swa config * UI doc * reverted dockerfile change * reverted dockerfile change * merge weirdness * Update docs/tre-developers/ui.md Co-authored-by: Marcus Robinson <[email protected]> * Update ui.md Co-authored-by: Marcus Robinson <[email protected]> * linting * yml file regression * pr feedback * moved launch tasks * reverted client apps -> swagger ui * moved var check to makefile over script * dockerfile linting * dockerfile typo fix * dockerfile typo fix Co-authored-by: Christofer Löf <[email protected]> Co-authored-by: Martin Peck <[email protected]> Co-authored-by: Steve Haigh <[email protected]> Co-authored-by: James Griffin <[email protected]> Co-authored-by: Ross Smith <[email protected]> Co-authored-by: Marcus Robinson <[email protected]> Co-authored-by: Anat Balzam <[email protected]> Co-authored-by: Anat Balzam <[email protected]> Co-authored-by: tanya-borisova <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: Tamir Kamara <[email protected]> Co-authored-by: Sven Aelterman <[email protected]> Co-authored-by: Sonali Rajput <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Liza Shakury <[email protected]> Co-authored-by: Liza Shakury <[email protected]> Co-authored-by: oliver7598 <[email protected]> Co-authored-by: Stuart Leeks <[email protected]> Co-authored-by: ross-p-smith <[email protected]> Co-authored-by: Jamie D <[email protected]> Co-authored-by: Elad Iwanir <[email protected]> Co-authored-by: Sharon Hart <[email protected]> Co-authored-by: sharon <[email protected]> Co-authored-by: Guy Bertental <[email protected]> Co-authored-by: João Almeida <[email protected]> Co-authored-by: Joao Almeida <[email protected]> Co-authored-by: dusan-ilic-mhra <[email protected]> Co-authored-by: Ciprian Maftei <[email protected]>
- Loading branch information
29 people
authored
Jun 9, 2022
1 parent
0385e91
commit 3744b5f