update to oss versions

mojaloop · Aug 1, 2021 · b1cd43c · b1cd43c
1 parent f870846
commit b1cd43c
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 34 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   # TODO: Change variable to your image's name.
-  IMAGE_NAME: mojaloop-platform-iac
+  IMAGE_NAME: iac-aws-platform
 
 jobs:
   # Run tests.
@@ -48,7 +48,6 @@ jobs:
         run: docker build . --file Dockerfile --tag $IMAGE_NAME
 
       - name: Log into GitHub Container Registry
-      # TODO: Create a PAT with `read:packages` and `write:packages` scopes and save it as an Actions secret `CR_PAT`
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Push image to GitHub Container Registry

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 default: 
   image: 
-    name: ghcr.io/modusintegration/mojaloop-platform-iac:3.8.19
+    name: ghcr.io/mojaloop/iac-aws-platform:1.0.0
   before_script:
     - "which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )"
     - test -n "$BUCKET"
@@ -106,7 +106,7 @@ Destroy Environment:
 Destroy k3s Cluster:
 
   image: 
-    name: ghcr.io/modusintegration/k3sbootstrap:0.9.16
+    name: ghcr.io/pm4ml/k3sbootstrap:0.10.12
   before_script:
     - "which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )"
     - eval `ssh-agent`
@@ -146,7 +146,7 @@ Deploy AWS Infrastructure:
 
 Create k3s Cluster:
   image: 
-    name: ghcr.io/modusintegration/k3sbootstrap:0.9.16
+    name: ghcr.io/pm4ml/k3sbootstrap:0.10.12
   before_script:
     - "which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )"
     - eval `ssh-agent`
@@ -242,7 +242,7 @@ Deploy Vault:
 2b. Install Internal PM4MLs:
   stage: "Deploy Platform"
   image: 
-    name: ghcr.io/modusintegration/k3sbootstrap:0.9.16
+    name: ghcr.io/pm4ml/k3sbootstrap:0.10.12
   before_script:
     - "which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )"
     - eval `ssh-agent`
@@ -300,7 +300,7 @@ Deploy Vault:
   script:
     - aws s3 sync s3://${BUCKET}/${TF_VAR_environment}/k8s-cluster/sim_tests/ $CI_IMAGE_PROJECT_DIR/sim_tests --sse
     - aws s3 sync s3://${BUCKET}/${TF_VAR_environment}/k8s-cluster/secrets_chart/ $CI_IMAGE_PROJECT_DIR/secrets_chart --sse
-    - git clone [email protected]:modusintegration/pm4ml-test-scripts.git $CI_IMAGE_PROJECT_DIR/pm4ml-tests
+    - git clone [email protected]:pm4ml/pm4ml-test-scripts.git $CI_IMAGE_PROJECT_DIR/pm4ml-tests
     - cp $CI_IMAGE_PROJECT_DIR/pm4ml-tests/postman/Deregister_Existing_Oracles.postman_collection.json $CI_IMAGE_PROJECT_DIR/sim_tests 
     - cd sim_tests
     - newman run Deregister_Existing_Oracles.postman_collection.json --insecure -e Lab.postman_environment.json
@@ -347,7 +347,7 @@ Deploy Vault:
     - aws s3 sync s3://${BUCKET}/${TF_VAR_environment}/k8s-cluster/sim_tests/ $CI_IMAGE_PROJECT_DIR/sim_tests --sse
     - aws s3 sync s3://${BUCKET}/${TF_VAR_environment}/k8s-cluster/secrets_chart/ $CI_IMAGE_PROJECT_DIR/secrets_chart --sse
     - aws s3 cp s3://${BUCKET}/${TF_VAR_environment}/k3saddons/onboarding_internal_pm4ml_output.json $CI_IMAGE_PROJECT_DIR/sim_tests
-    - git clone [email protected]:modusintegration/pm4ml-test-scripts.git $CI_IMAGE_PROJECT_DIR/pm4ml-tests
+    - git clone [email protected]:pm4ml/pm4ml-test-scripts.git $CI_IMAGE_PROJECT_DIR/pm4ml-tests
     - cp $CI_IMAGE_PROJECT_DIR/pm4ml-tests/postman/Deregister_Existing_Oracles.postman_collection.json $CI_IMAGE_PROJECT_DIR/sim_tests 
     - cp $CI_IMAGE_PROJECT_DIR/pm4ml-tests/postman/Mojaloop-Payment-Manager-Onboarding.postman_collection.json $CI_IMAGE_PROJECT_DIR/sim_tests
     - cp $CI_IMAGE_PROJECT_DIR/pm4ml-tests/postman/Mojaloop-Payment-Manager-Golden-Path.postman_collection.json $CI_IMAGE_PROJECT_DIR/sim_tests
@@ -397,14 +397,14 @@ Deploy Vault:
     - aws s3 sync s3://${BUCKET}/${TF_VAR_environment}/k8s-cluster/sim_tests/ $CI_IMAGE_PROJECT_DIR/sim_tests --sse
     - aws s3 sync s3://${BUCKET}/${TF_VAR_environment}/k8s-cluster/secrets_chart/ $CI_IMAGE_PROJECT_DIR/secrets_chart --sse
     - aws s3 cp s3://${BUCKET}/${TF_VAR_environment}/k3saddons/onboarding_internal_pm4ml_output.json $CI_IMAGE_PROJECT_DIR/sim_tests
-    - git clone [email protected]:modusintegration/pm4ml-test-scripts.git $CI_IMAGE_PROJECT_DIR/pm4ml-tests
+    - git clone [email protected]:pm4ml/pm4ml-test-scripts.git $CI_IMAGE_PROJECT_DIR/pm4ml-tests
     - cp $CI_IMAGE_PROJECT_DIR/pm4ml-tests/postman/Deregister_Existing_Oracles.postman_collection.json $CI_IMAGE_PROJECT_DIR/sim_tests 
     - cd $CI_IMAGE_PROJECT_DIR/sim_tests
     - newman run Deregister_Existing_Oracles.postman_collection.json --insecure -e Lab.postman_environment.json
     - newman run https://raw.githubusercontent.com/mojaloop/postman/${TAG_ML_GP}/MojaloopHub_Setup.postman_collection.json --insecure -e Lab.postman_environment.json
     - newman run https://raw.githubusercontent.com/mojaloop/postman/${TAG_ML_GP}/MojaloopSims_Onboarding.postman_collection.json --ssl-client-cert-list test_cert_list.json --insecure -e Lab.postman_environment.json || true
-    - git clone [email protected]:modusintegration/finance-portal-settlements.git $CI_IMAGE_PROJECT_DIR/finance-portal-settlements
-    - cd $CI_IMAGE_PROJECT_DIR/finance-portal-settlements/tests/e2e-ui-tests
+    - git clone [email protected]:mojaloop/finance-portal-v2-ui.git $CI_IMAGE_PROJECT_DIR/finance-portal-v2-ui
+    - cd $CI_IMAGE_PROJECT_DIR/finance-portal-v2-ui/tests/e2e-ui-tests
     - echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list
     - wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
     - apt-get update
@@ -414,9 +414,9 @@ Deploy Vault:
     - npm ci
     - npm run test:headless || true
   after_script:
-    - cp $CI_IMAGE_PROJECT_DIR/finance-portal-settlements/tests/e2e-ui-tests/src/reports/report.html ${CI_PROJECT_DIR}/fin_port_report.html
+    - cp $CI_IMAGE_PROJECT_DIR/finance-portal-v2-ui/tests/e2e-ui-tests/src/reports/report.html ${CI_PROJECT_DIR}/fin_port_report.html
     - curl https://slack.com/api/files.upload
-      -F file=@"$CI_IMAGE_PROJECT_DIR/finance-portal-settlements/tests/e2e-ui-tests/src/reports/report.html"
+      -F file=@"$CI_IMAGE_PROJECT_DIR/finance-portal-v2-ui/tests/e2e-ui-tests/src/reports/report.html"
       -F channels="${SLACK_GITLABCI_ALERTS_CHANNEL_NAME}"
       -F token="${SLACK_GITLABCI_ALERTS_TOKEN}"
       -F title="Run Finance Portal V2 UI Tests"
@@ -425,7 +425,7 @@ Deploy Vault:
     paths:
       - fin_port_report.html
     #reports:
-      #junit: $CI_IMAGE_PROJECT_DIR/finance-portal-settlements/tests/e2e-ui-tests/src/reports/report.html
+      #junit: $CI_IMAGE_PROJECT_DIR/finance-portal-v2-ui/tests/e2e-ui-tests/src/reports/report.html
 
 # 4. Run MMD GP Tests:
 #   stage: "Run Tests"
@@ -436,8 +436,8 @@ Deploy Vault:
 #     - aws s3 sync s3://${BUCKET}/${TF_VAR_environment}/k8s-cluster/secrets_chart/ $CI_IMAGE_PROJECT_DIR/secrets_chart --sse
 #     - aws s3 cp s3://${BUCKET}/${TF_VAR_environment}/k3saddons/onboarding_internal_pm4ml_output.json $CI_IMAGE_PROJECT_DIR/sim_tests
 #     - cp $CI_IMAGE_PROJECT_DIR/tests/Myanmar_Oracle_Registration.postman_collection.json sim_tests
-#     - git clone [email protected]:modusintegration/pm4ml-test-scripts.git $CI_IMAGE_PROJECT_DIR/pm4ml-tests
-#     - git clone [email protected]:modusintegration/myanmar-test-scripts.git $CI_IMAGE_PROJECT_DIR/mmd-tests
+#     - git clone [email protected]:pm4ml/pm4ml-test-scripts.git $CI_IMAGE_PROJECT_DIR/pm4ml-tests
+#     - git clone [email protected]:mmd/myanmar-test-scripts.git $CI_IMAGE_PROJECT_DIR/mmd-tests
 #     - cp $CI_IMAGE_PROJECT_DIR/pm4ml-tests/postman/Deregister_Existing_Oracles.postman_collection.json $CI_IMAGE_PROJECT_DIR/sim_tests 
 #     - cp $CI_IMAGE_PROJECT_DIR/mmd-tests/postman/Myanmar-Golden-Path.postman_collection.json sim_tests
 #     - cp $CI_IMAGE_PROJECT_DIR/mmd-tests/postman/Myanmar-Onboard-Generic-FSP-Central_Ledger.postman_collection.json sim_tests
@@ -466,7 +466,7 @@ Deploy Vault:
     - aws s3 sync s3://${BUCKET}/${TF_VAR_environment}/k8s-cluster/sim_tests/ $CI_IMAGE_PROJECT_DIR/sim_tests --sse
     - aws s3 sync s3://${BUCKET}/${TF_VAR_environment}/k8s-cluster/secrets_chart/ $CI_IMAGE_PROJECT_DIR/secrets_chart --sse
     - aws s3 cp s3://${BUCKET}/${TF_VAR_environment}/k3saddons/onboarding_external_pm4ml_output.json $CI_IMAGE_PROJECT_DIR/sim_tests
-    - git clone [email protected]:modusintegration/pm4ml-test-scripts.git $CI_IMAGE_PROJECT_DIR/pm4ml-tests
+    - git clone [email protected]:pm4ml/pm4ml-test-scripts.git $CI_IMAGE_PROJECT_DIR/pm4ml-tests
     - cp $CI_IMAGE_PROJECT_DIR/pm4ml-tests/postman/Mojaloop-Payment-Manager-Onboarding.postman_collection.json $CI_IMAGE_PROJECT_DIR/sim_tests
     - cd sim_tests
     - newman run Mojaloop-Payment-Manager-Onboarding.postman_collection.json --insecure -e Lab.postman_environment.json -d onboarding_external_pm4ml_output.json

diff --git a/gitlab_templates/standalone-pm4ml-iac/.gitlab-ci.yml b/gitlab_templates/standalone-pm4ml-iac/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 default: 
   image: 
-    name: ghcr.io/modusintegration/k3sbootstrap:0.9.2
+    name: ghcr.io/pm4ml/k3sbootstrap:0.10.12
   before_script:
     - "which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )"
     - eval `ssh-agent`

diff --git a/gitlab_templates/switch-iac/.gitlab-ci.yml b/gitlab_templates/switch-iac/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 default: 
   image: 
-    name: ghcr.io/modusintegration/mojaloop-platform-iac:3.8.6
+    name: ghcr.io/mojaloop/iac-aws-platform:1.0.0
   before_script:
     - "which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )"
     - test -n "$BUCKET"
@@ -94,7 +94,7 @@ Destroy Environment:
 Destroy k3s Cluster:
 
   image: 
-    name: ghcr.io/modusintegration/k3sbootstrap:0.9.2
+    name: ghcr.io/pm4ml/k3sbootstrap:0.10.12
   before_script:
     - "which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )"
     - eval `ssh-agent`
@@ -134,7 +134,7 @@ Deploy AWS Infrastructure:
 
 Create k3s Cluster:
   image: 
-    name: ghcr.io/modusintegration/k3sbootstrap:0.9.2
+    name: ghcr.io/pm4ml/k3sbootstrap:0.10.12
   before_script:
     - "which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )"
     - eval `ssh-agent`
@@ -233,7 +233,7 @@ Deploy Vault:
 3. Install PM4MLs:
   stage: "Deploy Platform"
   image: 
-    name: ghcr.io/modusintegration/k3sbootstrap:0.9.2
+    name: ghcr.io/pm4ml/k3sbootstrap:0.10.12
   before_script:
     - "which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )"
     - eval `ssh-agent`

diff --git a/terraform/create-infrastructure.tf b/terraform/create-infrastructure.tf
@@ -63,7 +63,7 @@ resource "aws_security_group" "internet" {
 
 # TODO: was is this even for?
 module "aws-iam" {
-  source = "[email protected]:modusintegration/terraform-shared-modules.git//aws/iam"
+  source = "[email protected]:mojaloop/iac-shared-modules//aws/iam?ref=v0.0.7"
 
   aws_cluster_name = "${var.environment}-${var.client}"
 }

diff --git a/terraform/k8s-setup/addons/simulator_install.tf b/terraform/k8s-setup/addons/simulator_install.tf
@@ -67,15 +67,15 @@ locals {
 }
 
 module "provision_sims_to_wso2" {
-  source            = "git::[email protected]:modusintegration/wso2-util-terraform-modules.git//create-test-user?ref=v2.0.2"
+  source            = "git::[email protected]:mojaloop/iac-shared-modules.git//wso2/create-test-user?ref=v0.0.7"
   extgw_fqdn        = data.terraform_remote_state.infrastructure.outputs.extgw_public_fqdn
   test_user_details = local.sim_details
   admin_user        = "admin"
   admin_password    = local.wso2_admin_pw
 }
 
 module "provision_sim_callbacks_to_wso2" {
-  source            = "git::[email protected]:modusintegration/wso2-util-terraform-modules.git//wso2-post-config/callbacks?ref=v2.0.2"
+  source            = "git::[email protected]:mojaloop/iac-shared-modules.git//wso2/callbacks-post-config?ref=v0.0.7"
   intgw_fqdn        = data.terraform_remote_state.infrastructure.outputs.intgw_private_fqdn
   test_user_details = local.sim_details
   fspiop_version    = split(".", var.helm_mojaloop_version)[0] == "10" ? "1.0" : "1.1"

diff --git a/terraform/k8s-setup/addons/user_creation.tf b/terraform/k8s-setup/addons/user_creation.tf
@@ -14,7 +14,7 @@ locals {
 }
 
 module "provision_accounts_to_wso2" {
-  source            = "git::[email protected]:modusintegration/wso2-util-terraform-modules.git//create-test-user?ref=v2.0.2"
+  source            = "git::[email protected]:mojaloop/iac-shared-modules.git//wso2/create-test-user?ref=v0.0.7"
   extgw_fqdn        = data.terraform_remote_state.infrastructure.outputs.extgw_public_fqdn
   test_user_details = local.account_details
   admin_user        = "admin"

diff --git a/terraform/k8s-setup/k8s-mcm.tf b/terraform/k8s-setup/k8s-mcm.tf
@@ -20,7 +20,7 @@ resource "null_resource" "wait_for_iskm_readiness" {
 }
 
 module "mcm-iskm-key-secret-gen" {
-  source    = "git::[email protected]:modusintegration/wso2-util-terraform-modules.git//wso2-automation-iskm-mcm?ref=v1.0.9-noprov"
+  source    = "git::[email protected]:mojaloop/iac-shared-modules.git//wso2/iskm-mcm?ref=v0.0.7"
   iskm_fqdn = data.terraform_remote_state.infrastructure.outputs.iskm_private_fqdn
   user      = "admin"
   password  = vault_generic_secret.wso2_admin_password.data.value

diff --git a/terraform/k8s-setup/k8s-mojaloop.tf b/terraform/k8s-setup/k8s-mojaloop.tf
@@ -204,7 +204,7 @@ resource "vault_generic_secret" "finance_portal_user_password" {
 }
 
 module "fin-portal-iskm" {
-  source    = "git::[email protected]:modusintegration/wso2is-populate.git//terraform?ref=v2.0.2"
+  source    = "git::[email protected]:mojaloop/wso2is-populate.git//terraform?ref=v2.0.4"
   wso2_host = "https://${data.terraform_remote_state.infrastructure.outputs.iskm_private_fqdn}:9443"
   admin_user = "admin"
   admin_password  = vault_generic_secret.wso2_admin_password.data.value

diff --git a/terraform/k8s-setup/pm4mls/onboard_external_pm4ml.tf b/terraform/k8s-setup/pm4mls/onboard_external_pm4ml.tf
@@ -86,15 +86,15 @@ locals {
 }
 
 module "external_provision_pm4ml_to_wso2" {
-  source            = "git::[email protected]:modusintegration/wso2-util-terraform-modules.git//create-test-user?ref=v2.0.2"
+  source            = "git::[email protected]:mojaloop/iac-shared-modules.git//wso2/create-test-user?ref=v0.0.7"
   extgw_fqdn        = data.terraform_remote_state.infrastructure.outputs.extgw_public_fqdn
   test_user_details = local.external_pm4ml_details
   admin_user        = "admin"
   admin_password    = local.wso2_admin_pw
 }
 
 module "external_provision_pm4ml_callbacks_to_wso2" {
-  source            = "git::[email protected]:modusintegration/wso2-util-terraform-modules.git//wso2-post-config/callbacks?ref=v2.0.2"
+  source            = "git::[email protected]:mojaloop/iac-shared-modules.git//wso2/callbacks-post-config?ref=v0.0.7"
   intgw_fqdn        = data.terraform_remote_state.infrastructure.outputs.intgw_private_fqdn
   test_user_details = local.external_pm4ml_details
   fspiop_version    = split(".", var.helm_mojaloop_version)[0] == "10" ? "1.0" : "1.1"

diff --git a/terraform/k8s-setup/pm4mls/onboard_pm4ml.tf b/terraform/k8s-setup/pm4mls/onboard_pm4ml.tf
@@ -84,15 +84,15 @@ resource "local_file" "pm4ml_personal_client_key" {
 }
 
 module "internal_provision_pm4ml_to_wso2" {
-  source            = "git::[email protected]:modusintegration/wso2-util-terraform-modules.git//create-test-user?ref=v2.0.2"
+  source            = "git::[email protected]:mojaloop/iac-shared-modules.git//wso2/create-test-user?ref=v0.0.7"
   extgw_fqdn        = data.terraform_remote_state.infrastructure.outputs.extgw_public_fqdn
   test_user_details = local.internal_pm4ml_details
   admin_user        = "admin"
   admin_password    = local.wso2_admin_pw
 }
 
 module "provision_pm4ml_callbacks_to_wso2" {
-  source            = "git::[email protected]:modusintegration/wso2-util-terraform-modules.git//wso2-post-config/callbacks?ref=v2.0.2"
+  source            = "git::[email protected]:mojaloop/iac-shared-modules.git//wso2/callbacks-post-config?ref=v0.0.7"
   intgw_fqdn        = data.terraform_remote_state.infrastructure.outputs.intgw_private_fqdn
   test_user_details = local.internal_pm4ml_details
   fspiop_version    = split(".", var.helm_mojaloop_version)[0] == "10" ? "1.0" : "1.1"

diff --git a/terraform/nlb-addons.tf b/terraform/nlb-addons.tf
@@ -1,5 +1,5 @@
 module "nlb_addons" {
-  source = "[email protected]:modusintegration/terraform-shared-modules.git//aws/nlb?ref=v0.0.2"
+  source = "[email protected]:mojaloop/iac-shared-modules//aws/nlb?ref=v0.0.7"
 
   vpc_id = data.aws_vpc.selected.id
   prefix = "addons-${var.client}-${var.environment}"

diff --git a/terraform/nlb-wso2.tf b/terraform/nlb-wso2.tf
@@ -1,5 +1,5 @@
 module "nlb_wso2" {
-  source = "[email protected]:modusintegration/terraform-shared-modules.git//aws/nlb?ref=v0.0.2"
+  source = "[email protected]:mojaloop/iac-shared-modules//aws/nlb?ref=v0.0.7"
 
   vpc_id = data.aws_vpc.selected.id
   prefix = "wso2-${var.client}-${var.environment}"