GEODE-7398 :show deployer and deploy time (apache#4509)

Co-authored-by: Darrel Schneider <[email protected]>
Co-authored-by: Dale Emery <[email protected]>
Co-authored-by: Jinmei Liao <[email protected]>

Author: 3 people

geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentManagementDUnitTest.java

@@ -28,6 +28,8 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.examples.SimpleSecurityManager;
 import org.apache.geode.management.api.ClusterManagementGetResult;
 import org.apache.geode.management.api.ClusterManagementListResult;
 import org.apache.geode.management.api.ClusterManagementService;
@@ -68,15 +70,20 @@ public static void beforeClass() throws Exception {
     jarBuilder.buildJarFromClassNames(group2Jar, "Class2");
     jarBuilder.buildJarFromClassNames(clusterJar, "Class3");
 
-    locator = cluster.startLocatorVM(0, l -> l.withHttpService());
-    server1 = cluster.startServerVM(1, "group1", locator.getPort());
-    server2 = cluster.startServerVM(2, "group2", locator.getPort());
+    locator = cluster.startLocatorVM(0, l -> l.withHttpService().withSecurityManager(
+        SimpleSecurityManager.class));
+    int locatorPort = locator.getPort();
+    server1 = cluster.startServerVM(1, s -> s.withConnectionToLocator(locatorPort).withProperty(
+        DistributionConfig.GROUPS_NAME, "group1").withCredential("cluster", "cluster"));
+    server2 = cluster.startServerVM(2, s -> s.withConnectionToLocator(locatorPort).withProperty(
+        DistributionConfig.GROUPS_NAME, "group2").withCredential("cluster", "cluster"));
 
     client =
         ClusterManagementServiceBuilder.buildWithHostAddress()
             .setHostAddress("localhost", locator.getHttpPort())
+            .setCredentials("cluster", "cluster")
             .build();
-    gfsh.connect(locator);
+    gfsh.secureConnect(locatorPort, GfshCommandRule.PortType.locator, "cluster", "cluster");
 
     gfsh.executeAndAssertThat("deploy --group=group1 --jar=" + group1Jar.getAbsolutePath())
         .statusIsSuccess();
@@ -115,15 +122,24 @@ public void listByGroup() throws Exception {
   public void listById() throws Exception {
     Deployment filter = new Deployment();
     filter.setJarFileName("cluster.jar");
+
     ClusterManagementListResult<Deployment, DeploymentInfo> list = client.list(filter);
+
     ClusterManagementListResultAssert<Deployment, DeploymentInfo> resultAssert =
         assertManagementListResult(list).isSuccessful();
-    resultAssert.hasConfigurations().extracting(Deployment::getJarFileName)
-        .containsExactlyInAnyOrder("cluster.jar");
+
+    assertThat(list.getConfigResult()).hasSize(1);
+    Deployment deployment = list.getConfigResult().get(0);
+    assertThat(deployment.getJarFileName()).isEqualTo("cluster.jar");
+    assertThat(deployment.getDeployedBy()).isEqualTo("cluster");
+    assertThat(deployment.getDeployedTime()).isNotNull();
+
     List<DeploymentInfo> runtimeResult = resultAssert.getActual().getRuntimeResult();
-    assertThat(runtimeResult).extracting(DeploymentInfo::getJarLocation).extracting(
-        FilenameUtils::getName).containsExactlyInAnyOrder("cluster.v1.jar", "cluster.v1.jar");
-    assertThat(runtimeResult.get(0).getTimeDeployed()).isNotNull();
+    assertThat(runtimeResult)
+        .extracting(DeploymentInfo::getJarLocation)
+        .extracting(FilenameUtils::getName)
+        .containsExactlyInAnyOrder("cluster.v1.jar", "cluster.v1.jar");
+    assertThat(runtimeResult.get(0).getLastModified()).isNotNull();
   }
 
   @Test

geode-assembly/src/upgradeTest/java/org/apache/geode/management/DeploymentManagementUpgradeTest.java

@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.management;
+
+import static org.apache.geode.test.junit.assertions.ClusterManagementListResultAssert.assertManagementListResult;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.management.api.ClusterManagementService;
+import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.configuration.Deployment;
+import org.apache.geode.test.compiler.JarBuilder;
+import org.apache.geode.test.junit.rules.gfsh.GfshRule;
+
+public class DeploymentManagementUpgradeTest {
+  @Rule
+  public GfshRule oldGfsh = new GfshRule("1.10.0");
+
+  @Rule
+  public GfshRule gfsh = new GfshRule();
+
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+  private static File stagingDir, clusterJar;
+
+  @BeforeClass
+  public static void beforeClass() throws Exception {
+    // prepare the jars to be deployed
+    stagingDir = tempFolder.newFolder("staging");
+    clusterJar = new File(stagingDir, "cluster.jar");
+    JarBuilder jarBuilder = new JarBuilder();
+    jarBuilder.buildJarFromClassNames(clusterJar, "Class1");
+  }
+
+  @Test
+  public void newLocatorCanReadOldConfigurationData() throws IOException {
+    File workingDir = tempFolder.newFolder();
+    int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(3);
+    oldGfsh.execute("start locator --name=test --port=" + ports[0] + " --http-service-port="
+        + ports[1] + " --dir=" + workingDir.getAbsolutePath() + " --J=-Dgemfire.jmx-manager-port="
+        + ports[2],
+        "deploy --jar=" + clusterJar.getAbsolutePath(),
+        "shutdown --include-locators");
+
+    gfsh.execute("start locator --name=test --port=" + ports[0] + " --http-service-port=" + ports[1]
+        + " --dir=" + workingDir.getAbsolutePath() + " --J=-Dgemfire.jmx-manager-port=" + ports[2]);
+
+    ClusterManagementService cms =
+        ClusterManagementServiceBuilder.buildWithHostAddress().setHostAddress("localhost", ports[1])
+            .build();
+    assertManagementListResult(cms.list(new Deployment())).isSuccessful()
+        .hasConfigurations().hasSize(1);
+  }
+}

geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt

@@ -2034,8 +2034,8 @@ fromData,17
 toData,17
 
 org/apache/geode/management/internal/configuration/domain/Configuration,2
-fromData,49
-toData,52
+fromData,110
+toData,62
 
 org/apache/geode/management/internal/configuration/domain/ConfigurationChangeResult,2
 fromData,31