Merge pull request #159 from cfieber/master

s/(oort|mort|kato)/clouddriver/g

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     maven { url "http://spinnaker.bintray.com/gradle" }
   }
   dependencies {
-    classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.3.0'
+    classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.4.0'
     classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
   }
 }
@@ -21,6 +21,8 @@ allprojects {
   }
 
   configurations.all {
+    exclude group: 'javax.servlet', module: 'servlet-api'
+    exclude group: 'javax.servlet', module: 'javax.servlet-api'
     resolutionStrategy {
       force 'org.codehaus.groovy:groovy-all:2.4.5'
       force 'org.spockframework:spock-core:1.0-groovy-2.4'

gate-core/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OortService.groovy → gate-core/src/main/groovy/com/netflix/spinnaker/gate/services/internal/ClouddriverService.groovy

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 Netflix, Inc.
+ * Copyright 2015 Netflix, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,9 +16,30 @@
 
 package com.netflix.spinnaker.gate.services.internal
 
-import retrofit.http.*
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import retrofit.http.GET
+import retrofit.http.Headers
+import retrofit.http.Path
+import retrofit.http.Query
+
+interface ClouddriverService {
+
+  @GET('/credentials')
+  List<Account> getAccounts()
+
+  @GET('/credentials/{account}')
+  Map getAccount(@Path("account") String account)
+
+  @GET('/task/{taskDetailsId}')
+  Map getTaskDetails(@Path("taskDetailsId") String taskDetailsId)
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  static class Account {
+    String name
+    String type
+    Collection<String> requiredGroupMembership
+  }
 
-interface OortService {
 
   @Headers("Accept: application/json")
   @GET("/applications")
@@ -114,9 +135,9 @@ interface OortService {
   @Headers("Accept: application/json")
   @GET("/instances/{account}/{region}/{instanceId}/console")
   Map getConsoleOutput(@Path("account") String account,
-                          @Path("region") String region,
-                          @Path("instanceId") String instanceId,
-                          @Query("provider") String provider)
+                       @Path("region") String region,
+                       @Path("instanceId") String instanceId,
+                       @Query("provider") String provider)
 
   @Headers("Accept: application/json")
   @GET("/{provider}/images/{account}/{region}/{imageId}")
@@ -143,4 +164,29 @@ interface OortService {
                    @Query("platform") String platform,
                    @Query("pageSize") Integer size,
                    @Query("page") Integer offset)
+
+  @GET('/securityGroups')
+  Map getSecurityGroups()
+
+  @GET('/securityGroups/{account}/{type}')
+  Map getSecurityGroups(@Path("account") String account, @Path("type") String type, @Query("region") String region)
+
+  @GET('/securityGroups/{account}/{type}/{region}/{name}')
+  Map getSecurityGroup(@Path("account") String account, @Path("type") String type, @Path("name") String name,
+                       @Path("region") String region, @Query("vpcId") String vpcId)
+
+  @GET('/instanceTypes')
+  List<Map> getInstanceTypes()
+
+  @GET('/keyPairs')
+  List<Map> getKeyPairs()
+
+  @GET('/subnets')
+  List<Map> getSubnets()
+
+  @GET('/networks')
+  Map getNetworks()
+
+  @GET('/networks/{cloudProvider}')
+  List<Map> getNetworks(@Path("cloudProvider") String cloudProvider)
 }

gate-manual/src/asciidoc/bakeStage.adoc

@@ -21,7 +21,7 @@ _createBake_, _monitorBake_, _completeBake_
 ----
 {
   "type": "bake",
-  "package": "kato",
+  "package": "myapp",
   "user": "orca",
   "baseLabel": "release",
   "baseOs": "ubuntu",

gate-manual/src/asciidoc/copyLastAsgStage.adoc

@@ -10,7 +10,7 @@ This stage provides orchestration to the copy of an ancestor ASG to a subsequent
 
 ====== Services Involved
 
-_orca_, _kato_, _oort_
+_orca_, _clouddriver_
 
 ====== Steps
 
@@ -21,7 +21,7 @@ _createCopyLastAsg_, _monitorDeploy_, _forceCacheRefresh_, _waitForUpInstances_,
 ----
 {
   "type": "copyLastAsg",
-  "application": "kato",
+  "application": "myapp",
   "amiName": "ami-2848a840",
   "credentials": "test",
   "availabilityZones": {
@@ -51,7 +51,7 @@ _createCopyLastAsg_, _monitorDeploy_, _forceCacheRefresh_, _waitForUpInstances_,
 |stack                    | string  | false    | The "stack" to which this deployment is applicable. A stack is some arbitrarily named "environment" that many applications may be a part of. This value, in conjunction with the "application" comprise the "cluster name" in Asgard's view of the Cloud.
 |associatePublicIpAddress | boolean | false    | Specifies whether to assign a public IP address to each instance launched in a VPC. A subnetType must be specified.
 |ramdiskId                | string  | false    | The ramdiskId to use for this ASG. This should only be specified when entirely sure what this value should exactly be.
-|terminationPolicies      | array   | false    | The http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingBehavior.InstanceTermination.html[termination policies] to apply to the launch configuration of this ASG. 
+|terminationPolicies      | array   | false    | The http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingBehavior.InstanceTermination.html[termination policies] to apply to the launch configuration of this ASG.
 |suspendedProcesses       | array   | false    | There are two primary auto scaling process types: Launch and Terminate. The former creates a new instance within an ASG, while the latter destroys one. When these processes are sususpended, those operations will no longer take place. There are six additional process types that can be suspended: AddToLoadBalancer; AlarmNotification; AZRebalance; HealthCheck; ReplaceUnhealthy; and ScheduledActions. If you suspend Launch and/or Terminate, each of the six additional processes will be affected to some degree. Consult the AWS developer guide for more details.
 |spotPrice                | string  | false    | The spot price to apply to the create ASG request. Only send this value if you're absolutely sure of what you're doing.
 |healthCheckType          | string  | false    | Valid values are: EC2 or ELB. Indicates whether an autoscaling group should derive instance health from Amazon itself or from the ELB. The latter may give you more granular application-level capabilities, while the former may be more accurate from a system perspective.

gate-manual/src/asciidoc/deleteAmazonLoadBalancer.adoc

@@ -14,7 +14,7 @@ CAUTION: This operation marks the end of a Load Balancer's life. The process can
 
 ====== Services Involved
 
-_orca_, _kato_, _oort_
+_orca_, _clouddriver_
 
 ====== Steps
 
@@ -25,7 +25,7 @@ _deleteAmazonLoadBalancer_, _forceCacheRefresh_, _monitorDelete_
 ----
 {
   "type": "deleteAmazonLoadBalancer",
-  "loadBalancerName": "kato-main-frontend",
+  "loadBalancerName": "myapp-main-frontend",
   "regions": ["us-east-1", "us-west-1", "us-west-2", "eu-west-1"],
   "credentials": "test"
 }

gate-manual/src/asciidoc/deleteApplicationStage.adoc

@@ -22,7 +22,7 @@ _deleteApplication_, _forceCacheRefresh_
 {
   "type": "deleteApplication",
   "account": "test",
-  "name": "kato"
+  "name": "myapp"
 }
 ----
 

gate-manual/src/asciidoc/deleteLoadBalancer.adoc

@@ -12,7 +12,7 @@ CAUTION: This operation marks the end of a Load Balancer's life. The process can
 
 ====== Services Involved
 
-_orca_, _kato_, _oort_
+_orca_, _clouddriver_
 
 ====== Steps
 
@@ -23,7 +23,7 @@ _deleteAmazonLoadBalancer_, _forceCacheRefresh_, _monitorDelete_
 ----
 {
   "type": "deleteLoadBalancer",
-  "loadBalancerName": "kato-main-frontend",
+  "loadBalancerName": "myapp-main-frontend",
   "regions": ["us-east-1", "us-west-1", "us-west-2", "eu-west-1"],
   "credentials": "test"
 }

gate-manual/src/asciidoc/deleteSecurityGroup.adoc

@@ -12,7 +12,7 @@ CAUTION: This operation marks the end of a Security Group's life. The process ca
 
 ====== Services Involved
 
-_orca_, _kato_, _mort_
+_orca_, _clouddriver_
 
 ====== Steps
 

gate-manual/src/asciidoc/deployStage.adoc

@@ -17,7 +17,7 @@ There are two strategies presently available for deployments:
 
 ====== Services Involved
 
-_orca_, _kato_, _oort_
+_orca_, _clouddriver_
 
 ====== Steps
 
@@ -139,7 +139,7 @@ This stage's configuration has an embedded data structure to describe the config
 |stack                    | string  | false    | The "stack" to which this deployment is applicable. A stack is some arbitrarily named "environment" that many applications may be a part of. This value, in conjunction with the "application" comprise the "cluster name" in Asgard's view of the Cloud.
 |associatePublicIpAddress | boolean | false    | Specifies whether to assign a public IP address to each instance launched in a VPC. A subnetType must be specified.
 |ramdiskId                | string  | false    | The ramdiskId to use for this ASG. This should only be specified when entirely sure what this value should exactly be.
-|terminationPolicies      | array   | false    | The http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingBehavior.InstanceTermination.html[termination policies] to apply to the launch configuration of this ASG. 
+|terminationPolicies      | array   | false    | The http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingBehavior.InstanceTermination.html[termination policies] to apply to the launch configuration of this ASG.
 |suspendedProcesses       | array   | false    | There are two primary auto scaling process types: Launch and Terminate. The former creates a new instance within an ASG, while the latter destroys one. When these processes are sususpended, those operations will no longer take place. There are six additional process types that can be suspended: AddToLoadBalancer; AlarmNotification; AZRebalance; HealthCheck; ReplaceUnhealthy; and ScheduledActions. If you suspend Launch and/or Terminate, each of the six additional processes will be affected to some degree. Consult the AWS developer guide for more details.
 |spotPrice                | string  | false    | The spot price to apply to the create ASG request. Only send this value if you're absolutely sure of what you're doing.
 |healthCheckType          | string  | false    | Valid values are: EC2 or ELB. Indicates whether an autoscaling group should derive instance health from Amazon itself or from the ELB. The latter may give you more granular application-level capabilities, while the former may be more accurate from a system perspective.

gate-manual/src/asciidoc/deregisterInstancesFromLoadBalancerStage.adoc

@@ -12,7 +12,7 @@ NOTE: If no auto scaling group is specified, the ASG associated with each instan
 
 ====== Services Involved
 
-_orca_, _kato_, _oort_
+_orca_, _clouddriver_
 
 ====== Steps
 
@@ -23,7 +23,7 @@ _deregisterInstances_, _monitorInstances_, _waitForLoadBalancerState_
 ----
 {
   "type": "deregisterInstancesFromLoadBalancer",
-  "asgName": "kato-main-v000",
+  "asgName": "myapp-main-v000",
   "instanceIds": ["i-123456", "i-234567"],
   "region": "us-east-1",
   "credentials": "test"

gate-manual/src/asciidoc/destroyAsgStage.adoc

@@ -14,7 +14,7 @@ TIP: Only use this operation if you're expecting that everything (EVERYTHING) in
 
 ====== Services Involved
 
-_orca_, _kato_, _oort_
+_orca_, _clouddriver_
 
 ====== Steps
 
@@ -25,7 +25,7 @@ _destroyAsg_, _monitorAsg_, _forceCacheRefresh_, _sendNotification_
 ----
 {
     "type": "destroyAsg",
-    "asgName": "kato-main-v000",
+    "asgName": "myapp-main-v000",
     "regions": ["us-east-1"],
     "credentials": "test"
 }

gate-manual/src/asciidoc/disableAsgStage.adoc

@@ -10,7 +10,7 @@ This stage disables a named AutoScaling group across multiple regions. AutoScali
 
 ====== Services Involved
 
-_orca_, _kato_, _oort_
+_orca_, _clouddriver_
 
 ====== Steps
 
@@ -21,7 +21,7 @@ _disableAsg_, _monitorAsg_, _waitForDownInstances_, _sendNotification_
 ----
 {
   "type": "disableAsg",
-  "asgName": "kato-main-v000",
+  "asgName": "myapp-main-v000",
   "regions": ["us-west-1", "us-east-1"],
   "credentials": "test"
 }

gate-manual/src/asciidoc/disableInstancesInDiscoveryStage.adoc

@@ -12,7 +12,7 @@ NOTE: If no auto scaling group is specified, the ASG associated with each instan
 
 ====== Services Involved
 
-_orca_, _kato_, _oort_
+_orca_, _clouddriver_
 
 ====== Steps
 
@@ -23,7 +23,7 @@ _disableInstances_, _monitorInstances_, _waitForDiscoveryState_
 ----
 {
   "type": "disableInstancesInDiscoveryDescription",
-  "asgName": "kato-main-v000",
+  "asgName": "myapp-main-v000",
   "instanceIds": ["i-123456", "i-234567"],
   "region": "us-east-1",
   "credentials": "test"

gate-manual/src/asciidoc/enableAsgStage.adoc

@@ -10,7 +10,7 @@ This stage enables a named AutoScaling group across multiple regions. AutoScalin
 
 ====== Services Involved
 
-_orca_, _kato_, _oort_
+_orca_, _clouddriver_
 
 ====== Steps
 
@@ -21,7 +21,7 @@ _enableAsg_, _monitorAsg_, _waitForUpInstances_, _sendNotification_
 ----
 {
   "type": "enableAsg",
-  "asgName": "kato-main-v000",
+  "asgName": "myapp-main-v000",
   "regions": ["us-west-1", "us-east-1"],
   "credentials": "test"
 }

gate-manual/src/asciidoc/enableInstancesInDiscoveryStage.adoc

@@ -12,7 +12,7 @@ NOTE: If no auto scaling group is specified, the ASG associated with each instan
 
 ====== Services Involved
 
-_orca_, _kato_, _oort_
+_orca_, _clouddriver_
 
 ====== Steps
 
@@ -23,7 +23,7 @@ _disableInstances_, _monitorInstances_, _waitForDiscoveryState_
 ----
 {
   "type": "enableInstancesInDiscoveryDescription",
-  "asgName": "kato-main-v000",
+  "asgName": "myapp-main-v000",
   "instanceIds": ["i-123456", "i-234567"],
   "region": "us-east-1",
   "credentials": "test"