davsclaus commented on code in PR #23812: URL: https://github.com/apache/camel/pull/23812#discussion_r3368868157
########## dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/process/ListVaultTest.java: ########## @@ -0,0 +1,309 @@ +/* + * 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.camel.dsl.jbang.core.commands.process; + +import java.util.stream.Stream; + +import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain; +import org.apache.camel.util.json.JsonArray; +import org.apache.camel.util.json.JsonObject; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.MockedStatic; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mockStatic; + +@ExtendWith(MockitoExtension.class) +class ListVaultTest extends ProcessCommandTestSupport { + + @Test + void testEmptyOutputWhenNoVaults() throws Exception { + JsonObject root = new JsonObject(); + root.put("context", contextObj()); + writeStatusFile(TEST_PID, root); + + ListVault command = new ListVault(new CamelJBangMain().withPrinter(printer)); + command.sort = "pid"; + + try (MockedStatic<ProcessHandle> mocked = mockStatic(ProcessHandle.class)) { + ProcessHandle ph = mockProcessHandle(TEST_PID); + ProcessHandle currentHandle = mockCurrentHandle(); + mocked.when(ProcessHandle::current).thenReturn(currentHandle); + mocked.when(ProcessHandle::allProcesses).thenAnswer(inv -> Stream.of(ph)); + + int exit = command.doCall(); + + assertEquals(0, exit); + assertEquals("", printer.getOutput().trim()); + } + } + + @Test + void testShowsAwsVault() throws Exception { + JsonObject root = new JsonObject(); + root.put("context", contextObj()); + root.put("vaults", vaults("aws-secrets", vault("us-east-1", "aws-secret"))); + writeStatusFile(TEST_PID, root); + + ListVault command = new ListVault(new CamelJBangMain().withPrinter(printer)); + command.sort = "pid"; + + try (MockedStatic<ProcessHandle> mocked = mockStatic(ProcessHandle.class)) { + ProcessHandle ph = mockProcessHandle(TEST_PID); + ProcessHandle currentHandle = mockCurrentHandle(); + mocked.when(ProcessHandle::current).thenReturn(currentHandle); + mocked.when(ProcessHandle::allProcesses).thenAnswer(inv -> Stream.of(ph)); + + int exit = command.doCall(); + + assertEquals(0, exit); + String output = printer.getOutput(); + assertTrue(output.contains("AWS"), "Should show AWS vault"); + assertTrue(output.contains("aws-secret"), "Should show AWS secret name"); + } + } + + @Test + void testShowsHashicorpVault() throws Exception { + JsonObject root = new JsonObject(); + root.put("context", contextObj()); + root.put("vaults", vaults("hashicorp-secrets", hashicorpVault())); + writeStatusFile(TEST_PID, root); + + ListVault command = new ListVault(new CamelJBangMain().withPrinter(printer)); + command.sort = "pid"; + + try (MockedStatic<ProcessHandle> mocked = mockStatic(ProcessHandle.class)) { + ProcessHandle ph = mockProcessHandle(TEST_PID); + ProcessHandle currentHandle = mockCurrentHandle(); + mocked.when(ProcessHandle::current).thenReturn(currentHandle); + mocked.when(ProcessHandle::allProcesses).thenAnswer(inv -> Stream.of(ph)); + + int exit = command.doCall(); + + assertEquals(0, exit); + assertTrue(printer.getOutput().contains("Hashicorp"), "Should show Hashicorp vault"); + } + } + + @Test + void testShowsKubernetesConfigMapVault() throws Exception { + JsonObject root = new JsonObject(); + root.put("context", contextObj()); + root.put("vaults", vaults("kubernetes-configmaps", configMapVault("app-config"))); + writeStatusFile(TEST_PID, root); + + ListVault command = new ListVault(new CamelJBangMain().withPrinter(printer)); + command.sort = "pid"; + + try (MockedStatic<ProcessHandle> mocked = mockStatic(ProcessHandle.class)) { + ProcessHandle ph = mockProcessHandle(TEST_PID); + ProcessHandle currentHandle = mockCurrentHandle(); + mocked.when(ProcessHandle::current).thenReturn(currentHandle); + mocked.when(ProcessHandle::allProcesses).thenAnswer(inv -> Stream.of(ph)); + + int exit = command.doCall(); + + assertEquals(0, exit); + String output = printer.getOutput(); + assertTrue(output.contains("Kubernetes-cm"), "Should show Kubernetes configmap vault"); + assertTrue(output.contains("app-config"), "Should show configmap name"); + } + } + + @Disabled("ListVault row-mutation bug: when each vault type has exactly 1 secret, doProcessWatchCall() " Review Comment: The bug documented here (row-mutation when each vault type has exactly 1 secret) is well-investigated and the root cause analysis looks accurate. Could you file a separate JIRA ticket for this bug and reference it in the `@Disabled` message? That way it gets tracked for the refactoring pass (CAMEL-23688) or as a standalone fix. Something like: ``` @Disabled("CAMEL-XXXXX: ListVault row-mutation bug — ...") ``` ########## dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetricTest.java: ########## @@ -0,0 +1,132 @@ +/* + * 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.camel.dsl.jbang.core.commands.process; + +import java.util.Collections; +import java.util.stream.Stream; + +import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain; +import org.apache.camel.util.json.JsonArray; +import org.apache.camel.util.json.JsonObject; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.MockedStatic; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mockStatic; + +@ExtendWith(MockitoExtension.class) +class ListMetricTest extends ProcessCommandTestSupport { + + @Test + void testEmptyOutputWhenNoMetrics() throws Exception { + JsonObject root = new JsonObject(); + root.put("context", contextObj()); + writeStatusFile(TEST_PID, root); + + ListMetric command = new ListMetric(new CamelJBangMain().withPrinter(printer)); + command.sort = "pid"; + + try (MockedStatic<ProcessHandle> mocked = mockStatic(ProcessHandle.class)) { + ProcessHandle ph = mockProcessHandle(TEST_PID); + ProcessHandle currentHandle = mockCurrentHandle(); + mocked.when(ProcessHandle::current).thenReturn(currentHandle); + mocked.when(ProcessHandle::allProcesses).thenAnswer(inv -> Stream.of(ph)); + + int exit = command.doCall(); + + assertEquals(0, exit); + assertEquals("", printer.getOutput().trim()); + } + } + + @Test + void testShowsCounterMetric() throws Exception { + JsonObject root = new JsonObject(); + root.put("context", contextObj()); + root.put("micrometer", micrometerObj(counterEntry(42.0))); + writeStatusFile(TEST_PID, root); + + ListMetric command = new ListMetric(new CamelJBangMain().withPrinter(printer)); + command.sort = "pid"; + command.all = true; + + try (MockedStatic<ProcessHandle> mocked = mockStatic(ProcessHandle.class)) { + ProcessHandle ph = mockProcessHandle(TEST_PID); + ProcessHandle currentHandle = mockCurrentHandle(); + mocked.when(ProcessHandle::current).thenReturn(currentHandle); + mocked.when(ProcessHandle::allProcesses).thenAnswer(inv -> Stream.of(ph)); + + int exit = command.doCall(); + + assertEquals(0, exit); + String output = printer.getOutput(); + assertTrue(output.contains("myCounter"), "Should show metric name"); + } + } + + @Test + void testJsonOutput() throws Exception { + JsonObject root = new JsonObject(); + root.put("context", contextObj()); + root.put("micrometer", micrometerObj(counterEntry(10.0))); + writeStatusFile(TEST_PID, root); + + ListMetric command = new ListMetric(new CamelJBangMain().withPrinter(printer)); + command.sort = "pid"; + command.all = true; + command.jsonOutput = true; + + try (MockedStatic<ProcessHandle> mocked = mockStatic(ProcessHandle.class)) { + ProcessHandle ph = mockProcessHandle(TEST_PID); + ProcessHandle currentHandle = mockCurrentHandle(); + mocked.when(ProcessHandle::current).thenReturn(currentHandle); + mocked.when(ProcessHandle::allProcesses).thenAnswer(inv -> Stream.of(ph)); + + int exit = command.doCall(); + + assertEquals(0, exit); + String output = printer.getOutput(); + assertTrue(output.startsWith("["), "JSON output should be array"); + assertTrue(output.contains("myCounter")); + } + } + + private static JsonObject contextObj() { + JsonObject ctx = new JsonObject(); + ctx.put("name", "myApp"); + return ctx; + } + + private JsonObject micrometerObj(JsonObject... counters) { Review Comment: Nit: this helper is an instance method while every other helper in this test class (and across all other test classes in this PR) is `static`. Consider making it `static` for consistency. ```suggestion private static JsonObject micrometerObj(JsonObject... counters) { ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
