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

update snakyml and replace deprecated method #42

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update snakyml and replace deprecated method #42

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
20 changes: 4 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,12 @@
<changelist>-SNAPSHOT</changelist>

<!-- jenkins versions -->
<jenkins.version>2.401.1</jenkins.version>
<jenkins.version>2.401.3</jenkins.version>
<bom.artifactId>bom-2.401.x</bom.artifactId>
<bom.version>2244.vd60654536b_96</bom.version>

<!-- dependency versions -->
<authentication-tokens.version>1.53.v1c90fd9191a_b_</authentication-tokens.version>
<docker-commons.version>439.va_3cb_0a_6a_fb_29</docker-commons.version>
<google-oauth-plugin.version>1.0.9</google-oauth-plugin.version>
<kubernetes-client-api.version>6.8.1-224.vd388fca_4db_3b_</kubernetes-client-api.version>
<bom.version>2555.v3190a_8a_c60c6</bom.version>

<!-- maven plugins versions -->
<maven-coveralls.version>4.3.0</maven-coveralls.version>
<maven-jacoco.version>0.8.10</maven-jacoco.version>

<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Low</spotbugs.threshold>
Expand All @@ -62,8 +55,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>kubernetes-client-api</artifactId>
<version>${kubernetes-client-api.version}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>jackson2-api</artifactId>
Expand All @@ -82,8 +74,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>authentication-tokens</artifactId>
<version>${authentication-tokens.version}</version>
</dependency>
</dependency>

<!-- optional plugins -->
<!-- to use StringCredentialsImpl for tokens -->
Expand All @@ -95,13 +86,11 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>google-oauth-plugin</artifactId>
<version>${google-oauth-plugin.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>docker-commons</artifactId>
<version>${docker-commons.version}</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -146,7 +135,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${maven-jacoco.version}</version>
<executions>
<execution>
<id>prepare-agent</id>
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/org/jenkinsci/plugins/kubernetes/auth/KubernetesAuthException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package org.jenkinsci.plugins.kubernetes.auth;

public class KubernetesAuthException extends Exception {
public KubernetesAuthException() { super(); }
/**
*
*/
private static final long serialVersionUID = 1L;
public KubernetesAuthException() { super(); }
public KubernetesAuthException(String message) { super(message); }
public KubernetesAuthException(String message, Throwable cause) { super(message, cause); }
public KubernetesAuthException(Throwable cause) { super(cause); }
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package org.jenkinsci.plugins.kubernetes.auth.impl;

import io.fabric8.kubernetes.client.ConfigBuilder;
import io.fabric8.kubernetes.client.internal.KubeConfigUtils;
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuth;
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthConfig;
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthException;

import java.io.IOException;
import io.fabric8.kubernetes.client.ConfigBuilder;
import io.fabric8.kubernetes.client.internal.KubeConfigUtils;

/**
* Kubernetes authentication using a raw kubeconfig string.
Expand Down
7 changes: 6 additions & 1 deletion ...in/java/org/jenkinsci/plugins/kubernetes/credentials/HttpClientWithTLSOptionsFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,12 @@ public static HttpClientBuilder getBuilder(URI uri, String caCertData, boolean s
}

public static class TLSConfigurationError extends Exception {
public TLSConfigurationError(Exception e) {
/**
*
*/
private static final long serialVersionUID = 1L;

public TLSConfigurationError(Exception e) {
super(e);
}
}
Expand Down
11 changes: 8 additions & 3 deletions ...java/org/jenkinsci/plugins/kubernetes/credentials/OpenShiftBearerTokenCredentialImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.logging.Logger;
//import java.util.logging.Logger;

/**
* @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
Expand All @@ -38,7 +38,7 @@ public class OpenShiftBearerTokenCredentialImpl extends UsernamePasswordCredenti
// Used to artificially reduce the lifespan of a token
protected static final long EARLY_EXPIRE_DELAY_SEC = 300;
private static final long serialVersionUID = 6031616605797622926L;
private static final Logger logger = Logger.getLogger(OpenShiftBearerTokenCredentialImpl.class.getName());
//private static final Logger logger = Logger.getLogger(OpenShiftBearerTokenCredentialImpl.class.getName());
private transient ConcurrentMap<String, Token> tokenCache = new ConcurrentHashMap<>();

@DataBoundConstructor
Expand Down Expand Up @@ -172,7 +172,12 @@ public static class Token {
}

public static class TokenResponseError extends Exception {
public TokenResponseError(String message) {
/**
*
*/
private static final long serialVersionUID = 1L;

public TokenResponseError(String message) {
super(message);
}
}
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/jenkinsci/plugins/kubernetes/credentials/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package org.jenkinsci.plugins.kubernetes.credentials;

import org.apache.commons.codec.binary.Base64;

import java.nio.charset.StandardCharsets;
import java.security.Key;
import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate;

import org.apache.commons.codec.binary.Base64;

public abstract class Utils {

Expand Down
22 changes: 9 additions & 13 deletions src/test/java/org/jenkinsci/plugins/kubernetes/auth/impl/AbstractKubernetesAuthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
package org.jenkinsci.plugins.kubernetes.auth.impl;

import io.fabric8.kubernetes.api.model.AuthInfoBuilder;
import io.fabric8.kubernetes.api.model.Cluster;
import io.fabric8.kubernetes.client.ConfigBuilder;
import io.fabric8.kubernetes.client.utils.Serialization;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthConfig;
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthException;
import org.jenkinsci.plugins.kubernetes.credentials.Utils;
import org.junit.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import io.fabric8.kubernetes.api.model.AuthInfoBuilder;
import io.fabric8.kubernetes.api.model.Cluster;
import io.fabric8.kubernetes.client.ConfigBuilder;

public class AbstractKubernetesAuthTest {
@Test
public void createConfig() throws Exception {
AbstractKubernetesAuth b = new NoopKubernetesAuth();
io.fabric8.kubernetes.api.model.Config c = Serialization.yamlMapper().readValue(
b.buildKubeConfig(new KubernetesAuthConfig("serverUrl", "caCertificate", false)), io.fabric8.kubernetes.api.model.Config.class
);
io.fabric8.kubernetes.api.model.Config c = b.buildConfigBuilder(new KubernetesAuthConfig("serverUrl", "caCertificate", false), "k8s", "k8s", "cluster-admin").build();
assertEquals(1, c.getClusters().size());
Cluster cluster = c.getClusters().get(0).getCluster();
assertEquals("serverUrl", cluster.getServer());
Expand All @@ -31,9 +29,7 @@ public void createConfig() throws Exception {
@Test
public void skipTlsVerify() throws Exception {
AbstractKubernetesAuth b = new NoopKubernetesAuth();
io.fabric8.kubernetes.api.model.Config c = Serialization.yamlMapper().readValue(
b.buildKubeConfig(new KubernetesAuthConfig("serverUrl", "caCertificate", true)), io.fabric8.kubernetes.api.model.Config.class
);
io.fabric8.kubernetes.api.model.Config c = b.buildConfigBuilder(new KubernetesAuthConfig("serverUrl", "caCertificate", true), "k8s", "k8s", "cluster-admin").build();
assertEquals(1, c.getClusters().size());
Cluster cluster = c.getClusters().get(0).getCluster();
assertEquals("serverUrl", cluster.getServer());
Expand Down
12 changes: 4 additions & 8 deletions src/test/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthCertificateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package org.jenkinsci.plugins.kubernetes.auth.impl;

import hudson.util.Secret;
import io.fabric8.kubernetes.client.utils.Serialization;
import static org.junit.Assert.assertEquals;

import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthConfig;
import org.jenkinsci.plugins.kubernetes.auth.impl.KubernetesAuthCertificate;
import org.jenkinsci.plugins.kubernetes.credentials.Utils;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;

import static org.junit.Assert.assertEquals;
import hudson.util.Secret;

public class KubernetesAuthCertificateTest {
@Rule
Expand All @@ -23,10 +22,7 @@ public void createConfig() throws Exception {
certData,
Secret.fromString(keyData)
);
io.fabric8.kubernetes.api.model.Config c = Serialization.yamlMapper().readValue(
b.buildKubeConfig(new KubernetesAuthConfig("serverUrl", "caCertificate", false)), io.fabric8.kubernetes.api.model.Config.class
);

io.fabric8.kubernetes.api.model.Config c = b.buildConfigBuilder(new KubernetesAuthConfig("serverUrl", "caCertificate", false), "k8s", "k8s", "cluster-admin").build();
// verifying class doesn't modify cert and key data, so not using here
assertEquals(Utils.encodeBase64(certData), c.getUsers().get(0).getUser().getClientCertificateData());
assertEquals(Utils.encodeBase64(keyData), c.getUsers().get(0).getUser().getClientKeyData());
Expand Down
23 changes: 10 additions & 13 deletions src/test/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKeystoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
package org.jenkinsci.plugins.kubernetes.auth.impl;

import hudson.util.Secret;
import io.fabric8.kubernetes.api.model.Config;
import io.fabric8.kubernetes.client.utils.Serialization;
import org.apache.commons.compress.utils.IOUtils;
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthConfig;
import org.jenkinsci.plugins.kubernetes.credentials.Utils;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;
import static org.junit.Assert.assertEquals;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -17,7 +9,14 @@
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;

import static org.junit.Assert.assertEquals;
import org.apache.commons.compress.utils.IOUtils;
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthConfig;
import org.jenkinsci.plugins.kubernetes.credentials.Utils;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;

import hudson.util.Secret;

public class KubernetesAuthKeystoreTest {
@Rule
Expand All @@ -30,9 +29,7 @@ public void createConfig() throws Exception {
try (InputStream resourceAsStream = getClass().getResourceAsStream("kubernetes.pkcs12")) {
KeyStore keyStore = loadKeyStore(resourceAsStream, PASSPHRASE.toCharArray());
KubernetesAuthKeystore auth = new KubernetesAuthKeystore(keyStore, Secret.fromString(PASSPHRASE));
Config c = Serialization.yamlMapper().readValue(
auth.buildKubeConfig(new KubernetesAuthConfig("serverUrl", "caCertificate", false)), Config.class
);
io.fabric8.kubernetes.api.model.Config c = auth.buildConfigBuilder(new KubernetesAuthConfig("serverUrl", "caCertificate", false), "k8s", "k8s", "cluster-admin").build();

// verifying class doesn't modify cert and key data, so not using here
assertEquals(Utils.encodeBase64(readFile("test.crt")), c.getUsers().get(0).getUser().getClientCertificateData());
Expand Down
5 changes: 2 additions & 3 deletions src/test/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package org.jenkinsci.plugins.kubernetes.auth.impl;

import static org.junit.Assert.assertEquals;

import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthConfig;
import org.jenkinsci.plugins.kubernetes.auth.impl.KubernetesAuthKubeconfig;
import org.junit.Test;

import static org.junit.Assert.assertEquals;

public class KubernetesAuthKubeconfigTest {
@Test
public void createConfig() throws Exception {
Expand Down
11 changes: 4 additions & 7 deletions ...t/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthUsernamePasswordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package org.jenkinsci.plugins.kubernetes.auth.impl;

import hudson.util.Secret;
import io.fabric8.kubernetes.client.utils.Serialization;
import static org.junit.Assert.assertEquals;

import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthConfig;
import org.jenkinsci.plugins.kubernetes.auth.impl.KubernetesAuthUsernamePassword;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;

import static org.junit.Assert.assertEquals;
import hudson.util.Secret;

public class KubernetesAuthUsernamePasswordTest {
@Rule
Expand All @@ -17,9 +16,7 @@ public class KubernetesAuthUsernamePasswordTest {
@Test
public void createConfig() throws Exception {
KubernetesAuthUsernamePassword b = new KubernetesAuthUsernamePassword("user", Secret.fromString("pass"));
io.fabric8.kubernetes.api.model.Config c = Serialization.yamlMapper().readValue(
b.buildKubeConfig(new KubernetesAuthConfig("serverUrl", "caCertificate", false)), io.fabric8.kubernetes.api.model.Config.class
);
io.fabric8.kubernetes.api.model.Config c = b.buildConfigBuilder(new KubernetesAuthConfig("serverUrl", "caCertificate", false), "k8s", "k8s", "cluster-admin").build();
assertEquals("cluster-admin", c.getUsers().get(0).getName());
assertEquals("user", c.getUsers().get(0).getUser().getUsername());
assertEquals("pass", c.getUsers().get(0).getUser().getPassword());
Expand Down
19 changes: 10 additions & 9 deletions src/test/java/org/jenkinsci/plugins/kubernetes/credentials/JCasCConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package org.jenkinsci.plugins.kubernetes.credentials;

import com.cloudbees.plugins.credentials.CredentialsProvider;
import com.cloudbees.plugins.credentials.CredentialsScope;
import hudson.init.InitMilestone;
import io.jenkins.plugins.casc.misc.RoundTripAbstractTest;
import jenkins.model.Jenkins;
import org.jvnet.hudson.test.RestartableJenkinsRule;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;

import java.util.Collections;
import java.util.List;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import org.jvnet.hudson.test.RestartableJenkinsRule;

import com.cloudbees.plugins.credentials.CredentialsProvider;
import com.cloudbees.plugins.credentials.CredentialsScope;

import io.jenkins.plugins.casc.misc.RoundTripAbstractTest;
import jenkins.model.Jenkins;

public class JCasCConfigurationTest extends RoundTripAbstractTest {

Expand All @@ -29,7 +30,7 @@ protected void assertConfiguredAsExpected(RestartableJenkinsRule restartableJenk
// assertThat(fileSystemServiceAccountCredential.getScope(), is(CredentialsScope.GLOBAL));

List<OpenShiftBearerTokenCredentialImpl> creds1 =
CredentialsProvider.lookupCredentials(OpenShiftBearerTokenCredentialImpl.class,
CredentialsProvider.lookupCredentialsInItemGroup(OpenShiftBearerTokenCredentialImpl.class,
Jenkins.getInstanceOrNull(), null, Collections.emptyList());
assertThat(creds1.size(), is(1));
OpenShiftBearerTokenCredentialImpl openShiftBearerTokenCredential = creds1.get(0);
Expand Down
7 changes: 6 additions & 1 deletion src/test/java/org/jenkinsci/plugins/kubernetes/credentials/MockHttpServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@
* @author Max Laverse
*/
public class MockHttpServlet extends HttpServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
/**
*
*/
private static final long serialVersionUID = 1L;

protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
switch (request.getPathInfo()) {
case "/bad-location/oauth/authorize":
response.sendRedirect("bad");
Expand Down
Loading