Skip to content

Fixed imports and a NullPointerException on baseUrl #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed imports and a NullPointerException on baseUrl #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/main/java/com/redhat/openshift/forge/OpenShiftPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.Properties;

import javax.enterprise.event.Event;
import javax.inject.Inject;
Expand All @@ -29,14 +28,13 @@
import org.jboss.forge.shell.util.NativeSystemCall;

import com.jcraft.jsch.JSch;
import com.jcraft.jsch.Session;
import com.openshift.client.IApplication;
import com.openshift.client.ICartridge;
import com.openshift.client.IEmbeddableCartridge;
import com.openshift.client.IEmbeddedCartridge;
import com.openshift.client.IOpenShiftConnection;
import com.openshift.client.IUser;
import com.openshift.client.InvalidCredentialsOpenShiftException;
import com.openshift.client.ICartridge;
import com.openshift.client.OpenShiftException;
import com.redhat.openshift.core.OpenShiftServiceFactory;
import com.redhat.openshift.forge.jsch.ForgeJschConfigSessionFactory;
Expand Down Expand Up @@ -144,13 +142,16 @@ public void tail(PipeOut out, @Option(name = "app", help = "Application name (al

JSch.setLogger(jschToForgeLogger);

String host = String.format("%s-%s.rhcloud.com", application.getName(), application.getDomain().getId());
if (baseUrl.contains("amazonaws"))
host = String.format("%s-%s.dev.rhcloud.com", application.getName(), application.getDomain().getId());
else if (baseUrl.contains("int."))
host = String.format("%s-%s.int.rhcloud.com", application.getName(), application.getDomain().getId());
else if (baseUrl.contains("stg."))
host = String.format("%s-%s.stg.rhcloud.com", application.getName(), application.getDomain().getId());
String hostFormat = "%s-%s.rhcloud.com";
if (baseUrl != null) {
if (baseUrl.contains("amazonaws"))
hostFormat = "%s-%s.dev.rhcloud.com";
else if (baseUrl.contains("int."))
hostFormat = "%s-%s.int.rhcloud.com";
else if (baseUrl.contains("stg."))
hostFormat = "%s-%s.stg.rhcloud.com";
}
String host = String.format(hostFormat, application.getName(), application.getDomain().getId());

URIish uri = new URIish().setHost(host).setUser(application.getUUID());
BufferedReader br = null;
Expand Down