onedev/k8s-helper

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/CloneInfo.java

		skipped 14 lines
15	15
16	16		private static final long serialVersionUID = 1L;
17	17
	18	+	public static final String ONEDEV_AUTHORIZATION = "OneDev-Authorization";
	19	+
18	20		private final String cloneUrl;
19	21
20	22		public CloneInfo(String cloneUrl) {
		skipped 28 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/DefaultCloneInfo.java

		skipped 3 lines
4	4		import java.nio.charset.StandardCharsets;
5	5		import java.util.Base64;
6	6
7		-	import javax.ws.rs.core.HttpHeaders;
8		-
9	7		import io.onedev.commons.utils.command.Commandline;
10	8		import io.onedev.commons.utils.command.LineConsumer;
11	9
		skipped 11 lines
23	21		@Override
24	22		public void writeAuthData(File homeDir, Commandline git, LineConsumer infoLogger, LineConsumer errorLogger) {
25	23		git.clearArgs();
26		-	String extraHeader = HttpHeaders.AUTHORIZATION + ": " + KubernetesHelper.BEARER + " " + jobToken;
	24	+	String extraHeader = ONEDEV_AUTHORIZATION + ": " + KubernetesHelper.BEARER + " " + jobToken;
27	25		git.addArgs("config", "--global", "http.extraHeader", extraHeader);
28	26		git.execute(infoLogger, errorLogger).checkReturnCode();
29	27		}
		skipped 10 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/HttpCloneInfo.java

		skipped 3 lines
4	4		import java.nio.charset.StandardCharsets;
5	5		import java.util.Base64;
6	6
7		-	import javax.ws.rs.core.HttpHeaders;
8		-
9	7		import io.onedev.commons.utils.command.Commandline;
10	8		import io.onedev.commons.utils.command.LineConsumer;
11	9
		skipped 12 lines
24	22		@Override
25	23		public void writeAuthData(File homeDir, Commandline git, LineConsumer infoLogger, LineConsumer errorLogger) {
26	24		git.clearArgs();
27		-	String extraHeader = HttpHeaders.AUTHORIZATION + ": " + KubernetesHelper.BEARER + " " + accessToken;
	25	+	String extraHeader = ONEDEV_AUTHORIZATION + ": " + KubernetesHelper.BEARER + " " + accessToken;
28	26		git.addArgs("config", "--global", "http.extraHeader", extraHeader);
29	27		git.execute(infoLogger, errorLogger).checkReturnCode();
30	28		}
		skipped 10 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/Init.java

		skipped 21 lines
22	22		logger.info(KubernetesHelper.LOG_END_MESSAGE);
23	23		System.exit(0);
24	24		} catch (Exception e) {
25		-	logger.error("Error executing init logic", e);
	25	+	logger.error(KubernetesHelper.wrapWithAnsiError("Error executing init logic"), e);
26	26		logger.info(KubernetesHelper.LOG_END_MESSAGE);
27	27		System.exit(1);
28	28		}
		skipped 4 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/KubernetesHelper.java

1	1		package io.onedev.k8shelper;
2	2
	3	+	import static java.nio.charset.StandardCharsets.UTF_8;
	4	+
3	5		import java.io.File;
4	6		import java.io.FileFilter;
5	7		import java.io.IOException;
		skipped 1 lines
7	9		import java.io.OutputStream;
8	10		import java.nio.ByteBuffer;
9	11		import java.nio.charset.Charset;
10		-	import static java.nio.charset.StandardCharsets.UTF_8;
11	12		import java.nio.file.Files;
12	13		import java.util.ArrayList;
13	14		import java.util.Base64;
		skipped 264 lines
278	279		@Override
279	280		public void consume(String line) {
280	281		if (!line.contains("Warning: use -cacerts option to access cacerts keystore"))
281		-	logger.error(line);
	282	+	logger.error(wrapWithAnsiError(line));
282	283		}
283	284
284	285		}).checkReturnCode();
		skipped 18 lines
303	304
304	305		@Override
305	306		public void consume(String line) {
306		-	logger.error(line);
	307	+	logger.error(wrapWithAnsiError(line));
307	308		}
308	309
309	310		};
		skipped 642 lines
952	953		for (String each: collection)
953	954		replacedCollection.add(replacePlaceholders(each, buildHome));
954	955		return replacedCollection;
	956	+	}
	957	+
	958	+	public static String wrapWithAnsiError(String text) {
	959	+	return "\033[1;31m" + text + "\033[0m";
	960	+	}
	961	+
	962	+	public static String wrapWithAnsiWarning(String text) {
	963	+	return "\033[1;33m" + text + "\033[0m";
	964	+	}
	965	+
	966	+	public static String wrapWithAnsiEmphasize(String text) {
	967	+	return "\033[1;35m" + text + "\033[0m";
955	968		}
956	969
957	970		}
		skipped 1 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/RunServerStep.java

		skipped 20 lines
21	21
22	22		KubernetesHelper.runServerStep(serverUrl, jobToken, args[0], args[1], args[2], args[3]);
23	23		} catch (Exception e) {
24		-	logger.error("Error executing step", e);
	24	+	logger.error(KubernetesHelper.wrapWithAnsiError("Error executing step"), e);
25	25		exitCode = 1;
26	26		} finally {
27	27		logger.info(KubernetesHelper.LOG_END_MESSAGE);
		skipped 6 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/SideCar.java

		skipped 22 lines
23	23		logger.info(KubernetesHelper.LOG_END_MESSAGE);
24	24		System.exit(0);
25	25		} catch (Exception e) {
26		-	logger.error("Error executing sidecar logic", e);
	26	+	logger.error(KubernetesHelper.wrapWithAnsiError("Error executing sidecar logic"), e);
27	27		logger.info(KubernetesHelper.LOG_END_MESSAGE);
28	28		System.exit(1);
29	29		}
		skipped 4 lines