Merge branch 'master' into do-not-confuse-yamltojson

.releaserc

@@ -0,0 +1,27 @@
+{
+    "branch": "master",
+    "plugins": [
+        "@semantic-release/commit-analyzer",
+        "@semantic-release/release-notes-generator",
+        [
+            "@semantic-release/changelog",
+            {
+                "changelogFile": "CHANGELOG.md",
+                "changelogTitle": "# GoFormation Versioning Changelog"
+            }
+        ],
+        [
+            "@semantic-release/git",
+            {
+                "assets": [
+                    "CHANGELOG.md",
+                    "AUTHORS.md"
+                ]
+            }
+        ],
+        [
+            "@semantic-release/github"
+        ]
+    ]
+}
+

.travis.yml

@@ -1,29 +1,36 @@
 language: go
-
-matrix:
-  include:
-  - go: "1.10.x"
-    script:  go test -v ./...
-  - go: "1.11.x"
-    script: go test -v -mod=vendor ./...
+go:
+  - 1.11.x
 
 env:
   - GO111MODULE=on
 
 install: true
 
-after_success:
-  # Check for updated CloudFormation resources, and submit a PR 
-  # - test "${TRAVIS_EVENT_TYPE}" = "cron" && ./generate/create-pull-request.sh
-  - ./generate/create-pull-request.sh
+jobs:
+  include:
+    - stage: test
+      script: go test -v -mod=vendor ./...
 
-# deploy:
-#   provider: script
-#   skip_cleanup: true
-#   script: 
-
-#     # Use nvm to install and use the Node LTS version (nvm is installed on all Travis images)
-#     - nvm install lts/*
+    # Define a stage that will auto-generate CloudFormation resources from the official
+    # AWS CloudFormation Resource Specification on a daily basis (run via a travis cron)
+    - stage: regenerate
+      if: type = cron
+      script: generate/create-pull-request.sh
 
-#     # Run semantic-release only on one job, after all other are successful
-#     - npx travis-deploy-once "npx semantic-release"
+    # Define the release stage that runs semantic-release
+    - stage: release
+      if: type = push
+      language: node_js
+      node_js: lts/*
+      before_install: skip
+      deploy:
+        provider: script
+        skip_cleanup: true
+        script: >-
+          go get github.com/myii/maintainer &&
+          maintainer contributor &&
+          npm install @semantic-release/changelog@3 -D &&
+          npm install @semantic-release/exec@3 -D &&
+          npm install @semantic-release/git@7 -D &&
+          npx semantic-release@15

AUTHORS.md

@@ -0,0 +1,29 @@
+# Authors
+
+This list is sorted by the number of commits per contributor in _descending_ order.
+
+Avatar|Contributor|Contributions
+:-:|---|:-:
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/4678446?v=4' width='36' height='36' alt='@PaulMaddox'>|[@PaulMaddox](https://github.com/PaulMaddox)|262
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/31303332?v=4' width='36' height='36' alt='@goformation'>|[@goformation](https://github.com/goformation)|40
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/331436?v=4' width='36' height='36' alt='@grahamjenson'>|[@grahamjenson](https://github.com/grahamjenson)|13
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/339849?v=4' width='36' height='36' alt='@pesama'>|[@pesama](https://github.com/pesama)|12
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/432692?v=4' width='36' height='36' alt='@parsnips'>|[@parsnips](https://github.com/parsnips)|8
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/484245?v=4' width='36' height='36' alt='@clareliguori'>|[@clareliguori](https://github.com/clareliguori)|7
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/22755571?v=4' width='36' height='36' alt='@sanathkr'>|[@sanathkr](https://github.com/sanathkr)|7
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3868295?v=4' width='36' height='36' alt='@resios'>|[@resios](https://github.com/resios)|7
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/508179?v=4' width='36' height='36' alt='@neoandroid'>|[@neoandroid](https://github.com/neoandroid)|3
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/7834613?v=4' width='36' height='36' alt='@evantorrie'>|[@evantorrie](https://github.com/evantorrie)|2
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/142510?v=4' width='36' height='36' alt='@majasb'>|[@majasb](https://github.com/majasb)|2
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/38672686?v=4' width='36' height='36' alt='@sam-goodwin'>|[@sam-goodwin](https://github.com/sam-goodwin)|2
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/482239?v=4' width='36' height='36' alt='@stilvoid'>|[@stilvoid](https://github.com/stilvoid)|2
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/857609?v=4' width='36' height='36' alt='@adamchainz'>|[@adamchainz](https://github.com/adamchainz)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/2552323?v=4' width='36' height='36' alt='@billyshambrook'>|[@billyshambrook](https://github.com/billyshambrook)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/983?v=4' width='36' height='36' alt='@statik'>|[@statik](https://github.com/statik)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/801084?v=4' width='36' height='36' alt='@lsuss'>|[@lsuss](https://github.com/lsuss)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/3982807?v=4' width='36' height='36' alt='@rjlohan'>|[@rjlohan](https://github.com/rjlohan)|1
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/35301479?v=4' width='36' height='36' alt='@manuel-trejo-rico'>|[@manuel-trejo-rico](https://github.com/manuel-trejo-rico)|1
+
+---
+
+Auto generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-03-10.

CHANGELOG.md

@@ -0,0 +1,95 @@
+# GoFormation Versioning Changelog
+
+# [2.2.0](https://github.com/awslabs/goformation/compare/v2.1.5...v2.2.0) (2019-03-10)
+
+
+### Features
+
+* **schema:** regenerated resources to apply SAM schema fixes from previous PR ([b30c019](https://github.com/awslabs/goformation/commit/b30c019))
+
+## [2.1.5](https://github.com/awslabs/goformation/compare/v2.1.4...v2.1.5) (2019-03-10)
+
+
+### Bug Fixes
+
+* **parser:** do not break if a non-intrinsic `Condition` statement is found in a YAML template ([#169](https://github.com/awslabs/goformation/issues/169)) ([e4671e3](https://github.com/awslabs/goformation/commit/e4671e3))
+
+## [2.1.4](https://github.com/awslabs/goformation/compare/v2.1.3...v2.1.4) (2019-03-10)
+
+
+### Bug Fixes
+
+* **schema:** fixed incorrect field type for AWS::Serverless::Application.Location ([#167](https://github.com/awslabs/goformation/issues/167)) ([3f1817b](https://github.com/awslabs/goformation/commit/3f1817b))
+
+## [2.1.3](https://github.com/awslabs/goformation/compare/v2.1.2...v2.1.3) (2019-03-10)
+
+
+### Bug Fixes
+
+* **schema:** maps within YAML templates should allow unknown fields/properties ([3b6e359](https://github.com/awslabs/goformation/commit/3b6e359))
+
+## [2.1.2](https://github.com/awslabs/goformation/compare/v2.1.1...v2.1.2) (2019-03-10)
+
+
+### Bug Fixes
+
+* **CI:** fix broken GitHub PR integration ([#185](https://github.com/awslabs/goformation/issues/185)) ([d42d00a](https://github.com/awslabs/goformation/commit/d42d00a))
+
+## [2.1.1](https://github.com/awslabs/goformation/compare/v2.1.0...v2.1.1) (2019-03-10)
+
+
+### Bug Fixes
+
+* **CI:** only run semantic-release on push-to-master (not on pull requests) ([#184](https://github.com/awslabs/goformation/issues/184)) ([c83945a](https://github.com/awslabs/goformation/commit/c83945a))
+
+# [2.1.0](https://github.com/awslabs/goformation/compare/v2.0.0...v2.1.0) (2019-03-10)
+
+
+### Features
+
+* **CI:** auto-generate AUTHORS.md file ([b37af7b](https://github.com/awslabs/goformation/commit/b37af7b))
+
+# Semantic Versioning Changelog
+
+# [2.0.0](https://github.com/awslabs/goformation/compare/v1.4.1...v2.0.0) (2019-03-10)
+
+
+### Code Refactoring
+
+* **generator:** moving resources and policies into their own packages ([#161](https://github.com/awslabs/goformation/issues/161)) ([03a0123](https://github.com/awslabs/goformation/commit/03a0123))
+
+
+### BREAKING CHANGES
+
+* **generator:** this PR refactors the auto-generated CloudFormation resources out of the cloudformation package and into a dedicated package (resources). This helps keep the auto generated files separate from others.
+
+E.g. cloudformation.AWSSnsTopic{} becomes resources.AWSSnsTopic{}
+
+## [1.4.1](https://github.com/awslabs/goformation/compare/v1.4.0...v1.4.1) (2019-03-10)
+
+
+### Bug Fixes
+
+* **spec:** corrected AWS::Serverless::Api.Auth.Authorizers to be of type JSON rather than string  ([#164](https://github.com/awslabs/goformation/issues/164)) ([4cf1bee](https://github.com/awslabs/goformation/commit/4cf1bee))
+
+# [1.4.0](https://github.com/awslabs/goformation/compare/v1.3.0...v1.4.0) (2019-03-09)
+
+
+### Features
+
+* **parser:** Default to parsing as YAML unless the filename ends in .json ([#176](https://github.com/awslabs/goformation/issues/176)) ([42e7146](https://github.com/awslabs/goformation/commit/42e7146))
+
+# [1.3.0](https://github.com/awslabs/goformation/compare/v1.2.1...v1.3.0) (2019-03-09)
+
+
+### Bug Fixes
+
+* **CI:** speed up PR builds by only downloading the cfn spec and regenerating resources on cron schedule (not on every build) ([7ae2a32](https://github.com/awslabs/goformation/commit/7ae2a32))
+* **CI:** Update TravisCI configuration based on https://github.com/se… ([#180](https://github.com/awslabs/goformation/issues/180)) ([88e1e85](https://github.com/awslabs/goformation/commit/88e1e85))
+* **CI:** Update TravisCI configuration for semantic-release to use jobs ([f6c2fee](https://github.com/awslabs/goformation/commit/f6c2fee))
+
+
+### Features
+
+* Added semantic-release CI setup ([a9b368a](https://github.com/awslabs/goformation/commit/a9b368a))
+* Added semantic-release configuration file ([3b25fdb](https://github.com/awslabs/goformation/commit/3b25fdb))

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/