From b95362da35025e163a2c608ccec5df312f1fc59b Mon Sep 17 00:00:00 2001
From: Junior Dongo <jdongo@aneo.fr>
Date: Wed, 6 Nov 2024 18:10:48 +0100
Subject: [PATCH] move docker authentication to infra

---
 infrastructure/quick-deploy/aws/ecr.tf      | 34 ++++++++-------------
 infrastructure/quick-deploy/aws/versions.tf |  4 +++
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/infrastructure/quick-deploy/aws/ecr.tf b/infrastructure/quick-deploy/aws/ecr.tf
index 2eac7f6e8..aa53cae7a 100644
--- a/infrastructure/quick-deploy/aws/ecr.tf
+++ b/infrastructure/quick-deploy/aws/ecr.tf
@@ -87,27 +87,17 @@ 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
+  fluent_bit_repository_uri = [
+    for name, uri in module.ecr.repositories : uri
+    if can(regex("fluent-bit", name))
+  ][0]
+  fluent_bit_image_tag = [
+    for name, details in local.repositories :
+    details.tag if can(regex("fluent-bit", details.image))
+  ][0]
+  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
@@ -120,6 +110,7 @@ module "default_images" {
 
 module "ecr" {
   source          = "./generated/infra-modules/container-registry/aws/ecr"
+  aws_profile     = var.profile
   kms_key_id      = local.kms_key
   repositories    = var.upload_images ? local.repositories : {}
   encryption_type = var.ecr.encryption_type
@@ -127,13 +118,12 @@ module "ecr" {
 }
 
 #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" {
+resource "generic_local_cmd" "build_fluent-bit_image" {
   count = var.upload_images ? 1 : 0
 
   provisioner "local-exec" {
-    # Command to log in to ECR and build the image
+    # build the muti-platform image in the registry
     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/infrastructure/quick-deploy/aws/versions.tf b/infrastructure/quick-deploy/aws/versions.tf
index 7e5e66bbc..991422d14 100644
--- a/infrastructure/quick-deploy/aws/versions.tf
+++ b/infrastructure/quick-deploy/aws/versions.tf
@@ -32,5 +32,9 @@ terraform {
       source  = "chilicat/pkcs12"
       version = "~> 0.0.7"
     }
+    generic = {
+      source  = "aneoconsulting.github.io/aneoconsulting/generic"
+      version = "~> 0.1.0"
+    }
   }
 }