[ARVADOS] updated: 1.3.0-484-gaf6447c82

[Git user]

Summary of changes:
 build/run-tests.sh            |   1 +
 lib/cloud/azure/azure_test.go |   5 +-
 lib/cloud/ec2/ec2.go          | 335 ++++++++++++++++++++++++++++++++++++++++++
 lib/cloud/ec2/ec2_test.go     | 247 +++++++++++++++++++++++++++++++
 lib/dispatchcloud/driver.go   |   2 +
 sdk/go/arvados/config.go      |  27 +++-
 vendor/vendor.json            | 193 ++++++++++++++++++++++++
 7 files changed, 800 insertions(+), 10 deletions(-)
 create mode 100644 lib/cloud/ec2/ec2.go
 create mode 100644 lib/cloud/ec2/ec2_test.go

       via  af6447c82f24b283b6b5f32b2b66dc6a47e24487 (commit)
       via  05a2bb382da111cf933d0ed67f4e099e4c8f9b70 (commit)
       via  4cb692fff4953a4a69ea2fb50ec29a8f5e9c9951 (commit)
       via  dc6c729a9e738d876642f2153e1fedd05878245a (commit)
       via  218866a5bb6d048576b8351515ea41c1e87eb43b (commit)
       via  62edb031350261966eec5dc9c5daa96ecc92765c (commit)
       via  ba5d3129f5f20124f9eb826a9f6b02c942c30945 (commit)
       via  1d347ca5163a984345b2541a434d04baa3ca8777 (commit)
       via  28ffc41895a431ef7d4e47713e4005e23e9065ae (commit)
       via  9cc8eb6ff1576395a47efa121ae211af7bd6c881 (commit)
       via  8dc25c1e0c3ad10eb7f3fc75cf73907293f4c803 (commit)
       via  72c6d63d52daa5405f872437667dd84137db9a04 (commit)
       via  3246e20c201aedc9fd448ab99d7d0950654e218b (commit)
       via  85cd30dffafaba80483e28ad6d4cac12b49a6d09 (commit)
       via  c82bd1f1c861beef92e317d5ce11136f4e4179a1 (commit)
       via  69f07756764e4722084aec1a7f9bcd005d4b1d04 (commit)
       via  6f52f5f4152b194aede8e9c8b05d210a9ba7718a (commit)
       via  544ad965e6d0a8f75268d2daea3a4c8c2748490c (commit)
       via  aa541480ba27f2dfec85cbe4f07c07743bb901b2 (commit)
       via  dc7fe787f4b6bae1ee6e740d8d5982e192c3fd75 (commit)
       via  21d29aa7defbe4472fb89d7790a3db79aef918ab (commit)
       via  69d8e37ca07721d7d2882704b9c1867c3756ac35 (commit)
       via  3f527041084af427dfb20c2fbfe1e7bc3911103e (commit)
       via  5e3f0c9b8c87c0ace05ea08ff1ab6434cb333f07 (commit)
       via  676423e298857c91d794dd9c6016b861304d45b1 (commit)
      from  64e72e2842da35ef1616a6a499731a6ed0a832b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit af6447c82f24b283b6b5f32b2b66dc6a47e24487
Merge: 64e72e284 05a2bb382
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Mar 8 15:19:59 2019 -0500

    Merge branch '14291-cdc-aws' refs #14291
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit 05a2bb382da111cf933d0ed67f4e099e4c8f9b70
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Mar 8 15:18:44 2019 -0500

    14291: EbsVolumeType → EBSVolumeType
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/lib/cloud/ec2/ec2.go b/lib/cloud/ec2/ec2.go
index 98e66c821..c5565d424 100644
--- a/lib/cloud/ec2/ec2.go
+++ b/lib/cloud/ec2/ec2.go
@@ -39,7 +39,7 @@ type ec2InstanceSetConfig struct {
 	SecurityGroupIDs []string
 	SubnetID         string
 	AdminUsername    string
-	EbsVolumeType    string
+	EBSVolumeType    string
 }
 
 type ec2Interface interface {
@@ -77,8 +77,8 @@ func newEC2InstanceSet(config json.RawMessage, dispatcherID cloud.InstanceSetID,
 		WithRegion(instanceSet.ec2config.Region)
 	instanceSet.client = ec2.New(session.Must(session.NewSession(awsConfig)))
 	instanceSet.keys = make(map[string]string)
-	if instanceSet.ec2config.EbsVolumeType == "" {
-		instanceSet.ec2config.EbsVolumeType = "gp2"
+	if instanceSet.ec2config.EBSVolumeType == "" {
+		instanceSet.ec2config.EBSVolumeType = "gp2"
 	}
 	return instanceSet, nil
 }
@@ -205,7 +205,7 @@ func (instanceSet *ec2InstanceSet) Create(
 			Ebs: &ec2.EbsBlockDevice{
 				DeleteOnTermination: aws.Bool(true),
 				VolumeSize:          aws.Int64((int64(instanceType.AddedScratch) + (1<<30 - 1)) >> 30),
-				VolumeType:          &instanceSet.ec2config.EbsVolumeType,
+				VolumeType:          &instanceSet.ec2config.EBSVolumeType,
 			}}}
 	}
 

-----------------------------------------------------------------------


hooks/post-receive
--