From 6cf598dc4debf5547222fc3a0d6f4105a42155b4 Mon Sep 17 00:00:00 2001 From: Darragh ORiordan Date: Sun, 31 Dec 2023 19:55:58 +1100 Subject: [PATCH] feat: update terraform providers and limit file writes on renames --- .../local-dev/auth0-dev/.terraform.lock.hcl | 57 ++++++++++--------- .../local-dev/auth0-dev/auth0-resources.tf | 7 +-- .../production/auth0-prod/.terraform.lock.hcl | 31 +++++----- .../production/auth0-prod/auth0-resources.tf | 2 +- libs/project-setup/setup-helpers.ts | 10 ++++ 5 files changed, 60 insertions(+), 47 deletions(-) diff --git a/infrastructure/local-dev/auth0-dev/.terraform.lock.hcl b/infrastructure/local-dev/auth0-dev/.terraform.lock.hcl index d13e9110..35f26736 100644 --- a/infrastructure/local-dev/auth0-dev/.terraform.lock.hcl +++ b/infrastructure/local-dev/auth0-dev/.terraform.lock.hcl @@ -2,38 +2,41 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/auth0/auth0" { - version = "1.0.0" + version = "1.1.1" hashes = [ - "h1:1q6OPUs3f99xnv/rT3R/BlyEtkKoJFQd+Re0YhZNB+I=", - "h1:9ulunyuLiqIkHH3boMaJO9+YbXxkGegtqi9Qeqcy3P4=", - "h1:ApQxhemModu5lgok5wQOn6nZD79j4/1LNinuk8REZAw=", - "h1:GBo4XKQ7KHaOicB4yPOXXWOJ41sE5cqPKp92yYF0SyQ=", - "h1:ZvR79cN45UJaLtwHhiiqliZ5ht5trtIfiWWLX9nT6Ns=", - "h1:aauVNTjp6xvlAV3kg90z/TEtuXWdDhtJhEz3O3W8xtQ=", - "h1:e28vNUD16QTiRmem593kNZfoal7GartVv9QXC4sk0dY=", - "h1:eoXCM9E0JIiJn8rtfRpX7llPKvmtRR2jVp2tFTa48oU=", - "h1:ftRrVUSbUnFzGQ4zzszu5XCX//Os20Tr/YUlVJnUqoU=", - "h1:nVFEcEqI2lEQlS2ODRLaN8nKMu7CNqK5PFk1M21WtQc=", - "h1:oVAk5k5pK424zbqwEszHE1uE3XSz9S0nU8vVuNS9i/w=", - "h1:uRiVj6whAI+l5VDEs4gAUOMsQRAQSQ5Y0kG+5+A/7cw=", - "h1:vijyv7biV2pjuibPs/xeHB3Q0hePKmH7fZJKIFt4kPY=", - "h1:zp1cXoJN6oMeO+msI2sngOPgehlqNrA6dTfEvf/RWTg=", + "h1:5L7Gq/6/lVvADbL7tyeCHZHMUr9nH3pVQ7hPtRXkgUA=", + "zh:2fecf328558331bb9faa31bfc49c7610c08dd718624733aacb687c982454008e", + "zh:35ca00946e511d9a03844d768bc1b21a1c87fc3ff547aa3e120a73e27559ce1f", + "zh:37ff592212604c32da2d6417bd519ae92fe09e97258e7479ca91d3d2a1a72815", + "zh:57980a701c68a3fd3c96b23d7289fb353fa9311697a8fa3061aad6115e459f6a", + "zh:5a12b84e88ecddec5e22cae92a5e9df7f715f966680d199923d9b24f9c2b8367", + "zh:6161a39be72e48ff101b2bfea03a8c08f3b4ee3892dc5ddf25098c3688f9aea1", + "zh:7f8ed5fc3e601e47e67a044fd432f56dc6d5ce5cfd8bf0e6d94432248d720b55", + "zh:8f4403503f6271deca4eb65a0a9c20b233521d46b9befdf948d94a53e6a98bff", + "zh:92b6abad23181ff2b468ad2d88fb2c92e0e3204cc0f575b532901a7dd0c5c959", + "zh:a14e498e9a3bcf14d8cb82fe66a9b1c06945a05d7c91db4a1950cf9aa9775c29", + "zh:b4ca1ee67e40e64a8256f18ca6aa0dad74517b5fcff4f89964c16a462cf2b4d6", + "zh:c5667e0e4038209475cb9f743756cad38def762cf74bbb5f1e6d076158fa12d6", + "zh:dc11dbe6bfe2eca64f6c672c52093805babfd5d9c04bf51edd06532523761db4", + "zh:f7a5505eda3c7405d75633661fef095e11e75d24905cc24afbcd64c681122412", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.5.1" + version = "3.6.0" hashes = [ - "h1:0ULxM8/DscMzfiDWg1yclBf/39U44wQmlx745BfYZ80=", - "h1:3hjTP5tQBspPcFAJlfafnWrNrKnr7J4Cp0qB9jbqf30=", - "h1:6FVyQ/aG6tawPam6B+oFjgdidKd83uG9n7dOSQ66HBA=", - "h1:6ePAACdONiMGe1j5pwUc0gpDFt82y/ka0zRimMg/geM=", - "h1:BD3Y4CcrGHb9sx+Bl5V8M2PSyw23mykzXSwj+/6FhHA=", - "h1:HGeb7Tajn7HZwX0MhrdyL57LoCSz5GMcI2wbHs12D4U=", - "h1:IL9mSatmwov+e0+++YX2V6uel+dV6bn+fC/cnGDK3Ck=", - "h1:JiENkIxSWc32/2Dtd1n4CWY3ow/PHvAeGhdgcOLpWZM=", - "h1:MROYZuKGTuaTNf2FgbwCgSVpteQW25ubnb+Xfok2jvk=", - "h1:VSnd9ZIPyfKHOObuQCaKfnjIHRtR7qTw19Rz8tJxm+k=", - "h1:sZ7MTSD4FLekNN2wSNFGpM+5slfvpm5A/NLVZiB7CO0=", + "h1:R5Ucn26riKIEijcsiOMBR3uOAjuOMfI1x7XvH4P6B1w=", + "zh:03360ed3ecd31e8c5dac9c95fe0858be50f3e9a0d0c654b5e504109c2159287d", + "zh:1c67ac51254ba2a2bb53a25e8ae7e4d076103483f55f39b426ec55e47d1fe211", + "zh:24a17bba7f6d679538ff51b3a2f378cedadede97af8a1db7dad4fd8d6d50f829", + "zh:30ffb297ffd1633175d6545d37c2217e2cef9545a6e03946e514c59c0859b77d", + "zh:454ce4b3dbc73e6775f2f6605d45cee6e16c3872a2e66a2c97993d6e5cbd7055", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:91df0a9fab329aff2ff4cf26797592eb7a3a90b4a0c04d64ce186654e0cc6e17", + "zh:aa57384b85622a9f7bfb5d4512ca88e61f22a9cea9f30febaa4c98c68ff0dc21", + "zh:c4a3e329ba786ffb6f2b694e1fd41d413a7010f3a53c20b432325a94fa71e839", + "zh:e2699bc9116447f96c53d55f2a00570f982e6f9935038c3810603572693712d0", + "zh:e747c0fd5d7684e5bfad8aa0ca441903f15ae7a98a737ff6aca24ba223207e2c", + "zh:f1ca75f417ce490368f047b63ec09fd003711ae48487fba90b4aba2ccf71920e", ] } diff --git a/infrastructure/local-dev/auth0-dev/auth0-resources.tf b/infrastructure/local-dev/auth0-dev/auth0-resources.tf index 3c74c1e1..3f813002 100644 --- a/infrastructure/local-dev/auth0-dev/auth0-resources.tf +++ b/infrastructure/local-dev/auth0-dev/auth0-resources.tf @@ -57,7 +57,6 @@ resource "auth0_resource_server" "backend_api_app" { resource "auth0_resource_server_scopes" "backend_api_app_scopes" { resource_server_identifier = auth0_resource_server.backend_api_app.identifier - scopes { name = "read:own" description = "Read own records" @@ -86,8 +85,6 @@ resource "auth0_resource_server_scopes" "backend_api_app_scopes" { resource "auth0_role" "super_user_role" { name = "SuperUserDeveloper" description = "This role is able to do everything" - - } resource "auth0_role_permissions" "backend_api_app_role_permissions" { @@ -131,6 +128,7 @@ resource "auth0_user" "dev_test_basic_user" { email_verified = true given_name = "Basic" family_name = "User" + } resource "auth0_user" "dev_test_no_email_verified_user" { @@ -141,6 +139,7 @@ resource "auth0_user" "dev_test_no_email_verified_user" { email_verified = false given_name = "NoEmail" family_name = "Verified" + } resource "auth0_user" "dev_test_user" { @@ -185,7 +184,7 @@ output "app_auth0_dev_management_client_secret" { sensitive = true } output "auth0_client_secret" { - value = auth0_client.frontend_spa_app.client_secret + value = auth0_client_credentials.fe_spa_client_credentials.client_secret sensitive = true } output "test_user_username" { diff --git a/infrastructure/production/auth0-prod/.terraform.lock.hcl b/infrastructure/production/auth0-prod/.terraform.lock.hcl index 241b3ef9..f8c3d61c 100644 --- a/infrastructure/production/auth0-prod/.terraform.lock.hcl +++ b/infrastructure/production/auth0-prod/.terraform.lock.hcl @@ -2,21 +2,22 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/auth0/auth0" { - version = "1.0.0" + version = "1.1.1" hashes = [ - "h1:1q6OPUs3f99xnv/rT3R/BlyEtkKoJFQd+Re0YhZNB+I=", - "h1:9ulunyuLiqIkHH3boMaJO9+YbXxkGegtqi9Qeqcy3P4=", - "h1:ApQxhemModu5lgok5wQOn6nZD79j4/1LNinuk8REZAw=", - "h1:GBo4XKQ7KHaOicB4yPOXXWOJ41sE5cqPKp92yYF0SyQ=", - "h1:ZvR79cN45UJaLtwHhiiqliZ5ht5trtIfiWWLX9nT6Ns=", - "h1:aauVNTjp6xvlAV3kg90z/TEtuXWdDhtJhEz3O3W8xtQ=", - "h1:e28vNUD16QTiRmem593kNZfoal7GartVv9QXC4sk0dY=", - "h1:eoXCM9E0JIiJn8rtfRpX7llPKvmtRR2jVp2tFTa48oU=", - "h1:ftRrVUSbUnFzGQ4zzszu5XCX//Os20Tr/YUlVJnUqoU=", - "h1:nVFEcEqI2lEQlS2ODRLaN8nKMu7CNqK5PFk1M21WtQc=", - "h1:oVAk5k5pK424zbqwEszHE1uE3XSz9S0nU8vVuNS9i/w=", - "h1:uRiVj6whAI+l5VDEs4gAUOMsQRAQSQ5Y0kG+5+A/7cw=", - "h1:vijyv7biV2pjuibPs/xeHB3Q0hePKmH7fZJKIFt4kPY=", - "h1:zp1cXoJN6oMeO+msI2sngOPgehlqNrA6dTfEvf/RWTg=", + "h1:5L7Gq/6/lVvADbL7tyeCHZHMUr9nH3pVQ7hPtRXkgUA=", + "zh:2fecf328558331bb9faa31bfc49c7610c08dd718624733aacb687c982454008e", + "zh:35ca00946e511d9a03844d768bc1b21a1c87fc3ff547aa3e120a73e27559ce1f", + "zh:37ff592212604c32da2d6417bd519ae92fe09e97258e7479ca91d3d2a1a72815", + "zh:57980a701c68a3fd3c96b23d7289fb353fa9311697a8fa3061aad6115e459f6a", + "zh:5a12b84e88ecddec5e22cae92a5e9df7f715f966680d199923d9b24f9c2b8367", + "zh:6161a39be72e48ff101b2bfea03a8c08f3b4ee3892dc5ddf25098c3688f9aea1", + "zh:7f8ed5fc3e601e47e67a044fd432f56dc6d5ce5cfd8bf0e6d94432248d720b55", + "zh:8f4403503f6271deca4eb65a0a9c20b233521d46b9befdf948d94a53e6a98bff", + "zh:92b6abad23181ff2b468ad2d88fb2c92e0e3204cc0f575b532901a7dd0c5c959", + "zh:a14e498e9a3bcf14d8cb82fe66a9b1c06945a05d7c91db4a1950cf9aa9775c29", + "zh:b4ca1ee67e40e64a8256f18ca6aa0dad74517b5fcff4f89964c16a462cf2b4d6", + "zh:c5667e0e4038209475cb9f743756cad38def762cf74bbb5f1e6d076158fa12d6", + "zh:dc11dbe6bfe2eca64f6c672c52093805babfd5d9c04bf51edd06532523761db4", + "zh:f7a5505eda3c7405d75633661fef095e11e75d24905cc24afbcd64c681122412", ] } diff --git a/infrastructure/production/auth0-prod/auth0-resources.tf b/infrastructure/production/auth0-prod/auth0-resources.tf index ac29e5f7..c6ac961d 100644 --- a/infrastructure/production/auth0-prod/auth0-resources.tf +++ b/infrastructure/production/auth0-prod/auth0-resources.tf @@ -130,6 +130,6 @@ output "app_auth0_prod_management_client_secret" { sensitive = true } output "auth0_client_secret" { - value = auth0_client.frontend_spa_app.client_secret + value = auth0_client_credentials.fe_spa_client_credentials.client_secret sensitive = true } diff --git a/libs/project-setup/setup-helpers.ts b/libs/project-setup/setup-helpers.ts index f1b74358..08d9d781 100644 --- a/libs/project-setup/setup-helpers.ts +++ b/libs/project-setup/setup-helpers.ts @@ -80,6 +80,12 @@ const searchFilesForTextAndReplace = async ( dot: true, gitignore: true, ignore: [ + "*.png", + "*.jpg", + "*.jpeg", + "*.gif", + "*.svg", + "*.ico", ".git/**/*", "node_modules/**/*", "dist/**/*", @@ -91,7 +97,11 @@ const searchFilesForTextAndReplace = async ( const fileContents = fs.readFileSync(file, "utf8"); for (const { search, replace } of replacePatterns) { const regex = new RegExp(search, "g"); + if (!regex.test(fileContents)) { + continue; + } const newFileContents = fileContents.replace(regex, replace); + console.log(`replacing ${search} with ${replace} in ${file}`); fs.writeFileSync(file, newFileContents); } });