cfndsl 1.3.3 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f9e4225237504ceeefb412f00d2b40155ffe6f6997630a9a2a8cac3f1c0e4ac
-  data.tar.gz: c2252302422353a946fd82f7a52d8961380cf7c1c824fb32728eeeeb91bb1d6b
+  metadata.gz: 1ceb84791ba82ab87bc436044190c38d88977e91ba3000a23eda817223a5a7a1
+  data.tar.gz: f70d20c384bffe9739301c6b3b8ba40ebe3d605de99b8a46ebe715e178492b30
 SHA512:
-  metadata.gz: dce14c2caef119a285ef6c76b9895d5bbfa80936d77c61a3955501c2f72646503295ec5a2c2fc0aab3ab28d131669e7a38c80ee4e2b9d0e51e1558c02b34d57b
-  data.tar.gz: f7620f53641683b52a125185c87cef06aee2dca097171aaf292106808bcf83fb1124bf688d4f90c12f057cf521b80c3a49bc87128db5166905f54d0578c1a6a1
+  metadata.gz: 19af4bc25b347cc61363cd6500ed59fb913182d5a4ce32c5c0754d5eca33bc78de168ebbb584d55e2f801a9a7076675b425b758c627bf4d2114646e5761b8ed8
+  data.tar.gz: 989bad5d7dc8a08011290f066d3de6fc9b082b6b6ec92604407497eae26c7aaf84782dadc89211691b9e8a0fbb3aabe8d53030613e3cf2bce064288986e1647a

data/.github/workflows/spec.yml

@@ -0,0 +1,28 @@
+name: Spec
+
+on:
+  push:
+    branches:
+      - "**"
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Update system gems
+        run: gem update --system
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/.github/workflows/spec_publish.yml

@@ -0,0 +1,36 @@
+name: Spec and publish
+
+on:
+  push:
+    tags:
+     - 'v*'
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ['3.0']
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Update system gems
+        run: gem update --system
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake
+
+      - name: Publish Gem
+        if: contains(github.ref, 'refs/tags/v')
+        uses: cadwallion/publish-rubygems-action@master
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RELEASE_COMMAND: bundle exec rake release

data/.rubocop.yml

@@ -47,3 +47,4 @@ AllCops:
   TargetRubyVersion: 2.6
   Exclude:
     - 'tmp/**/*'
+    - 'vendor/**/*'

data/CHANGELOG.md

@@ -1,8 +1,29 @@
 # Changelog
 
-## [1.3.3](https://github.com/cfndsl/cfndsl/tree/1.3.3) (2021-07-15)
+## [v1.3.5](https://github.com/cfndsl/cfndsl/tree/v1.3.5) (2022-06-07)
 
-[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.3.2...1.3.3)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.3.4...v1.3.5)
+
+**Closed issues:**
+
+- List ItemType in the specification file breaking template generation with spec version 69.0.0 [\#474](https://github.com/cfndsl/cfndsl/issues/474)
+
+**Merged pull requests:**
+
+- patch for sagemaker untyped tag [\#478](https://github.com/cfndsl/cfndsl/pull/478) ([gergnz](https://github.com/gergnz))
+- Remove TravisCI [\#477](https://github.com/cfndsl/cfndsl/pull/477) ([elmobp](https://github.com/elmobp))
+
+## [v1.3.4](https://github.com/cfndsl/cfndsl/tree/v1.3.4) (2022-05-16)
+
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.3.3...v1.3.4)
+
+**Merged pull requests:**
+
+- handle List ItemType in the spec file [\#475](https://github.com/cfndsl/cfndsl/pull/475) ([Guslington](https://github.com/Guslington))
+
+## [v1.3.3](https://github.com/cfndsl/cfndsl/tree/v1.3.3) (2021-07-14)
+
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.3.2...v1.3.3)
 
 **Merged pull requests:**
 
@@ -740,6 +761,9 @@
 **Merged pull requests:**
 
 - Application Autoscaling Types [\#271](https://github.com/cfndsl/cfndsl/pull/271) ([kornypoet](https://github.com/kornypoet))
+- Certificate manager type [\#267](https://github.com/cfndsl/cfndsl/pull/267) ([kornypoet](https://github.com/kornypoet))
+- Add monitoring properties to AWS::RDS::DBInstance [\#266](https://github.com/cfndsl/cfndsl/pull/266) ([mikechau](https://github.com/mikechau))
+- Add support for AWS::KMS::Alias [\#265](https://github.com/cfndsl/cfndsl/pull/265) ([mikechau](https://github.com/mikechau))
 
 ## [v0.11.8](https://github.com/cfndsl/cfndsl/tree/v0.11.8) (2016-11-13)
 
@@ -749,12 +773,6 @@
 
 - Support for Export/Import values from stacks [\#260](https://github.com/cfndsl/cfndsl/issues/260)
 
-**Merged pull requests:**
-
-- Certificate manager type [\#267](https://github.com/cfndsl/cfndsl/pull/267) ([kornypoet](https://github.com/kornypoet))
-- Add monitoring properties to AWS::RDS::DBInstance [\#266](https://github.com/cfndsl/cfndsl/pull/266) ([mikechau](https://github.com/mikechau))
-- Add support for AWS::KMS::Alias [\#265](https://github.com/cfndsl/cfndsl/pull/265) ([mikechau](https://github.com/mikechau))
-
 ## [v0.11.6](https://github.com/cfndsl/cfndsl/tree/v0.11.6) (2016-10-23)
 
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.11.5...v0.11.6)
@@ -1005,10 +1023,6 @@
 
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.8.2...v0.8.3)
 
-**Fixed bugs:**
-
-- Add tag arguments [\#188](https://github.com/cfndsl/cfndsl/pull/188) ([kornypoet](https://github.com/kornypoet))
-
 ## [v0.8.2](https://github.com/cfndsl/cfndsl/tree/v0.8.2) (2016-04-27)
 
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.8.1...v0.8.2)
@@ -1037,10 +1051,6 @@
 
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.6.2...v0.7.0)
 
-**Implemented enhancements:**
-
-- Fix the issue with plural types [\#153](https://github.com/cfndsl/cfndsl/pull/153) ([johnf](https://github.com/johnf))
-
 ## [v0.6.2](https://github.com/cfndsl/cfndsl/tree/v0.6.2) (2016-04-19)
 
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.6.1...v0.6.2)

data/Gemfile

@@ -8,6 +8,7 @@ gem 'json'
 
 group :development, :test do
   gem 'github_changelog_generator', require: false
+  gem 'panolint', require: false
   gem 'rubocop', require: false
   gem 'yamllint', require: false
 end

data/Rakefile

@@ -8,8 +8,10 @@ require 'yamllint/rake_task'
 require 'github_changelog_generator/task'
 require 'cfndsl/rake_task'
 
-RSpec::Core::RakeTask.new
-RuboCop::RakeTask.new
+# RSpec::Core::RakeTask.new
+RuboCop::RakeTask.new do |t|
+  t.options = ['--debug', '--cache=false']
+end
 
 desc 'Run RSpec with SimpleCov'
 task :cov do
@@ -20,7 +22,6 @@ end
 YamlLint::RakeTask.new do |t|
   t.paths = %w[
     sample/t1.yaml
-    .travis.yml
     .rubocop.yml
   ]
 end
@@ -99,5 +100,5 @@ task :bump, :type do |_, args|
   puts 'Pushing tag'
   `git push origin v#{version}`
 
-  puts 'All done, travis should pick up and release the gem now!'
+  puts 'All done, GitHub should pick up and release the gem now!'
 end

data/lib/cfndsl/aws/patches/901_SageMakerTags_patch.json

@@ -0,0 +1,23 @@
+{
+  "broken": "75.0.0",
+  "ResourceTypes": {
+    "AWS::SageMaker::ModelPackage": {
+      "patch": {
+        "operations": [
+          {
+            "op": "replace",
+            "path": "/Properties/Tag",
+            "value": {
+              "Type": "List",
+              "ItemType": "Tag",
+              "Required": false,
+              "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-device.html#cfn-sagemaker-device-tags",
+              "UpdateType": "Mutable"
+            }
+          }
+        ],
+        "description": "Fix SageMaker Device to be List of Tag"
+      }
+    }
+  }
+}

data/lib/cfndsl/types.rb

@@ -28,7 +28,7 @@ module CfnDsl
       { 'Resources' => resources, 'Types' => types, 'Version' => spec.version, 'File' => spec.file }
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/AbcSize
     def self.extract_resources(spec)
       spec.each_with_object({}) do |(resource_name, resource_info), resources|
         properties = resource_info['Properties'].each_with_object({}) do |(property_name, property_info), extracted|
@@ -43,6 +43,8 @@ module CfnDsl
               Array(property_info['PrimitiveItemType'])
             elsif property_info['PrimitiveTypes']
               property_info['PrimitiveTypes'][0]
+            elsif property_info['ItemType'] == 'List'
+              'List'
             elsif property_info['ItemType']
               extract_list_type(resource_name.split('::').join, property_info)
             elsif property_info['Type']
@@ -61,7 +63,7 @@ module CfnDsl
       end
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/MethodLength
+    # rubocop:disable Metrics/PerceivedComplexity
     def self.extract_types(spec)
       primitive_types = {
         'String' => 'String',
@@ -73,7 +75,8 @@ module CfnDsl
         'Double' => 'Double',
         'Timestamp' => 'Timestamp',
         'Map' => 'Map',
-        'Long' => 'Long'
+        'Long' => 'Long',
+        'List' => 'List'
       }
       spec.each_with_object(primitive_types) do |(property_name, property_info), types|
         # In order to name things uniquely and allow for connections

data/lib/cfndsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CfnDsl
-  VERSION = '1.3.3'
+  VERSION = '1.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.6
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,9 +52,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/spec.yml"
+- ".github/workflows/spec_publish.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -84,6 +85,7 @@ files:
 - lib/cfndsl/aws/patches/600_RefKinds_patch.json
 - lib/cfndsl/aws/patches/700_SAM_Serverless_Function_InlineCode_patch.json
 - lib/cfndsl/aws/patches/900_SageMakerTags_patch.json
+- lib/cfndsl/aws/patches/901_SageMakerTags_patch.json
 - lib/cfndsl/aws/resource_specification.json
 - lib/cfndsl/aws/types.rb
 - lib/cfndsl/aws/types.yaml
@@ -192,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: AWS Cloudformation DSL

data/.travis.yml

@@ -1,24 +0,0 @@
-language: ruby
-rvm:  # all MRI ruby versions that are not EOL
-- '2.7'
-- '2.6'
-- '3.0'
-sudo: false
-before_install:
-  - gem update --system
-  - gem install bundler
-deploy:
-  provider: rubygems
-  api_key:
-    secure: cIDF27JCirxxg7SXw6R+xxABMwCrrirJiJzljVxb/MdlRyUVaSW8XdZjOVyNgJkCx+vQOX4U+hp+p0xVI/Loh4EXkgbDvu2oGIAn/g1lfWabwKtdkFEviQn4tWvqDcEkxm5Hm6Gs0pFCaurqynMPNbsLVAEIiSw+la8LxEeeQ6I=
-  gem: cfndsl
-  on:
-    tags: true
-    repo: cfndsl/cfndsl
-    ruby: '2.7'
-notifications:
-  email:
-    recipients:
-    - gergnz@gmail.com
-    on_failure: change
-    on_success: never