refactor(core): remove skins
MODIFY
clouddriver-kubernetes/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/config/KubernetesConfigurationProperties.java
clouddriver-kubernetes/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/config/KubernetesConfigurationProperties.java
@@ -46,7 +46,6 @@ public class KubernetesConfigurationProperties {
private boolean configureImagePullSecrets = true;
private List<String> namespaces = new ArrayList<>();
private List<String> omitNamespaces = new ArrayList<>();
- private String skin;
private int cacheThreads = DEFAULT_CACHE_THREADS;
private List<LinkedDockerRegistryConfiguration> dockerRegistries;
private List<String> requiredGroupMembership = new ArrayList<>();

MODIFY
clouddriver-kubernetes/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/security/KubernetesNamedAccountCredentials.java
clouddriver-kubernetes/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/security/KubernetesNamedAccountCredentials.java
@@ -44,8 +44,6 @@ public class KubernetesNamedAccountCredentials<C extends KubernetesCredentials>
@Include private final String accountType;
- @Include private final String skin;
-
@Include private final int cacheThreads;
@Include private final C credentials;
@@ -64,9 +62,6 @@ public class KubernetesNamedAccountCredentials<C extends KubernetesCredentials>
Optional.ofNullable(managedAccount.getEnvironment()).orElse(managedAccount.getName());
this.accountType =
Optional.ofNullable(managedAccount.getAccountType()).orElse(managedAccount.getName());
- this.skin =
- Optional.ofNullable(managedAccount.getSkin())
- .orElse(managedAccount.getProviderVersion().toString());
this.cacheThreads = managedAccount.getCacheThreads();
this.cacheIntervalSeconds = managedAccount.getCacheIntervalSeconds();

MODIFY
clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/caching/KubernetesV2ProviderSynchronizableSpec.groovy
clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/caching/KubernetesV2ProviderSynchronizableSpec.groovy
@@ -105,7 +105,6 @@ class KubernetesV2ProviderSynchronizableSpec extends Specification {
credentials.getName() == "test-account"
credentials.getEnvironment() == "test-account"
credentials.getAccountType() == "test-account"
- credentials.getSkin() == "v2"
credentials.getCacheIntervalSeconds() == null
credentials.getCacheThreads() == 1

MODIFY
clouddriver-security/src/main/groovy/com/netflix/spinnaker/clouddriver/security/AccountCredentials.java
clouddriver-security/src/main/groovy/com/netflix/spinnaker/clouddriver/security/AccountCredentials.java
@@ -77,17 +77,6 @@ public interface AccountCredentials<T> {
return ProviderVersion.v1;
}
- /**
- * Provides a named "skin" as a signal for Spinnaker API clients, e.g. Deck, to alter their
- * behavior. By default, returns an account's provider version, but does not need to be coupled to
- * a provider version.
- *
- * @return the account's skin.
- */
- default String getSkin() {
- return getProviderVersion().toString();
- }
-
/** @return the id for the account (may be null if not supported by underlying cloud provider) */
default String getAccountId() {
return null;

MODIFY
clouddriver-web/src/main/groovy/com/netflix/spinnaker/clouddriver/controllers/CredentialsController.groovy
clouddriver-web/src/main/groovy/com/netflix/spinnaker/clouddriver/controllers/CredentialsController.groovy
@@ -73,8 +73,7 @@ class CredentialsController {
'requiredGroupMembership',
'permissions',
'providerVersion',
- 'accountId',
- 'skin'])
+ 'accountId'])
}
cred.type = accountCredentials.cloudProvider

MODIFY
clouddriver-web/src/test/groovy/com/netflix/spinnaker/clouddriver/controllers/CredentialsControllerSpec.groovy
clouddriver-web/src/test/groovy/com/netflix/spinnaker/clouddriver/controllers/CredentialsControllerSpec.groovy
@@ -53,7 +53,7 @@ class CredentialsControllerSpec extends Specification {
List<Map> parsedResponse = new JsonSlurper().parseText(result.response.contentAsString) as List
- parsedResponse == [[name: "test", environment: "env", accountType: "acctType", cloudProvider: "testProvider", type: "testProvider", requiredGroupMembership: ["test"], permissions: [READ:["test"], WRITE:["test"]], challengeDestructiveActions: false, primaryAccount: false, providerVersion: "v1", skin: "v1"]]
+ parsedResponse == [[name: "test", environment: "env", accountType: "acctType", cloudProvider: "testProvider", type: "testProvider", requiredGroupMembership: ["test"], permissions: [READ:["test"], WRITE:["test"]], challengeDestructiveActions: false, primaryAccount: false, providerVersion: "v1"]]
}
static class TestNamedAccountCredentials implements AccountCredentials<Map> {

refactor(core): remove skins (#4576)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>