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

docs: adjust retry settings for hmac samples #1303

Merged
merged 3 commits into from
Mar 29, 2022
Merged

docs: adjust retry settings for hmac samples #1303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48248b5
Adjust retry settings for hmac samples
JesseLovelace Mar 18, 2022
9614022
Add multiple attempts rule; refactor stdout capture
JesseLovelace Mar 29, 2022
27c50f5
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-storage'
If you are using Gradle without BOM, add this to your dependencies

```Groovy
implementation 'com.google.cloud:google-cloud-storage:2.4.5'
implementation 'com.google.cloud:google-cloud-storage:2.5.1'
```

If you are using SBT, add this to your dependencies

```Scala
libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.4.5"
libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.5.1"
```

## Authentication
Expand Down
58 changes: 11 additions & 47 deletions samples/snippets/src/test/java/com/example/storage/ITHmacSnippets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,51 +33,25 @@
import com.google.cloud.storage.HmacKey.HmacKeyState;
import com.google.cloud.storage.ServiceAccount;
import com.google.cloud.storage.Storage;
import com.google.cloud.storage.testing.RemoteStorageHelper;
import java.io.ByteArrayOutputStream;
import java.io.FileDescriptor;
import java.io.FileOutputStream;
import java.io.PrintStream;
import com.google.cloud.testing.junit4.MultipleAttemptsRule;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;

public class ITHmacSnippets {
public class ITHmacSnippets extends TestBase {
private static final String PROJECT_ID = ServiceOptions.getDefaultProjectId();
private static final String HMAC_KEY_TEST_SERVICE_ACCOUNT =
PROJECT_ID + "@" + PROJECT_ID + ".iam.gserviceaccount.com";
private final PrintStream standardOut = new PrintStream(new FileOutputStream(FileDescriptor.out));

private static Storage storage;

@BeforeClass
public static void beforeClass() {
RemoteStorageHelper helper = RemoteStorageHelper.create();
storage =
helper
.getOptions()
.toBuilder()
.setRetrySettings(
helper
.getOptions()
.getRetrySettings()
.toBuilder()
.setRetryDelayMultiplier(3.0)
.build())
.build()
.getService();
}

@Before
public void before() {
cleanUpHmacKeys(ServiceAccount.of(HMAC_KEY_TEST_SERVICE_ACCOUNT));

// This is just in case any tests failed before they could reset the value
System.setOut(standardOut);
}

private static void cleanUpHmacKeys(ServiceAccount serviceAccount) {
@Rule public MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(5);

private void cleanUpHmacKeys(ServiceAccount serviceAccount) {
Page<HmacKey.HmacKeyMetadata> metadatas =
storage.listHmacKeys(Storage.ListHmacKeysOption.serviceAccount(serviceAccount));
for (HmacKey.HmacKeyMetadata hmacKeyMetadata : metadatas.iterateAll()) {
Expand All @@ -92,11 +66,9 @@ private static void cleanUpHmacKeys(ServiceAccount serviceAccount) {

@Test
public void testCreateHmacKey() throws Exception {
final ByteArrayOutputStream snippetOutputCapture = new ByteArrayOutputStream();
System.setOut(new PrintStream(snippetOutputCapture));
;
CreateHmacKey.createHmacKey(HMAC_KEY_TEST_SERVICE_ACCOUNT, PROJECT_ID);
String snippetOutput = snippetOutputCapture.toString();
System.setOut(standardOut);
String snippetOutput = stdOut.getCapturedOutputAsUtf8String();
String accessId = snippetOutput.split("Access ID: ")[1].split("\n")[0];
Thread.sleep(5000);
assertNotNull(storage.getHmacKey(accessId));
Expand All @@ -105,13 +77,9 @@ public void testCreateHmacKey() throws Exception {
@Test
public void testGetHmacKey() throws Exception {
HmacKey hmacKey = storage.createHmacKey(ServiceAccount.of(HMAC_KEY_TEST_SERVICE_ACCOUNT));

final ByteArrayOutputStream snippetOutputCapture = new ByteArrayOutputStream();
System.setOut(new PrintStream(snippetOutputCapture));
Thread.sleep(5000);
GetHmacKey.getHmacKey(hmacKey.getMetadata().getAccessId(), PROJECT_ID);
String snippetOutput = snippetOutputCapture.toString();
System.setOut(standardOut);
String snippetOutput = stdOut.getCapturedOutputAsUtf8String();
Assert.assertTrue(snippetOutput.contains(HMAC_KEY_TEST_SERVICE_ACCOUNT));
}

Expand All @@ -129,9 +97,8 @@ public void testActivateHmacKey() throws Exception {
@Test
public void testDeactivateHmacKey() throws Exception {
HmacKey hmacKey = storage.createHmacKey(ServiceAccount.of(HMAC_KEY_TEST_SERVICE_ACCOUNT));

DeactivateHmacKey.deactivateHmacKey(hmacKey.getMetadata().getAccessId(), PROJECT_ID);
Thread.sleep(5000);
DeactivateHmacKey.deactivateHmacKey(hmacKey.getMetadata().getAccessId(), PROJECT_ID);
assertEquals(
HmacKeyState.INACTIVE, storage.getHmacKey(hmacKey.getMetadata().getAccessId()).getState());
}
Expand All @@ -158,12 +125,9 @@ public void testListHmacKeys() {
ServiceAccount.of(HMAC_KEY_TEST_SERVICE_ACCOUNT),
Storage.CreateHmacKeyOption.projectId(PROJECT_ID));

final ByteArrayOutputStream snippetOutputCapture = new ByteArrayOutputStream();
System.setOut(new PrintStream(snippetOutputCapture));
ListHmacKeys.listHmacKeys(PROJECT_ID);
String snippetOutput = snippetOutputCapture.toString();
String snippetOutput = stdOut.getCapturedOutputAsUtf8String();
assertTrue(snippetOutput.contains(one.getMetadata().getAccessId()));
assertTrue(snippetOutput.contains(two.getMetadata().getAccessId()));
System.setOut(standardOut);
}
}