Use AWS credentials in KONFIG.test object

Sonmez Kartal · Sonmez Kartal · commit b49e9c2434a5 · 2017-02-18T23:52:07.000+03:00
Signed-off-by: Sonmez Kartal &lt;sonmez@koding.com&gt;
diff --git a/scripts/test-instance/aws.coffee b/scripts/test-instance/aws.coffee
@@ -1,19 +1,30 @@
 AWS = require 'aws-sdk'
-unless process.env.TEST_AWS_REGION
-  console.error 'error: TEST_AWS_REGION is not set'
+
+KONFIG = require 'koding-config-manager'
+
+unless KONFIG.test?.credentials?.AWS
+  console.error 'error: test aws credentials are not set'
+  process.exit 1
+
+{
+  region
+  accessKeyId
+  secretAccessKey
+} = KONFIG.test.credentials.AWS
+
+unless region
+  console.error 'error: region is not set'
   process.exit 1
 
-unless process.env.TEST_AWS_ACCESS_KEY
-  console.error 'error: TEST_AWS_ACCESS_KEY is not set'
+unless accessKeyId
+  console.error 'error: access key id is not set'
   process.exit 1
 
-unless process.env.TEST_AWS_SECRET_KEY
-  console.error 'error: TEST_AWS_SECRET_KEY is not set'
+unless secretAccessKey
+  console.error 'error: secret access key is not set'
   process.exit 1
 
-AWS.config.region = process.env.TEST_AWS_REGION
-AWS.config.update
-  accessKeyId     : process.env.TEST_AWS_ACCESS_KEY
-  secretAccessKey : process.env.TEST_AWS_SECRET_KEY
+AWS.config.region = region
+AWS.config.update { accessKeyId, secretAccessKey }
 
 module.exports = AWS
diff --git a/scripts/test-instance/launch b/scripts/test-instance/launch
@@ -3,20 +3,35 @@
 fs   = require 'fs'
 argv = require('minimist')(process.argv.slice(2))
 
-unless subnetId = process.env.TEST_AWS_SUBNET_ID
-  console.error 'error: TEST_AWS_SUBNET_ID is not set'
+KONFIG = require 'koding-config-manager'
+
+unless KONFIG.test?.credentials?.AWS
+  console.error 'error: test aws credentials are not set'
+  process.exit 1
+
+{
+  subnetId
+  securityGroupId
+  keyName
+
+  domainBase
+  route53: { hostedZoneId }
+} = KONFIG.test.credentials.AWS
+
+unless subnetId
+  console.error 'error: subnet id is not set'
   process.exit 1
 
-unless securityGroupId = process.env.TEST_AWS_SECURITY_GROUP_ID
-  console.error 'error: TEST_AWS_SECURITY_GROUP_ID is not set'
+unless securityGroupId
+  console.error 'error: security group id is not set'
   process.exit 1
 
-unless keyName = process.env.TEST_AWS_KEY_NAME
-  console.error 'error: TEST_AWS_KEY_NAME is not set'
+unless keyName
+  console.error 'error: key name is not set'
   process.exit 1
 
-unless domainBase = process.env.TEST_AWS_R53_DOMAIN_BASE
-  console.error 'error: TEST_AWS_R53_DOMAIN_BASE is not set'
+unless domainBase
+  console.error 'error: domain base is not set'
   process.exit 1
 
 AWS = require './aws'
@@ -134,7 +149,7 @@ createRecordSets = (Instances, callback) ->
     }
 
   params =
-    HostedZoneId: process.env.TEST_AWS_HOSTED_ZONE_ID
+    HostedZoneId: hostedZoneId
     ChangeBatch: { Changes }
 
   R53.changeResourceRecordSets params, (err, res) ->
@@ -157,7 +172,7 @@ checkInstances = ({Instances}) ->
 
   Instances.forEach checkInstanceState
   if RunningInstances.length is InstanceIds.length
-    if process.env.TEST_AWS_HOSTED_ZONE_ID
+    if hostedZoneId
       createRecordSets Instances, exit
     else
       exit()
diff --git a/scripts/wercker/upload-logs b/scripts/wercker/upload-logs
@@ -13,7 +13,10 @@ cat $INSTANCE_DATA_FILE | awk '{print $2}' \
 	| xargs -n 1 \
 		-I HOST \
 		$SCRIPTS/test-instance/ssh HOST \
-		"sudo $REPOSITORY_PATH/scripts/test-instance/upload-logs $WERCKER_BUILD_ID $TEST_AWS_ACCESS_KEY $TEST_AWS_SECRET_KEY"
+			"sudo $REPOSITORY_PATH/scripts/test-instance/upload-logs \
+			$WERCKER_BUILD_ID \
+			$KONFIG_TEST_CREDENTIALS_AWS_ACCESSKEYID \
+			$KONFIG_TEST_CREDENTIALS_AWS_SECRETACCESSKEY"
 
 cat - <<EOF
 You can view logs at s3://kodingdev-test-instance-logs/$WERCKER_BUILD_ID/
