diff --git a/devops-service/db/mongo/models/stack_template/stack_template_ec2.rb b/devops-service/db/mongo/models/stack_template/stack_template_ec2.rb index 371a6d4..20b3d03 100644 --- a/devops-service/db/mongo/models/stack_template/stack_template_ec2.rb +++ b/devops-service/db/mongo/models/stack_template/stack_template_ec2.rb @@ -36,7 +36,7 @@ module Devops def generate_template_file_and_upload_to_storage(id, json) uniq_filename = "#{id}-#{SecureRandom.hex}.template" - provider_instance.store_file(uniq_filename, json)['url'] + provider_instance.store_stack_template(uniq_filename, json)['url'] end end diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb index b62a32f..b0e8e2a 100644 --- a/devops-service/providers/ec2.rb +++ b/devops-service/providers/ec2.rb @@ -320,11 +320,13 @@ module Provider self.compute.describe_vpcs.body["vpcSet"].select{|v| v["state"] == "available"}.map{|v| {"vpc_id" => v["vpcId"], "cidr" => v["cidrBlock"] } } end - # use public_url for a while because there is no possibility to create - # non expiring private links via fog - def store_file(filename, json) + def store_stack_template(filename, json) + store_file(stack_templates_bucket, filename, json) + end + + def store_file(bucket, filename, body) { - 'url' => stack_templates_bucket.files.create(key: filename, body: json, public: true).public_url + 'url' => bucket.files.create(key: filename, body: body, public: true).public_url } end