-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into secure-hermetic-build-docker-image
- Loading branch information
Showing
23 changed files
with
546 additions
and
91 deletions.
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
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,60 @@ | ||
| # Copyright 2024 Google LLC | ||
| # | ||
| # 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. | ||
| # GitHub action job to test core java library features on | ||
| # downstream client libraries before they are released. | ||
|
|
||
| # This composite action should be used in google-cloud-java and handwritten | ||
| # libraries to generate changed libraries. | ||
| # This composite action serves as a source of truth of scripts that run | ||
| # library generation and create pull requests. | ||
| name: Hermetic library generation | ||
| description: Runs hermetic library generation to produce changed libraries | ||
| inputs: | ||
| base_ref: | ||
| description: base branch | ||
| required: true | ||
| head_ref: | ||
| description: head branch | ||
| required: true | ||
| image_tag: | ||
| description: the tag of hermetic build image | ||
| required: false | ||
| token: | ||
| description: Personal Access Token | ||
| required: true | ||
|
|
||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: Copy shell script | ||
| shell: bash | ||
| run: | | ||
| cd ${{ github.action_path }} | ||
| cp hermetic_library_generation.sh $GITHUB_WORKSPACE | ||
| - name: Generate changed libraries | ||
| shell: bash | ||
| run: | | ||
| set -x | ||
| [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com" | ||
| [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot" | ||
| cd "${GITHUB_WORKSPACE}" | ||
| bash hermetic_library_generation.sh \ | ||
| --target_branch "${BASE_REF}" \ | ||
| --current_branch "${HEAD_REF}" \ | ||
| --image_tag "${IMAGE_TAG}" | ||
| env: | ||
| BASE_REF: ${{ inputs.base_ref }} | ||
| HEAD_REF: ${{ inputs.head_ref }} | ||
| IMAGE_TAG: ${{ inputs.image_tag }} | ||
| GH_TOKEN: ${{ inputs.token }} |
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
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,10 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html --> | ||
| <differences> | ||
| <!-- Add AutoValue abstract method isDirectPath --> | ||
| <difference> | ||
| <differenceType>7013</differenceType> | ||
| <className>com/google/api/gax/grpc/GrpcTransportChannel</className> | ||
| <method>boolean isDirectPath()</method> | ||
| </difference> | ||
| </differences> |
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
48 changes: 48 additions & 0 deletions
48
gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcTransportChannelTest.java
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,48 @@ | ||
| /* | ||
| * Copyright 2024 Google LLC | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following disclaimer | ||
| * in the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * * Neither the name of Google LLC nor the names of its | ||
| * contributors may be used to endorse or promote products derived from | ||
| * this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| package com.google.api.gax.grpc; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.*; | ||
|
|
||
| import io.grpc.ManagedChannel; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.mockito.Mockito; | ||
|
|
||
| class GrpcTransportChannelTest { | ||
|
|
||
| @Test | ||
| void testBuilderDefaults() { | ||
| ManagedChannel channel = Mockito.mock(ManagedChannel.class); | ||
| GrpcTransportChannel grpcTransportChannel = | ||
| GrpcTransportChannel.newBuilder().setManagedChannel(channel).build(); | ||
| assertFalse(grpcTransportChannel.isDirectPath()); | ||
| } | ||
| } |
Oops, something went wrong.