From 745bcb1db111d8143d2a231c882d537c089c29fe Mon Sep 17 00:00:00 2001
From: Dmitry Dunaev <83591011+dunaev-opsfleet@users.noreply.github.com>
Date: Wed, 18 May 2022 16:24:31 +0300
Subject: [PATCH] [WIFI-7873] Add: owgw/owprov support for ipinfo (#549)

Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>
---
 .../workflows/ucentralgw-dev-deployment.yaml  | 37 +++++++------------
 .../workflows/ucentralgw-qa-deployment.yaml   |  1 +
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ucentralgw-dev-deployment.yaml b/.github/workflows/ucentralgw-dev-deployment.yaml
index 3055b2d40..ff4e62636 100644
--- a/.github/workflows/ucentralgw-dev-deployment.yaml
+++ b/.github/workflows/ucentralgw-dev-deployment.yaml
@@ -114,8 +114,20 @@ jobs:
     - name: Deploy OpenWIFI Cloud SDK
       working-directory: wlan-cloud-ucentral-deploy/chart/environment-values
       run: |
+        export NAMESPACE=${{ matrix.namespace }}
+        export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.external-db.yaml
+        export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }}
+        export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }}
+        export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }}
+        export OWFMS_S3_SECRET=${{ secrets.UCENTRALFMS_S3_SECRET }}
+        export OWFMS_S3_KEY=${{ secrets.UCENTRALFMS_S3_KEY }}
+        export CERT_LOCATION=cert.pem
+        export KEY_LOCATION=key.pem
+        export OWSEC_NEW_PASSWORD=${{ secrets.OWSEC_NEW_PASSWORD }}
+        export MAILER_USERNAME=${{ secrets.MAILER_USERNAME }}
+        export MAILER_PASSWORD=${{ secrets.MAILER_PASSWORD }}
+        export IPTOCOUNTRY_IPINFO_TOKEN=${{ secrets.IPTOCOUNTRY_IPINFO_TOKEN }}
         if [[ "${{ github.event.inputs.force_latest }}" == "false" ]]; then
-          export NAMESPACE=${{ matrix.namespace }}
           export DEPLOY_METHOD=${{ matrix.deploy_method }}
           export CHART_VERSION=${{ matrix.chart_version }}
           export OWGW_VERSION=${{ matrix.owgw_version }}
@@ -126,20 +138,8 @@ jobs:
           export OWPROVUI_VERSION=${{ matrix.owprovui_version }}
           export OWANALYTICS_VERSION=${{ matrix.owanalytics_version }}
           export OWSUB_VERSION=${{ matrix.owsub_version }}
-          export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.external-db.yaml
-          export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }}
-          export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }}
-          export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }}
-          export OWFMS_S3_SECRET=${{ secrets.UCENTRALFMS_S3_SECRET }}
-          export OWFMS_S3_KEY=${{ secrets.UCENTRALFMS_S3_KEY }}
-          export CERT_LOCATION=cert.pem
-          export KEY_LOCATION=key.pem
-          export OWSEC_NEW_PASSWORD=${{ secrets.OWSEC_NEW_PASSWORD }}
-          export MAILER_USERNAME=${{ secrets.MAILER_USERNAME }}
-          export MAILER_PASSWORD=${{ secrets.MAILER_PASSWORD }}
           ./deploy.sh
         else
-          export NAMESPACE=${{ matrix.namespace }}
           export DEPLOY_METHOD=git
           export CHART_VERSION=main
           export OWGW_VERSION=master
@@ -150,17 +150,6 @@ jobs:
           export OWPROVUI_VERSION=main
           export OWANALYTICS_VERSION=main
           export OWSUB_VERSION=main
-          export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.external-db.yaml
-          export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }}
-          export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }}
-          export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }}
-          export OWFMS_S3_SECRET=${{ secrets.UCENTRALFMS_S3_SECRET }}
-          export OWFMS_S3_KEY=${{ secrets.UCENTRALFMS_S3_KEY }}
-          export CERT_LOCATION=cert.pem
-          export KEY_LOCATION=key.pem
-          export OWSEC_NEW_PASSWORD=${{ secrets.OWSEC_NEW_PASSWORD }}
-          export MAILER_USERNAME=${{ secrets.MAILER_USERNAME }}
-          export MAILER_PASSWORD=${{ secrets.MAILER_PASSWORD }}
           ./deploy.sh
         fi
 
diff --git a/.github/workflows/ucentralgw-qa-deployment.yaml b/.github/workflows/ucentralgw-qa-deployment.yaml
index 8b62dca7c..df8c35793 100644
--- a/.github/workflows/ucentralgw-qa-deployment.yaml
+++ b/.github/workflows/ucentralgw-qa-deployment.yaml
@@ -117,6 +117,7 @@ jobs:
         export OWSEC_NEW_PASSWORD=${{ secrets.OWSEC_NEW_PASSWORD }}
         export MAILER_USERNAME=${{ secrets.MAILER_USERNAME }}
         export MAILER_PASSWORD=${{ secrets.MAILER_PASSWORD }}
+        export IPTOCOUNTRY_IPINFO_TOKEN=${{ secrets.IPTOCOUNTRY_IPINFO_TOKEN }}
         ./deploy.sh
 
     - name: Show resource state on deployment failure