cps-property-generator 0.3.4 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92bcebb64ae7a91987b380162300bebb2591a07260eedd5dca7f380d7e88ec5
-  data.tar.gz: ed617617d6453f496aa221c719ddf49f70d1ef9860324fcc3c222599d062eaef
+  metadata.gz: c9136a28b0b22964cfe78116a5baa2355f0d582336624a05ec0b1c37e1c96887
+  data.tar.gz: 1960f53fb08fd4911045072be3d85f7be78932b57fb6eb8593a0882c1fc70d8b
 SHA512:
-  metadata.gz: d37ff4bdb610ee0ce64b3c2674d5c4203db83197667c642323866e1277afd09e647006aeedc1e946c449e22e43bb0bb2095bae5d18f7e5dfa874c4e119f25054
-  data.tar.gz: 8f860efa224d1a67bba04bdfee0184d1a0217da9f2a2a0173c37ef2c5c075a991d0b5e14731ed85d060b007bc8e0d8664114b448cc60d5b25373f77f447aa489
+  metadata.gz: 8b1f580b49c991ad93efc8fd64e60c8762cb5446d0566edeccb5f3916839db5f8db43219f46054056731287cc74f6b31607d535752812380f3569b892827bdf4
+  data.tar.gz: f863f63f20700d9767143d4a935ddf005a9547bff1d33cb31f2b0007b0871b6769dad6571d43708bd0b5e16378ca7b67a8750d220603953f72d4a7477cc416e5

data/lib/generator/globals.rb

@@ -73,6 +73,25 @@ module PropertyGenerator
         end
       end
 
+      # If there are no environmental globals and there are account globals we have to merge them in
+      if condensed.empty? && !account_globals.empty?
+        # assemble the account to env mapping
+        mapping = {}
+
+        @environment_configs.each do |env, vals|
+          account = vals["account"]
+          next if account.nil?
+
+          mapping[account] = Array(mapping[account]).push(env)
+        end
+
+        account_globals.each do |account, env_account|
+          mapping[account].each do |env|
+            condensed[env] = env_account
+          end
+        end
+      end
+
       unless main_global.empty?
         # All environments need the main global definitions
         @environments.each do |env|

data/spec/lib/global_spec.rb

@@ -23,6 +23,9 @@ module PropertyGenerator
       expect(global.get_account_globals).to eq({
                                                  123456789012 => {
                                                    'my_account' => 123456789012
+                                                 },
+                                                 987654321098 => {
+                                                   'my_account' => 987654321098
                                                  }
                                                })
     end

data/spec/resources/globals/accounts/987654321098/987654321098.yml

@@ -0,0 +1 @@
+my_account: 987654321098

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cps-property-generator
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.7
 platform: ruby
 authors:
 - Bryan Call
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2023-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.117.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.117.2
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
 - spec/resources/config/config.yml
 - spec/resources/globals/accounts/123456789012/123456789012.yml
 - spec/resources/globals/accounts/123456789012/environments/my-test-env1.yml
+- spec/resources/globals/accounts/987654321098/987654321098.yml
 - spec/resources/globals/globals.yml
 - spec/resources/services/my-microservice-1.yml
 - spec/spec_helper.rb