[OSJC-203] Expose context dir for buildconfigs

openshift · Aug 7, 2015 · fba467e · fba467e
1 parent f47745e
commit fba467e
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 6 deletions.
diff --git a/src/main/java/com/openshift/internal/restclient/model/BuildConfig.java b/src/main/java/com/openshift/internal/restclient/model/BuildConfig.java
@@ -137,7 +137,7 @@ public String getSourceURI() {
 	public <T extends IBuildSource> T getBuildSource() {
 		switch(asString(BUILDCONFIG_SOURCE_TYPE)){
 		case BuildSourceType.GIT:
-			return (T) new GitBuildSource(asString(BUILDCONFIG_SOURCE_URI), asString(BUILDCONFIG_SOURCE_REF));
+			return (T) new GitBuildSource(asString(BUILDCONFIG_SOURCE_URI), asString(BUILDCONFIG_SOURCE_REF), asString(BUILDCONFIG_SOURCE_CONTEXTDIR));
 		default:
 		}
 		return null;
@@ -156,6 +156,7 @@ public void setBuildSource(IBuildSource source){
 		}
 		set(BUILDCONFIG_SOURCE_URI, source.getURI());
 		set(BUILDCONFIG_SOURCE_TYPE, source.getType().toString());
+		set(BUILDCONFIG_SOURCE_CONTEXTDIR, source.getContextDir());
 	}
 
 	@Override

diff --git a/src/main/java/com/openshift/internal/restclient/model/build/GitBuildSource.java b/src/main/java/com/openshift/internal/restclient/model/build/GitBuildSource.java
@@ -18,10 +18,12 @@ public class GitBuildSource implements IGitBuildSource {
 
 	private String ref;
 	private String uri;
+	private String contextDir;
 
-	public GitBuildSource(String uri, String ref){
+	public GitBuildSource(String uri, String ref, String contextDir){
 		this.ref = ref;
 		this.uri = uri;
+		this.contextDir = contextDir;
 	}
 
 	@Override
@@ -39,4 +41,9 @@ public String getRef() {
 		return ref;
 	}
 
+	@Override
+	public String getContextDir() {
+		return contextDir;
+	}
+
 }
diff --git a/...main/java/com/openshift/internal/restclient/model/properties/BuildConfigPropertyKeys.java b/...main/java/com/openshift/internal/restclient/model/properties/BuildConfigPropertyKeys.java
@@ -12,6 +12,7 @@
  * @author Jeff Cantrill
  */
 public interface BuildConfigPropertyKeys {
+	static final String BUILDCONFIG_SOURCE_CONTEXTDIR = "buildconfig.source.contextdir";
 	static final String BUILDCONFIG_SOURCE_TYPE = "buildconfig.source.type";
 	static final String BUILDCONFIG_SOURCE_REF = "buildconfig.source.ref";
 	static final String BUILDCONFIG_SOURCE_URI = "buildconfig.sourceuri";

diff --git a/.../java/com/openshift/internal/restclient/model/properties/OpenShiftApiModelProperties.java b/.../java/com/openshift/internal/restclient/model/properties/OpenShiftApiModelProperties.java
@@ -35,6 +35,7 @@ public interface OpenShiftApiModelProperties extends ResourcePropertyKeys{
 		put(BUILD_PODNAME, new String[]{"podName"});
 		put(BUILD_STATUS, new String[]{"status","phase"});
 
+		put(BUILDCONFIG_SOURCE_CONTEXTDIR, new String[]{"spec","source","contextDir"});
 		put(BUILDCONFIG_SOURCE_TYPE, new String[]{"spec","source","type"});
 		put(BUILDCONFIG_SOURCE_URI, new String[]{"spec","source","git","uri"});
 		put(BUILDCONFIG_SOURCE_REF, new String[]{"spec","source","git","ref"});
@@ -104,7 +105,8 @@ public interface OpenShiftApiModelProperties extends ResourcePropertyKeys{
 		put(BUILD_MESSAGE, new String[]{"status","message"});
 		put(BUILD_PODNAME, new String[]{"podName"});
 		put(BUILD_STATUS, new String[]{"status","phase"});
-
+
+		put(BUILDCONFIG_SOURCE_CONTEXTDIR, new String[]{"spec","source","contextDir"});
 		put(BUILDCONFIG_SOURCE_TYPE, new String[]{"spec","source","type"});
 		put(BUILDCONFIG_SOURCE_URI, new String[]{"spec","source","git","uri"});
 		put(BUILDCONFIG_SOURCE_REF, new String[]{"spec","source","git","ref"});

diff --git a/src/main/java/com/openshift/restclient/model/build/IBuildSource.java b/src/main/java/com/openshift/restclient/model/build/IBuildSource.java
@@ -24,4 +24,12 @@ public interface IBuildSource {
 	 * @return
 	 */
 	String getURI();
+
+	/**
+	 * The sub-directory relative to the repo root where the source code for the application exists. 
+	 * This allows to have buildable sources in directory other than root of repository.  
+	 * 
+	 * @return
+	 */
+	String getContextDir();
 }
diff --git a/src/test/java/com/openshift/internal/restclient/model/v1/BuildConfigTest.java b/src/test/java/com/openshift/internal/restclient/model/v1/BuildConfigTest.java
@@ -103,7 +103,7 @@ public void setGitBuildSource() {
 
 		Map<String, String> env = new HashMap<String, String>();
 		env.put("foo", "bar");
-		writeConfig.setBuildSource(new GitBuildSource("git://github.com/openshift/ruby-hello-world.git", ""));
+		writeConfig.setBuildSource(new GitBuildSource("git://github.com/openshift/ruby-hello-world.git", "", "foobar"));
 
 		assertGitBuildSource(reCreateBuildConfig(writeConfig).getBuildSource());
 	}
@@ -137,6 +137,7 @@ private void assertBuildTriggers(IBuildTrigger[] triggers) {
 	private void assertGitBuildSource(IBuildSource source) {
 		assertEquals(BuildSourceType.GIT, source.getType());
 		assertEquals("git://github.com/openshift/ruby-hello-world.git", source.getURI());
+		assertEquals("foobar", source.getContextDir());
 		assertTrue(source instanceof IGitBuildSource);
 
 		IGitBuildSource git = (IGitBuildSource)source;

diff --git a/src/test/java/com/openshift/internal/restclient/model/v1beta3/BuildConfigTest.java b/src/test/java/com/openshift/internal/restclient/model/v1beta3/BuildConfigTest.java
@@ -103,7 +103,7 @@ public void setGitBuildSource() {
 
 		Map<String, String> env = new HashMap<String, String>();
 		env.put("foo", "bar");
-		writeConfig.setBuildSource(new GitBuildSource("git://github.com/openshift/ruby-hello-world.git", ""));
+		writeConfig.setBuildSource(new GitBuildSource("git://github.com/openshift/ruby-hello-world.git", "", "foobar"));
 
 		assertGitBuildSource(reCreateBuildConfig(writeConfig).getBuildSource());
 	}
@@ -137,6 +137,7 @@ private void assertBuildTriggers(IBuildTrigger[] triggers) {
 	private void assertGitBuildSource(IBuildSource source) {
 		assertEquals(BuildSourceType.GIT, source.getType());
 		assertEquals("git://github.com/openshift/ruby-hello-world.git", source.getURI());
+		assertEquals("foobar", source.getContextDir());
 		assertTrue(source instanceof IGitBuildSource);
 
 		IGitBuildSource git = (IGitBuildSource)source;

diff --git a/src/test/resources/samples/openshift3/v1_build_config.json b/src/test/resources/samples/openshift3/v1_build_config.json
@@ -40,6 +40,7 @@
             "git": {
                 "uri": "git://github.com/openshift/ruby-hello-world.git"
             },
+            "contextDir" : "foobar"
         },
         "strategy": {
             "type": "Source",

diff --git a/src/test/resources/samples/openshift3/v1beta3_build_config.json b/src/test/resources/samples/openshift3/v1beta3_build_config.json
@@ -39,7 +39,8 @@
             "type": "Git",
             "git": {
                 "uri": "git://github.com/openshift/ruby-hello-world.git"
-            }
+            },
+            "contextDir" : "foobar"
         },
         "strategy": {
             "type": "Source",