Release 2.10.0

Author: weidongxu-microsoft

README.md

@@ -26,7 +26,7 @@ extensions:
 
 To run this sample:
 
-See [DefaultAzureCredential](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/identity/azure-identity#defaultazurecredential) and prepare the authentication works best for you. For more details on authentication, please refer to [AUTH.md](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/resourcemanager/docs/AUTH.md).
+See [DefaultAzureCredential](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/identity/azure-identity#defaultazurecredential) and prepare the authentication works best for you. For more details on authentication, please refer to [AUTH.md](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/resourcemanager/docs/AUTH.md).
 
     git clone https://github.com/Azure-Samples/acr-java-manage-azure-container-registry-with-webhooks.git
 

pom.xml

@@ -54,12 +54,12 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager</artifactId>
-      <version>2.1.0</version>
+      <version>2.10.0</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.2.0</version>
+      <version>1.4.1</version>
     </dependency>
     <dependency>
       <groupId>com.jcraft</groupId>
@@ -76,15 +76,10 @@
       <artifactId>docker-java</artifactId>
       <version>3.2.1</version>
     </dependency>
-    <dependency>
-      <groupId>com.github.cverges.expect4j</groupId>
-      <artifactId>expect4j</artifactId>
-      <version>1.6</version>
-    </dependency>
     <dependency>
       <groupId>com.github.spotbugs</groupId>
       <artifactId>spotbugs-annotations</artifactId>
-      <version>4.0.2</version>
+      <version>4.2.2</version>
     </dependency>
   </dependencies>
 </project>

src/main/java/com/azure/resourcemanager/samples/SSHShell.java

@@ -11,32 +11,21 @@
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.KeyPair;
 import com.jcraft.jsch.Session;
-import expect4j.Closure;
-import expect4j.Expect4j;
-import expect4j.ExpectState;
-import expect4j.matches.Match;
-import expect4j.matches.RegExpMatch;
-import org.apache.oro.text.regex.MalformedPatternException;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.Hashtable;
-import java.util.List;
 
 /**
  * Utility class to run commands on Linux VM via SSH.
  */
 public final class SSHShell {
     private final Session session;
     private final ChannelShell channel;
-    private final Expect4j expect;
-    private final StringBuilder shellBuffer = new StringBuilder();
-    private List<Match> linuxPromptMatches = new ArrayList<>();
 
     /**
      * Creates SSHShell.
@@ -45,21 +34,9 @@ public final class SSHShell {
      * @param port the ssh port
      * @param userName the ssh user name
      * @param password the ssh password
-     * @return the shell
      * @throws JSchException the JSchException
-     * @throws IOException the IOException
      */
-    private SSHShell(String host, int port, String userName, String password)
-            throws JSchException, IOException {
-        Closure expectClosure = getExpectClosure();
-        for (String linuxPromptPattern : new String[]{"\\>", "#", "~#", "~\\$"}) {
-            try {
-                Match match = new RegExpMatch(linuxPromptPattern, expectClosure);
-                linuxPromptMatches.add(match);
-            } catch (MalformedPatternException malformedEx) {
-                throw new RuntimeException(malformedEx);
-            }
-        }
+    private SSHShell(String host, int port, String userName, String password) throws JSchException {
         JSch jsch = new JSch();
         this.session = jsch.getSession(userName, host, port);
         session.setPassword(password);
@@ -68,41 +45,6 @@ private SSHShell(String host, int port, String userName, String password)
         session.setConfig(config);
         session.connect(60000);
         this.channel = (ChannelShell) session.openChannel("shell");
-        this.expect = new Expect4j(channel.getInputStream(), channel.getOutputStream());
-        channel.connect();
-    }
-
-    /**
-     * Creates SSHShell.
-     *
-     * @param host the host name
-     * @param port the ssh port
-     * @param userName the ssh user name
-     * @param sshPrivateKey the ssh password
-     * @return the shell
-     * @throws JSchException the JSchException
-     * @throws IOException the IOException
-     */
-    private SSHShell(String host, int port, String userName, byte[] sshPrivateKey)
-            throws JSchException, IOException {
-        Closure expectClosure = getExpectClosure();
-        for (String linuxPromptPattern : new String[]{"\\>", "#", "~#", "~\\$"}) {
-            try {
-                Match match = new RegExpMatch(linuxPromptPattern, expectClosure);
-                linuxPromptMatches.add(match);
-            } catch (MalformedPatternException malformedEx) {
-                throw new RuntimeException(malformedEx);
-            }
-        }
-        JSch jsch = new JSch();
-        jsch.setKnownHosts(System.getProperty("user.home") + "/.ssh/known_hosts");
-        jsch.addIdentity(host, sshPrivateKey, (byte[]) null, (byte[]) null);
-        this.session = jsch.getSession(userName, host, port);
-        this.session.setConfig("StrictHostKeyChecking", "no");
-        this.session.setConfig("PreferredAuthentications", "publickey,keyboard-interactive,password");
-        session.connect(60000);
-        this.channel = (ChannelShell) session.openChannel("shell");
-        this.expect = new Expect4j(channel.getInputStream(), channel.getOutputStream());
         channel.connect();
     }
 
@@ -122,45 +64,6 @@ public static SSHShell open(String host, int port, String userName, String passw
         return new SSHShell(host, port, userName, password);
     }
 
-    /**
-     * Opens a SSH shell.
-     *
-     * @param host the host name
-     * @param port the ssh port
-     * @param userName the ssh user name
-     * @param sshPrivateKey the ssh private key
-     * @return the shell
-     * @throws JSchException exception thrown
-     * @throws IOException IO exception thrown
-     */
-    public static SSHShell open(String host, int port, String userName, byte[] sshPrivateKey)
-            throws JSchException, IOException {
-        return new SSHShell(host, port, userName, sshPrivateKey);
-    }
-
-    /**
-     * Runs a given list of commands in the shell.
-     *
-     * @param commands the commands
-     * @return the result
-     * @throws Exception exception thrown
-     */
-    public String runCommands(List<String> commands) throws Exception {
-        String output = null;
-        try {
-            for (String command : commands) {
-                expect.expect(this.linuxPromptMatches);
-                expect.send(command);
-                expect.send("\r");
-                expect.expect(this.linuxPromptMatches);
-            }
-            output = shellBuffer.toString();
-        } finally {
-            shellBuffer.setLength(0);
-        }
-        return output;
-    }
-
     /**
      * Executes a command on the remote host.
      *
@@ -278,9 +181,6 @@ public void upload(InputStream from, String fileName, String toPath, boolean isU
      * Closes shell.
      */
     public void close() {
-        if (expect != null) {
-            expect.close();
-        }
         if (channel != null) {
             channel.disconnect();
         }
@@ -289,20 +189,6 @@ public void close() {
         }
     }
 
-    private Closure getExpectClosure() {
-        return new Closure() {
-            /**
-             * @throws Exception thrown Exception
-             */
-            public void run(ExpectState expectState) throws Exception {
-                String outputBuffer = expectState.getBuffer();
-                System.out.println(outputBuffer);
-                shellBuffer.append(outputBuffer);
-                expectState.exp_continue();
-            }
-        };
-    }
-
     /**
      * Automatically generate SSH keys.
      *