Skip to content

Commit ef0b2b5

Browse files
committed
Polishing.
Remove GcpIam and AppId leftovers. See gh-904
1 parent 2ca063f commit ef0b2b5

6 files changed

+1
-209
lines changed

spring-vault-core/src/main/java/org/springframework/vault/authentication/DefaultGcpCredentialAccessors.java

-65
This file was deleted.

spring-vault-core/src/main/java/org/springframework/vault/authentication/DefaultGoogleCredentialsAccessors.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ enum DefaultGoogleCredentialsAccessors implements GoogleCredentialsAccountIdAcce
3333
INSTANCE;
3434

3535
/**
36-
* Get a the service account id (email) to be placed in the signed JWT.
36+
* Get the service account id (email) to be placed in the signed JWT.
3737
* @param credentials credentials object to obtain the service account id from.
3838
* @return the service account id to use.
3939
*/

spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpCredentialSupplier.java

-56
This file was deleted.

spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpProjectIdAccessor.java

-39
This file was deleted.

spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpServiceAccountIdAccessor.java

-38
This file was deleted.

spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java

-10
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,6 @@
102102
* <ul>
103103
* <li>Vault Token: {@code vault.token}</li>
104104
* </ul>
105-
* <li>AppId authentication
106-
* <ul>
107-
* <li>AppId path: {@code vault.app-id.app-id-path} (since 2.2.1, defaults to
108-
* {@link AppIdAuthenticationOptions#DEFAULT_APPID_AUTHENTICATION_PATH})</li>
109-
* <li>AppId: {@code vault.app-id.app-id}</li>
110-
* <li>UserId: {@code vault.app-id.user-id}. {@literal MAC_ADDRESS} and
111-
* {@literal IP_ADDRESS} use {@link MacAddressUserId}, respective {@link IpAddressUserId}.
112-
* Any other value is used with {@link StaticUserId}.</li>
113-
* </ul>
114105
* <li>AppRole authentication
115106
* <ul>
116107
* <li>AppRole path: {@code vault.app-role.app-role-path} (since 2.2.1, defaults to
@@ -170,7 +161,6 @@
170161
* @see org.springframework.core.env.Environment
171162
* @see org.springframework.core.env.PropertySource
172163
* @see VaultEndpoint
173-
* @see AppIdAuthentication
174164
* @see AppRoleAuthentication
175165
* @see AwsEc2Authentication
176166
* @see AwsIamAuthentication

0 commit comments

Comments
 (0)