Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(cli): ignore providerVersion in all non-Kubernetes account types #1747

Merged
merged 1 commit into from
Jul 7, 2020
Merged

fix(cli): ignore providerVersion in all non-Kubernetes account types #1747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/model/v1/node/Account.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.netflix.spinnaker.halyard.config.model.v1.node;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.netflix.spinnaker.fiat.model.resources.Permissions;
import com.netflix.spinnaker.halyard.config.config.v1.ArtifactSourcesConfig;
import java.util.ArrayList;
Expand All @@ -26,7 +25,6 @@

@Data
@EqualsAndHashCode(callSuper = false)
@JsonIgnoreProperties({"providerVersion"})
public abstract class Account extends Node implements Cloneable {
String name;
String environment;
Expand Down
2 changes: 2 additions & 0 deletions ...src/main/java/com/netflix/spinnaker/halyard/config/model/v1/providers/aws/AwsAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package com.netflix.spinnaker.halyard.config.model.v1.providers.aws;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -25,6 +26,7 @@

@Data
@EqualsAndHashCode(callSuper = true)
@JsonIgnoreProperties({"providerVersion"})
public class AwsAccount extends Account {
private String defaultKeyPair;
private String edda;
Expand Down
2 changes: 2 additions & 0 deletions ...main/java/com/netflix/spinnaker/halyard/config/model/v1/providers/azure/AzureAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.netflix.spinnaker.halyard.config.model.v1.providers.azure;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
import com.netflix.spinnaker.halyard.config.model.v1.node.Secret;
import java.util.ArrayList;
Expand All @@ -25,6 +26,7 @@

@Data
@EqualsAndHashCode(callSuper = true)
@JsonIgnoreProperties({"providerVersion"})
public class AzureAccount extends Account {
private String clientId;
@Secret private String appKey;
Expand Down
2 changes: 2 additions & 0 deletions ...netflix/spinnaker/halyard/config/model/v1/providers/cloudfoundry/CloudFoundryAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.netflix.spinnaker.halyard.config.model.v1.providers.cloudfoundry;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
import com.netflix.spinnaker.halyard.config.model.v1.node.Secret;
Expand All @@ -25,6 +26,7 @@

@Data
@EqualsAndHashCode(callSuper = true)
@JsonIgnoreProperties({"providerVersion"})
public class CloudFoundryAccount extends Account {
@JsonProperty("api")
String apiHost;
Expand Down
2 changes: 2 additions & 0 deletions ...c/main/java/com/netflix/spinnaker/halyard/config/model/v1/providers/dcos/DCOSAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.netflix.spinnaker.halyard.config.model.v1.providers.dcos;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.netflix.spinnaker.halyard.config.model.v1.node.*;
import com.netflix.spinnaker.halyard.config.model.v1.providers.containers.ContainerAccount;
import com.netflix.spinnaker.halyard.config.model.v1.providers.dockerRegistry.DockerRegistryProvider;
Expand All @@ -11,6 +12,7 @@

@Data
@EqualsAndHashCode(callSuper = true)
@JsonIgnoreProperties({"providerVersion"})
public class DCOSAccount extends ContainerAccount {
private List<ClusterCredential> clusters;

Expand Down
2 changes: 2 additions & 0 deletions ...lix/spinnaker/halyard/config/model/v1/providers/dockerRegistry/DockerRegistryAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.netflix.spinnaker.halyard.config.model.v1.providers.dockerRegistry;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
import com.netflix.spinnaker.halyard.config.model.v1.node.LocalFile;
import com.netflix.spinnaker.halyard.config.model.v1.node.Secret;
Expand All @@ -27,6 +28,7 @@

@Data
@EqualsAndHashCode(callSuper = true)
@JsonIgnoreProperties({"providerVersion"})
public class DockerRegistryAccount extends Account {
private String address;
private String username;
Expand Down
2 changes: 2 additions & 0 deletions ...src/main/java/com/netflix/spinnaker/halyard/config/model/v1/providers/ecs/EcsAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package com.netflix.spinnaker.halyard.config.model.v1.providers.ecs;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@EqualsAndHashCode(callSuper = true)
@JsonIgnoreProperties({"providerVersion"})
public class EcsAccount extends Account {

private String awsAccount;
Expand Down
2 changes: 2 additions & 0 deletions ...a/com/netflix/spinnaker/halyard/config/model/v1/providers/google/CommonGoogleAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.netflix.spinnaker.halyard.config.model.v1.providers.google;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
import com.netflix.spinnaker.halyard.config.model.v1.node.LocalFile;
import com.netflix.spinnaker.halyard.config.model.v1.node.SecretFile;
Expand All @@ -26,6 +27,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@JsonIgnoreProperties({"providerVersion"})
public class CommonGoogleAccount extends Account {
private String project;
@LocalFile @SecretFile private String jsonPath;
Expand Down
2 changes: 2 additions & 0 deletions ...m/netflix/spinnaker/halyard/config/model/v1/providers/huaweicloud/HuaweiCloudAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.netflix.spinnaker.halyard.config.model.v1.providers.huaweicloud;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
import com.netflix.spinnaker.halyard.config.model.v1.node.Secret;
import java.util.List;
Expand All @@ -24,6 +25,7 @@

@Data
@EqualsAndHashCode(callSuper = true)
@JsonIgnoreProperties({"providerVersion"})
public class HuaweiCloudAccount extends Account {
private String accountType;
private String authUrl;
Expand Down
2 changes: 2 additions & 0 deletions ...in/java/com/netflix/spinnaker/halyard/config/model/v1/providers/oracle/OracleAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package com.netflix.spinnaker.halyard.config.model.v1.providers.oracle;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
import com.netflix.spinnaker.halyard.config.model.v1.node.LocalFile;
import com.netflix.spinnaker.halyard.config.model.v1.node.Secret;
Expand All @@ -18,6 +19,7 @@

@Data
@EqualsAndHashCode(callSuper = true)
@JsonIgnoreProperties({"providerVersion"})
public class OracleAccount extends Account {
private String compartmentId;
private String userId;
Expand Down
2 changes: 2 additions & 0 deletions ...netflix/spinnaker/halyard/config/model/v1/providers/tencentcloud/TencentCloudAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.netflix.spinnaker.halyard.config.model.v1.providers.tencentcloud;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
import com.netflix.spinnaker.halyard.config.model.v1.node.Secret;
import java.util.ArrayList;
Expand All @@ -25,6 +26,7 @@

@Data
@EqualsAndHashCode(callSuper = true)
@JsonIgnoreProperties({"providerVersion"})
public class TencentCloudAccount extends Account {
private String secretId;
@Secret private String secretKey;
Expand Down