feat(moniker): Add monikers to security groups & load balancers (spin…

…naker#1941)
lookout · BrunoCarrier · Nov 6, 2017 · Aug 31, 2017 · Aug 31, 2017 · Sep 1, 2017
commit 4fab668aef7564e8940c62b8044df84927d1239d
diff --git a/...ain/groovy/com/netflix/spinnaker/clouddriver/appengine/model/AppengineLoadBalancer.groovy b/...ain/groovy/com/netflix/spinnaker/clouddriver/appengine/model/AppengineLoadBalancer.groovy
@@ -23,6 +23,7 @@ import com.netflix.spinnaker.clouddriver.appengine.AppengineCloudProvider
 import com.netflix.spinnaker.clouddriver.model.LoadBalancer
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerInstance
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerServerGroup
+import com.netflix.spinnaker.moniker.Moniker
 import groovy.transform.AutoClone
 import groovy.transform.CompileStatic
 import groovy.transform.EqualsAndHashCode
@@ -44,6 +45,8 @@ class AppengineLoadBalancer implements LoadBalancer, Serializable {
   String project
   List<AppenginePlatformApplication.AppengineDispatchRule> dispatchRules
 
+  void setMoniker(Moniker _ignored) {}
+
   AppengineLoadBalancer() { }
 
   AppengineLoadBalancer(Service service, String account, String region) {

diff --git a/...aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonLoadBalancer.groovy b/...aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonLoadBalancer.groovy
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.netflix.spinnaker.clouddriver.aws.AmazonCloudProvider
 import com.netflix.spinnaker.clouddriver.model.LoadBalancer
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerServerGroup
+import com.netflix.spinnaker.moniker.Moniker
 import groovy.transform.CompileStatic
 
 @CompileStatic
@@ -33,6 +34,8 @@ class AmazonLoadBalancer implements LoadBalancer {
   Set<LoadBalancerServerGroup> serverGroups = []
   Set<AmazonTargetGroup> targetGroups = []
 
+  void setMoniker(Moniker _ignored) {}
+
   final String type = AmazonCloudProvider.ID
   final String cloudProvider = AmazonCloudProvider.ID
 

diff --git a/...ws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonSecurityGroup.groovy b/...ws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonSecurityGroup.groovy
@@ -21,6 +21,7 @@ import com.netflix.spinnaker.clouddriver.aws.AmazonCloudProvider
 import com.netflix.spinnaker.clouddriver.model.SecurityGroup
 import com.netflix.spinnaker.clouddriver.model.SecurityGroupSummary
 import com.netflix.spinnaker.clouddriver.model.securitygroups.Rule
+import com.netflix.spinnaker.moniker.Moniker
 import groovy.transform.Immutable
 
 @Immutable
@@ -39,6 +40,8 @@ class AmazonSecurityGroup implements SecurityGroup {
   final Set<Rule> inboundRules
   final Set<Rule> outboundRules
 
+  void setMoniker(Moniker _ignored) {}
+
   @Override
   SecurityGroupSummary getSummary() {
     new AmazonSecurityGroupSummary(name: name, id: id, vpcId: vpcId)

diff --git a/...-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonTargetGroup.groovy b/...-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonTargetGroup.groovy
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.netflix.spinnaker.clouddriver.aws.AmazonCloudProvider
 import com.netflix.spinnaker.clouddriver.model.LoadBalancer
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerServerGroup
+import com.netflix.spinnaker.moniker.Moniker
 
 class AmazonTargetGroup implements LoadBalancer {
   String account
@@ -32,6 +33,8 @@ class AmazonTargetGroup implements LoadBalancer {
 
   private Map<String, Object> dynamicProperties = new HashMap<String, Object>()
 
+  void setMoniker(Moniker _ignored) {}
+
   @JsonAnyGetter
   public Map<String,Object> any() {
     return dynamicProperties

diff --git a/...vy/com/netflix/spinnaker/clouddriver/aws/provider/view/AmazonSecurityGroupProvider.groovy b/...vy/com/netflix/spinnaker/clouddriver/aws/provider/view/AmazonSecurityGroupProvider.groovy
@@ -25,15 +25,15 @@ import com.netflix.spinnaker.cats.cache.Cache
 import com.netflix.spinnaker.cats.cache.CacheData
 import com.netflix.spinnaker.cats.cache.RelationshipCacheFilter
 import com.netflix.spinnaker.clouddriver.aws.AmazonCloudProvider
+import com.netflix.spinnaker.clouddriver.aws.cache.Keys
+import com.netflix.spinnaker.clouddriver.aws.model.AmazonSecurityGroup
 import com.netflix.spinnaker.clouddriver.aws.security.AmazonCredentials
 import com.netflix.spinnaker.clouddriver.model.AddressableRange
 import com.netflix.spinnaker.clouddriver.model.SecurityGroupProvider
 import com.netflix.spinnaker.clouddriver.model.securitygroups.IpRangeRule
 import com.netflix.spinnaker.clouddriver.model.securitygroups.Rule
 import com.netflix.spinnaker.clouddriver.model.securitygroups.SecurityGroupRule
 import com.netflix.spinnaker.clouddriver.security.AccountCredentialsProvider
-import com.netflix.spinnaker.clouddriver.aws.cache.Keys
-import com.netflix.spinnaker.clouddriver.aws.model.AmazonSecurityGroup
 import groovy.transform.Canonical
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component

diff --git a/...netflix/spinnaker/clouddriver/azure/resources/loadbalancer/model/AzureLoadBalancer.groovy b/...netflix/spinnaker/clouddriver/azure/resources/loadbalancer/model/AzureLoadBalancer.groovy
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.netflix.spinnaker.clouddriver.azure.AzureCloudProvider
 import com.netflix.spinnaker.clouddriver.model.LoadBalancer
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerServerGroup
+import com.netflix.spinnaker.moniker.Moniker
 
 class AzureLoadBalancer implements LoadBalancer {
 
@@ -34,6 +35,8 @@ class AzureLoadBalancer implements LoadBalancer {
   final String type = AzureCloudProvider.ID
   final String cloudProvider = AzureCloudProvider.ID
 
+  void setMoniker(Moniker _ignored) {}
+
   private Map<String, Object> dynamicProperties = new HashMap<String, Object>()
 
   AzureLoadBalancer() {

diff --git a/...tflix/spinnaker/clouddriver/azure/resources/securitygroup/model/AzureSecurityGroup.groovy b/...tflix/spinnaker/clouddriver/azure/resources/securitygroup/model/AzureSecurityGroup.groovy
@@ -21,6 +21,7 @@ import com.netflix.spinnaker.clouddriver.azure.AzureCloudProvider
 import com.netflix.spinnaker.clouddriver.model.SecurityGroup
 import com.netflix.spinnaker.clouddriver.model.SecurityGroupSummary
 import com.netflix.spinnaker.clouddriver.model.securitygroups.Rule
+import com.netflix.spinnaker.moniker.Moniker
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.Immutable
 
@@ -43,6 +44,8 @@ class AzureSecurityGroup implements SecurityGroup {
   final Set<Rule> outboundRules = []
   final List<AzureSecurityGroupDescription.AzureSGRule> securityRules = []
 
+  void setMoniker(Moniker _ignored) {}
+
   @Override
   SecurityGroupSummary getSummary() {
     new AzureSecurityGroupSummary(name: name, id: id, network: network)

diff --git a/...rc/main/groovy/com/netflix/spinnaker/clouddriver/cf/model/CloudFoundryLoadBalancer.groovy b/...rc/main/groovy/com/netflix/spinnaker/clouddriver/cf/model/CloudFoundryLoadBalancer.groovy
@@ -19,6 +19,7 @@ package com.netflix.spinnaker.clouddriver.cf.model
 import com.netflix.spinnaker.clouddriver.cf.CloudFoundryCloudProvider
 import com.netflix.spinnaker.clouddriver.model.LoadBalancer
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerServerGroup
+import com.netflix.spinnaker.moniker.Moniker
 import groovy.transform.CompileStatic
 import groovy.transform.EqualsAndHashCode
 import org.cloudfoundry.client.lib.domain.CloudRoute
@@ -35,4 +36,6 @@ class CloudFoundryLoadBalancer implements LoadBalancer {
   String account
   CloudRoute nativeRoute
 
+  void setMoniker(Moniker _ignored) {}
+
 }
diff --git a/...ker/clouddriver/model/LoadBalancer.groovy → ...naker/clouddriver/model/LoadBalancer.java b/...ker/clouddriver/model/LoadBalancer.groovy → ...naker/clouddriver/model/LoadBalancer.java
@@ -14,47 +14,60 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.clouddriver.model
+package com.netflix.spinnaker.clouddriver.model;
 
-import com.netflix.spinnaker.clouddriver.documentation.Empty
+import com.netflix.spinnaker.clouddriver.documentation.Empty;
+import com.netflix.spinnaker.clouddriver.names.NamerRegistry;
+import com.netflix.spinnaker.moniker.Moniker;
+
+import java.util.Set;
 
 /**
  * A representation of a network load balancer, which is indirectly correlated to a {@link Cluster} through its relationship to {@link ServerGroup} objects. This interface provides a contract for
  * retrieving the name of the load balancer and the names of the server groups that it is servicing.
  *
  *
  */
-interface LoadBalancer {
+public interface LoadBalancer {
   /**
    * Name of the load balancer
    *
    * @return name
    */
-  String getName()
+  String getName();
+
+  /**
+   * This resource's moniker
+   *
+   * @return moniker
+   */
+  default Moniker getMoniker() {
+    return NamerRegistry.getDefaultNamer().deriveMoniker(this);
+  }
 
   /**
    * The type of this load balancer. Can indicate some vendor-specific designation, or cloud provider
    * @deprecated use #getCloudProvider
    * @return type
    */
-  String getType()
+  String getType();
 
   /**
    * Provider-specific identifier
    */
-  String getCloudProvider()
+  String getCloudProvider();
 
   /**
    * Account under which this load balancer exists.
    * @return
    */
-  String getAccount()
+  String getAccount();
 
   /**
    * The names of the server groups that this load balancer is servicing.
    *
    * @return set of names or an empty set if none exist
    */
   @Empty
-  Set<LoadBalancerServerGroup> getServerGroups()
+  Set<LoadBalancerServerGroup> getServerGroups();
 }
diff --git a/...er/clouddriver/model/SecurityGroup.groovy → ...aker/clouddriver/model/SecurityGroup.java b/...er/clouddriver/model/SecurityGroup.groovy → ...aker/clouddriver/model/SecurityGroup.java
@@ -14,72 +14,88 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.clouddriver.model
+package com.netflix.spinnaker.clouddriver.model;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo
-import com.netflix.spinnaker.clouddriver.model.securitygroups.Rule
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.netflix.spinnaker.clouddriver.model.securitygroups.Rule;
+import com.netflix.spinnaker.clouddriver.names.NamerRegistry;
+import com.netflix.spinnaker.moniker.Moniker;
+
+import java.util.Set;
 
 /**
  * A representation of a security group
  */
-@JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property='class')
-interface SecurityGroup {
+@JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="class")
+public interface SecurityGroup {
 
   /**
    * The type of this security group. May reference the cloud provider to which it is associated
    * @deprecated use #getCloudProvider
    * @return
    */
-  String getType()
+  String getType();
 
   /**
    * Provider-specific identifier
    */
-  String getCloudProvider()
+  String getCloudProvider();
 
   /**
    * The ID associated with this security group
    *
    * @return
    */
-  String getId()
+  String getId();
 
   /**
    * The name representing this security group
    *
    * @return
    */
-  String getName()
+  String getName();
+
+  /**
+   * This resource's moniker
+   *
+   * @return moniker
+   */
+  default Moniker getMoniker() {
+    return NamerRegistry.getDefaultNamer().deriveMoniker(this);
+  }
 
   /**
-   * The application associated with this security group
+   * The application associated with this security group.
+   *
+   * Deprecated in favor of getMoniker().getApp()
    *
    * @return
    */
-  String getApplication()
+  @Deprecated
+  String getApplication();
 
   /**
    * The account associated with this security group
    *
    * @return
    */
-  String getAccountName()
+  String getAccountName();
 
   /**
    * The region associated with this security group
    *
    * @return
    */
-  String getRegion()
+  String getRegion();
 
   /**
    * A representation of the inbound securityRules
    *
    * @return
    */
-  Set<Rule> getInboundRules()
+  Set<Rule> getInboundRules();
 
-  Set<Rule> getOutboundRules()
+  Set<Rule> getOutboundRules();
 
-  SecurityGroupSummary getSummary()
+  SecurityGroupSummary getSummary();
 }
diff --git a/...ddriver/model/SecurityGroupSummary.groovy → ...ouddriver/model/SecurityGroupSummary.java b/...ddriver/model/SecurityGroupSummary.groovy → ...ouddriver/model/SecurityGroupSummary.java
@@ -14,9 +14,17 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.clouddriver.model
+package com.netflix.spinnaker.clouddriver.model;
 
-interface SecurityGroupSummary {
-  String getName()
-  String getId()
+import com.netflix.spinnaker.clouddriver.names.NamerRegistry;
+import com.netflix.spinnaker.moniker.Moniker;
+
+public interface SecurityGroupSummary {
+  String getName();
+
+  default Moniker getMoniker() {
+    return NamerRegistry.getDefaultNamer().deriveMoniker(this);
+  }
+
+  String getId();
 }
diff --git a/...uddriver/model/securitygroups/Rule.groovy → ...louddriver/model/securitygroups/Rule.java b/...uddriver/model/securitygroups/Rule.groovy → ...louddriver/model/securitygroups/Rule.java
@@ -14,33 +14,44 @@
  * limitations under the License.
  */
 
-package com.netflix.spinnaker.clouddriver.model.securitygroups
+package com.netflix.spinnaker.clouddriver.model.securitygroups;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo
-import groovy.transform.Canonical
-import groovy.transform.Sortable
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.Data;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.util.SortedSet;
 
 /**
  * An abstract interface representing a security rule.
  *
  * @see IpRangeRule
  * @see SecurityGroupRule
  */
-@JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property='class')
-interface Rule {
+@JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="class")
+public interface Rule {
   /**
    * The port ranges associated with this rule
    *
    * @return
    */
-  SortedSet<PortRange> getPortRanges()
+  SortedSet<PortRange> getPortRanges();
+
+  String getProtocol();
 
-  String getProtocol()
+  @Data
+  class PortRange implements Comparable<PortRange> {
+    Integer startPort;
+    Integer endPort;
 
-  @Sortable
-  @Canonical
-  static class PortRange {
-    Integer startPort
-    Integer endPort
+    @Override
+    public int compareTo(PortRange o) {
+      if (o == null) {
+        return 1;
+      }
+
+      int res = ObjectUtils.compare(this.startPort, o.startPort);
+      return res == 0 ? ObjectUtils.compare(this.endPort, o.endPort) : res;
+    }
   }
 }