From 557dcd6dcf36c037d9c3c9a700e6afe98910e34b Mon Sep 17 00:00:00 2001 From: smerle33 Date: Wed, 8 Jun 2022 14:57:56 +0200 Subject: [PATCH 1/2] feat(oracle): add credentials secrets in jenkins for oracle terraform --- config/ext_jenkins-infra-jobs.yaml | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/config/ext_jenkins-infra-jobs.yaml b/config/ext_jenkins-infra-jobs.yaml index 8f09e20e7d..073b7dc797 100644 --- a/config/ext_jenkins-infra-jobs.yaml +++ b/config/ext_jenkins-infra-jobs.yaml @@ -285,6 +285,42 @@ jobsDefinition: fileName: "backend-config" description: "Terraform backend configuration for the production environment of jenkins-infra/fastly" secretBytes: "${base64:${PRODUCTION_TERRAFORM_FASTLY_BACKEND_CONFIG}}" + oracle: + name: Terraform ORACLE + description: ORACLE resources managed by Terraform + credentials: + staging_oracle_oci_cli_user: + secret: "${STAGING_ORACLE_OCI_CLI_USER}" + description: "ORACLE access USER for the staging terraform account for jenkins-infra/oracle" + staging_oracle_oci_cli_fingerprint: + secret: "${STAGING_ORACLE_OCI_CLI_FINGERPRINT}" + description: "ORACLE fingerkey for the staging terraform account for jenkins-infra/oracle" + staging_oracle_oci_cli_key_content: + secret: "${STAGING_ORACLE_OCI_CLI_KEY_CONTENT}" + description: "ORACLE secret key for the staging terraform account for jenkins-infra/oracle" + staging_terraform_oracle_backend_config: + fileName: backend-config + description: "Terraform backend configuration for the staging environment of jenkins-infra/oracle" + secretBytes: "${base64:${STAGING_TERRAFORM_ORACLE_BACKEND_CONFIG}}" + production_oracle_oci_cli_user: + secret: "${PRODUCTION_ORACLE_OCI_CLI_USER}" + description: "ORACLE access user for the staging terraform account for jenkins-infra/oracle" + production_oracle_oci_cli_fingerprint: + secret: "${PRODUCTION_ORACLE_OCI_CLI_FINGERPRINT}" + description: "ORACLE fingerkey for the staging terraform account for jenkins-infra/oracle" + production_oracle_oci_cli_key_content: + secret: "${PRODUCTION_ORACLE_OCI_CLI_KEY_CONTENT}" + description: "ORACLE secret key for the staging terraform account for jenkins-infra/oracle" + production_terraform_oracle_backend_config: + fileName: backend-config + description: "Terraform backend configuration for the staging environment of jenkins-infra/oracle" + secretBytes: "${base64:${PRODUCTION_TERRAFORM_ORACLE_BACKEND_CONFIG}}" + oracle_oci_cli_tenancy: + secret: "${ORACLE_OCI_CLI_TENANCY}" + description: "ORACLE tenant OCI for the terraform account for jenkins-infra/oracle" + oracle_oci_cli_region: + secret: "${ORACLE_OCI_CLI_REGION}" + description: "ORACLE region OCI for the terraform account for jenkins-infra/oracle" website-jobs: name: Website Jobs description: "Folder hosting all the Website jobs" From 874769ef0da7c5a8069e14b24250fb9c4c050981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20MERLE?= <95630726+smerle33@users.noreply.github.com> Date: Wed, 8 Jun 2022 16:15:17 +0200 Subject: [PATCH 2/2] Update config/ext_jenkins-infra-jobs.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :rocket: Co-authored-by: Hervé Le Meur <91831478+lemeurherve@users.noreply.github.com> --- config/ext_jenkins-infra-jobs.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/config/ext_jenkins-infra-jobs.yaml b/config/ext_jenkins-infra-jobs.yaml index 073b7dc797..9c3dc6fe55 100644 --- a/config/ext_jenkins-infra-jobs.yaml +++ b/config/ext_jenkins-infra-jobs.yaml @@ -286,41 +286,41 @@ jobsDefinition: description: "Terraform backend configuration for the production environment of jenkins-infra/fastly" secretBytes: "${base64:${PRODUCTION_TERRAFORM_FASTLY_BACKEND_CONFIG}}" oracle: - name: Terraform ORACLE - description: ORACLE resources managed by Terraform + name: Terraform Oracle + description: Oracle resources managed by Terraform credentials: staging_oracle_oci_cli_user: secret: "${STAGING_ORACLE_OCI_CLI_USER}" - description: "ORACLE access USER for the staging terraform account for jenkins-infra/oracle" + description: "Oracle access user for the staging terraform account for jenkins-infra/oracle" staging_oracle_oci_cli_fingerprint: secret: "${STAGING_ORACLE_OCI_CLI_FINGERPRINT}" - description: "ORACLE fingerkey for the staging terraform account for jenkins-infra/oracle" + description: "Oracle fingerkey for the staging terraform account for jenkins-infra/oracle" staging_oracle_oci_cli_key_content: secret: "${STAGING_ORACLE_OCI_CLI_KEY_CONTENT}" - description: "ORACLE secret key for the staging terraform account for jenkins-infra/oracle" + description: "Oracle secret key for the staging terraform account for jenkins-infra/oracle" staging_terraform_oracle_backend_config: fileName: backend-config description: "Terraform backend configuration for the staging environment of jenkins-infra/oracle" secretBytes: "${base64:${STAGING_TERRAFORM_ORACLE_BACKEND_CONFIG}}" production_oracle_oci_cli_user: secret: "${PRODUCTION_ORACLE_OCI_CLI_USER}" - description: "ORACLE access user for the staging terraform account for jenkins-infra/oracle" + description: "Oracle access user for the production terraform account for jenkins-infra/oracle" production_oracle_oci_cli_fingerprint: secret: "${PRODUCTION_ORACLE_OCI_CLI_FINGERPRINT}" - description: "ORACLE fingerkey for the staging terraform account for jenkins-infra/oracle" + description: "Oracle fingerkey for the production terraform account for jenkins-infra/oracle" production_oracle_oci_cli_key_content: secret: "${PRODUCTION_ORACLE_OCI_CLI_KEY_CONTENT}" - description: "ORACLE secret key for the staging terraform account for jenkins-infra/oracle" + description: "Oracle secret key for the production terraform account for jenkins-infra/oracle" production_terraform_oracle_backend_config: fileName: backend-config - description: "Terraform backend configuration for the staging environment of jenkins-infra/oracle" + description: "Terraform backend configuration for the production environment of jenkins-infra/oracle" secretBytes: "${base64:${PRODUCTION_TERRAFORM_ORACLE_BACKEND_CONFIG}}" oracle_oci_cli_tenancy: secret: "${ORACLE_OCI_CLI_TENANCY}" - description: "ORACLE tenant OCI for the terraform account for jenkins-infra/oracle" + description: "Oracle tenant OCI for the terraform account for jenkins-infra/oracle" oracle_oci_cli_region: secret: "${ORACLE_OCI_CLI_REGION}" - description: "ORACLE region OCI for the terraform account for jenkins-infra/oracle" + description: "Oracle region OCI for the terraform account for jenkins-infra/oracle" website-jobs: name: Website Jobs description: "Folder hosting all the Website jobs"