From 7f0b78be4eae98350817133cb4f686d3d4b8ee3d Mon Sep 17 00:00:00 2001 From: Daniel B Date: Wed, 16 Jun 2021 12:53:56 -0700 Subject: [PATCH 1/3] feat: configure initial sp version --- .github/workflows/ci.yaml | 114 ++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 53 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6830220756..27c49c8821 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,79 +1,87 @@ -on: +'on': push: branches: - - master - pull_request: + - 1.111.3-patch + pull_request: null name: ci jobs: units: runs-on: ubuntu-latest strategy: matrix: - java: [7, 8, 11] + java: + - 7 + - 8 + - 11 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: ${{matrix.java}} - - run: java -version - - run: .kokoro/build.sh - env: - JOB_TYPE: test - - name: coverage - uses: codecov/codecov-action@v1 - with: - name: actions ${{matrix.java}} + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: ${{matrix.java}} + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: test windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - run: .kokoro/build.bat - env: - JOB_TYPE: test + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/build.bat + env: + JOB_TYPE: test dependencies: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11] + java: + - 8 + - 11 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: ${{matrix.java}} - - run: java -version - - run: .kokoro/dependencies.sh + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: ${{matrix.java}} + - run: java -version + - run: .kokoro/dependencies.sh linkage-monitor: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - run: .kokoro/linkage-monitor.sh + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - name: Install artifacts to local Maven repository + run: .kokoro/build.sh + shell: bash + - name: >- + Validate any conflicts with regard to com.google.cloud:libraries-bom + (latest release) + uses: >- + GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - run: .kokoro/build.sh - env: - JOB_TYPE: lint + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: lint clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - run: .kokoro/build.sh - env: - JOB_TYPE: clirr \ No newline at end of file + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: clirr From 89b8a09ebd29c944ff1dfb20f98a80af06aa6f19 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Tue, 16 Mar 2021 11:15:07 -0400 Subject: [PATCH 2/3] fix(test): update blob paths used in storage.it.ITStorageTest#testDownloadPublicBlobWithoutAuthentication (#759) Port of https://github.com/googleapis/google-cloud-go/pull/3806 Fixes https://github.com/googleapis/java-storage/issues/755 --- .../java/com/google/cloud/storage/it/ITStorageTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java index ba4b3623f6..8856b55353 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java @@ -2053,11 +2053,11 @@ public void testDownloadPublicBlobWithoutAuthentication() { // try to download blobs from a public bucket String landsatBucket = "gcp-public-data-landsat"; - String landsatPrefix = "LC08/PRE/044/034/LC80440342016259LGN00/"; - String landsatBlob = landsatPrefix + "LC80440342016259LGN00_MTL.txt"; + String landsatPrefix = "LC08/01/001/002/LC08_L1GT_001002_20160817_20170322_01_T2/"; + String landsatBlob = landsatPrefix + "LC08_L1GT_001002_20160817_20170322_01_T2_ANG.txt"; byte[] bytes = unauthorizedStorage.readAllBytes(landsatBucket, landsatBlob); - assertThat(bytes.length).isEqualTo(7903); + assertThat(bytes.length).isEqualTo(117255); int numBlobs = 0; Iterator blobIterator = unauthorizedStorage @@ -2068,7 +2068,7 @@ public void testDownloadPublicBlobWithoutAuthentication() { numBlobs++; blobIterator.next(); } - assertThat(numBlobs).isEqualTo(13); + assertThat(numBlobs).isEqualTo(14); // try to download blobs from a bucket that requires authentication // authenticated client will succeed From 80984a6e74220a417d51b9f7a4ed8fe23184df1f Mon Sep 17 00:00:00 2001 From: Chris Cotter Date: Sun, 6 Jun 2021 22:10:29 -0400 Subject: [PATCH 3/3] test: remove error string matching (#861) It looks like the text for this error on the backend has changed (sometimes) from "Precondition Failed" to "At least one of the pre-conditions you specified did not hold". I don't think it's really necessary to check the exact message in any case given that we do check for a code of 412, which implies a precondition failure. I added a check of the error Reason instead, which is more standardized. Fixes #853 --- .../test/java/com/google/cloud/storage/it/ITStorageTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java index 8856b55353..ac90a9a437 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java @@ -3291,7 +3291,7 @@ public void testBlobReload() throws Exception { fail("StorageException was expected"); } catch (StorageException e) { assertEquals(412, e.getCode()); - assertEquals("Precondition Failed", e.getMessage()); + assertEquals("conditionNotMet", e.getReason()); } Blob updated = blob.reload();