Skip to content

Commit d6e03d0

Browse files
authored
Rename the secret name property for Secret Manager (spring-attic#2191)
1 parent f06e9f1 commit d6e03d0

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/secretmanager/GcpSecretManagerBootstrapConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,6 @@ public SecretManagerServiceClient secretManagerClient() throws IOException {
9898
@Bean
9999
public PropertySourceLocator secretManagerPropertySourceLocator(SecretManagerServiceClient client) {
100100
return new SecretManagerPropertySourceLocator(
101-
client, this.gcpProjectIdProvider, this.properties.getSecretPropertyNamespace());
101+
client, this.gcpProjectIdProvider, this.properties.getSecretNamePrefix());
102102
}
103103
}

spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/secretmanager/GcpSecretManagerProperties.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class GcpSecretManagerProperties implements CredentialsSupplier {
4040
* Defines a prefix String that will be prepended to the environment property names
4141
* of secrets in Secret Manager.
4242
*/
43-
private String secretPropertyNamespace = "";
43+
private String secretNamePrefix = "";
4444

4545
public Credentials getCredentials() {
4646
return credentials;
@@ -54,11 +54,11 @@ public void setProjectId(String projectId) {
5454
this.projectId = projectId;
5555
}
5656

57-
public String getSecretPropertyNamespace() {
58-
return secretPropertyNamespace;
57+
public String getSecretNamePrefix() {
58+
return secretNamePrefix;
5959
}
6060

61-
public void setSecretPropertyNamespace(String secretPropertyNamespace) {
62-
this.secretPropertyNamespace = secretPropertyNamespace;
61+
public void setSecretNamePrefix(String secretNamePrefix) {
62+
this.secretNamePrefix = secretNamePrefix;
6363
}
6464
}

spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/secretmanager/SecretManagerPropertySource.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ public SecretManagerPropertySource(
4848
String propertySourceName,
4949
SecretManagerServiceClient client,
5050
GcpProjectIdProvider projectIdProvider,
51-
String secretsNamespace) {
51+
String secretsPrefix) {
5252

5353
super(propertySourceName, client);
5454

5555
Map<String, Object> propertiesMap = createSecretsPropertiesMap(
56-
client, projectIdProvider.getProjectId(), secretsNamespace);
56+
client, projectIdProvider.getProjectId(), secretsPrefix);
5757

5858
this.properties = propertiesMap;
5959
this.propertyNames = propertiesMap.keySet().toArray(new String[propertiesMap.size()]);
@@ -70,15 +70,15 @@ public Object getProperty(String name) {
7070
}
7171

7272
private static Map<String, Object> createSecretsPropertiesMap(
73-
SecretManagerServiceClient client, String projectId, String secretsNamespace) {
73+
SecretManagerServiceClient client, String projectId, String secretsPrefix) {
7474

7575
ListSecretsPagedResponse response = client.listSecrets(ProjectName.of(projectId));
7676

7777
HashMap<String, Object> secretsMap = new HashMap<>();
7878
for (Secret secret : response.iterateAll()) {
7979
String secretId = extractSecretId(secret);
8080
ByteString secretPayload = getSecretPayload(client, projectId, secretId);
81-
secretsMap.put(secretsNamespace + secretId, secretPayload);
81+
secretsMap.put(secretsPrefix + secretId, secretPayload);
8282
}
8383

8484
return secretsMap;

spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/secretmanager/SecretManagerPropertySourceLocator.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ public class SecretManagerPropertySourceLocator implements PropertySourceLocator
3838

3939
private final GcpProjectIdProvider projectIdProvider;
4040

41-
private final String secretsNamespace;
41+
private final String secretsPrefix;
4242

4343
SecretManagerPropertySourceLocator(
4444
SecretManagerServiceClient client,
4545
GcpProjectIdProvider projectIdProvider,
46-
String secretsNamespace) {
46+
String secretsPrefix) {
4747
this.client = client;
4848
this.projectIdProvider = projectIdProvider;
49-
this.secretsNamespace = secretsNamespace;
49+
this.secretsPrefix = secretsPrefix;
5050
}
5151

5252
@Override
@@ -55,6 +55,6 @@ public PropertySource<?> locate(Environment environment) {
5555
SECRET_MANAGER_NAME,
5656
this.client,
5757
this.projectIdProvider,
58-
this.secretsNamespace);
58+
this.secretsPrefix);
5959
}
6060
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# This optional setting adds a prefix to your secret names that get injected
22
# into the application Environment.
3-
spring.cloud.gcp.secretmanager.secret-property-namespace=secrets.
3+
spring.cloud.gcp.secretmanager.secret-name-prefix=secrets.

0 commit comments

Comments
 (0)