From 70942fe69e4735e49e3f8613372037877005d349 Mon Sep 17 00:00:00 2001
From: larisa17 <42570262+larisa17@users.noreply.github.com>
Date: Thu, 7 Nov 2024 15:40:38 +0200
Subject: [PATCH] update core infra refences (#723)

* update core infra refences

* update naming convention

* update minor naming
---
 infra/aws/index.ts | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/infra/aws/index.ts b/infra/aws/index.ts
index f6bdeee5b..109cbc9db 100644
--- a/infra/aws/index.ts
+++ b/infra/aws/index.ts
@@ -118,11 +118,6 @@ const pagerDutyIntegrationEndpoint = op.read.parse(
   `op://DevOps/passport-scorer-${stack}-env/ci/PAGERDUTY_INTEGRATION_ENDPOINT`
 );
 
-// TODO: remove this once the noStackPassportXyzCertificateArn can be read from the core infra
-const noStackPassportXyzCertificateArn = op.read.parse(
-  `op://DevOps/passport-scorer-${stack}-env/ci/PASSPORT_XYZ_CERTIFICATE_ARN`
-);
-
 const coreInfraStack = new pulumi.StackReference(
   `passportxyz/core-infra/${stack}`
 );
@@ -133,11 +128,17 @@ const vpcID = coreInfraStack.getOutput("vpcId");
 const vpcPrivateSubnetIds = coreInfraStack.getOutput("privateSubnetIds");
 const vpcPublicSubnetIds = coreInfraStack.getOutput("publicSubnetIds");
 
-const passportXyzDomainName = coreInfraStack.getOutput("passportXyzDomainName");
+const passportXyzDomainName = coreInfraStack.getOutput(
+  "passportXyzEnvDomainName"
+);
 const passportXyzHostedZoneId = coreInfraStack.getOutput(
-  "passportXyzHostedZoneId"
+  "envPassportXyzZoneId"
 );
 const passportXyzCertificateArn = coreInfraStack.getOutput(
+  "envPassportXyzCertificateArn"
+);
+
+const noStackPassportXyzCertificateArn = coreInfraStack.getOutput(
   "passportXyzCertificateArn"
 );
 
@@ -440,8 +441,10 @@ const targetGroupRegistry = createTargetGroup("scorer-api-reg", vpcID);
 //////////////////////////////////////////////////////////////
 // Create the HTTPS listener, and set the default target group
 //////////////////////////////////////////////////////////////
-const HTTPS_ALB_CERT_ARN = coreInfraStack.getOutput("API_CERTIFICATE_ARN");
-const httpsListener = HTTPS_ALB_CERT_ARN.apply(
+const httpsAlbCertArn = coreInfraStack.getOutput(
+  "gitcoinScorerApiCertificateArn"
+);
+const httpsListener = httpsAlbCertArn.apply(
   (certificate) =>
     new aws.alb.Listener("scorer-https-listener", {
       loadBalancerArn: alb.arn,
@@ -1270,7 +1273,7 @@ const redashTarget = new aws.alb.TargetGroup("redash-target", {
 });
 
 // Listen to traffic on port 443 & route it through the target group
-const redashHttpsListener = HTTPS_ALB_CERT_ARN.apply(
+const redashHttpsListener = httpsAlbCertArn.apply(
   (certificate) =>
     new aws.alb.Listener("redash-https-listener", {
       loadBalancerArn: redashAlb.arn,