diff --git a/.gitignore b/.gitignore index 3509a16eea329d0b8fe123b4d5b5708d050ddfc7..265c0a2a48b6971a21a63b81ea1e82515a883302 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ yarn-error.log !.yarn/plugins !.yarn/releases !.yarn/sdks -!.yarn/versions \ No newline at end of file +!.yarn/versions +/.gitlab-ci-local diff --git a/package.json b/package.json index 48e2f0bd982bccc85557d4932ae197e4bbfd17e0..12d24c992e008ba6bc2c8b36caa2a74481dc9d5f 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@types/winston": "^2.4.4", "copyfiles": "^2.4.1", "jest": "^29.5.0", - "prettier": "3.5.1", + "prettier": "3.5.2", "rimraf": "^6.0.0", "ts-jest": "^29.1.0", "ts-node": "^10.9.1", diff --git a/terraform/common/init.tf b/terraform/common/init.tf index 8498779e964ace247ffd5a434d6e33347e4b888f..7e25d7c44e9fedf3edf0943530c20a9fae48f934 100644 --- a/terraform/common/init.tf +++ b/terraform/common/init.tf @@ -1,4 +1,16 @@ terraform { + # allow the lowest common version across all projects, so that the current CI docker image version suits all projects + required_version = ">= 1.9" + required_providers { + google = { + source = "hashicorp/google" + version = "6.22.0" + } + google-beta = { + source = "hashicorp/google-beta" + version = "6.22.0" + } + } backend "gcs" { bucket = "holi-shared-terraform-state" prefix = "chat-integration-common" diff --git a/terraform/environments/init.tf b/terraform/environments/init.tf index deaaf8ab2132e5d181091946cefce630ee555f3b..b35d0bde853656ec9fb645adec695dcbe9dbe150 100644 --- a/terraform/environments/init.tf +++ b/terraform/environments/init.tf @@ -1,4 +1,16 @@ terraform { + # allow the lowest common version across all projects, so that the current CI docker image version suits all projects + required_version = ">= 1.9" + required_providers { + google = { + source = "hashicorp/google" + version = "6.22.0" + } + google-beta = { + source = "hashicorp/google-beta" + version = "6.22.0" + } + } backend "gcs" { bucket = "holi-shared-terraform-state" prefix = "chat-integration-environments" diff --git a/yarn.lock b/yarn.lock index 2ffe347f5d5b7e6b27d80ac7108200e5d924b0b1..948a3a6108b0e866a4eb2cff6ad125ad33ac1120 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1002,11 +1002,11 @@ __metadata: linkType: hard "@types/node@npm:*, @types/node@npm:^22.0.0": - version: 22.13.4 - resolution: "@types/node@npm:22.13.4" + version: 22.13.5 + resolution: "@types/node@npm:22.13.5" dependencies: undici-types: "npm:~6.20.0" - checksum: 10c0/3a234fa7766a3efc382cf81f66f474c26cdab2f54f43f757634c81c0444eb2160c2dabbde9741e4983078a318a88515b65416b5f1ab5478548579d7b3ead1d95 + checksum: 10c0/a2e7ed7bb0690e439004779baedeb05159c5cc41ef6d81c7a6ebea5303fde4033669e1c0e41ff7453b45fd2fea8dbd55fddfcd052950c7fcae3167c970bca725 languageName: node linkType: hard @@ -1279,13 +1279,13 @@ __metadata: linkType: hard "axios@npm:^1.3.4": - version: 1.7.9 - resolution: "axios@npm:1.7.9" + version: 1.8.1 + resolution: "axios@npm:1.8.1" dependencies: follow-redirects: "npm:^1.15.6" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: 10c0/b7a41e24b59fee5f0f26c1fc844b45b17442832eb3a0fb42dd4f1430eb4abc571fe168e67913e8a1d91c993232bd1d1ab03e20e4d1fee8c6147649b576fc1b0b + checksum: 10c0/b2e1d5a61264502deee4b50f0a6df0aa3b174c546ccf68c0dff714a2b8863232e0bd8cb5b84f853303e97f242a98260f9bb9beabeafe451ad5af538e9eb7ac22 languageName: node linkType: hard @@ -2675,7 +2675,7 @@ __metadata: jest: "npm:^29.5.0" node-fetch: "npm:^3.3.2" pg: "npm:^8.4.0" - prettier: "npm:3.5.1" + prettier: "npm:3.5.2" rimraf: "npm:^6.0.0" ts-jest: "npm:^29.1.0" ts-node: "npm:^10.9.1" @@ -4353,12 +4353,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.5.1": - version: 3.5.1 - resolution: "prettier@npm:3.5.1" +"prettier@npm:3.5.2": + version: 3.5.2 + resolution: "prettier@npm:3.5.2" bin: prettier: bin/prettier.cjs - checksum: 10c0/9f6f810eae455d6e4213845151a484a2338f2e0d6a8b84ee8e13a83af8a2421ef6c1e31e61e4b135671fb57b9541f6624648880cc2061ac803e243ac898c0123 + checksum: 10c0/d7b597ed33f39c32ace675896ad187f06a3e48dc8a1e80051b5c5f0dae3586d53981704b8fda5ac3b080e6c2e0e197d239131b953702674f044351621ca5e1ac languageName: node linkType: hard @@ -4698,6 +4698,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.7.1": + version: 7.7.1 + resolution: "semver@npm:7.7.1" + bin: + semver: bin/semver.js + checksum: 10c0/fd603a6fb9c399c6054015433051bdbe7b99a940a8fb44b85c2b524c4004b023d7928d47cb22154f8d054ea7ee8597f586605e05b52047f048278e4ac56ae958 + languageName: node + linkType: hard + "send@npm:0.19.0": version: 0.19.0 resolution: "send@npm:0.19.0" @@ -5212,8 +5221,8 @@ __metadata: linkType: hard "ts-jest@npm:^29.1.0": - version: 29.2.5 - resolution: "ts-jest@npm:29.2.5" + version: 29.2.6 + resolution: "ts-jest@npm:29.2.6" dependencies: bs-logger: "npm:^0.2.6" ejs: "npm:^3.1.10" @@ -5222,7 +5231,7 @@ __metadata: json5: "npm:^2.2.3" lodash.memoize: "npm:^4.1.2" make-error: "npm:^1.3.6" - semver: "npm:^7.6.3" + semver: "npm:^7.7.1" yargs-parser: "npm:^21.1.1" peerDependencies: "@babel/core": ">=7.0.0-beta.0 <8" @@ -5244,7 +5253,7 @@ __metadata: optional: true bin: ts-jest: cli.js - checksum: 10c0/acb62d168faec073e64b20873b583974ba8acecdb94681164eb346cef82ade8fb481c5b979363e01a97ce4dd1e793baf64d9efd90720bc941ad7fc1c3d6f3f68 + checksum: 10c0/2a79bdb2631bbd004cd6ec171d62dc3681b86e7d1c20eece7f56e7c3df11a0f5a14f4831960b1ba8d1836787395c8f9dcbd084fd7f59246bbee8048feb93f892 languageName: node linkType: hard