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

chore: add secret manager module and sample it tests to native image CI #2206

Merged
merged 8 commits into from
Oct 9, 2023
+124 −42
Merged

chore: add secret manager module and sample it tests to native image CI #2206

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d486719
add retrieve secret step so this test does not rely on secret == 'Hel…
zhumin8 Sep 28, 2023
284b88e
add secretmanager sample test to native test setup.
zhumin8 Sep 28, 2023
00ce246
add secretmanager module it test to native ci setup.
zhumin8 Sep 28, 2023
fdbaeca
add uuid to test-secret names for it test.
zhumin8 Oct 2, 2023
138ec14
refactor secret manager sample application test to remove dependency …
zhumin8 Oct 3, 2023
4d24190
Merge branch 'main' into graal-secretmanager
zhumin8 Oct 3, 2023
e71482a
fix: checkstyle.
zhumin8 Oct 3, 2023
351643b
chore:add secretmanager to native test ci matrix.
zhumin8 Oct 9, 2023
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
4 changes: 3 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@
<module>spring-cloud-gcp-storage</module>
<module>spring-cloud-gcp-vision</module>
<module>spring-cloud-gcp-data-spanner</module>
<module>spring-cloud-gcp-secretmanager</module>
</modules>

<dependencies>
Expand All @@ -381,9 +382,10 @@
<classesDirectory>${project.build.outputDirectory}</classesDirectory>
<systemPropertyVariables>
<!--integration tests are not invoked unless the relevant system property is set to true here. -->
<it.storage>true</it.storage>
<it.storage>true</it.storage>
<it.vision>true</it.vision>
<it.spanner>true</it.spanner>
<it.secretmanager>true</it.secretmanager>
</systemPropertyVariables>
</configuration>
</plugin>
Expand Down
5 changes: 3 additions & 2 deletions spring-cloud-gcp-samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
<module>spring-cloud-gcp-integration-storage-sample</module>
<module>spring-cloud-gcp-trace-sample</module>
<module>spring-cloud-gcp-vision-api-sample</module>
<module>spring-cloud-gcp-secretmanager-sample</module>
</modules>
<build>
<plugins>
Expand Down Expand Up @@ -138,9 +139,9 @@
<systemPropertyVariables>
<it.logging>true</it.logging>
<it.storage>true</it.storage>
<it.vision>true</it.vision>
<it.trace>true</it.trace>
<it.vision>true</it.vision>
<it.trace>true</it.trace>
<it.secretmanager>true</it.secretmanager>
<gcs-resource-test-bucket>gcp-storage-resource-bucket-sample</gcs-resource-test-bucket>
<gcs-read-bucket>gcp-storage-bucket-sample-input</gcs-read-bucket>
<gcs-write-bucket>gcp-storage-bucket-sample-output</gcs-write-bucket>
Expand Down
19 changes: 12 additions & 7 deletions ...p-secretmanager-sample/src/test/java/com/example/SecretManagerSampleIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;

/**
* Application secret named "application-secret" must exist and have a value of "Hello world.".
*/
/** Application secret named "application-secret" must exist. */
@EnabledIfSystemProperty(named = "it.secretmanager", matches = "true")
@ExtendWith(SpringExtension.class)
@SpringBootTest(
Expand All @@ -52,12 +50,19 @@ class SecretManagerSampleIntegrationTests {

@Test
void testApplicationStartup() {
// retrieve secret string with secretManagerTemplate directly, to compare with loaded
// application
String secretString =
this.secretManagerTemplate.getSecretString(
"sm://" + "application-secret" + "/" + SecretManagerTemplate.LATEST_VERSION);

ResponseEntity<String> response = this.testRestTemplate.getForEntity("/", String.class);
assertThat(response.getStatusCode().is2xxSuccessful()).isTrue();
assertThat(response.getBody()).contains(
"<b>Application secret from @Value:</b> <i>Hello world.</i>");
assertThat(response.getBody()).contains(
"<b>Application secret from @ConfigurationProperties:</b> <i>Hello world.</i>");
assertThat(response.getBody())
.contains("<b>Application secret from @Value:</b> <i>" + secretString + "</i>");
assertThat(response.getBody())
.contains(
"<b>Application secret from @ConfigurationProperties:</b> <i>" + secretString + "</i>");
}

@Test
Expand Down