cloudstrap-azure 0.6.2.pre → 0.7.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a6db7b5576a1d3f791d713a942f1544b8718a14da6bc1dcf549f00ec790b943
-  data.tar.gz: f4ecd4d68b973932110bf9dc3a1ed8a93830f55bf9c7c3d890d65f6510689c2c
+  metadata.gz: b8157e5960128618648c4da46d2f98d21f896161f40a8bf6b565057b9f251d7a
+  data.tar.gz: bd3cf8ea3ac38c8c52c3160c0bf8bbe0c13fe2145d87b68237afd084a759757c
 SHA512:
-  metadata.gz: 5538afd73118953d0d8873e22aedfffdae7b46b460061248bed34136dcd088a3812a346b0638d9a84caf24bae161aa251bca1e22d75bed67b2b12621ec4ca713
-  data.tar.gz: 1d52f8bc49602f8992c70632675f32d30cdc5c40ad921209fbb626881dca158ad0dd76b315ce44ac62526445acac4e09159437b3078e6ebb4f181846d0dff4e9
+  metadata.gz: e5279876e16b7b7d1bec27c0622e5ff401cea22d3f8fd032773155f3344dbf3a1bc5fc1c6c0432063c56be3a97770083ed4aa8addbeb670d7c76500358f6cef5
+  data.tar.gz: 94b828772c08ea5624244fa05d2fa42001a941305d730c72b0db442a51ade75b825c0eba85464b1eb252b4e93be2ba3d647013e4d003571a6a325ddbb97c080b

data/command/internal/cloudstrap-azure.deploy

@@ -72,7 +72,7 @@ If                 = ->(predicate, consequent, alternative = Nothing) {
     predicate.(*arguments) ? consequent.(*arguments) : alternative.(*arguments) } }
 ApplyIf            = ->(predicate, consequent) { If.(predicate, consequent, Itself) }
 
-LONGEST_MESSAGE = 30
+LONGEST_MESSAGE = 36
 
 WhileSpinning = lambda do |message, report: nil, &block|
   Concurrent::IVar.new.tap do |ivar|
@@ -445,22 +445,22 @@ KubernetesMasterSecurityGroup = ->(resource_group) {
       .list(resource_group.name)
       .find { |network_security_group| network_security_group.name == name }}}
 
-FindSecurityRule = ->(network_security_group) {
-  WhileSpinning.("Security Rule Exists", report: :name) {
+FindSecurityRule = ->(network_security_group, port) {
+  WhileSpinning.("Security Rule Exists for Port #{port}", report: :name) {
     network_security_group
       .security_rules
-      .find { |security_rule| security_rule.name == Chamber.env.identifier }}}
+      .find { |security_rule| security_rule.name == "#{Chamber.env.identifier}-#{port}" }}}
 
-CreateSecurityRule = ->(network_security_group, resource_group) {
-  WhileSpinning.("Create Security Rule", report: :name) {
+CreateSecurityRule = ->(network_security_group, port, resource_group) {
+  WhileSpinning.("Create Security Rule for Port #{port}", report: :name) {
     AzureAPI::Network::SecurityRules.create_or_update(
       resource_group.name,
       network_security_group.name,
-      Chamber.env.identifier,
+      "#{Chamber.env.identifier}-#{port}",
       AzureAPI::Network::Models::SecurityRule.new.tap { |security_rule|
         security_rule.access                     = 'Allow'
         security_rule.destination_address_prefix = '*'
-        security_rule.destination_port_ranges    = [80,443,4443,2222,2793]
+        security_rule.destination_port_ranges    = [port]
         security_rule.direction                  = AzureAPI::Network::Models::SecurityRuleDirection::Inbound
         security_rule.priority                   = network_security_group.security_rules.map(&:priority).max.next
         security_rule.protocol                   = 'Tcp'
@@ -564,7 +564,14 @@ public_ip_address      = FindPublicIPv4.(resource_group)                  || Cre
 container_service      = FindContainerService.(resource_group)            || CreateContainerService.(service_principal, resource_group)
 
 network_security_group = KubernetesMasterSecurityGroup.(resource_group)
-security_rule          = FindSecurityRule.(network_security_group)        || CreateSecurityRule.(network_security_group, resource_group)
+
+security_rules = [80,443,4443,2222,2793].map do |port|
+  [
+    port,
+    (FindSecurityRule.(network_security_group, port) || CreateSecurityRule.(network_security_group = KubernetesMasterSecurityGroup.(resource_group), port, resource_group))
+  ]
+end.to_h
+
 network_interface      = FindNetworkInterface.(resource_group)
 association            = AssociatePublicIP.(resource_group, network_interface, public_ip_address)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstrap-azure
 version: !ruby/object:Gem::Version
-  version: 0.6.2.pre
+  version: 0.7.0.pre
 platform: ruby
 authors:
 - Chris Olstrom
@@ -34,7 +34,7 @@ cert_chain:
   EIKh6yDoB+oCRuiTV0uw/lKE2PtbONhJb7uN1qhZqla/iBpmUjiEu8+skI+ygv9n
   7Krw8FJrV3+VRCiZTPKHeshAfL9yeIZh
   -----END CERTIFICATE-----
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_graph_rbac