From 4e47002701feb768a86cc45e674e77c0e7e2183b Mon Sep 17 00:00:00 2001
From: Junior Dongo <jdongo@aneo.fr>
Date: Thu, 31 Oct 2024 16:54:20 +0100
Subject: [PATCH] adding fluent-bit image retagging for windows

---
 infrastructure/quick-deploy/aws/armonik.tf |  1 -
 infrastructure/quick-deploy/aws/ecr.tf     | 36 ++++++++++++++++++++++
 versions.tfvars.json                       |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/infrastructure/quick-deploy/aws/armonik.tf b/infrastructure/quick-deploy/aws/armonik.tf
index aa894412d..92a7d1872 100644
--- a/infrastructure/quick-deploy/aws/armonik.tf
+++ b/infrastructure/quick-deploy/aws/armonik.tf
@@ -76,5 +76,4 @@ module "armonik" {
     image = local.ecr_images["${var.pod_deletion_cost.image}:${try(coalesce(var.pod_deletion_cost.tag), "")}"].image
     tag   = local.ecr_images["${var.pod_deletion_cost.image}:${try(coalesce(var.pod_deletion_cost.tag), "")}"].tag
   })
-  depends_on = [module.ecr]
 }
diff --git a/infrastructure/quick-deploy/aws/ecr.tf b/infrastructure/quick-deploy/aws/ecr.tf
index b16ea5be4..85bd8cfbb 100644
--- a/infrastructure/quick-deploy/aws/ecr.tf
+++ b/infrastructure/quick-deploy/aws/ecr.tf
@@ -83,7 +83,30 @@ locals {
   }
 
   default_tags = module.default_images.image_tags
+
+  #information for fluent-bit image retagging.
+  fluent_bit_repo_details = try(
+    [
+      for repo in local.ecr_repositories :
+      {
+        name = repo.name
+        tag  = repo.tag
+      }
+      if repo.image == var.fluent_bit.image_name
+    ][0],
+    null
+  )
+  fluent_bit_repository_name = local.fluent_bit_repo_details != null ? local.fluent_bit_repo_details.name : null
+  fluent_bit_image_tag       = local.fluent_bit_repo_details != null ? local.fluent_bit_repo_details.tag : null
+
+  fluent_bit_repository_uri = data.aws_ecr_repository.fluent_bit.repository_url
+  region                    = data.aws_region.current.name
+}
+
+data "aws_ecr_repository" "fluent_bit" {
+  name = local.fluent_bit_repository_name
 }
+data "aws_region" "current" {}
 
 # Default tags for all images
 module "default_images" {
@@ -100,3 +123,16 @@ module "ecr" {
   encryption_type = var.ecr.encryption_type
   tags            = local.tags
 }
+
+#Temporary solution for image retagging while waiting for the muli-plateform image from fluent-bit: https://github.com/fluent/fluent-bit/issues/9509
+resource "null_resource" "ecr_login_and_build" {
+  count = var.upload_images ? 1 : 0
+
+  provisioner "local-exec" {
+    # Command to log in to ECR and build the image
+    command = <<EOT
+      aws ecr get-login-password --profile ${var.profile} --region --region ${local.region}  | docker login --username AWS --password-stdin ${local.fluent_bit_repository_uri}
+      docker buildx imagetools create ${local.fluent_bit_repository_uri}:${local.fluent_bit_image_tag} --tag ${local.fluent_bit_repository_uri}:${local.fluent_bit_image_tag} --append ${var.fluent_bit.image_name}:windows-2022-${local.fluent_bit_image_tag}
+    EOT
+  }
+}
diff --git a/versions.tfvars.json b/versions.tfvars.json
index efe1a6ee1..9e0ec3270 100644
--- a/versions.tfvars.json
+++ b/versions.tfvars.json
@@ -1,7 +1,7 @@
 {
   "armonik_versions": {
     "armonik":       "2.20.0",
-    "infra":         "0.5.0-pre-8-f5b8bd3",
+    "infra":         "jd/scopeo",
     "infra_plugins": "0.1.1",
     "core":          "0.24.3",
     "api":           "3.19.0",