Skip to content

Commit

Permalink
Make version control statement about requirements
Browse files Browse the repository at this point in the history
The `$version` control statement can now be set to only a major version
(e.g., "1") to indicate that an implementation must support a version >= 1
and < 2. `$version` can now be set to `major.minor` (e.g., "1.1") to
indicate that an implementation must support a version >= 1.1 and < 2.
  • Loading branch information
mtdowling committed May 4, 2020
1 parent 33994de commit 34d51e3
Show file tree
Hide file tree
Showing 370 changed files with 533 additions and 529 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ the end of this entry.

#### General

* The model format version has beeen updated to `1.0.0` and contains several updates: [BC] ([#357](https://github.com/awslabs/smithy/pull/357), [#381](https://github.com/awslabs/smithy/pull/381))
* The model format version has beeen updated to `1.0` and contains several updates: [BC] ([#357](https://github.com/awslabs/smithy/pull/357), [#381](https://github.com/awslabs/smithy/pull/381))
* The JSON AST representation requires describing annotation traits as `{}` instead of `true`.
* Annotation traits in the IDL are now provided as `@foo` or `@foo()`. Explicit `@foo(true)` and
`@foo(null)` support was removed.
Expand All @@ -23,6 +23,9 @@ from Smithy `Node`s. ([#301](https://github.com/awslabs/smithy/pull/301))
* Added expect* methods to the base `Shape`. ([#314](https://github.com/awslabs/smithy/pull/314))
* Added `@SmithyUnstableApi`, `@SmithyInternalApi` and `@SmithyGenerated` Java annotations. ([#297](https://github.com/awslabs/smithy/pull/297))
* `NodeValidationVisitor`s are marked as internal and/or unstable. ([#375](https://github.com/awslabs/smithy/pull/375))
* The `$version` control statement can now be set to only a major version (e.g., "1") to indicate that an
implementation must support a version >= 1 and < 2. `$version` can now be set to `major.minor` (e.g., "1.1")
to indicate that an implementation must support a version >= 1.1 and < 2.

#### Trait updates

Expand Down Expand Up @@ -321,7 +324,7 @@ complete redesign. Many direct links to components of the documentation will hav

* Fix collection and gradle doc issues ([#145](https://github.com/awslabs/smithy/pull/145))
* Make `AuthorizerDefinition` definition private ([#146](https://github.com/awslabs/smithy/pull/146))
* Fix put handling on `ResourceShape` ([#158](https://github.com/awslabs/smithy/pull/158))
* Fix put handling on `ResourceShape` ([#158](https://github.com/awslabs/smithy/pull/158))
* Fix parse error when `apply` is at eof ([#159](https://github.com/awslabs/smithy/pull/159))
* Prevent `list`/`set` member from targeting container ([#162](https://github.com/awslabs/smithy/pull/162))
* Allow model assembling from symlink model files / directory ([#163](https://github.com/awslabs/smithy/pull/163))
12 changes: 6 additions & 6 deletions docs/source/1.0/guides/model-linters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Example:

.. code-block:: smithy
$version: "1.0.0"
$version: "1.0"
metadata validators = [
{name: "AbbreviationName"}
Expand Down Expand Up @@ -121,7 +121,7 @@ Example:

.. code-block:: smithy
$version: "1.0.0"
$version: "1.0"
metadata validators = [
{name: "CamelCase"}
Expand Down Expand Up @@ -183,7 +183,7 @@ Example:

.. code-block:: smithy
$version: "1.0.0"
$version: "1.0"
metadata validators = [{
id: "FooReservedWords"
Expand Down Expand Up @@ -338,7 +338,7 @@ Example:

.. code-block:: smithy
$version: "1.0.0"
$version: "1.0"
metadata validators = [{
name: "StandardOperationVerb",
Expand Down Expand Up @@ -672,7 +672,7 @@ example warns each time the word "meow" appears in documentation:

.. code-block:: smithy
$version: "1.0.0"
$version: "1.0"
metadata validators = [
{
Expand All @@ -691,7 +691,7 @@ example warns each time the word "meow" appears in documentation:

.. code-block:: smithy
$version: "1.0.0"
$version: "1.0"
metadata validators = [
{
Expand Down
2 changes: 1 addition & 1 deletion docs/source/1.0/guides/style-guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Smithy models SHOULD resemble the following example:

.. code-block:: smithy
$version: "1.0.0"
$version: "1.0"
metadata validators = []
metadata suppressions = []
Expand Down
8 changes: 4 additions & 4 deletions docs/source/1.0/spec/aws/amazon-apigateway.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ The following example sets the ``X-API-Key`` header as the API key source.
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#Weather": {
"type": "service",
Expand Down Expand Up @@ -295,7 +295,7 @@ Then following example enables request validation on a service:
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#Weather": {
"type": "service",
Expand Down Expand Up @@ -423,7 +423,7 @@ operation within the service.
.. code-block:: json
{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#Weather": {
"type": "service",
Expand Down Expand Up @@ -535,7 +535,7 @@ The following example defines an operation that uses a mock integration.
.. code-block:: json
{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyOperation": {
"type": "operation",
Expand Down
4 changes: 2 additions & 2 deletions docs/source/1.0/spec/aws/aws-auth.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Trait value
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"aws.fooBaz#FooBaz": {
"type": "service",
Expand Down Expand Up @@ -116,7 +116,7 @@ operation MUST NOT be used as part of the request signature calculation:
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#PutThings": {
"type": "operation",
Expand Down
26 changes: 13 additions & 13 deletions docs/source/1.0/spec/aws/aws-core.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The following example defines an AWS service that uses the default values of

.. code-tab:: smithy

$version: "1.0.0"
$version: "1.0"
namespace aws.fooBaz

use aws.api#service
Expand All @@ -52,7 +52,7 @@ The following example defines an AWS service that uses the default values of
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"aws.fooBaz#FooBaz": {
"type": "service",
Expand All @@ -72,7 +72,7 @@ The following example provides explicit values for all properties:

.. code-tab:: smithy

$version: "1.0.0"
$version: "1.0"
namespace aws.fooBaz

use aws.api#service
Expand All @@ -89,7 +89,7 @@ The following example provides explicit values for all properties:
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"aws.fooBaz#FooBaz": {
"type": "service",
Expand Down Expand Up @@ -386,7 +386,7 @@ For example, given the following service:
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#FooBaz": {
"type": "service",
Expand Down Expand Up @@ -452,7 +452,7 @@ resource.
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyResource": {
"type": "resource",
Expand Down Expand Up @@ -550,7 +550,7 @@ referenced resource.
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#SomeResourceId": {
"type": "string",
Expand All @@ -573,7 +573,7 @@ previous example:

.. code-tab:: smithy

$version: "1.0.0"
$version: "1.0"
namespace smithy.example

use aws.api#arnReference
Expand All @@ -584,7 +584,7 @@ previous example:
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#SomeResourceId": {
"type": "string",
Expand Down Expand Up @@ -638,7 +638,7 @@ structure, union, or collection unless overridden.
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyStructure": {
"type": "structure",
Expand Down Expand Up @@ -764,7 +764,7 @@ plane unless an operation or resource is marked with the
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#PutThings": {
"type": "operation",
Expand Down Expand Up @@ -818,7 +818,7 @@ plane unless an operation or resource is marked with the
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#PutThings": {
"type": "operation",
Expand Down Expand Up @@ -1014,7 +1014,7 @@ using an ``clientEndpointDiscoveryId``.
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"ns.foo#FooService": {
"type": "service",
Expand Down
4 changes: 2 additions & 2 deletions docs/source/1.0/spec/aws/aws-ec2-query-protocol.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Value type
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyService": {
"type": "service",
Expand Down Expand Up @@ -90,7 +90,7 @@ Given the following structure definition:
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyStruct": {
"type": "structure",
Expand Down
12 changes: 6 additions & 6 deletions docs/source/1.0/spec/aws/aws-iam.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Value type
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#FooOperation": {
"type": "operation",
Expand Down Expand Up @@ -112,7 +112,7 @@ The following example's ``MyResource`` resource has the
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyService": {
"type": "service",
Expand Down Expand Up @@ -235,7 +235,7 @@ Each condition key structure supports the following members:
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyService": {
"type": "service",
Expand Down Expand Up @@ -358,7 +358,7 @@ condition key inference disabled.
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyService": {
"type": "service",
Expand Down Expand Up @@ -439,7 +439,7 @@ operation for it to complete successfully.
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyService": {
"type": "service",
Expand Down Expand Up @@ -535,7 +535,7 @@ Given the following model,
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyService": {
"type": "service",
Expand Down
2 changes: 1 addition & 1 deletion docs/source/1.0/spec/aws/aws-json-1_0-protocol.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ See
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyService": {
"type": "service",
Expand Down
2 changes: 1 addition & 1 deletion docs/source/1.0/spec/aws/aws-json-1_1-protocol.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ See
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyService": {
"type": "service",
Expand Down
2 changes: 1 addition & 1 deletion docs/source/1.0/spec/aws/aws-query-protocol.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ See
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyService": {
"type": "service",
Expand Down
2 changes: 1 addition & 1 deletion docs/source/1.0/spec/aws/aws-restjson1-protocol.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ The following example defines a service that uses ``aws.protocols#restJson1``.
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyService": {
"type": "service",
Expand Down
2 changes: 1 addition & 1 deletion docs/source/1.0/spec/aws/aws-restxml-protocol.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ The following example defines a service that uses ``aws.protocols#restXml``.
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#MyService": {
"type": "service",
Expand Down
4 changes: 2 additions & 2 deletions docs/source/1.0/spec/core/auth-traits.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ and the hypothetical ``fooExample`` authentication scheme.
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#WeatherService": {
"type": "service",
Expand Down Expand Up @@ -323,7 +323,7 @@ The following example defines two operations:
.. code-tab:: json

{
"smithy": "1.0.0",
"smithy": "1.0",
"shapes": {
"smithy.example#AuthenticatedService": {
"type": "service",
Expand Down
Loading

0 comments on commit 34d51e3

Please sign in to comment.