Merge branch 'fixed_vpc_validator' into bug_fix

2016-02-08 15:50:06 +03:00 · 2016-02-08 15:50:06 +03:00 · d4ebdad1fb
commit d4ebdad1fb
parent 3942ac59bb bc37eac6d9
1 changed files with 2 additions and 1 deletions
--- a/devops-service/db/validators/field_validators/vpc.rb
+++ b/devops-service/db/validators/field_validators/vpc.rb
@ -7,7 +7,8 @@ module Validators
      def valid?
        provider = ::Provider::ProviderFactory.get(@model.provider, @model.provider_account)
        vpcs = provider.describe_vpcs
-        vpcs.keys.include?(@value)
+        ids = vpcs.map{|v| v["vpc_id"]}
+        ids.include?(@value)
      rescue
        raise "Invalid provider account '#{@model.provider_account}'"
      end