Merged

fix(java): make system property accessible for native image compilation #1694

Show file tree
Hide file tree
Changes from 1 commit
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b7f574
fix(java): make system properties accessible for native image compila…
mpeddada1Feb 16, 2022
f8045e6
🦉 Updates from OwlBot
gcf-owl-bot[bot]Feb 16, 2022
e5c4ba5
resolve merge conflicts
mpeddada1Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Failed to load files.
Next Next commit
fix(java): make system properties accessible for native image compila…
…tion
  • Loading branch information
@mpeddada1
mpeddada1 committedFeb 16, 2022
commit 7b7f574c797b30d1dbc166cbe445067fc07e462c
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,10 @@
<properties>
<site.installationModule>google-cloud-spanner</site.installationModule>
<opencensus.version>0.30.0</opencensus.version>
<spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
<spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing-east1</spanner.testenv.instance>
<spanner.gce.config.project_id>gcloud-devel</spanner.gce.config.project_id>
<spanner.testenv.kms_key.name>projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key</spanner.testenv.kms_key.name>
</properties>


Expand DownExpand Up@@ -70,10 +74,10 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
<spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing-east1</spanner.testenv.instance>
<spanner.gce.config.project_id>gcloud-devel</spanner.gce.config.project_id>
<spanner.testenv.kms_key.name>projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key</spanner.testenv.kms_key.name>
<spanner.testenv.config.class>${spanner.testenv.config.class}</spanner.testenv.config.class>
<spanner.testenv.instance>${spanner.testenv.instance}</spanner.testenv.instance>
<spanner.gce.config.project_id>${spanner.gce.config.project_id}</spanner.gce.config.project_id>
<spanner.testenv.kms_key.name>${spanner.testenv.kms_key.name}</spanner.testenv.kms_key.name>
</systemPropertyVariables>
<forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
</configuration>
Expand All@@ -100,6 +104,32 @@
</execution>
</executions>
</plugin>

<!--Configurations for native image tests-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<spanner.testenv.config.class>${spanner.testenv.config.class}</spanner.testenv.config.class>
<spanner.testenv.instance>${spanner.testenv.instance}</spanner.testenv.instance>
<spanner.gce.config.project_id>${spanner.gce.config.project_id}</spanner.gce.config.project_id>
<spanner.testenv.kms_key.name>${spanner.testenv.kms_key.name}</spanner.testenv.kms_key.name>
</systemPropertyVariables>
<forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
</configuration>
</plugin>
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<configuration>
<buildArgs combine.children="append">
<buildArg>-Dspanner.testenv.config.class=${spanner.testenv.config.class}</buildArg>
</buildArgs>
</configuration>
</plugin>
<!--Configurations for native image tests-->

<plugin>
<?m2e ignore?>
<groupId>org.codehaus.mojo</groupId>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,8 @@ public class IntegrationTestEnv extends ExternalResource {
/** Names a property that provides the class name of the {@link TestEnvConfig} to use. */
public static final String TEST_ENV_CONFIG_CLASS_NAME = "spanner.testenv.config.class";

public static final String CONFIG_CLASS = System.getProperty(TEST_ENV_CONFIG_CLASS_NAME, null);

/**
* Names a property that, if set, identifies an existing Cloud Spanner instance to use for tests.
*/
Expand All@@ -62,12 +64,11 @@ public RemoteSpannerHelper getTestHelper() {
@SuppressWarnings("unchecked")
protected void initializeConfig()
throws ClassNotFoundException, InstantiationException, IllegalAccessException {
String configClassName = System.getProperty(TEST_ENV_CONFIG_CLASS_NAME, null);
if (configClassName == null) {
if (CONFIG_CLASS == null) {
throw new NullPointerException("Property " + TEST_ENV_CONFIG_CLASS_NAME + " needs to be set");
}
Class<? extends TestEnvConfig> configClass;
configClass = (Class<? extends TestEnvConfig>) Class.forName(configClassName);
configClass = (Class<? extends TestEnvConfig>) Class.forName(CONFIG_CLASS);
config = configClass.newInstance();
}

Expand Down