fix(outputs) ensure outputs required by trusted.ci.jenkins.io are def…

…ined (#842) Fixup of #838 and #839 We need to keep some outputs. This PR either move them or add them back but in the `outputs.tf` file which is the Terraform convention. Note: adding a comment explaining which script is using them. Signed-off-by: Damien Duportal <[email protected]>
jenkins-infra · Sep 20, 2024 · f334d54 · f334d54
1 parent 88235dd
commit f334d54
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/outputs.tf b/outputs.tf
@@ -10,3 +10,33 @@ resource "local_file" "jenkins_infra_data_report" {
   })
   filename = "${path.module}/jenkins-infra-data-reports/azure.json"
 }
+
+## The script <https://github.com/jenkins-infra/charts-secrets/blob/main/config/trusted.ci.jenkins.io/get-uc-sync-zip-credential.sh>
+## requires the following output for generating trusted.ci.jenkins.io's Update Center ZIP credentials
+## used by https://github.com/jenkins-infra/update-center2 and https://github.com/jenkins-infra/crawler
+# From updates.jenkins.io.tf #
+output "updates_jenkins_io_storage_account_name" {
+  value = azurerm_storage_account.updates_jenkins_io.name
+}
+output "updates_jenkins_io_content_fileshare_name" {
+  value = azurerm_storage_share.updates_jenkins_io.name
+}
+output "updates_jenkins_io_redirections_fileshare_name" {
+  value = azurerm_storage_share.updates_jenkins_io_redirects.name
+}
+# From trusted.ci.jenkins.io.tf #
+output "trustedci_updatesjenkinsio_content_fileshare_serviceprincipal_writer_application_client_id" {
+  value = module.trustedci_updatesjenkinsio_content_fileshare_serviceprincipal_writer.fileshare_serviceprincipal_writer_application_client_id
+}
+output "trustedci_updatesjenkinsio_content_fileshare_serviceprincipal_writer_application_client_secret" {
+  sensitive = true
+  value     = module.trustedci_updatesjenkinsio_content_fileshare_serviceprincipal_writer.fileshare_serviceprincipal_writer_application_client_password
+}
+output "trustedci_updatesjenkinsio_redirections_fileshare_serviceprincipal_writer_application_client_id" {
+  value = module.trustedci_updatesjenkinsio_redirections_fileshare_serviceprincipal_writer.fileshare_serviceprincipal_writer_application_client_id
+}
+output "trustedci_updatesjenkinsio_redirections_fileshare_serviceprincipal_writer_application_client_secret" {
+  sensitive = true
+  value     = module.trustedci_updatesjenkinsio_redirections_fileshare_serviceprincipal_writer.fileshare_serviceprincipal_writer_application_client_password
+}
+## End
diff --git a/updates.jenkins.io.tf b/updates.jenkins.io.tf
@@ -40,20 +40,12 @@ resource "azurerm_storage_account" "updates_jenkins_io" {
   }
 }
 
-output "updates_jenkins_io_storage_account_name" {
-  value = azurerm_storage_account.updates_jenkins_io.name
-}
-
 resource "azurerm_storage_share" "updates_jenkins_io" {
   name                 = "updates-jenkins-io"
   storage_account_name = azurerm_storage_account.updates_jenkins_io.name
   quota                = 100 # Minimum size of premium is 100 - https://learn.microsoft.com/en-us/azure/storage/files/understanding-billing#provisioning-method
 }
 
-output "updates_jenkins_io_content_fileshare_name" {
-  value = azurerm_storage_share.updates_jenkins_io.name
-}
-
 # TODO: remove once migration to 'updates_jenkins_io_redirect' is complete
 resource "azurerm_storage_share" "updates_jenkins_io_httpd" {
   name                 = "updates-jenkins-io-httpd"
@@ -66,10 +58,6 @@ resource "azurerm_storage_share" "updates_jenkins_io_redirects" {
   quota                = 100 # Minimum size of premium is 100 - https://learn.microsoft.com/en-us/azure/storage/files/understanding-billing#provisioning-method
 }
 
-output "updates_jenkins_io_redirections_fileshare_name" {
-  value = azurerm_storage_share.updates_jenkins_io_redirects.name
-}
-
 ## Kubernetes Resources (static provision of persistent volumes)
 resource "kubernetes_namespace" "updates_jenkins_io" {
   provider = kubernetes.publick8s