Initial merge of Development to Master

.gitignore

@@ -0,0 +1,27 @@
+build
+.gradle
+.idea
+
+*.class
+out/
+.gradle/
+build/
+*.iml
+*.ipr
+*.iws
+TestScript.groovy
+.idea/
+.classpath
+.project
+.settings/
+bin/
+application.yml
+*.hprof
+README.html
+*~
+es-tmp/
+clouddriver-oracle-bmcs/bmcs-sdk
+gatling.conf
+.DS_Store
+/plugins/
+

README.md

@@ -1,11 +1,34 @@
-## My Project
-
-TODO: Fill this README out!
-
-Be sure to:
-
-* Change the title in this README
-* Edit your repository description on GitHub
+## Spinnaker Plugin for Dynamic Account Registration
+
+### Usage
+1. Run `./gradlew releaseBundle` in the root of this project. 
+2. The above command will create a zip file, `build/distributions/spinnaker-aws-account-registration*.zip`.
+3. Copy the zip file to Clouddriver plugin directory. Defaults to `/opt/clouddriver/plugins`. This directory can be 
+specified by the `plugins-root-path` configuration property.
+4. Enable the plugin by placing the following in [Clouddriver profile](https://spinnaker.io/reference/halyard/custom/#custom-profiles)
+
+
+```yaml
+spinnaker:
+  extensibility:
+    plugins-root-path: /opt/clouddriver/plugins
+    plugins:
+      AWS.AccountRegistration:
+        enabled: true
+    repositories: {}
+    strict-plugin-loading: false
+```
+
+### Available configuration properties:
+```yaml
+accountProvision:
+  url: 'http://localhost:8080/hello' # Remote host address. 
+  pullFrequencyInMilliSeconds: 10000 # How often this plugin should query the remote host.
+  syncAgentFrequencyInMilliSeconds: 10000 # How often agent scheduler should run.
+```
+
+### Known issues
+1. When creating lambda functions, on-demand cache update may fail. This seems to be a bug in caching agent in `clouddriver-lambda`. 
 
 ## Security
 

account-registration/account-registration.gradle

@@ -0,0 +1,78 @@
+buildscript {
+  ext.kotlin_version = '1.3.50'
+
+  repositories {
+    mavenCentral()
+  }
+  dependencies {
+//    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  }
+}
+apply plugin: "io.spinnaker.plugin.service-extension"
+//apply plugin: "maven-publish"
+apply plugin: 'groovy'
+apply plugin: 'java'
+//apply plugin: 'kotlin-kapt'
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+  mavenCentral()
+  jcenter()
+  maven { url "http://dl.bintray.com/spinnaker/spinnaker/" }
+}
+
+sourceSets.main.java.srcDirs = []
+sourceSets.main.groovy.srcDirs += ["src/main/java"]
+
+spinnakerPlugin {
+  serviceName = "clouddriver"
+  pluginClass = "com.amazon.aws.spinnaker.plugin.registration.AccountRegistrationPlugin"
+  requires = "clouddriver>=5.0.0"
+}
+
+
+dependencies {
+//  compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+//  api "org.codehaus.groovy:groovy"
+  compileOnly "org.codehaus.groovy:groovy-all:+"
+  compileOnly (group: 'org.springframework', name: 'spring-context', version: '5.2.1.RELEASE')
+  compileOnly (group: 'com.netflix.spinnaker.kork', name: 'kork-plugins-spring-api', version: "${korkVersion}")
+  compileOnly (group: 'org.springframework', name: 'spring-web', version: '5.2.2.RELEASE')
+  compileOnly (group: 'com.netflix.spinnaker.orca', name: 'orca-core', version: "${orcaVersion}")
+  compileOnly 'com.netflix.spinnaker.clouddriver:clouddriver-api:5.67.0'
+  compileOnly 'com.netflix.spinnaker.clouddriver:clouddriver-aws:5.67.0'
+  compileOnly 'com.netflix.spinnaker.clouddriver:clouddriver-ecs:5.67.0'
+  compileOnly 'com.netflix.spinnaker.clouddriver:cats-core:5.67.0'
+  compileOnly 'com.netflix.spinnaker.clouddriver:clouddriver-security:5.67.0'
+  compileOnly 'com.netflix.spinnaker.clouddriver:clouddriver-eureka:5.67.0'
+  compileOnly 'com.netflix.spinnaker.clouddriver:clouddriver-core:5.67.0'
+  compileOnly 'com.netflix.spinnaker.fiat:fiat-core:1.22.0'
+  compileOnly 'com.amazonaws:aws-java-sdk:1.11.802'
+  compileOnly 'org.projectlombok:lombok:+'
+  annotationProcessor "org.projectlombok:lombok:+"
+  annotationProcessor("org.pf4j:pf4j:$pf4jVersion")
+
+  testImplementation (group: 'com.netflix.spinnaker.orca', name: 'orca-core', version: "${orcaVersion}")
+  testImplementation 'com.netflix.spinnaker.clouddriver:clouddriver-api:5.67.0'
+  testImplementation 'com.netflix.spinnaker.clouddriver:clouddriver-aws:5.67.0'
+  testImplementation 'com.netflix.spinnaker.clouddriver:clouddriver-ecs:5.67.0'
+  testImplementation 'com.netflix.spinnaker.clouddriver:cats-core:5.67.0'
+  testImplementation 'com.netflix.spinnaker.clouddriver:clouddriver-security:5.67.0'
+  testImplementation 'com.netflix.spinnaker.clouddriver:clouddriver-eureka:5.67.0'
+  testImplementation 'com.netflix.spinnaker.clouddriver:clouddriver-core:5.67.0'
+  testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.2"
+  testImplementation group: 'io.strikt', name: 'strikt-core', version: '0.22.1'
+  testImplementation group: 'dev.minutest', name: 'minutest', version: '1.10.0'
+
+  testRuntime "org.junit.jupiter:junit-jupiter-engine:5.3.2"
+  testRuntime "org.junit.platform:junit-platform-launcher:1.3.2"
+}
+
+test {
+  testLogging {
+    events "passed", "skipped", "failed", "standardOut", "standardError"
+  }
+  useJUnitPlatform()
+}

account-registration/src/main/java/com/amazon/aws/spinnaker/plugin/registration/Account.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *   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
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package com.amazon.aws.spinnaker.plugin.registration;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.netflix.spinnaker.fiat.model.resources.Permissions;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Account {
+    @JsonProperty("AccountName")
+    private String name; // required. MUST be unique.
+    @JsonProperty("AccountId")
+    private String accountId;  // required.
+    @JsonProperty("SpinnakerAssumeRole")
+    private String assumeRole;  // required.
+    @JsonProperty("Regions")
+    private List<String> regions;  // required.
+    @JsonProperty("SpinnakerProviders")
+    private List<String> providers;  // required.
+    @JsonProperty("SpinnakerEnabled")
+    private Boolean enabled = false;  // required.
+    // Optional
+    @JsonProperty("DeletedAt")
+    private Long deletedAt;
+    @JsonProperty("Permissions")
+    private Permissions.Builder permissions;
+    @JsonProperty("Environment")
+    private String environment;
+    @JsonProperty("AccountArn")
+    private String accountArn;
+    @JsonProperty("AccountEmail")
+    private String accountEmail;
+    @JsonProperty("Profile")
+    private String profile;
+    @JsonProperty("ServiceId")
+    private String serviceId;
+    @JsonProperty("Status")
+    private String status;
+    @JsonProperty("CreatedAt")
+    private String createdAt;
+    @JsonProperty("UpdatedAt")
+    private String updatedAt;
+    // Pagination
+    @JsonProperty("Pagination")
+    private AccountPagination pagination;
+
+    Account(String name, String accountId, String assumeRole, List<String> regions,
+            List<String> providers, Boolean enabled) {
+        this.name = name;
+        this.accountId = accountId;
+        this.assumeRole = assumeRole;
+        this.regions = regions;
+        this.providers = providers;
+        this.enabled = enabled;
+    }
+}

account-registration/src/main/java/com/amazon/aws/spinnaker/plugin/registration/AccountPagination.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *   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
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package com.amazon.aws.spinnaker.plugin.registration;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class AccountPagination {
+    @JsonProperty("Limit")
+    private String limit;
+    @JsonProperty("NextUrl")
+    private String nextUrl;
+    @JsonProperty("CursorState")
+    private String cursorState;
+}

account-registration/src/main/java/com/amazon/aws/spinnaker/plugin/registration/AccountRegistrationPlugin.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *   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
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package com.amazon.aws.spinnaker.plugin.registration;
+
+import com.netflix.spinnaker.kork.plugins.api.spring.PrivilegedSpringPlugin;
+import lombok.extern.slf4j.Slf4j;
+import org.pf4j.PluginWrapper;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Slf4j
+public class AccountRegistrationPlugin extends PrivilegedSpringPlugin {
+
+    public AccountRegistrationPlugin(PluginWrapper wrapper) {
+        super(wrapper);
+    }
+
+    @Override
+    public void registerBeanDefinitions(BeanDefinitionRegistry registry) {
+        BeanDefinition lazyLoadCredentialsRepositoryDefinition = primaryBeanDefinitionFor(LazyLoadCredentialsRepository.class);
+        try {
+            log.debug("Registering bean: {}", lazyLoadCredentialsRepositoryDefinition.getBeanClassName());
+            registry.registerBeanDefinition("accountCredentialsRepository", lazyLoadCredentialsRepositoryDefinition);
+        } catch (BeanDefinitionStoreException e) {
+            log.error("Could not register bean {}", lazyLoadCredentialsRepositoryDefinition.getBeanClassName());
+        }
+        List<Class> classes = new ArrayList<>(Arrays.asList(AmazonPollingSynchronizer.class,
+                AmazonEC2InfraCachingAgentScheduler.class,
+                AmazonAWSCachingAgentScheduler.class, AmazonECSCachingAgentScheduler.class));
+        for (Class calssToAdd : classes) {
+            BeanDefinition beanDefinition = beanDefinitionFor(calssToAdd);
+            try {
+                log.debug("Registering bean: {}", beanDefinition.getBeanClassName());
+                registerBean(beanDefinition, registry);
+            } catch (ClassNotFoundException e) {
+                log.error("Could not register bean {}", beanDefinition.getBeanClassName());
+            }
+        }
+    }
+
+    @Override
+    public void start() {
+        log.info("{} plugin started", this.getClass().getSimpleName());
+    }
+
+    @Override
+    public void stop() {
+        log.info("{} plugin stopped", this.getClass().getSimpleName());
+    }
+}

account-registration/src/main/java/com/amazon/aws/spinnaker/plugin/registration/AccountsStatus.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *   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
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package com.amazon.aws.spinnaker.plugin.registration;
+
+import com.netflix.spinnaker.clouddriver.aws.security.config.CredentialsConfig;
+import com.netflix.spinnaker.clouddriver.ecs.security.ECSCredentialsConfig;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@Data
+public class AccountsStatus {
+    public HashMap<String, CredentialsConfig.Account> ec2Accounts;
+    public HashMap<String, ECSCredentialsConfig.Account> ecsAccounts;
+    public List<String> deletedAccounts;
+
+    public List<CredentialsConfig.Account> getEC2AccountsAsList() {
+        List<CredentialsConfig.Account> desiredEc2Accounts = new ArrayList<>();
+        desiredEc2Accounts.addAll(ec2Accounts.values());
+        return desiredEc2Accounts;
+    }
+
+    public List<ECSCredentialsConfig.Account> getECSAccountsAsList() {
+        List<ECSCredentialsConfig.Account> desiredEcsAccounts = new ArrayList<>();
+        desiredEcsAccounts.addAll(ecsAccounts.values());
+        return desiredEcsAccounts;
+    }
+}