Merge branch 'main' into docs

tx-pts-dai · Jan 14, 2025 · c04d0c3 · c04d0c3
2 parents 05c24f0 + 879cae0
commit c04d0c3
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 23 deletions.
diff --git a/addons/discovery-app-layer/@{{ cookiecutter.project_slug }}/deploy/app/providers.tf b/addons/discovery-app-layer/@{{ cookiecutter.project_slug }}/deploy/app/providers.tf
@@ -70,7 +70,7 @@ data "terraform_remote_state" "infra_local" {
 
 module "platform_ssm" {
   source  = "tx-pts-dai/kubernetes-platform/aws//modules/ssm"
-  version = "0.7.0"
+  version = "0.9.2"
 
   base_prefix = "infrastructure"
   stack_type  = "platform"

diff --git a/addons/github-workflows/README.md b/addons/github-workflows/README.md
@@ -1,3 +1,3 @@
 # Github Workflows
 
-Template for creating a Github workflows.
+Template for creating Github workflows and Terraform base modules.
diff --git a/addons/mkdocs/@{{ cookiecutter.project_slug }}/.github/workflows/publish-docs.yaml b/addons/mkdocs/@{{ cookiecutter.project_slug }}/.github/workflows/publish-docs.yaml
@@ -18,7 +18,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout main
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v5

diff --git a/bases/sfmc-app/@{{ cookiecutter.project_slug }}/.github/workflows/build-push.yaml b/bases/sfmc-app/@{{ cookiecutter.project_slug }}/.github/workflows/build-push.yaml
@@ -33,7 +33,7 @@ jobs:
 
   docker_build_push:
     needs: [get_date]
-    uses: tx-pts-dai/github-workflows/.github/workflows/docker-build-push-ecr.yaml@v1
+    uses: tx-pts-dai/github-workflows/.github/workflows/docker-build-push-ecr.yaml@v2
     with:
       environment: prod
       docker_context: .

diff --git a/bases/sfmc-app/@{{ cookiecutter.project_slug }}/Dockerfile b/bases/sfmc-app/@{{ cookiecutter.project_slug }}/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:21
+FROM node:22
 
 RUN mkdir -p /usr/app
 WORKDIR /usr/app

diff --git a/bases/sfmc-app/README.md b/bases/sfmc-app/README.md
@@ -1,3 +1,3 @@
 # SFMC Application Template
 
-A template for deploying a Salesforce Marketing Cloud (SFMC) application using Docker and PM2.  It's designed to streamline the deployment process and provide a structured approach to interacting with Journey Builder activities.
+A template for deploying a simple SFMC application. It's designed to streamline the deployment process and provide a structured approach.
diff --git a/...s/simple-app/@{{ cookiecutter.project_slug }}/@{{ cookiecutter.project_slug }}/Dockerfile b/...s/simple-app/@{{ cookiecutter.project_slug }}/@{{ cookiecutter.project_slug }}/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11-slim
+FROM python:3.13-slim
 
 WORKDIR /app
 COPY requirements.txt .

diff --git a/bases/simple-app/@{{ cookiecutter.project_slug }}/deploy/app/providers.tf b/bases/simple-app/@{{ cookiecutter.project_slug }}/deploy/app/providers.tf
@@ -70,7 +70,7 @@ data "terraform_remote_state" "infra_local" {
 
 module "platform_ssm" {
   source  = "tx-pts-dai/kubernetes-platform/aws//modules/ssm"
-  version = "0.7.0"
+  version = "0.9.2"
 
   base_prefix       = "infrastructure"
   stack_type        = "platform"

diff --git a/bases/simple-app/@{{ cookiecutter.project_slug }}/deploy/infra/main.tf b/bases/simple-app/@{{ cookiecutter.project_slug }}/deploy/infra/main.tf
@@ -6,7 +6,7 @@ locals {
 
 module "platform_ssm" {
   source  = "tx-pts-dai/kubernetes-platform/aws//modules/ssm"
-  version = "0.7.0"
+  version = "0.9.2"
 
   base_prefix       = "infrastructure"
   stack_type        = "platform"
@@ -73,7 +73,7 @@ resource "aws_iam_policy" "get_all_secrets" {
 
 module "iam_eks_role" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-eks-role"
-  version = "5.32.0"
+  version = "5.52.2"
 
   role_name_prefix = "${local.app_name}-"
 

diff --git a/bases/simple-app/README.md b/bases/simple-app/README.md
@@ -1,14 +1,14 @@
 # Simple App Template
 
-This Template contains the code for deploying a simple application to AWS using Terraform and Helm.
+A minimal template for deploying an application to AWS using Terraform and Helm.
 
 ## Project Structure
 
 The project's structure is designed to be clear and maintainable, enabling efficient development and deployment processes.
 
 ```
 My Simple App/
-├── app/          # Application source code (e.g., Python Flask app) (modify as needed)
+├── app/          # Application source code (e.g. Python Flask app) (modify as needed)
 │   └── ...
 ├── deploy/       # Terraform code for infrastructure deployments
 │   ├── app/      # Helm deployments for the application

diff --git a/docs/template/usage.md b/docs/template/usage.md
@@ -1,6 +1,6 @@
-## Usage Instructions¶
+## Usage Instructions
 
-The preferred way to use the template is through the [tam-cli](https://github.com/DND-IT/tam-cli) tool. This tool allows you to easily initialize a new project with the template.
+The preferred way to use the template is through the [tam-cli](https://github.com/DND-IT/tam-cli) tool. This tool allows you to easily initialize a new project with a template.
 
 ### Installation
 

diff --git a/docs/templates_/index.md b/docs/templates_/index.md
@@ -1,13 +1,7 @@
 # Templates
 
-# Bases
+- Bases: These are base templates intended to serve as bootstrap templates for new projects. They follow the opinionated golden paths recommended by the Tamedia Core engineering organisation.
 
-Base templates are designed to be used as a bootstrap template for new projects. This are opinionated the golden paths for the Tamedia Core engineering organisation.
+- Addons: These templates are designed to be integrated into existing projects. They offer a structured approach to adding new features and are also opinionated in nature.
 
-# Addons
-
-Addon templates are designed to be used with already existing projects. They are opinionated and provide a structured approach to adding new features to your project.
-
-# External
-
-Templates stored in external repositories.
+- External: This section lists templates that are stored in external repositories.