Merge branch 'master' into depends-on-diff

Author: mergify[bot]

buildspec-pr.yaml

@@ -8,6 +8,8 @@ phases:
       # Start docker daemon inside the container
       - nohup /usr/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 --storage-driver=overlay2&
       - timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
+      # login to DockerHub to avoid throttling
+      - docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD}
 
       # Install yarn if it wasn't already present in the image
       - yarn --version || npm -g install yarn

packages/@aws-cdk/aws-appsync/lib/graphqlapi.ts

@@ -4,7 +4,7 @@ import { ManagedPolicy, Role, ServicePrincipal, Grant, IGrantable } from '@aws-c
 import { CfnResource, Construct, Duration, IResolvable, Stack } from '@aws-cdk/core';
 import { CfnApiKey, CfnGraphQLApi, CfnGraphQLSchema } from './appsync.generated';
 import { IGraphqlApi, GraphqlApiBase } from './graphqlapi-base';
-import { ObjectType, ObjectTypeProps } from './schema-types';
+import { ObjectType, ObjectTypeProps } from './schema-intermediate';
 
 /**
  * enum with all possible values for AppSync authorization type

packages/@aws-cdk/aws-appsync/lib/index.ts

@@ -4,6 +4,8 @@ export * from './key';
 export * from './data-source';
 export * from './mapping-template';
 export * from './resolver';
-export * from './schema-types';
+export * from './schema-intermediate';
+export * from './schema-field';
+export * from './schema-base';
 export * from './graphqlapi';
 export * from './graphqlapi-base';

packages/@aws-cdk/aws-appsync/lib/schema-base.ts

@@ -0,0 +1,88 @@
+/**
+ * Enum containing the Types that can be used to define ObjectTypes
+ */
+export enum Type {
+  /**
+   * `ID` scalar type is a unique identifier. `ID` type is serialized similar to `String`.
+   *
+   * Often used as a key for a cache and not intended to be human-readable.
+   */
+  ID = 'ID',
+  /**
+   * `String` scalar type is a free-form human-readable text.
+   */
+  STRING = 'String',
+  /**
+   * `Int` scalar type is a signed non-fractional numerical value.
+   */
+  INT = 'Int',
+  /**
+   * `Float` scalar type is a signed double-precision fractional value.
+   */
+  FLOAT = 'Float',
+  /**
+   * `Boolean` scalar type is a boolean value: true or false.
+   */
+  BOOLEAN = 'Boolean',
+
+  /**
+   * `AWSDate` scalar type represents a valid extended `ISO 8601 Date` string.
+   *
+   * In other words, accepts date strings in the form of `YYYY-MM-DD`. It accepts time zone offsets.
+   *
+   * @see https://en.wikipedia.org/wiki/ISO_8601#Calendar_dates
+   */
+  AWS_DATE = 'AWSDate',
+  /**
+   * `AWSTime` scalar type represents a valid extended `ISO 8601 Time` string.
+   *
+   * In other words, accepts date strings in the form of `hh:mm:ss.sss`. It accepts time zone offsets.
+   *
+   * @see https://en.wikipedia.org/wiki/ISO_8601#Times
+   */
+  AWS_TIME = 'AWSTime',
+  /**
+   * `AWSDateTime` scalar type represents a valid extended `ISO 8601 DateTime` string.
+   *
+   * In other words, accepts date strings in the form of `YYYY-MM-DDThh:mm:ss.sssZ`. It accepts time zone offsets.
+   *
+   * @see https://en.wikipedia.org/wiki/ISO_8601#Combined_date_and_time_representations
+   */
+  AWS_DATE_TIME = 'AWSDateTime',
+  /**
+   * `AWSTimestamp` scalar type represents the number of seconds since `1970-01-01T00:00Z`.
+   *
+   * Timestamps are serialized and deserialized as numbers.
+   */
+  AWS_TIMESTAMP = 'AWSTimestamp',
+  /**
+   * `AWSEmail` scalar type represents an email address string (i.e.`username@example.com`)
+   */
+  AWS_EMAIL = 'AWSEmail',
+  /**
+   * `AWSJson` scalar type represents a JSON string.
+   */
+  AWS_JSON = 'AWSJSON',
+  /**
+   * `AWSURL` scalar type represetns a valid URL string.
+   *
+   * URLs wihtout schemes or contain double slashes are considered invalid.
+   */
+  AWS_URL = 'AWSURL',
+  /**
+   * `AWSPhone` scalar type represents a valid phone number. Phone numbers maybe be whitespace delimited or hyphenated.
+   *
+   * The number can specify a country code at the beginning, but is not required for US phone numbers.
+   */
+  AWS_PHONE = 'AWSPhone',
+  /**
+   * `AWSIPAddress` scalar type respresents a valid `IPv4` of `IPv6` address string.
+   */
+  AWS_IP_ADDRESS = 'AWSIPAddress',
+
+  /**
+   * Type used for Intermediate Types
+   * (i.e. an interface or an object type)
+   */
+  INTERMEDIATE = 'INTERMEDIATE',
+}