Merging from upstream

Jenkinsfile

@@ -0,0 +1,2 @@
+// Build on ci.jenkins.io; see https://github.com/jenkins-infra/pipeline-library
+buildPlugin()

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Byclosure
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

pom.xml

@@ -1,62 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-		<version>1.580.1</version>
-		<relativePath/>
+		<version>2.7</version>
+		<relativePath />
 	</parent>
+
 	<groupId>com.byclosure.jenkins.plugins</groupId>
 	<artifactId>gcloud-sdk</artifactId>
-	<version>1.0-SNAPSHOT</version>
+	<version>0.0.4-SNAPSHOT</version>
 	<packaging>hpi</packaging>
 
+	<properties>
+		<jenkins.version>2.60.3</jenkins.version>
+		<java.level>8</java.level>
+		<doclint>none</doclint>
+	</properties>
+
 	<name>GCloud SDK Plugin</name>
-	<description>GCloud SDK Plugin allows the invocation of the gcloud CLI as a job step.</description>
-	<url>https://wiki.jenkins-ci.org/display/JENKINS/TODO+Plugin</url>
+	<description>GCloud SDK Plugin allows users to invoke gcloud tools with jenkins credentials.</description>
+	<url>https://wiki.jenkins-ci.org/display/JENKINS/GCloud+SDK+Plugin</url>
 	<licenses>
 		<license>
 			<name>MIT License</name>
 			<url>http://opensource.org/licenses/MIT</url>
 		</license>
 	</licenses>
-	<!-- If you want this to appear on the wiki page:
-	  <developers>
+
+	<developers>
 		<developer>
-		  <id>bhacker</id>
-		  <name>Bob Q. Hacker</name>
-		  <email>bhacker@nowhere.net</email>
+			<id>jrluis</id>
+			<name>João Luís</name>
+			<email>jrluis@gmail.com</email>
 		</developer>
-	  </developers>
-	  -->
-	<!-- Assuming you want to host on @jenkinsci:
-	  <scm>
-		<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
-		<developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
-		<url>http://github.com/jenkinsci/${project.artifactId}-plugin</url>
-	  </scm>
-	   -->
+	</developers>
+
+	<scm>
+		<connection>scm:git:git://github.com/jenkinsci/gcloud-sdk-plugin.git</connection>
+		<developerConnection>scm:git:git@github.com:jenkinsci/gcloud-sdk-plugin.git</developerConnection>
+		<url>https://github.com/jenkinsci/gcloud-sdk-plugin</url>
+	  <tag>HEAD</tag>
+  </scm>
+
 	<repositories>
 		<repository>
 			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
+			<url>https://repo.jenkins-ci.org/public/</url>
 		</repository>
 	</repositories>
+
 	<pluginRepositories>
 		<pluginRepository>
 			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
+			<url>https://repo.jenkins-ci.org/public/</url>
 		</pluginRepository>
 	</pluginRepositories>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.kohsuke</groupId>
+			<artifactId>access-modifier-suppressions</artifactId>
+			<version>1.16</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.http-client</groupId>
+			<artifactId>google-http-client-jackson2</artifactId>
+			<version>1.24.1</version>
+		</dependency>
 		<dependency>
 			<groupId>org.jenkins-ci.plugins</groupId>
 			<artifactId>google-oauth-plugin</artifactId>
-			<version>0.3</version>
+			<version>0.8</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jenkins-ci.plugins</groupId>
+			<artifactId>structs</artifactId>
+			<version>1.7</version>
 		</dependency>
 	</dependencies>
 

src/main/java/com/byclosure/jenkins/plugins/gcloud/GCloudBuildWrapper.java

@@ -1,61 +1,109 @@
 package com.byclosure.jenkins.plugins.gcloud;
 
+import com.cloudbees.jenkins.plugins.gcloudsdk.GCloudInstallation;
+import com.cloudbees.plugins.credentials.CredentialsMatcher;
+import com.cloudbees.plugins.credentials.CredentialsMatchers;
+import com.cloudbees.plugins.credentials.CredentialsProvider;
+import com.cloudbees.plugins.credentials.common.StandardListBoxModel;
+import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
 import com.google.jenkins.plugins.credentials.domains.RequiresDomain;
+import com.google.jenkins.plugins.credentials.oauth.GoogleRobotPrivateKeyCredentials;
+import hudson.EnvVars;
 import hudson.Extension;
+import hudson.FilePath;
 import hudson.Launcher;
-import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
-import hudson.model.BuildListener;
-import hudson.tasks.BuildWrapper;
+import hudson.model.Computer;
+import hudson.model.Item;
+import hudson.model.Node;
+import hudson.model.Run;
+import hudson.model.TaskListener;
+import hudson.security.ACL;
 import hudson.tasks.BuildWrapperDescriptor;
+import hudson.util.ListBoxModel;
+import jenkins.tasks.SimpleBuildWrapper;
 import net.sf.json.JSONObject;
+import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
 
+import javax.annotation.CheckForNull;
 import java.io.IOException;
 import java.util.Map;
 import java.util.logging.Logger;
 
 @RequiresDomain(value = GCloudScopeRequirement.class)
-public class GCloudBuildWrapper extends BuildWrapper {
+public class GCloudBuildWrapper extends SimpleBuildWrapper {
 	private static final Logger LOGGER = Logger.getLogger(GCloudBuildWrapper.class.getName());
+
+	private final String installation;
 	private final String credentialsId;
 
 	@DataBoundConstructor
-	public GCloudBuildWrapper(String credentialsId) {
-		this.credentialsId = credentialsId;
-	}
+	public GCloudBuildWrapper(String installation, String credentialsId) {
+        this.installation = installation;
+        this.credentialsId = credentialsId;
+    }
 
-	@Override
-	public Environment setUp(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException {
-		final GCloudServiceAccount serviceAccount =
-				GCloudServiceAccount.getServiceAccount(build, launcher, listener, credentialsId);
+    @Override
+    public void setUp(Context context, Run<?, ?> build, FilePath workspace, Launcher launcher, TaskListener listener, EnvVars initialEnvironment) throws IOException, InterruptedException {
 
-		if (!serviceAccount.activate()) {
-			serviceAccount.cleanUp();
-			throw new InterruptedException("Couldn't activate GCloudServiceAccount");
-		}
+        GCloudInstallation sdk = getSDK();
+
+        if (sdk == null) {
+            throw new RuntimeException("Could not find a matching Google Cloud SDK installation: " + installation);
+        }
+
+        Computer computer = workspace.toComputer();
+        if (computer == null) throw new RuntimeException("Unable to get workspace node.");
+        Node node = computer.getNode();
+        if (node == null) throw new RuntimeException("Unable to get workspace node.");
 
-		return new Environment() {
-			@Override
-			public void buildEnvVars(Map<String, String> env) {
-			}
+        sdk = sdk.translate(node, initialEnvironment, listener);
+        final FilePath configDir = workspace.createTempDir("gcloud", "config");
 
-			@Override
-			public boolean tearDown(AbstractBuild build, final BuildListener listener) throws IOException, InterruptedException {
-				if (!serviceAccount.revoke()) {
-					serviceAccount.cleanUp();
-					return false;
-				}
+        final GCloudServiceAccount serviceAccount =
+                GCloudServiceAccount.getServiceAccount(build, launcher, listener, credentialsId, configDir);
 
-				serviceAccount.cleanUp();
-				return true;
-			}
+        if (serviceAccount != null) {
+            if (!serviceAccount.activate(sdk)) {
+                configDir.deleteRecursive();
+                throw new InterruptedException("Couldn't activate GCloudServiceAccount");
+            }
 
-		};
+            context.env("GOOGLE_APPLICATION_CREDENTIALS", serviceAccount.getKeyFile().getRemote());
+        }
+
+        context.env("CLOUDSDK_CONFIG", configDir.getRemote());
+
+        sdk.buildEnvVars(initialEnvironment);
+        for (Map.Entry<String, String> entry : initialEnvironment.entrySet()) {
+            context.env(entry.getKey(), entry.getValue());
+        }
+
+
+        context.setDisposer(new GCloudConfigDisposer(configDir));
 	}
 
-	public String getCredentialsId() {
+    public @CheckForNull GCloudInstallation getSDK() {
+        GCloudInstallation[] installations = GCloudInstallation.getInstallations();
+
+        if (installation.isEmpty() && installations.length > 0) {
+            return installations[0];
+        }
+
+        for (GCloudInstallation sdk : installations) {
+            if (installation.equals(sdk.getName())) return sdk;
+        }
+        return null;
+    }
+
+    public String getInstallation() {
+        return installation;
+    }
+
+    public String getCredentialsId() {
 		return credentialsId;
 	}
 
@@ -67,7 +115,7 @@ public DescriptorImpl() {
 
 		@Override
 		public String getDisplayName() {
-			return "GCloud authentication";
+			return "GCloud SDK authentication";
 		}
 
 		@Override
@@ -80,5 +128,38 @@ public boolean configure(StaplerRequest req, JSONObject formData) throws FormExc
 			save();
 			return super.configure(req, formData);
 		}
+
+        public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item project,
+                                                     @QueryParameter String serverAddress) {
+            if (project == null || !project.hasPermission(Item.CONFIGURE)) {
+                return new StandardListBoxModel();
+            }
+            return new StandardListBoxModel()
+                    .withEmptySelection()
+                    .withMatching(
+                            MATCHER,
+                            CredentialsProvider.lookupCredentials(GoogleRobotPrivateKeyCredentials.class,
+                                    project,
+                                    ACL.SYSTEM,
+                                    URIRequirementBuilder.fromUri(serverAddress).build()));
+        }
+
+        public static final CredentialsMatcher MATCHER = CredentialsMatchers.anyOf(CredentialsMatchers.instanceOf(GoogleRobotPrivateKeyCredentials.class));
 	}
+
+    private static class GCloudConfigDisposer extends Disposer {
+
+        private static final long serialVersionUID = 5723296082223871496L;
+
+        private final FilePath configDir;
+
+        public GCloudConfigDisposer(FilePath configDir) {
+            this.configDir = configDir;
+        }
+
+        @Override
+        public void tearDown(Run<?, ?> build, FilePath workspace, Launcher launcher, TaskListener listener) throws IOException, InterruptedException {
+            configDir.deleteRecursive();
+        }
+    }
 }

src/main/java/com/byclosure/jenkins/plugins/gcloud/GCloudSDKBuilder.java

@@ -2,6 +2,7 @@
 
 
 import com.google.jenkins.plugins.credentials.domains.RequiresDomain;
+import hudson.EnvVars;
 import hudson.Extension;
 import hudson.Launcher;
 import hudson.model.AbstractBuild;
@@ -17,9 +18,11 @@
 
 import javax.servlet.ServletException;
 import java.io.IOException;
+import java.util.logging.Logger;
 
 @RequiresDomain(value = GCloudScopeRequirement.class)
 public class GCloudSDKBuilder extends Builder {
+	private static final Logger LOGGER = Logger.getLogger(GCloudSDKBuilder.class.getName());
 
 	private final String command;
 
@@ -42,9 +45,13 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
 	}
 
 	private boolean executeGCloudCLI(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException {
+		EnvVars env = build.getEnvironment(listener);
+		String binariesPath = env.get("CLOUDSDK_DIR")+"/bin/";
+
 		int retCode = launcher.launch()
 				.pwd(build.getWorkspace())
-				.cmdAsSingleString("gcloud " + command)
+				.cmdAsSingleString(binariesPath + "gcloud " + command)
+				.envs(env)
 				.stdout(listener.getLogger())
 				.join();