removed aws config from shell script

.gitlab/.gitlab-ci.yml

@@ -200,15 +200,23 @@ build container fb:
 deploy node for linux amd64:
   stage: lint
   image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
+  variable:
+    PROFILE: "default"
+    AWS_SSH_PRIVATE_KEY: $AWS_SSH_PRIVATE_KEY
   before_script:
+    - aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
+    - aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
+    - aws configure set region "us-east-2"
+    - aws configure set aws_profile $PROFILE
+    - echo $AWS_SSH_PRIVATE_KEY > gitlab-featurebase-dev.pem
     - echo $AWS_SSH_PRIVATE_KEY > gitlab-featurebase-dev.pem
     - chmod 400 gitlab-featurebase-dev.pem
     - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
     - eval `ssh-agent -s`
-    - mkdir -p ~/.ssh && 
+    - mkdir -p ~/.ssh 
     - echo "$AWS_SSH_PRIVATE_KEY" | ssh-add -
     - chmod 700 /root/.ssh
     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
     - apt update && apt -y install jq
   script:
-    - ./qa/scripts/deployNode.sh $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY $AWS_SSH_PRIVATE_KEY
+    - ./qa/scripts/deployNode.sh $PROFILE

qa/scripts/deployNode.sh

@@ -1,13 +1,6 @@
 #!/bin/bash
 
-# To run script: ./deployNode.sh AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SSH_PRIVATE_KEY
-
-function configure_env() {
-    aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
-    aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
-    aws configure set region $REGION
-    aws configure set aws_profile $PROFILE
-}
+# To run script: ./deployNode.sh $PROFILE
 
 function deploy_node() {
     # get AMI, security group and subnet ID 
@@ -43,30 +36,15 @@ function terminate_node() {
     aws ec2 terminate-instances --instance-ids $INSTANCE_ID
 }
 
-# Pass variables to shell script 
-AWS_ACCESS_KEY_ID=$1
-shift
+# Pass variables to shell script
 
-AWS_SECRET_ACCESS_KEY=$1
-shift
-
-AWS_SSH_PRIVATE_KEY=$1
+PROFILE=$1
 shift 
 
-echo $AWS_ACCESS_KEY_ID, $AWS_ACCESS_KEY_ID, $AWS_SSH_PRIVATE_KEY
-
 # set some variables 
-PROFILE="default"
 INSTANCE="t3a.large"
 REGION="us-east-2"
 
-# set up environment variables for aws, ssh
-# and install needed packages 
-configure_env
-# if [ $? > 0 ]; then 
-#     exit 1
-# fi
-
 # get AMI, security group and subnet for EC2 instance,
 # launch instance, save instance Id and run cloud-init to set up node env
 deploy_node