Skip to content
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

Jump to bottom

feat(publishing): more work on artifact registry publish plugin #174

Merged
merged 1 commit into from
Mar 2, 2022
Merged

feat(publishing): more work on artifact registry publish plugin #174

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions spinnaker-project-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ gradlePlugin {
id = 'io.spinnaker.bintray-publish'
implementationClass = 'com.netflix.spinnaker.gradle.publishing.bintray.BintrayPublishPlugin'
}
spinnakerArtifactRegistryPublish {
id = 'io.spinnaker.artifactregistry-publish'
implementationClass = 'com.netflix.spinnaker.gradle.publishing.artifactregistry.ArtifactRegistryPublishPlugin'
}
}
}

Expand All @@ -45,5 +49,8 @@ pluginBundle {
spinnakerBintrayPublish {
displayName = 'Bintray publishing for spinnaker jars and debs'
}
spinnakerArtifactRegistryPublish {
displayName = 'Google Artifact Registry publishing for spinnaker packages'
}
}
}
39 changes: 26 additions & 13 deletions .../netflix/spinnaker/gradle/publishing/artifactregistry/ArtifactRegistryDebPublishTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,34 @@
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.services.artifactregistry.v1beta1.model.Operation;
import com.google.auth.Credentials;
import com.google.auth.http.HttpCredentialsAdapter;
import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.artifactregistry.auth.DefaultCredentialProvider;
import com.google.cloud.storage.BlobId;
import com.google.cloud.storage.BlobInfo;
import com.google.cloud.storage.Storage;
import com.google.cloud.storage.StorageException;
import com.google.cloud.storage.StorageOptions;
import com.google.cloud.storage.*;
import com.google.common.base.Stopwatch;
import com.google.common.base.Strings;
import com.google.common.io.ByteStreams;
import java.io.IOException;
import java.nio.channels.ByteChannel;
import java.nio.channels.WritableByteChannel;
import java.nio.file.Files;
import java.security.GeneralSecurityException;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import org.apache.tools.ant.filters.StringInputStream;
import org.gradle.api.DefaultTask;
import org.gradle.api.file.RegularFile;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.InputFile;
import org.gradle.api.tasks.TaskAction;

import javax.inject.Inject;
import java.io.IOException;
import java.nio.channels.ByteChannel;
import java.nio.channels.WritableByteChannel;
import java.nio.file.Files;
import java.security.GeneralSecurityException;
import java.util.concurrent.TimeUnit;

class ArtifactRegistryDebPublishTask extends DefaultTask {

private static final String GOOGLE_SERVICE_ACCT_JSON_ENV_VAR = "GAR_JSON_KEY";

private Provider<String> uploadBucket;
private Provider<String> repoProject;
private Provider<String> location;
Expand Down Expand Up @@ -116,6 +119,16 @@ private void deleteDebFromGcs(Storage storage, BlobId blobId) {
}
}

private Credentials resolveCredentials() throws IOException {
String fromEnvironmentVar = System.getenv(GOOGLE_SERVICE_ACCT_JSON_ENV_VAR);

if (!Strings.isNullOrEmpty(fromEnvironmentVar)) {
return GoogleCredentials.fromStream(new StringInputStream(fromEnvironmentVar));
}

return new DefaultCredentialProvider().getCredential();
}

/**
* Import the blob into Artifact Registry and return an Operation representing the import.
*
Expand All @@ -128,7 +141,7 @@ private Operation importDebToArtifactRegistry(BlobId blobId) throws GeneralSecur

ArtifactRegistryAlphaClient artifactRegistryClient = new ArtifactRegistryAlphaClient(
GoogleNetHttpTransport.newTrustedTransport(), JacksonFactory.getDefaultInstance(), new HttpCredentialsAdapter(
new DefaultCredentialProvider().getCredential()
resolveCredentials()
)
);

Expand Down
2 changes: 1 addition & 1 deletion ...netflix/spinnaker/gradle/publishing/artifactregistry/ArtifactRegistryPublishPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class ArtifactRegistryPublishPlugin implements Plugin<Project> {
it.repoProject = extension.aptProject()
it.location = extension.aptLocation()
it.repository = extension.aptRepository()
it.aptImportTimeoutSeconds = extension.aptImportTimeoutSeconds
it.aptImportTimeoutSeconds = extension.aptImportTimeoutSeconds()
it.dependsOn(debTask)
it.onlyIf { extension.enabled().get() }
it.onlyIf { extension.aptEnabled().get() }
Expand Down