multiple fixes

tvarit-foggy · Oct 10, 2023 · a156074 · a156074
1 parent c57c507
commit a156074
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 45 deletions.
diff --git a/.github/tvarit/conf/prod/lightsail.sh b/.github/tvarit/conf/prod/lightsail.sh
@@ -11,8 +11,8 @@ sleep 300
 rm -rf awscliv2.zip
 
 #with only ECR pull access. TODO: update
-AWS_ACCESS_KEY_ID=""
-AWS_SECRET_ACCESS_KEY=""
+AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID_016}
+AWS_SECRET_ACCESS_KEY=${AWS_SECRET_KEY_ID_016}
 AWS_REGION="eu-central-1"
 
 aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID

diff --git a/.github/tvarit/deploy_to_dev_16.sh b/.github/tvarit/deploy_to_dev_16.sh
@@ -58,52 +58,66 @@ function create_load_balancer() {
 
 # aws lightsail get-certificates --certificate-name ${PREFIX}-tvarit-com > /dev/null
 
-echo "Creating production database..."
-aws lightsail create-relational-database \
-  --relational-database-name ${PREFIX}-grafana-db \
-  --availability-zone ${AWS_DEFAULT_REGION}a \
-  --relational-database-blueprint-id mysql_8_0 \
-  --relational-database-bundle-id micro_1_0 \
-  --preferred-backup-window 00:00-00:30 \
-  --preferred-maintenance-window Sun:01:00-Sun:01:30 \
-  --master-database-name grafana \
-  --master-username grafana \
-  --no-publicly-accessible || :
-
-echo "Waiting for database to be available..."
-for run in {1..60}; do
-  state=$(aws lightsail get-relational-database --relational-database-name ${PREFIX}-grafana-db --output text --query 'relationalDatabase.state')
-  if [ "${state}" == "available" ]; then
-    break
-  fi
-  echo "Waiting for database to be available..."
-  sleep 60
-done
+echo "Checking if production database already exists..."
+existing_db=$(aws lightsail get-relational-database --relational-database-name ${PREFIX}-grafana-db --output text --query 'relationalDatabase.name' 2>/dev/null)
+
+if [ -n "$existing_db" ]; then
+  echo "Production database already exists. Skipping creation."
+else
+  echo "Creating production database..."
+  aws lightsail create-relational-database \
+    --relational-database-name ${PREFIX}-grafana-db \
+    --availability-zone ${AWS_DEFAULT_REGION}a \
+    --relational-database-blueprint-id mysql_8_0 \
+    --relational-database-bundle-id micro_1_0 \
+    --preferred-backup-window 00:00-00:30 \
+    --preferred-maintenance-window Sun:01:00-Sun:01:30 \
+    --master-database-name grafana \
+    --master-username grafana \
+    --no-publicly-accessible || :
 
-if [ "${state}" != "available" ]; then
-  echo "Database not created in 60 mins"
-  exit 1
+  echo "Waiting for database to be available..."
+  for run in {1..60}; do
+    state=$(aws lightsail get-relational-database --relational-database-name ${PREFIX}-grafana-db --output text --query 'relationalDatabase.state')
+    if [ "${state}" == "available" ]; then
+      break
+    fi
+    echo "Waiting for database to be available..."
+    sleep 60
+  done
+
+  if [ "${state}" != "available" ]; then
+    echo "Database not created in 60 mins"
+    exit 1
+  fi
 fi
 
-echo "Creating staging database..."
-aws lightsail create-relational-database-from-snapshot \
-  --relational-database-name ${PREFIX}-next-grafana-db \
-  --source-relational-database-name ${PREFIX}-grafana-db \
-  --use-latest-restorable-time || :
-
-echo "Waiting for database to be available..."
-for run in {1..60}; do
-  state=$(aws lightsail get-relational-database --relational-database-name ${PREFIX}-next-grafana-db --output text --query 'relationalDatabase.state')
-  if [ "${state}" == "available" ]; then
-    break
-  fi
-  echo "Waiting for database to be available..."
-  sleep 60
-done
+echo "Checking if staging database already exists..."
+existing_staging_db=$(aws lightsail get-relational-database --relational-database-name ${PREFIX}-next-grafana-db --output text --query 'relationalDatabase.name' 2>/dev/null)
+
+if [ -n "$existing_staging_db" ]; then
+  echo "Staging database already exists. Skipping creation."
+else
+  echo "Creating staging database..."
+  aws lightsail create-relational-database-from-snapshot \
+    --relational-database-name ${PREFIX}-next-grafana-db \
+    --source-relational-database-name ${PREFIX}-grafana-db \
+    --use-latest-restorable-time || :
 
-if [ "${state}" != "available" ]; then
-  echo "Database not created in 60 mins"
-  exit 1
+  echo "Waiting for database to be available..."
+  for run in {1..60}; do
+    state=$(aws lightsail get-relational-database --relational-database-name ${PREFIX}-next-grafana-db --output text --query 'relationalDatabase.state')
+    if [ "${state}" == "available" ]; then
+      break
+    fi
+    echo "Waiting for database to be available..."
+    sleep 60
+  done
+
+  if [ "${state}" != "available" ]; then
+    echo "Database not created in 60 mins"
+    exit 1
+  fi
 fi
 
 DB_ENDPOINT=$(aws lightsail get-relational-database --relational-database-name ${PREFIX}-next-grafana-db --output text --query 'relationalDatabase.masterEndpoint.address')

diff --git a/.github/workflows/deploy-016.yml b/.github/workflows/deploy-016.yml
@@ -16,6 +16,8 @@ jobs:
       SMTP_HOST: ${{ secrets.SMTP_HOST }}
       SMTP_USER: ${{ secrets.SMTP_USER }}
       SMTP_PASSWORD: ${{ secrets.SMTP_PASSWORD }}
+      AWS_ACCESS_KEY_ID_016: ${{secrets.AWS_ACCESS_KEY_ID_016}}
+      AWS_SECRET_KEY_ID_016: ${{secrets.AWS_SECRET_KEY_ID_016}}
     steps:
     - uses: actions/checkout@v2
     - run: |

diff --git a/conf/defaults.ini b/conf/defaults.ini
@@ -485,7 +485,7 @@ client_id = 190aea98-f89e-4fd6-b2d2-89e16b490ff1
 client_secret = 0sK8Q~LYvnVZRRZruiVodqa~.KNygugwLHm34bNg
 auth_url = https://login.microsoftonline.com/54067617-1ace-44a2-b7d9-f59327ef106d/oauth2/v2.0/authorize
 token_url = https://login.microsoftonline.com/54067617-1ace-44a2-b7d9-f59327ef106d/oauth2/v2.0/token
-scopes = openid email profile
+scopes = openid email
 ;allowed_domains =
 ;allowed_groups =