Skip to content

Commit 3ddfe7a

Browse files
committed
Remove getSimpleDateFormat() as it is equivalent to Instant's toString()
1 parent 4b46f38 commit 3ddfe7a

File tree

4 files changed

+2
-13
lines changed

4 files changed

+2
-13
lines changed

src/main/java/cd/go/contrib/elasticagent/Constants.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public interface Constants {
5353
String KUBERNETES_POD_KIND_LABEL_KEY = "kind";
5454
String KUBERNETES_POD_KIND_LABEL_VALUE = "kubernetes-elastic-agent";
5555
String KUBERNETES_POD_NAME_PREFIX = "k8s-ea";
56-
String KUBERNETES_POD_CREATION_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
5756

5857
String POD_POSTFIX = "POD_POSTFIX";
5958
String CONTAINER_POSTFIX = "CONTAINER_POSTFIX";

src/main/java/cd/go/contrib/elasticagent/KubernetesInstanceFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import static cd.go.contrib.elasticagent.Constants.*;
4242
import static cd.go.contrib.elasticagent.KubernetesPlugin.LOG;
4343
import static cd.go.contrib.elasticagent.executors.GetProfileMetadataExecutor.*;
44-
import static cd.go.contrib.elasticagent.utils.Util.getSimpleDateFormat;
4544
import static java.lang.String.valueOf;
4645
import static java.nio.charset.StandardCharsets.UTF_8;
4746
import static java.text.MessageFormat.format;
@@ -104,7 +103,7 @@ private Boolean privileged(CreateAgentRequest request) {
104103
}
105104

106105
private void setGoCDMetadata(CreateAgentRequest request, PluginSettings settings, PluginRequest pluginRequest, Pod elasticAgentPod) {
107-
elasticAgentPod.getMetadata().setCreationTimestamp(getSimpleDateFormat().format(Instant.now()));
106+
elasticAgentPod.getMetadata().setCreationTimestamp(Instant.now().toString());
108107

109108
setContainerEnvVariables(elasticAgentPod, request, settings, pluginRequest);
110109
setAnnotations(elasticAgentPod, request);

src/main/java/cd/go/contrib/elasticagent/utils/Util.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,14 @@
2626
import java.io.InputStream;
2727
import java.io.StringReader;
2828
import java.nio.charset.StandardCharsets;
29-
import java.time.ZoneOffset;
30-
import java.time.format.DateTimeFormatter;
3129
import java.util.Properties;
3230

33-
import static cd.go.contrib.elasticagent.Constants.KUBERNETES_POD_CREATION_TIME_FORMAT;
34-
3531
public class Util {
3632
public static final Gson GSON = new GsonBuilder()
3733
.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
3834
.excludeFieldsWithoutExposeAnnotation()
3935
.create();
4036

41-
public static DateTimeFormatter getSimpleDateFormat() {
42-
return DateTimeFormatter.ofPattern(KUBERNETES_POD_CREATION_TIME_FORMAT).withZone(ZoneOffset.UTC);
43-
}
44-
4537
public static String readResource(String resourceFile) {
4638
return new String(readResourceBytes(resourceFile), StandardCharsets.UTF_8);
4739
}

src/test/java/cd/go/contrib/elasticagent/executors/ServerPingRequestExecutorTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import static java.time.temporal.ChronoUnit.MINUTES;
3636

3737
import static cd.go.contrib.elasticagent.Constants.JOB_ID_LABEL_KEY;
38-
import static cd.go.contrib.elasticagent.utils.Util.getSimpleDateFormat;
3938
import static org.junit.jupiter.api.Assertions.assertFalse;
4039
import static org.junit.jupiter.api.Assertions.assertTrue;
4140
import static org.mockito.Mockito.*;
@@ -206,7 +205,7 @@ public void testShouldTerminateUnregisteredInstances_forSingleCluster() throws E
206205
objectMetadata = new ObjectMeta();
207206
objectMetadata.setLabels(Collections.singletonMap(JOB_ID_LABEL_KEY, "20"));
208207
objectMetadata.setName(unregisteredAgentId1);
209-
objectMetadata.setCreationTimestamp(getSimpleDateFormat().format(Instant.now().minus(20, MINUTES)));
208+
objectMetadata.setCreationTimestamp(Instant.now().minus(20, MINUTES).toString());
210209

211210
when(mockedPod.getMetadata()).thenReturn(objectMetadata);
212211

0 commit comments

Comments
 (0)