stackit 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39c2acbc470ade26621ca98efb4022dc6a6fee1
-  data.tar.gz: 399b7ae0ffe05e4eb97cc515ca8163ebf0f5efdb
+  metadata.gz: de939371b4c2853953a61ce1851f1ac00e2bad9a
+  data.tar.gz: 3b5b469c61b4a782c48c026b59b00f15b9bc315d
 SHA512:
-  metadata.gz: bae425a405e846166d0a9e83b83f1ba9bf4dbe1b937943f0ddb463dab8f91bcb14eabe272910f14fb0477d8a023d605f39cfa5c6302f06ded70edfa9a9f9c8d4
-  data.tar.gz: ebecc281df32b6392c39f1b217722fa27901a83c156acadc9d96c2503a0d5734c95f6194d5873f5d69fd3bfe82c42843a5eb4c4fc6eda751354a8909120bfdf2
+  metadata.gz: 0e41b598ae066cec28c01cf73671c8e624c633aae1c835f53035bf3934eef2c7b826371c149d6f8f1c1362005fe849a8be0f980e11f82b87dcc4b77523a2ab8d
+  data.tar.gz: 0b428e5bfb1a5b863bc2344624d9fd67b4ff3896bbe4abaa907bc7ddc61173dc49d375a09732fc4caa1aa920920482eae5122820866f01fadbd1116e451708b1

data/lib/stackit/mixin/availability_zone.rb

@@ -1,39 +1,36 @@
 module Stackit::Mixin::AvailabilityZone
 
-  def selected_az_sym
-    selected_az.keys[0].to_sym
+  attr_accessor :az_syms
+
+  def az_syms=(keys)
+    @az_syms = keys.each{ |key|
+      key = key.to_sym
+    }
   end
 
-  def selected_az_value
-    selected_az.values[0]
+  def selected_az_sym
+    selected_az_hash.keys[0].to_sym
   end
 
-  def subnet_id_for_selected_az(tier, az_sym = selected_az_sym)
-    az_subnet_mapping = az_subnet_map(tier)
-    selected_subnet_key = az_subnet_mapping[az_sym]
-    resolve_parameter(selected_subnet_key)
+  def selected_az
+    selected_az_hash.values[0]
   end
 
-  def random_az(keys = default_az_keys)
-    resolve_parameters(keys).split(',').sample
+  def random_az
+    resolve_parameters(az_syms).split(',').sample
   end
 
-  def random_az_as_hash(keys = default_az_keys)
-    sampled_az_key = default_az_keys.sample
-    sampled_az_value = resolve_parameter(sampled_az_key.to_sym)
+  def random_az_hash
+    sampled_az_sym = az_syms.sample 
     {
-      sampled_az_key => sampled_az_value
+      sampled_az_sym => resolve_parameter(sampled_az_sym)
     }
   end
 
  private
 
-  def default_az_keys
-    [:VpcAvailabilityZone1, :VpcAvailabilityZone2, :VpcAvailabilityZone3]
-  end
-
-  def selected_az
-    @selected_az ||= random_az_as_hash
+  def selected_az_hash
+    @selected_az_hash ||= random_az_hash
   end
 
 end

data/lib/stackit/mixin/tier.rb

@@ -5,30 +5,44 @@ module Stackit::Mixin::Tier
   include Stackit::Mixin::AvailabilityZone
 
   attr_accessor :tier
+  attr_accessor :tier_map
 
   def tier=(tier)
     @tier = tier.to_sym
   end
 
-  def random_tier_az
-    random_az ||= random_az_as_hash
+  def tier_map=(map)
+    @tier_map = map
   end
 
-  def random_tier_az_sym
-    random_tier_az.keys[0].to_sym
+  def selected_subnet_sym
+    tier_map[tier][selected_az_sym]
   end
 
-  def random_tier_az_value
-   random_tier_az.values[0]
+  def selected_subnet
+    resolve_parameter(selected_subnet_sym)
+  end
+
+  def subnets
+    resolve_parameters(tier_map[tier].values)
+  end
+
+  def random_subnet
+    random_az_and_subnet[:subnet]
+  end
+
+  def random_subnet_sym
+    random_az = random_az_hash
+    random_az_sym = random_az.keys[0]
+    tier_map[tier][random_az_sym]
   end
 
   def random_az_and_subnet
-    random_az = random_az_as_hash
-    random_az_sym = random_az.keys[0].to_sym
+    random_az = random_az_hash
+    random_az_sym = random_az.keys[0]
     random_az_value = random_az.values[0]
-    az_subnet_mapping = az_subnet_map(tier)
-    selected_subnet_key = az_subnet_mapping[random_az_sym]
-    resolved_subnet = resolve_parameter(selected_subnet_key)
+    selected_subnet_sym = tier_map[tier][random_az_sym]
+    resolved_subnet = resolve_parameter(selected_subnet_sym)
     {
       :az => random_az_value,
       :subnet => resolved_subnet

data/lib/stackit/version.rb

@@ -1,3 +1,3 @@
 module Stackit
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jeremy Hahn