scott/docker-android
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Enabled of using existing security group

Browse source
This commit is contained in:
butomo1989 2018-11-19 13:01:18 +01:00
parent 0e00cffe4d
commit c298cc7ae1
1 changed files with 45 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/appium.sh
View file

@ -58,7 +58,7 @@ function prepare_geny_aws() {
echo $ami echo $ami
echo $sg echo $sg
#TODO: remove this dirty hack (this version will be ignored anyway!) #TODO: remove this dirty hack
if [[ $android_version == null ]]; then if [[ $android_version == null ]]; then
echo "[HACK] Version cannot be empty! version will be added!" echo "[HACK] Version cannot be empty! version will be added!"
android_version="6.0" android_version="6.0"
@ -69,6 +69,9 @@ function prepare_geny_aws() {
echo "Custom security group is found!" echo "Custom security group is found!"
security_group="" security_group=""
is_array=$(echo "${sg}" | jq 'if type=="array" then true else false end')
if [ $is_array == "true" ]; then
echo "New security group with given rules will be created"
for i in $(echo "${sg}" | jq -r '.[] | @base64'); do for i in $(echo "${sg}" | jq -r '.[] | @base64'); do
get_value() { get_value() {
echo ${i} | base64 --decode | jq -r ${1} echo ${i} | base64 --decode | jq -r ${1}
@ -95,10 +98,24 @@ function prepare_geny_aws() {
protocol = "$protocol" protocol = "$protocol"
cidr_blocks = ["$cidr_blocks"] cidr_blocks = ["$cidr_blocks"]
} }
_EOF
)
done
done
else
#TODO: remove this dirty hack
echo "Given security group will be used!"
is_array="false"
security_group=$(cat <<_EOF
ingress {
from_port = 22
to_port = 22
protocol = "tcp"
cidr_blocks = ["0.0.0.0/0"]
}
_EOF _EOF
) )
done fi
done
else else
echo "Custom security is not found! It will use default security group!" echo "Custom security is not found! It will use default security group!"
security_group=$(cat <<_EOF security_group=$(cat <<_EOF
@ -189,7 +206,7 @@ resource "aws_instance" "geny_aws_$index" {
provider = "aws.provider_$index" provider = "aws.provider_$index"
ami="\${data.aws_ami.geny_aws_$index.id}" ami="\${data.aws_ami.geny_aws_$index.id}"
instance_type = "\${var.instance_type_$index}" instance_type = "\${var.instance_type_$index}"
vpc_security_group_ids = ["\${aws_security_group.geny_sg_$index.name}"] vpc_security_group_ids=["\${aws_security_group.geny_sg_$index.name}"]
key_name = "\${aws_key_pair.geny_key_$index.key_name}" key_name = "\${aws_key_pair.geny_key_$index.key_name}"
tags { tags {
Name = "DockerAndroid-\${data.aws_ami.geny_aws_$index.id}" Name = "DockerAndroid-\${data.aws_ami.geny_aws_$index.id}"
@ -215,11 +232,17 @@ _EOF
echo "$aws_tf_content" > /root/aws_tf_$index.tf echo "$aws_tf_content" > /root/aws_tf_$index.tf
if [[ $ami != null ]]; then if [[ $ami != null ]]; then
echo "Custom AMI is found!" echo "Using given AMI!"
sed -i "s/.*ami=.*/ ami=\"$ami\"/g" /root/aws_tf_$index.tf sed -i "s/.*ami=.*/ ami=\"$ami\"/g" /root/aws_tf_$index.tf
else else
echo "Custom AMI is not found. It will use the latest AMI!" echo "Custom AMI is not found. It will use the latest AMI!"
fi fi
if [[ $sg != null ]] && [[ $is_array == "false" ]]; then
echo "Using given security group: $sg"
sed -i "s/.*vpc_security_group_ids=.*/ vpc_security_group_ids=[\"$sg\"]/g" /root/aws_tf_$index.tf
fi
echo "---------------------------------------------------------" echo "---------------------------------------------------------"
((index++)) ((index++))