cps-property-generator 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92bcebb64ae7a91987b380162300bebb2591a07260eedd5dca7f380d7e88ec5
-  data.tar.gz: ed617617d6453f496aa221c719ddf49f70d1ef9860324fcc3c222599d062eaef
+  metadata.gz: 90f86cd9b77d13d580141626eff83d20bd728cc75799d015ddbd7384def4195f
+  data.tar.gz: b1410f2a1b54e474ea907e129e5d33d41515a83fe573b54c3e640a022c7f9b4a
 SHA512:
-  metadata.gz: d37ff4bdb610ee0ce64b3c2674d5c4203db83197667c642323866e1277afd09e647006aeedc1e946c449e22e43bb0bb2095bae5d18f7e5dfa874c4e119f25054
-  data.tar.gz: 8f860efa224d1a67bba04bdfee0184d1a0217da9f2a2a0173c37ef2c5c075a991d0b5e14731ed85d060b007bc8e0d8664114b448cc60d5b25373f77f447aa489
+  metadata.gz: 0334b337bf71712e60b67a8648228e348bc2de4164fdb43d6cd57e77716101c35222004061c89793f61c190aaae845b2b57ecfa3e89706e0ecf4b6f96dd6f577
+  data.tar.gz: cab84ec3b1be510ca2ad557877193e1e5c2ef686c37e25d387d5b8296bb447f201c13c1ffcfcb6319de794f7e85ac687ede8e6bcf36161389c26e3941be86a24

data/lib/generator/generator.rb

@@ -26,7 +26,7 @@ module PropertyGenerator
       output = []
       @service_list.each do |service, path|
         PropertyGenerator.config_enforcer(@configs.environment_configs)
-        service_instance = PropertyGenerator::Service.new(YAML.load_file(path), @configs, @globals)
+        service_instance = PropertyGenerator::Service.new(YAML.load_file(path, permitted_classes: [Time]), @configs, @globals)
         service_instance.service
         service_instance.interpolate
 

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/lib/helpers/helpers.rb

@@ -87,6 +87,7 @@ module PropertyGenerator
       puts "Destination: #{account}/#{file_region}/#{filename}"
       puts "Uploading: #{file}"
       obj = s3.bucket(bucket).object("#{account}/#{file_region}/#{filename}")
+      obj.acl.put({ acl: "bucket-owner-full-control" })
       obj.upload_file(file)
     end
 

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,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cps-property-generator
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.1
 platform: ruby
 authors:
 - Bryan Call
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: '0'
 - !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
@@ -177,14 +178,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.5.14
 signing_key: 
 specification_version: 4
 summary: Centralized Property Service json file generator