Update from projects

20tab · Apr 4, 2024 · 0aefb99 · 0aefb99
1 parent 6d0b132
commit 0aefb99
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 720 deletions.
diff --git a/terraform/gitlab/main.tf b/terraform/gitlab/main.tf
@@ -15,7 +15,7 @@ terraform {
   required_providers {
     gitlab = {
       source  = "gitlabhq/gitlab"
-      version = "~> 3.18"
+      version = "~> 16.10.0"
     }
   }
 }

diff --git a/terraform/terraform-cloud/main.tf b/terraform/terraform-cloud/main.tf
@@ -43,7 +43,7 @@ terraform {
   required_providers {
     tfe = {
       source  = "hashicorp/tfe"
-      version = "~> 0.37"
+      version = "~> 0.53"
     }
   }
 }
@@ -70,12 +70,16 @@ resource "tfe_organization" "main" {
 
 /* Workspaces */
 
-resource "tfe_workspace" "test" {
+resource "tfe_workspace" "main" {
   for_each = { for i in local.workspaces : i.name => i }
 
   name           = each.value.name
   description    = each.value.description
   organization   = local.organization.name
-  execution_mode = "local"
   tag_names      = each.value.tags
 }
+
+resource "tfe_workspace_settings" "main-settings" {
+  workspace_id   = tfe_workspace.main.id
+  execution_mode = "local"
+}
diff --git a/terraform/vault/main.tf b/terraform/vault/main.tf
@@ -5,7 +5,7 @@ terraform {
   required_providers {
     vault = {
       source  = "hashicorp/vault"
-      version = "~>3.11.0"
+      version = "~>4.2.0"
     }
   }
 }

diff --git a/{{cookiecutter.project_dirname}}/docker/local.Dockerfile b/{{cookiecutter.project_dirname}}/docker/local.Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update \
 WORKDIR /
 COPY --chown=node ./package.json ./
 COPY --chown=node ./yarn.lock ./
-RUN yarn install --ignore-optional
+RUN yarn install
 ENV PATH="/node_modules/.bin:${PATH}"
 RUN userdel -r node
 RUN addgroup --system --gid $GROUP_ID $USER

diff --git a/{{cookiecutter.project_dirname}}/docker/remote.Dockerfile b/{{cookiecutter.project_dirname}}/docker/remote.Dockerfile
@@ -5,7 +5,7 @@ ENV PATH="$PATH:./node_modules/.bin"
 WORKDIR /app
 COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
 RUN \
-  if [ -f yarn.lock ]; then yarn --ignore-optional --frozen-lockfile; \
+  if [ -f yarn.lock ]; then yarn install --frozen-lockfile; \
   elif [ -f package-lock.json ]; then npm ci; \
   elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i; \
   else echo "Lockfile not found." && exit 1; \

diff --git a/{{cookiecutter.project_dirname}}/package.json b/{{cookiecutter.project_dirname}}/package.json
@@ -5,13 +5,13 @@
   "scripts": {
     "audit:fix": "npm_config_yes=true npx yarn-audit-fix",
     "build": "next build",
-    "ci:contract-test": "npx jest pact/contracts --testEnvironment=node --color --detectOpenHandles --passWithNoTests",
-    "ci:unit-test": "npx jest --color --silent --detectOpenHandles --testPathIgnorePatterns=pact/contracts --coverage --coverageDirectory ./coverage/tests --ci --reporters=default --reporters=jest-junit",
-    "e2e": "CYPRESS_BASE_URL=http://localhost:3000 cypress open",
+    "ci:contract-test": "npx --yes jest pact/contracts --testEnvironment=node --color --detectOpenHandles --passWithNoTests",
+    "ci:unit-test": "npx --yes jest --color --silent --detectOpenHandles --testPathIgnorePatterns=pact/contracts --coverage --coverageDirectory ./coverage/tests --ci --reporters=default --reporters=jest-junit",
+    "e2e": "CYPRESS_BASE_URL=http://localhost:3000 npx --yes cypress open",
     "lint": "next lint",
-    "pact": "npx jest pact/contracts --testEnvironment=node --detectOpenHandles",
+    "pact": "npx --yes jest pact/contracts --testEnvironment=node --detectOpenHandles",
     "start": "node server.js",
-    "test": "npx jest --testPathIgnorePatterns=pact/contracts --detectOpenHandles"
+    "test": "npx --yes jest --testPathIgnorePatterns=pact/contracts --detectOpenHandles"
   },
   "dependencies": {
     "@next/font": "^14.1.4",
@@ -56,8 +56,5 @@
     "jest-pact": "^0.11.0",
     "prettier": "^3.2.5",
     "typescript": "^5"
-  },
-  "optionalDependencies": {
-    "cypress": "^13.7.0"
   }
 }
diff --git a/{{cookiecutter.project_dirname}}/scripts/test.sh b/{{cookiecutter.project_dirname}}/scripts/test.sh
@@ -3,4 +3,5 @@
 set -e
 
 yarn install
+yarn upgrade --latest
 exec "${@}"
diff --git a/{{cookiecutter.project_dirname}}/terraform/digitalocean-k8s/main.tf b/{{cookiecutter.project_dirname}}/terraform/digitalocean-k8s/main.tf
@@ -10,11 +10,11 @@ terraform {
   required_providers {
     digitalocean = {
       source  = "digitalocean/digitalocean"
-      version = "~> 2.22"
+      version = "~> 2.36"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.13"
+      version = "~> 2.27"
     }
   }
 }

diff --git a/{{cookiecutter.project_dirname}}/terraform/modules/kubernetes/deployment/main.tf b/{{cookiecutter.project_dirname}}/terraform/modules/kubernetes/deployment/main.tf
@@ -11,7 +11,7 @@ terraform {
   required_providers {
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.13"
+      version = "~> 2.27"
     }
   }
 }

diff --git a/{{cookiecutter.project_dirname}}/terraform/other-k8s/main.tf b/{{cookiecutter.project_dirname}}/terraform/other-k8s/main.tf
@@ -10,7 +10,7 @@ terraform {
   required_providers {
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.13"
+      version = "~> 2.27"
     }
   }
 }