Merge pull request #263 from ravega/master

Git module added (status, add, commit, branch)

src/main/java/com/suse/salt/netapi/calls/modules/Git.java

@@ -0,0 +1,51 @@
+package com.suse.salt.netapi.calls.modules;
+
+import com.suse.salt.netapi.calls.LocalCall;
+import com.suse.salt.netapi.results.GitResult;
+import com.google.gson.reflect.TypeToken;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import static java.util.Collections.emptyMap;
+
+/**
+ * salt.modules.git
+ */
+public class Git {
+
+    private Git() { }
+
+    public static LocalCall<GitResult> status(String cwd, Optional<String> user) {
+        List<String> args = Arrays.asList(cwd);
+        user.ifPresent(usr -> args.add(usr));
+        return new LocalCall<>("git.status", Optional.of(args),
+                Optional.of(emptyMap()), new TypeToken<GitResult>(){});
+    }
+
+    public static LocalCall<String> add(String cwd, String filename,
+            String opts, String gitOpts, Optional<String> user) {
+        List<String> args = Arrays.asList(cwd, filename, opts, gitOpts);
+        user.ifPresent(usr -> args.add(usr));
+        return new LocalCall<>("git.add", Optional.of(args),
+                Optional.of(emptyMap()), new TypeToken<String>(){});
+    }
+
+    public static LocalCall<String> commit(String cwd, String message,
+            String opts, String gitOpts, Optional<String> user, Optional<String> filename) {
+        List<String> args = Arrays.asList(cwd, message, opts, gitOpts);
+        user.ifPresent(usr -> args.add(usr));
+        filename.ifPresent(file -> args.add(file));
+        return new LocalCall<>("git.commit", Optional.of(args),
+                Optional.of(emptyMap()), new TypeToken<String>(){});
+    }
+
+    public static LocalCall<Boolean> branch(String cwd, String branch,
+            String opts, String gitOpts, Optional<String> user) {
+        List<String> args = Arrays.asList(cwd, branch, opts, gitOpts);
+        user.ifPresent(usr -> args.add(usr));
+        return new LocalCall<>("git.branch", Optional.of(args),
+                Optional.of(emptyMap()), new TypeToken<Boolean>(){});
+    }
+}

src/main/java/com/suse/salt/netapi/results/GitResult.java

@@ -0,0 +1,32 @@
+package com.suse.salt.netapi.results;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Result structure as returned by git status.
+ */
+public class GitResult {
+
+    private List<String> modified;
+    private List<String> untracked;
+
+    public List<String> getModified() {
+        return modified;
+    }
+
+    public List<String> getUntracked() {
+        return untracked;
+    }
+
+    @Override
+    public String toString() {
+        List<List<String>> allFiles = Arrays.asList(modified, untracked);
+        return allFiles.stream()
+                .filter(list -> list != null)
+                .flatMap(list -> list.stream())
+                .collect(Collectors.joining(","));
+    }
+
+}

src/test/java/com/suse/salt/netapi/calls/modules/GitTest.java

@@ -0,0 +1,177 @@
+package com.suse.salt.netapi.calls.modules;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.any;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import com.suse.salt.netapi.calls.LocalCall;
+import com.suse.salt.netapi.client.SaltClient;
+import com.suse.salt.netapi.client.impl.HttpAsyncClientImpl;
+import com.suse.salt.netapi.datatypes.AuthMethod;
+import com.suse.salt.netapi.datatypes.Token;
+import com.suse.salt.netapi.datatypes.target.MinionList;
+import com.suse.salt.netapi.results.GitResult;
+import com.suse.salt.netapi.results.Result;
+import com.suse.salt.netapi.utils.ClientUtils;
+import com.suse.salt.netapi.utils.TestUtils;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Git unit tests.
+ */
+public class GitTest {
+
+    private static final int MOCK_HTTP_PORT = 8888;
+
+    static final String JSON_STATUS_RESPONSE = ClientUtils.streamToString(
+            SaltUtilTest.class.getResourceAsStream("/modules/git/git_status.json"));
+
+    static final String JSON_ADD_SUCCESS_RESPONSE = ClientUtils.streamToString(
+            SaltUtilTest.class.getResourceAsStream("/modules/git/git_add_success.json"));
+
+    static final String JSON_ADD_ERROR_RESPONSE = ClientUtils.streamToString(
+            SaltUtilTest.class.getResourceAsStream("/modules/git/git_add_error.json"));
+
+    static final String JSON_COMMIT_RESPONSE = ClientUtils.streamToString(
+            SaltUtilTest.class.getResourceAsStream("/modules/git/git_commit.json"));
+
+    static final String JSON_BRANCH_RESPONSE = ClientUtils.streamToString(
+            SaltUtilTest.class.getResourceAsStream("/modules/git/git_branch.json"));
+
+    static final AuthMethod AUTH = new AuthMethod(new Token());
+
+    private SaltClient client;
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(MOCK_HTTP_PORT);
+
+    @Before
+    public void init() {
+        URI uri = URI.create("http://localhost:" + Integer.toString(MOCK_HTTP_PORT));
+        client = new SaltClient(uri, new HttpAsyncClientImpl(TestUtils.defaultClient()));
+    }
+
+    @Test
+    public void testStatus() {
+        // First we get the call to use in the tests
+        LocalCall<GitResult> call = Git.status("/dev", Optional.empty());
+        assertEquals("git.status", call.getPayload().get("fun"));
+
+        // Test with a successful response
+        mockOkResponseWith(JSON_STATUS_RESPONSE);
+
+        Map<String, Result<GitResult>> response =
+                call.callSync(client, new MinionList("myminion"), AUTH)
+                        .toCompletableFuture().join();
+
+        assertNotNull(response.get("myminion"));
+
+        GitResult output = response.get("myminion").result().get();
+        assertTrue(output.getModified().size() == 2);
+        assertEquals("src/main/java/com/suse/salt/netapi/client/SaltClient.java," +
+                "src/test/java/com/suse/salt/netapi/examples/Calls.java",
+                output.getModified().stream().collect(Collectors.joining(",")));
+    }
+
+    @Test
+    public void testAddSuccess() {
+        // First we get the call to use in the tests
+        LocalCall<String> call = Git.add("/dev", "add_test_file.txt", "", "", Optional.empty());
+        assertEquals("git.add", call.getPayload().get("fun"));
+
+        // Test with a successful response
+        mockOkResponseWith(JSON_ADD_SUCCESS_RESPONSE);
+
+        Map<String, Result<String>> response =
+                call.callSync(client, new MinionList("myminion"), AUTH)
+                        .toCompletableFuture().join();
+
+        assertNotNull(response.get("myminion"));
+
+        String output = response.get("myminion").result().get();
+        assertEquals("add 'add_test_file.txt'", output);
+    }
+
+    @Test
+    public void testAddError() {
+        // First we get the call to use in the tests
+        LocalCall<String> call = Git.add("/dev", "add_test_file.txt", "", "", Optional.empty());
+        assertEquals("git.add", call.getPayload().get("fun"));
+
+        // Test with an error response
+        mockOkResponseWith(JSON_ADD_ERROR_RESPONSE);
+
+        Map<String, Result<String>> response =
+                call.callSync(client, new MinionList("myminion"), AUTH)
+                        .toCompletableFuture().join();
+
+        assertNotNull(response.get("myminion"));
+
+        String output = response.get("myminion").result().get();
+        assertEquals("ERROR: Command 'git add --verbose -- add_test_file.txt' failed: fatal: " +
+                "pathspec 'add_test_file.txt' did not match any files",
+                output);
+    }
+
+    @Test
+    public void testCommit() {
+        // First we get the call to use in the tests
+        LocalCall<String> call = Git.commit("/dev", "Test commit message", "", "",
+                Optional.empty(), Optional.empty());
+        assertEquals("git.commit", call.getPayload().get("fun"));
+
+        // Test with a successful response
+        mockOkResponseWith(JSON_COMMIT_RESPONSE);
+
+        Map<String, Result<String>> response =
+                call.callSync(client, new MinionList("myminion"), AUTH)
+                        .toCompletableFuture().join();
+
+        assertNotNull(response.get("myminion"));
+
+        String output = response.get("myminion").result().get();
+        assertEquals("[master a5d60b640] Test commit\n 1 file changed, 1 insertion(+)\n create mode " +
+                "100644 add_test_file.txt",
+                output);
+    }
+
+    @Test
+    public void testBranch() {
+        // First we get the call to use in the tests
+        LocalCall<Boolean> call = Git.branch("/dev", "feature/git_module", "", "", Optional.empty());
+        assertEquals("git.branch", call.getPayload().get("fun"));
+
+        // Test with a successful response
+        mockOkResponseWith(JSON_BRANCH_RESPONSE);
+
+        Map<String, Result<Boolean>> response =
+                call.callSync(client, new MinionList("myminion"), AUTH)
+                        .toCompletableFuture().join();
+
+        assertNotNull(response.get("myminion"));
+
+        Boolean output = response.get("myminion").result().get();
+        assertEquals(true, output);
+    }
+
+    private static void mockOkResponseWith(String json) {
+        stubFor(any(urlMatching("/"))
+                .willReturn(aResponse()
+                        .withStatus(HttpURLConnection.HTTP_OK)
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(json)));
+    }
+}

src/test/resources/modules/git/git_add_error.json

@@ -0,0 +1 @@
+{"return":[{"myminion": "ERROR: Command 'git add --verbose -- add_test_file.txt' failed: fatal: pathspec 'add_test_file.txt' did not match any files"}]}

src/test/resources/modules/git/git_add_success.json

@@ -0,0 +1 @@
+{"return":[{"myminion": "add 'add_test_file.txt'"}]}

src/test/resources/modules/git/git_branch.json

@@ -0,0 +1 @@
+{"return":[{"myminion": true}]}

src/test/resources/modules/git/git_commit.json

@@ -0,0 +1 @@
+{"return":[{"myminion": "[master a5d60b640] Test commit\n 1 file changed, 1 insertion(+)\n create mode 100644 add_test_file.txt"}]}

src/test/resources/modules/git/git_status.json

@@ -0,0 +1 @@
+{"return":[{"myminion":{"modified":["src/main/java/com/suse/salt/netapi/client/SaltClient.java","src/test/java/com/suse/salt/netapi/examples/Calls.java"]}}]}