From 1109172de194ef01d932fecdb73a6d2d7c5fb369 Mon Sep 17 00:00:00 2001 From: Paul van der Bles Date: Mon, 7 Oct 2024 10:58:48 +0200 Subject: [PATCH] Rename variables(#4067) --- .../google/cloud/tools/jib/gradle/ContainerParameters.java | 6 +++--- .../com/google/cloud/tools/jib/gradle/JibPluginTest.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ContainerParameters.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ContainerParameters.java index 7561550a55..961aa90b34 100644 --- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ContainerParameters.java +++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ContainerParameters.java @@ -113,10 +113,10 @@ public void setJvmFlags(Provider> jvmFlags) { public MapProperty getEnvironment() { String environmentProperty = System.getProperty(PropertyNames.CONTAINER_ENVIRONMENT); if (environmentProperty != null) { - Map parsedLabels = + Map parsedEnvironment = ConfigurationPropertyValidator.parseMapProperty(environmentProperty); - if (!parsedLabels.equals(environment.get())) { - environment.set(parsedLabels); + if (!parsedEnvironment.equals(environment.get())) { + environment.set(parsedEnvironment); } } return environment; diff --git a/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/JibPluginTest.java b/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/JibPluginTest.java index 50a115b5c1..ad2beadb75 100644 --- a/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/JibPluginTest.java +++ b/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/JibPluginTest.java @@ -370,8 +370,8 @@ public void testLazyEvalForLabels() { @Test public void testLazyEvalForEnvironment() { - BuildResult showLabels = testProject.build("showenvironment", "-Djib.console=plain"); - assertThat(showLabels.getOutput()) + BuildResult showEnvironment = testProject.build("showenvironment", "-Djib.console=plain"); + assertThat(showEnvironment.getOutput()) .contains( "environment contains values [var1:val1updated, var2:val2updated]"); }