Skip to content

Make testDownloadPublicBlobWithoutAuthentication skippable with an environment variable #3828

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

Merged
JesseLovelace merged 9 commits into from
Oct 17, 2018
Merged

Make testDownloadPublicBlobWithoutAuthentication skippable with an environment variable #3828

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
307f682
Add assumptions to storage integration tests
JesseLovelace Oct 12, 2018
a7a5f29
Merge remote-tracking branch 'upstream/master' into HEAD
JesseLovelace Oct 16, 2018
1eed09b
Make testDownloadPublicBlobWithoutAuthentication skippable with an en…
JesseLovelace Oct 16, 2018
35ef5f3
Make testDownloadPublicBlobWithoutAuthentication skippable with an en…
JesseLovelace Oct 16, 2018
a618868
Merge branch 'useenvironmentvariable' of github.com:JesseLovelace/goo…
JesseLovelace Oct 16, 2018
07a9740
Merge branch 'useenvironmentvariable' of github.com:JesseLovelace/goo…
JesseLovelace Oct 16, 2018
1d606be
Merge branch 'useenvironmentvariable' of github.com:JesseLovelace/goo…
JesseLovelace Oct 16, 2018
466756e
Merge branch 'useenvironmentvariable' of github.com:JesseLovelace/goo…
JesseLovelace Oct 16, 2018
343e9d6
Merge branch 'useenvironmentvariable' of github.com:JesseLovelace/goo…
JesseLovelace Oct 16, 2018
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
13 changes: 5 additions & 8 deletions ...clients/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;

import com.google.api.client.googleapis.json.GoogleJsonResponseException;
import com.google.api.gax.paging.Page;
import com.google.auth.ServiceAccountSigner;
import com.google.auth.oauth2.GoogleCredentials;
Expand Down Expand Up @@ -143,6 +142,8 @@ public class ITStorageTest {
private static final String KMS_KEY_RING_LOCATION = "us";
private static final String KMS_KEY_ONE_NAME = "gcs_kms_key_one";
private static final String KMS_KEY_TWO_NAME = "gcs_kms_key_two";
private static final boolean IS_VPC_TEST = System.getenv("GOOGLE_CLOUD_TESTS_IN_VPCSC") != null
&& System.getenv("GOOGLE_CLOUD_TESTS_IN_VPCSC").equalsIgnoreCase("true");

@BeforeClass
public static void beforeClass() throws IOException {
Expand Down Expand Up @@ -1661,20 +1662,16 @@ public void testGetBlobs() {

@Test
public void testDownloadPublicBlobWithoutAuthentication() {
assumeFalse(IS_VPC_TEST);
// create an unauthorized user
Storage unauthorizedStorage = StorageOptions.getUnauthenticatedInstance().getService();

// 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";
byte[] bytes;
try {
bytes = unauthorizedStorage.readAllBytes(landsatBucket, landsatBlob);
} catch (StorageException ex) {
assumeFalse(403 == ex.getCode());
return;
}
byte[] bytes = unauthorizedStorage.readAllBytes(landsatBucket, landsatBlob);

assertThat(bytes.length).isEqualTo(7903);
int numBlobs = 0;
Iterator<Blob> blobIterator = unauthorizedStorage
Expand Down