Skip to content

Commit

Permalink
Merge pull request #212 from gocd/fix-null-ca-cert-data
Browse files Browse the repository at this point in the history
Treat blank CA Cert data as null
  • Loading branch information
chadlwilson authored Jan 6, 2024
2 parents 27e1bf5 + d0981f8 commit 7074960
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public String getSecurityToken() {
}

public String getClusterCACertData() {
return clusterCACertData;
return clusterCACertData != null && clusterCACertData.isBlank() ? null : clusterCACertData;
}

public String getNamespace() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package cd.go.contrib.secrets.kubernetes.models;

import cd.go.plugin.base.GsonTransformer;
import org.junit.jupiter.api.Test;

import java.util.HashMap;
import java.util.Map;

import static org.assertj.core.api.Assertions.assertThat;

class SecretConfigTest {

@Test
public void shouldConsiderBlankCertAsNull() {
final Map<String, Object> settings = new HashMap<>();
settings.put("kubernetes_cluster_ca_cert", " ");

SecretConfig config = GsonTransformer.fromJson(GsonTransformer.toJson(settings), SecretConfig.class);

assertThat(config.getClusterCACertData()).isNull();
}
}

0 comments on commit 7074960

Please sign in to comment.