Break apart container configuration build and push step #252
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Copyright 2018 Google LLC. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy of | ||
| * the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.tools.jib.blob; | ||
|
|
||
| /** Struct for pairing a Blob and its digest. */ | ||
| public class BlobAndDigest { | ||
| private Blob blob; | ||
| private BlobDescriptor blobDescriptor; | ||
|
|
||
| public BlobAndDigest(Blob blob, BlobDescriptor blobDescriptor) { | ||
| this.blob = blob; | ||
| this.blobDescriptor = blobDescriptor; | ||
| } | ||
|
|
||
| public Blob getBlob() { | ||
| return blob; | ||
| } | ||
|
|
||
| public BlobDescriptor getBlobDescriptor() { | ||
| return blobDescriptor; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Copyright 2018 Google LLC. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy of | ||
| * the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.tools.jib.builder; | ||
|
|
||
| import com.google.cloud.tools.jib.Timer; | ||
| import com.google.cloud.tools.jib.blob.BlobAndDigest; | ||
| import com.google.cloud.tools.jib.blob.BlobDescriptor; | ||
| import com.google.cloud.tools.jib.http.Authorization; | ||
| import com.google.cloud.tools.jib.registry.RegistryClient; | ||
| import com.google.common.util.concurrent.ListenableFuture; | ||
| import com.google.common.util.concurrent.ListeningExecutorService; | ||
| import java.util.concurrent.Callable; | ||
|
|
||
| class PushContainerConfigurationStep implements Callable<ListenableFuture<BlobDescriptor>> { | ||
|
|
||
|
|
||
| private static final String DESCRIPTION = "Pushing container configuration"; | ||
|
|
||
| private final BuildConfiguration buildConfiguration; | ||
| private final ListenableFuture<Authorization> pushAuthorizationFuture; | ||
| private final ListenableFuture<BlobAndDigest> blobAndDigestFuture; | ||
| private final ListeningExecutorService listeningExecutorService; | ||
|
|
||
| PushContainerConfigurationStep( | ||
| BuildConfiguration buildConfiguration, | ||
| ListenableFuture<Authorization> pushAuthorizationFuture, | ||
| ListenableFuture<BlobAndDigest> blobAndDigestFuture, | ||
| ListeningExecutorService listeningExecutorService) { | ||
| this.buildConfiguration = buildConfiguration; | ||
| this.pushAuthorizationFuture = pushAuthorizationFuture; | ||
| this.blobAndDigestFuture = blobAndDigestFuture; | ||
| this.listeningExecutorService = listeningExecutorService; | ||
| } | ||
|
|
||
| @Override | ||
| public ListenableFuture<BlobDescriptor> call() { | ||
| return listeningExecutorService.submit( | ||
| () -> { | ||
| try (Timer timer = new Timer(buildConfiguration.getBuildLogger(), DESCRIPTION)) { | ||
| RegistryClient registryClient = | ||
| new RegistryClient( | ||
| NonBlockingFutures.get(pushAuthorizationFuture), | ||
| buildConfiguration.getTargetRegistry(), | ||
| buildConfiguration.getTargetRepository()) | ||
| .setTimer(timer); | ||
|
|
||
| // TODO: Use PushBlobStep. | ||
| // Pushes the container configuration. | ||
| BlobAndDigest blobAndDigest = blobAndDigestFuture.get(); | ||
| registryClient.pushBlob( | ||
| blobAndDigest.getBlobDescriptor().getDigest(), blobAndDigest.getBlob()); | ||
| return blobAndDigest.getBlobDescriptor(); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This could probably avoid creating a new tuple class
BlobAndDigestby just returning theBlobhere and generating theDigestin the push step.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good, I wasn't sure if the Digest generation should be kept in the build step.