Aws sdk 343

CHANGELOG.md

@@ -0,0 +1,11 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [0.6.0] - 2018-06-08
+- Cross compile to 2.12
+- Update to AWS SDK 1.11.343
+- Update all other deps
+
+## Prior versions did not track changes in this log.

aws2scala-cloudformation/src/test/scala/com/monsanto/arch/awsutil/cloudformation/DefaultCloudFormationClientSpec.scala

@@ -234,18 +234,18 @@ object DefaultCloudFormationClientSpec {
     val topicDisplayNameParameter = testTemplateParameter(stackName)
 
     val template = Template(
-      Description = TemplateDescription,
+      Description = Some(TemplateDescription),
       Parameters = Some(Seq(topicDisplayNameParameter)),
       Conditions = None,
       Mappings = None,
-      Resources = Some(Seq(
+      Resources = Seq(
         `AWS::SNS::Topic`("TestSNSTopic",
           DisplayName = Some(ParameterRef(topicDisplayNameParameter)),
           Subscription = None,
           TopicName = None
         ),
         `AWS::IAM::Group`("TestGroup")
-      )),
+      ),
       Routables = None,
       Outputs = None)
 

aws2scala-core-tests/src/test/scala/com/monsanto/arch/awsutil/auth/policy/PolicyJsonSupportSpec.scala

@@ -13,7 +13,7 @@ import org.scalacheck.Gen
 import org.scalatest.FreeSpec
 import org.scalatest.Matchers._
 import org.scalatest.prop.GeneratorDrivenPropertyChecks._
-import spray.json.{JsArray, JsNull, JsObject, JsString, JsValue, pimpString}
+import spray.json._
 
 class PolicyJsonSupportSpec extends FreeSpec {
   TestAction.registerActions()

aws2scala-core/src/main/scala/com/monsanto/arch/awsutil/auth/policy/Principal.scala

@@ -89,7 +89,7 @@ object Principal {
     case object AllServices extends Service("*") with AwsEnumerated
 
     /** Matches the Amazon API Gateway service. */
-    case object AmazonAPIGateway extends Service("apigateway.amazonaws.com")
+    case object AmazonApiGateway extends Service("apigateway.amazonaws.com") with AwsEnumerated
 
     /** Matches the Amazon Elastic Compute Cloud (EC2) service. */
     case object AmazonEC2 extends Service("ec2.amazonaws.com") with AwsEnumerated
@@ -141,7 +141,7 @@ object Principal {
 
     /** All valid values for the enumeration. */
     val values: Seq[Service] =
-      Seq(AllServices, AmazonAPIGateway, AmazonEC2, AmazonEC2ContainerService, AmazonEC2SpotFleet,
+      Seq(AllServices, AmazonApiGateway, AmazonEC2, AmazonEC2ContainerService, AmazonEC2SpotFleet,
         AmazonElasticMapReduce, AmazonElasticTranscoder, AmazonInspector, AmazonVPCFlowLogs, AmazonWorkSpaces,
         AWSCloudHSM, AWSCloudTrail, AWSConfig, AWSDataPipeline, AWSLambda, AWSOpsWorks, AWSServiceCatalog)
 

aws2scala-core/src/main/scala/com/monsanto/arch/awsutil/converters/CoreConverters.scala

@@ -248,6 +248,7 @@ object CoreConverters {
     def asScala: Principal.Service with Principal.Service.AwsEnumerated =
       service match {
         case policy.Principal.Services.AllServices             ⇒ Principal.Service.AllServices
+        case policy.Principal.Services.AmazonApiGateway        ⇒ Principal.Service.AmazonApiGateway
         case policy.Principal.Services.AmazonEC2               ⇒ Principal.Service.AmazonEC2
         case policy.Principal.Services.AmazonElasticTranscoder ⇒ Principal.Service.AmazonElasticTranscoder
         case policy.Principal.Services.AWSCloudHSM             ⇒ Principal.Service.AWSCloudHSM
@@ -260,6 +261,7 @@ object CoreConverters {
     def asAws: policy.Principal.Services =
       service match {
         case Principal.Service.AllServices             ⇒ policy.Principal.Services.AllServices
+        case Principal.Service.AmazonApiGateway        ⇒ policy.Principal.Services.AmazonApiGateway
         case Principal.Service.AmazonEC2               ⇒ policy.Principal.Services.AmazonEC2
         case Principal.Service.AmazonElasticTranscoder ⇒ policy.Principal.Services.AmazonElasticTranscoder
         case Principal.Service.AWSCloudHSM             ⇒ policy.Principal.Services.AWSCloudHSM

aws2scala-core/src/main/scala/com/monsanto/arch/awsutil/regions/Region.scala

@@ -23,6 +23,12 @@ object Region {
   /** EU West (Ireland). */
   case object EU_WEST_1 extends Region("eu-west-1", Partition.Aws)
 
+  /** EU West (London). */
+  case object EU_WEST_2 extends Region("eu-west-2", Partition.Aws)
+
+  /** EU West (Paris). */
+  case object EU_WEST_3 extends Region("eu-west-3", Partition.Aws)
+
   /** EU Central (Frankfurt). */
   case object EU_CENTRAL_1 extends Region("eu-central-1", Partition.Aws)
 
@@ -47,9 +53,16 @@ object Region {
   /** China (Beijing). */
   case object CN_NORTH_1 extends Region("cn-north-1", Partition.China)
 
+  /** China (Ningxia). */
+  case object CN_NORTHWEST_1 extends Region("cn-northwest-1", Partition.China)
+
+  /** Canada (Central). */
+  case object CA_CENTRAL_1 extends Region("ca-central-1", Partition.Aws)
+
   /** All valid values for the enumeration. */
-  val values: Seq[Region] = Seq(GovCloud, US_EAST_1, US_EAST_2, US_WEST_1, US_WEST_2, EU_WEST_1, EU_CENTRAL_1,
-    AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, SA_EAST_1, CN_NORTH_1)
+  val values: Seq[Region] = Seq(GovCloud, US_EAST_1, US_EAST_2, US_WEST_1, US_WEST_2, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1,
+    AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, SA_EAST_1, CN_NORTH_1, CN_NORTHWEST_1,
+    CA_CENTRAL_1)
 
   /** Extracts a region from its name. */
   def unapply(str: String): Option[Region] = values.find(_.name == str)