Merge pull request #1089 from nasa/earthdata_login_uat

Add EARTHDATA_UAT_USER and EARTHDATA_UAT_PASS
nasa · Feb 13, 2025 · a5a3db2 · a5a3db2
2 parents 1a7aad7 + 948ada8
commit a5a3db2
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 2 deletions.
diff --git a/cluster_provisioning/dev-e2e/main.tf b/cluster_provisioning/dev-e2e/main.tf
@@ -96,6 +96,8 @@ module "common" {
   dataspace_pass                          = var.dataspace_pass
   earthdata_user                          = var.earthdata_user
   earthdata_pass                          = var.earthdata_pass
+  earthdata_uat_user                      = var.earthdata_uat_user
+  earthdata_uat_pass                      = var.earthdata_uat_pass
   hls_download_timer_trigger_frequency    = var.hls_download_timer_trigger_frequency
   hlsl30_query_timer_trigger_frequency    = var.hlsl30_query_timer_trigger_frequency
   hlss30_query_timer_trigger_frequency    = var.hlss30_query_timer_trigger_frequency

diff --git a/cluster_provisioning/dev-e2e/variables.tf b/cluster_provisioning/dev-e2e/variables.tf
@@ -498,6 +498,13 @@ variable "earthdata_user" {
 variable "earthdata_pass" {
 }
 
+variable "earthdata_uat_user" {
+}
+
+variable "earthdata_uat_pass" {
+}
+
+
 # ami vars
 variable "amis" {
   type = map(string)

diff --git a/cluster_provisioning/dev-int/main.tf b/cluster_provisioning/dev-int/main.tf
@@ -96,6 +96,8 @@ module "common" {
   dataspace_pass                          = var.dataspace_pass
   earthdata_user                          = var.earthdata_user
   earthdata_pass                          = var.earthdata_pass
+  earthdata_uat_user                      = var.earthdata_uat_user
+  earthdata_uat_pass                      = var.earthdata_uat_pass
   hls_download_timer_trigger_frequency    = var.hls_download_timer_trigger_frequency
   hlsl30_query_timer_trigger_frequency    = var.hlsl30_query_timer_trigger_frequency
   hlss30_query_timer_trigger_frequency    = var.hlss30_query_timer_trigger_frequency

diff --git a/cluster_provisioning/dev-releaser/main.tf b/cluster_provisioning/dev-releaser/main.tf
@@ -92,6 +92,8 @@ module "common" {
   dataspace_pass                          = var.dataspace_pass
   earthdata_user                          = var.earthdata_user
   earthdata_pass                          = var.earthdata_pass
+  earthdata_uat_user                      = var.earthdata_uat_user
+  earthdata_uat_pass                      = var.earthdata_uat_pass
   hls_download_timer_trigger_frequency    = var.hls_download_timer_trigger_frequency
   hlsl30_query_timer_trigger_frequency    = var.hlsl30_query_timer_trigger_frequency
   hlss30_query_timer_trigger_frequency    = var.hlss30_query_timer_trigger_frequency

diff --git a/cluster_provisioning/dev-releaser/variables.tf b/cluster_provisioning/dev-releaser/variables.tf
@@ -444,3 +444,11 @@ variable "earthdata_user" {
 variable "earthdata_pass" {
   default = ""
 }
+
+variable "earthdata_uat_user" {
+  default = ""
+} 
+
+variable "earthdata_uat_pass" {
+  default = ""
+} 
diff --git a/cluster_provisioning/dev/main.tf b/cluster_provisioning/dev/main.tf
@@ -97,6 +97,8 @@ module "common" {
   dataspace_pass                          = var.dataspace_pass
   earthdata_user                          = var.earthdata_user
   earthdata_pass                          = var.earthdata_pass
+  earthdata_uat_user                      = var.earthdata_uat_user
+  earthdata_uat_pass                      = var.earthdata_uat_pass
 }
 
 locals {

diff --git a/cluster_provisioning/dev/variables.tf b/cluster_provisioning/dev/variables.tf
@@ -475,3 +475,12 @@ variable "earthdata_user" {
 variable "earthdata_pass" {
   default = ""
 }
+
+variable "earthdata_uat_user" {
+  default = ""
+}
+
+variable "earthdata_uat_pass" {
+  default = ""
+}
+
diff --git a/cluster_provisioning/modules/common/mozart.tf b/cluster_provisioning/modules/common/mozart.tf
@@ -338,6 +338,9 @@ resource "aws_instance" "mozart" {
 
       echo EARTHDATA_USER: ${var.earthdata_user} >> ~/.sds/config
       echo EARTHDATA_PASS: ${var.earthdata_pass} >> ~/.sds/config
+
+      echo EARTHDATA_UAT_USER: ${var.earthdata_uat_user} >> ~/.sds/config
+      echo EARTHDATA_UAT_PASS: ${var.earthdata_uat_pass} >> ~/.sds/config
       echo >> ~/.sds/config
     EOT
     ]

diff --git a/cluster_provisioning/modules/common/variables.tf b/cluster_provisioning/modules/common/variables.tf
@@ -810,6 +810,14 @@ variable "earthdata_pass" {
   default = ""
 }
 
+variable "earthdata_uat_user" {
+  default = ""
+}
+
+variable "earthdata_uat_pass" {
+  default = ""
+}
+
 variable "clear_s3_aws_es" {
   type    = bool
   default = true

diff --git a/conf/sds/files/netrc b/conf/sds/files/netrc
@@ -1,6 +1,6 @@
 machine dataspace.copernicus.eu login {{ DATASPACE_USER }} password {{ DATASPACE_PASS }}
 machine urs.earthdata.nasa.gov login {{ EARTHDATA_USER }} password {{ EARTHDATA_PASS }}
-machine uat.urs.earthdata.nasa.gov login {{ EARTHDATA_USER }} password {{ EARTHDATA_PASS }}
+machine uat.urs.earthdata.nasa.gov login {{ EARTHDATA_UAT_USER }} password {{ EARTHDATA_UAT_PASS }}
 machine {{ MOZART_RABBIT_PVT_IP }} login {{ MOZART_RABBIT_USER }} password {{ MOZART_RABBIT_PASSWORD }}
 macdef init
 
diff --git a/conf/sds/files/netrc.mozart b/conf/sds/files/netrc.mozart
@@ -1,6 +1,6 @@
 machine dataspace.copernicus.eu login {{ DATASPACE_USER }} password {{ DATASPACE_PASS }}
 machine urs.earthdata.nasa.gov login {{ EARTHDATA_USER }} password {{ EARTHDATA_PASS }}
-machine uat.urs.earthdata.nasa.gov login {{ EARTHDATA_USER }} password {{ EARTHDATA_PASS }}
+machine uat.urs.earthdata.nasa.gov login {{ EARTHDATA_UAT_USER }} password {{ EARTHDATA_UAT_PASS }}
 machine {{ MOZART_RABBIT_PVT_IP }} login {{ MOZART_RABBIT_USER }} password {{ MOZART_RABBIT_PASSWORD }}
 macdef init