Skip to content

Commit 2c68883

Browse files
metaclipsmetaclips
committed
chore: allow examples to use older or newer versions of ockam
1 parent 8da0e79 commit 2c68883

File tree

92 files changed

+310
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+310
-170
lines changed

‎examples/command/portals/ai/amazon_bedrock/ai_corp/run.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ run() {
5252
aws ec2 create-key-pair --key-name "$key_name" --query 'KeyMaterial' > key.pem
5353
chmod 400 key.pem
5454

55-
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
55+
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
56+
sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
5657
instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type c5n.large \
5758
--subnet-id "$subnet_id" --security-group-ids "$sg_id" \
5859
--key-name "$key_name" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
@@ -128,7 +129,7 @@ get_configured_region() {
128129
cleanup() {
129130
# ----------------------------------------------------------------------------------------------------------------
130131
# DELETE INSTANCE
131-
rm -f user_data.sh
132+
rm -f user_data*.sh
132133

133134
instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
134135
--query "Reservations[].Instances[?State.Name!='terminated'].InstanceId[]")

‎examples/command/portals/ai/amazon_bedrock/ai_corp/run_ockam.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
77
set -ex
88
99
# Install Ockam Command
10+
export OCKAM_VERSION="$OCKAM_VERSION"
1011
curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
1112
source "$HOME/.ockam/env"
1213

‎examples/command/portals/ai/amazon_bedrock/health_corp/client.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ async function run() {
1010
console.log("Connected to the model.\n\nApp: ", query);
1111
const queryResponse = await fetch("http://127.0.0.1:3000/query", {
1212
method: "POST",
13-
headers: {"Content-Type": "application/json"},
14-
body: JSON.stringify({query}),
13+
headers: { "Content-Type": "application/json" },
14+
body: JSON.stringify({ query }),
1515
keepalive: true,
1616
});
1717

@@ -23,6 +23,7 @@ async function run() {
2323

2424
const answer = await queryResponse.json();
2525
console.log(answer['answer']);
26+
console.log("\nThe example run was successful 🥳.");
2627
} catch (error) {
2728
console.log("Error:", error);
2829
}

‎examples/command/portals/ai/amazon_bedrock/health_corp/run.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ run() {
4444
aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
4545
chmod 400 key.pem
4646

47-
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
47+
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
48+
sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
4849
instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type c5n.large \
4950
--subnet-id "$subnet_id" --security-group-ids "$sg_id" \
5051
--key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
5152
aws ec2 create-tags --resources "$instance_id" --tags "Key=Name,Value=${name}-ec2-instance"
5253
aws ec2 wait instance-running --instance-ids "$instance_id"
5354
ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
54-
rm -f user_data.sh
5555

5656
until scp -o StrictHostKeyChecking=no -i ./key.pem ./client.js "ec2-user@$ip:client.js"; do sleep 10; done
5757
ssh -o StrictHostKeyChecking=no -i ./key.pem "ec2-user@$ip" \
@@ -65,7 +65,7 @@ cleanup() {
6565
# ----------------------------------------------------------------------------------------------------------------
6666
# DELETE INSTANCE
6767

68-
rm -f user_data.sh
68+
rm -rf user_data*.sh
6969
instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
7070
--query "Reservations[].Instances[?State.Name!='terminated'].InstanceId[]")
7171
for i in $instance_ids; do

‎examples/command/portals/ai/amazon_bedrock/health_corp/run_ockam.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
77
set -ex
88
99
# Install Ockam Command
10+
export OCKAM_VERSION="$OCKAM_VERSION"
1011
curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
1112
source "$HOME/.ockam/env"
1213

‎examples/command/portals/ai/amazon_bedrock/run.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ run() {
4444
health_corp_ticket=$(ockam project ticket --usage-count 1 --expires-in 60m \
4545
--attribute "ai-inlet=true")
4646

47+
if [[ -n "$OCKAM_VERSION" ]]; then
48+
export OCKAM_VERSION="v${OCKAM_VERSION}";
49+
fi
50+
4751
# Invoke `ai_corp/run.sh` in the directory that has ai_corp's configuration. Pass the above
4852
# enrollment ticket as the first argument to run.sh script. Read ai_corp/run.sh to understand the parts
4953
# that are provisioned in ai_corp's virtual private cloud.

‎examples/command/portals/ai/amazon_ec2/ai_corp/run.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ run() {
4747
# make sure that the current region supports the instance required to run the model
4848
check_if_instance_type_available g5g.2xlarge
4949

50-
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
50+
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
51+
sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
5152
instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type g5g.2xlarge \
5253
--subnet-id "$subnet_id" --security-group-ids "$sg_id" \
5354
--key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
@@ -115,7 +116,7 @@ cleanup() {
115116
# ----------------------------------------------------------------------------------------------------------------
116117
# DELETE INSTANCE
117118

118-
rm -f user_data.sh
119+
rm -f user_data*.sh
119120
instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
120121
--query "Reservations[*].Instances[*].InstanceId")
121122
for i in $instance_ids; do

‎examples/command/portals/ai/amazon_ec2/ai_corp/run_ockam.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
77
set -ex
88
99
# Install Ockam Command
10+
export OCKAM_VERSION="$OCKAM_VERSION"
1011
curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
1112
source "$HOME/.ockam/env"
1213

‎examples/command/portals/ai/amazon_ec2/health_corp/client.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ async function run() {
2121

2222
const answer = await queryResponse.json();
2323
console.log(answer['answer']);
24+
console.log("\nThe example run was successful 🥳.");
2425
} catch (error) {
2526
console.log("Error:", error.message);
2627
}

‎examples/command/portals/ai/amazon_ec2/health_corp/run.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ run() {
4444
aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
4545
chmod 400 key.pem
4646

47-
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
47+
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
48+
sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
4849
instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type c5n.large \
4950
--subnet-id "$subnet_id" --security-group-ids "$sg_id" \
5051
--key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
@@ -65,7 +66,7 @@ cleanup() {
6566
# ----------------------------------------------------------------------------------------------------------------
6667
# DELETE INSTANCE
6768

68-
rm -f user_data.sh
69+
rm -f user_data*.sh
6970
instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
7071
--query "Reservations[*].Instances[*].InstanceId")
7172
for i in $instance_ids; do

‎examples/command/portals/ai/amazon_ec2/health_corp/run_ockam.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
77
set -ex
88
99
# Install Ockam Command
10+
export OCKAM_VERSION="$OCKAM_VERSION"
1011
curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
1112
source "$HOME/.ockam/env"
1213

‎examples/command/portals/ai/amazon_ec2/run.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ run() {
4444
health_corp_ticket=$(ockam project ticket --usage-count 1 --expires-in 60m \
4545
--attribute "ai-inlet=true")
4646

47+
if [[ -n "$OCKAM_VERSION" ]]; then
48+
export OCKAM_VERSION="v${OCKAM_VERSION}";
49+
fi
50+
4751
# Invoke `ai_corp/run.sh` in the directory that has ai_corp's configuration. Pass the above
4852
# enrollment ticket as the first argument to run.sh script. Read ai_corp/run.sh to understand the parts
4953
# that are provisioned in ai_corp's virtual private cloud.

‎examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/monitoring_corp/run.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ run() {
4444
aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
4545
chmod 400 key.pem
4646

47-
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
47+
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
48+
sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
4849
instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type t2.micro \
4950
--subnet-id "$subnet_id" --security-group-ids "$sg_id" \
5051
--key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
5152
aws ec2 create-tags --resources "$instance_id" --tags "Key=Name,Value=${name}-ec2-instance"
5253
aws ec2 wait instance-running --instance-ids "$instance_id"
5354
ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
54-
rm -f user_data.sh
5555

5656
until scp -o StrictHostKeyChecking=no -i ./key.pem ./api.js "ec2-user@$ip:api.js"; do sleep 10; done
5757
ssh -o StrictHostKeyChecking=no -i ./key.pem "ec2-user@$ip" \
@@ -68,7 +68,7 @@ cleanup() {
6868
# ----------------------------------------------------------------------------------------------------------------
6969
# DELETE INSTANCE
7070

71-
rm -f user_data.sh
71+
rm -f user_data*.sh
7272
instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
7373
--query "Reservations[*].Instances[*].InstanceId")
7474
for i in $instance_ids; do

‎examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/monitoring_corp/run_ockam.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
77
set -ex
88
99
# Install Ockam Command
10+
export OCKAM_VERSION="$OCKAM_VERSION"
1011
curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
1112
source "$HOME/.ockam/env"
1213

‎examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/run.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ run() {
4444
travel_app_corp_ticket=$(ockam project ticket --usage-count 1 --expires-in 60m \
4545
--attribute "monitoring-api-inlet=true")
4646

47+
if [[ -n "$OCKAM_VERSION" ]]; then
48+
export OCKAM_VERSION="v${OCKAM_VERSION}";
49+
fi
50+
4751
# Invoke `monitoring_corp/run.sh` in the directory that has monitoring_corp's configuration. Pass the above
4852
# enrollment ticket as the first argument to run.sh script. Read monitoring_corp/run.sh to understand the parts
4953
# that are provisioned in monitoring_corp's virtual private cloud.

‎examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/travel_app_corp/run.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ run() {
4444
aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
4545
chmod 400 key.pem
4646

47-
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
47+
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
48+
sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
4849
instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type t2.micro \
4950
--subnet-id "$subnet_id" --security-group-ids "$sg_id" \
5051
--key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
5152
aws ec2 create-tags --resources "$instance_id" --tags "Key=Name,Value=${name}-ec2-instance"
5253
aws ec2 wait instance-running --instance-ids "$instance_id"
5354
ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
54-
rm -f user_data.sh
5555

5656
until scp -o StrictHostKeyChecking=no -i ./key.pem ./client.js "ec2-user@$ip:client.js"; do sleep 10; done
5757
ssh -o StrictHostKeyChecking=no -i ./key.pem "ec2-user@$ip" \
@@ -65,7 +65,7 @@ cleanup() {
6565
# ----------------------------------------------------------------------------------------------------------------
6666
# DELETE INSTANCE
6767

68-
rm -f user_data.sh
68+
rm -rf user_data*.sh
6969
instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
7070
--query "Reservations[*].Instances[*].InstanceId")
7171
for i in $instance_ids; do

‎examples/command/portals/apis/nodejs/amazon_ec2/aws_cli/travel_app_corp/run_ockam.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
77
set -ex
88
99
# Install Ockam Command
10+
export OCKAM_VERSION="$OCKAM_VERSION"
1011
curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
1112
source "$HOME/.ockam/env"
1213

‎examples/command/portals/apis/python/amazon_ec2/aws_cli/monitoring_corp/run.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ run() {
4444
aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
4545
chmod 400 key.pem
4646

47-
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
47+
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
48+
sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
4849
instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type t2.micro \
4950
--subnet-id "$subnet_id" --security-group-ids "$sg_id" \
5051
--key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')

‎examples/command/portals/apis/python/amazon_ec2/aws_cli/monitoring_corp/run_ockam.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
77
set -ex
88
99
# Install Ockam Command
10+
export OCKAM_VERSION="$OCKAM_VERSION"
1011
curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
1112
source "$HOME/.ockam/env"
1213

‎examples/command/portals/apis/python/amazon_ec2/aws_cli/run.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ run() {
4545
travel_app_corp_ticket=$(ockam project ticket --usage-count 1 --expires-in 60m \
4646
--attribute "monitoring-api-inlet=true")
4747

48+
if [[ -n "$OCKAM_VERSION" ]]; then
49+
export OCKAM_VERSION="v${OCKAM_VERSION}";
50+
fi
51+
4852
# Invoke `monitoring_corp/run.sh` in the directory that has monitoring_corp's configuration. Pass the above
4953
# enrollment ticket as the first argument to run.sh script. Read monitoring_corp/run.sh to understand the parts
5054
# that are provisioned in monitoring_corp's virtual private cloud.

‎examples/command/portals/apis/python/amazon_ec2/aws_cli/travel_app_corp/run.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ run() {
4444
aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
4545
chmod 400 key.pem
4646

47-
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data.sh
47+
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
48+
sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data.sh
4849
instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type t2.micro \
4950
--subnet-id "$subnet_id" --security-group-ids "$sg_id" \
5051
--key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
5152
aws ec2 create-tags --resources "$instance_id" --tags "Key=Name,Value=${name}-ec2-instance"
5253
aws ec2 wait instance-running --instance-ids "$instance_id"
5354
ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
54-
rm -f user_data.sh
5555

5656
until scp -o StrictHostKeyChecking=no -i ./key.pem ./client.py "ec2-user@$ip:client.py"; do sleep 10; done
5757
ssh -o StrictHostKeyChecking=no -i ./key.pem "ec2-user@$ip" \
@@ -68,7 +68,7 @@ cleanup() {
6868
# ----------------------------------------------------------------------------------------------------------------
6969
# DELETE INSTANCE
7070

71-
rm -f user_data.sh
71+
rm -rf user_data*.sh
7272
instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
7373
--query "Reservations[*].Instances[*].InstanceId")
7474
for i in $instance_ids; do

‎examples/command/portals/apis/python/amazon_ec2/aws_cli/travel_app_corp/run_ockam.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
77
set -ex
88
99
# Install Ockam Command
10+
export OCKAM_VERSION="$OCKAM_VERSION"
1011
curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
1112
source "$HOME/.ockam/env"
1213

‎examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/analysis_corp/run.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ run() {
4545
aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
4646
chmod 400 key.pem
4747

48-
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > run_ockam_temp.sh
49-
cat run_repoaccess.sh run_ockam_temp.sh > user_data.sh
48+
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
49+
sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data2.sh
50+
cat run_repoaccess.sh user_data2.sh > user_data.sh
5051
instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type c5n.large \
5152
--subnet-id "$subnet_id" --security-group-ids "$sg_id" \
5253
--key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
5354
aws ec2 create-tags --resources "$instance_id" --tags "Key=Name,Value=${name}-ec2-instance"
5455
aws ec2 wait instance-running --instance-ids "$instance_id"
5556
ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
56-
rm -f run_ockam_temp.sh user_data.sh
5757

5858
until scp -o StrictHostKeyChecking=no -i ./key.pem ./app.js "ec2-user@$ip:app.js"; do sleep 10; done
5959
until scp -o StrictHostKeyChecking=no -i ./key.pem ../bank_corp/gitlab_rsa "ec2-user@$ip:gitlab_rsa"; do sleep 10; done
@@ -70,7 +70,8 @@ cleanup() {
7070
# ----------------------------------------------------------------------------------------------------------------
7171
# DELETE INSTANCE
7272

73-
rm -f run_ockam_temp.sh user_data.sh
73+
rm -rf user_data*.sh
74+
rm -rf run_repoaccess.sh
7475
instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-ec2-instance" \
7576
--query "Reservations[*].Instances[*].InstanceId")
7677
for i in $instance_ids; do

‎examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/analysis_corp/run_ockam.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
77
set -ex
88
99
# Install Ockam Command
10+
export OCKAM_VERSION="$OCKAM_VERSION"
1011
curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
1112
source "$HOME/.ockam/env"
1213

‎examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,12 @@ run() {
5454
aws ec2 create-key-pair --key-name "${name}-key" --query 'KeyMaterial' > key.pem
5555
chmod 400 key.pem
5656

57-
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > run_ockam_temp.sh
57+
sed "s/\$ENROLLMENT_TICKET/${enrollment_ticket}/g" run_ockam.sh > user_data1.sh
58+
sed "s/\$OCKAM_VERSION/${OCKAM_VERSION}/g" user_data1.sh > user_data2.sh
5859
sed "s|PUBLIC_KEY=\$SSH_PUBLIC_KEY|PUBLIC_KEY='$SSH_PUBLIC_KEY'|g" run_gitlab.sh > run_gitlab_temp.sh
5960

60-
cat run_gitlab_temp.sh run_ockam_temp.sh > user_data.sh
61+
cat run_gitlab_temp.sh user_data2.sh > user_data.sh
62+
6163
instance_id=$(aws ec2 run-instances --image-id "$ami_id" --instance-type c5n.large \
6264
--subnet-id "$subnet1_id" --security-group-ids "$sg_id" \
6365
--key-name "${name}-key" --user-data file://user_data.sh --query 'Instances[0].InstanceId')
@@ -66,7 +68,6 @@ run() {
6668
ip=$(aws ec2 describe-instances --instance-ids "$instance_id" --query 'Reservations[0].Instances[0].PublicIpAddress')
6769
sleep 180
6870
check_gitlab_availability "$ip"
69-
rm -f user_data.sh run_gitlab_temp.sh run_ockam_temp.sh
7071
}
7172

7273
check_gitlab_availability() {
@@ -100,7 +101,8 @@ cleanup() {
100101
# ----------------------------------------------------------------------------------------------------------------
101102
# DELETE INSTANCE
102103

103-
rm -f user_data.sh run_gitlab_temp.sh run_ockam_temp.sh
104+
rm -rf user_data*.sh
105+
rm -rf run_gitlab_temp.sh
104106
rm -f gitlab_rsa gitlab_rsa.pub
105107
instance_ids=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=${name}-gitlab-ec2" \
106108
--query "Reservations[*].Instances[*].InstanceId")

‎examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run_gitlab.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,3 @@ curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $ACCE
9898

9999
echo "SSH key added successfully."
100100
echo "Setup complete"
101-

‎examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run_ockam.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sudo -u ec2-user bash << 'EOS'
77
set -ex
88
99
# Install Ockam Command
10+
export OCKAM_VERSION="$OCKAM_VERSION"
1011
curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash
1112
source "$HOME/.ockam/env"
1213

‎examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/run.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ run() {
4444
analysis_corp_ticket=$(ockam project ticket --usage-count 1 --expires-in 60m \
4545
--attribute "gitlab-inlet=true")
4646

47+
if [[ -n "$OCKAM_VERSION" ]]; then
48+
export OCKAM_VERSION="v${OCKAM_VERSION}";
49+
fi
50+
4751
# Invoke `bank_corp/run.sh` in the directory that has bank_corp's configuration. Pass the above enrollment ticket
4852
# as the first argument to run.sh script. Read bank_corp/run.sh to understand the parts that are provisioned in
4953
# bank_corp's virtual private cloud.

0 commit comments

Comments
 (0)