Merge "add support for per gw supported_plans"

cloudfoundry-attic · Nov 9, 2012 · 0963f95 · 0963f95
2 parents 89b97be + 5b49f65
commit 0963f95
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 7 deletions.
diff --git a/jobs/memcached_gateway/templates/memcached_gateway.yml.erb b/jobs/memcached_gateway/templates/memcached_gateway.yml.erb
@@ -5,7 +5,12 @@ gateway = eval("properties.#{service}_gateway")
 acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
-plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+supported_plans = properties.supported_plans
+if supported_plans
+  plan_mgmt.instance_eval("def fields; @table.keys.select { |v| #{supported_plans}.include? v.to_s }; end;") if plan_mgmt
+else
+  plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+end
 supported_versions = gateway.supported_versions
 version_aliases = gateway.version_aliases
 version_aliases.instance_eval("def fields; @table.keys; end;") if version_aliases

diff --git a/jobs/mongodb_gateway/templates/mongodb_gateway.yml.erb b/jobs/mongodb_gateway/templates/mongodb_gateway.yml.erb
@@ -5,7 +5,12 @@ gateway = eval("properties.#{service}_gateway")
 acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
-plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+supported_plans = properties.supported_plans
+if supported_plans
+  plan_mgmt.instance_eval("def fields; @table.keys.select { |v| #{supported_plans}.include? v.to_s }; end;") if plan_mgmt
+else
+  plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+end
 supported_versions = gateway.supported_versions
 version_aliases = gateway.version_aliases
 version_aliases.instance_eval("def fields; @table.keys; end;") if version_aliases

diff --git a/jobs/mysql_gateway/templates/mysql_gateway.yml.erb b/jobs/mysql_gateway/templates/mysql_gateway.yml.erb
@@ -5,7 +5,12 @@ gateway = eval("properties.#{service}_gateway")
 acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
-plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+supported_plans = properties.supported_plans
+if supported_plans
+  plan_mgmt.instance_eval("def fields; @table.keys.select { |v| #{supported_plans}.include? v.to_s }; end;") if plan_mgmt
+else
+  plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+end
 supported_versions = gateway.supported_versions
 version_aliases = gateway.version_aliases
 version_aliases.instance_eval("def fields; @table.keys; end;") if version_aliases

diff --git a/jobs/postgresql_gateway/templates/postgresql_gateway.yml.erb b/jobs/postgresql_gateway/templates/postgresql_gateway.yml.erb
@@ -5,7 +5,12 @@ gateway = eval("properties.#{service}_gateway")
 acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
-plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+supported_plans = properties.supported_plans
+if supported_plans
+  plan_mgmt.instance_eval("def fields; @table.keys.select { |v| #{supported_plans}.include? v.to_s }; end;") if plan_mgmt
+else
+  plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+end
 supported_versions = gateway.supported_versions
 version_aliases = gateway.version_aliases
 version_aliases.instance_eval("def fields; @table.keys; end;") if version_aliases

diff --git a/jobs/rabbit_gateway/templates/rabbit_gateway.yml.erb b/jobs/rabbit_gateway/templates/rabbit_gateway.yml.erb
@@ -5,7 +5,12 @@ gateway = eval("properties.#{service}_gateway")
 acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
-plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+supported_plans = properties.supported_plans
+if supported_plans
+  plan_mgmt.instance_eval("def fields; @table.keys.select { |v| #{supported_plans}.include? v.to_s }; end;") if plan_mgmt
+else
+  plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+end
 supported_versions = gateway.supported_versions
 version_aliases = gateway.version_aliases
 version_aliases.instance_eval("def fields; @table.keys; end;") if version_aliases

diff --git a/jobs/redis_gateway/templates/redis_gateway.yml.erb b/jobs/redis_gateway/templates/redis_gateway.yml.erb
@@ -5,7 +5,12 @@ gateway = eval("properties.#{service}_gateway")
 acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
-plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+supported_plans = properties.supported_plans
+if supported_plans
+  plan_mgmt.instance_eval("def fields; @table.keys.select { |v| #{supported_plans}.include? v.to_s }; end;") if plan_mgmt
+else
+  plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+end
 supported_versions = gateway.supported_versions
 version_aliases = gateway.version_aliases
 version_aliases.instance_eval("def fields; @table.keys; end;") if version_aliases

diff --git a/jobs/vblob_gateway/templates/vblob_gateway.yml.erb b/jobs/vblob_gateway/templates/vblob_gateway.yml.erb
@@ -5,7 +5,12 @@ gateway = eval("properties.#{service}_gateway")
 acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
-plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+supported_plans = properties.supported_plans
+if supported_plans
+  plan_mgmt.instance_eval("def fields; @table.keys.select { |v| #{supported_plans}.include? v.to_s }; end;") if plan_mgmt
+else
+  plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
+end
 supported_versions = gateway.supported_versions
 version_aliases = gateway.version_aliases
 version_aliases.instance_eval("def fields; @table.keys; end;") if version_aliases